owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed the lists tab order. This should partially fix #3

Browse Source
This commit is contained in:
LucasGGamerM
2022-12-11 20:12:27 -03:00
parent d1e77efa1c
commit ab00ad68f1
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java
View File

@@ -88,11 +88,11 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
tabView.setId(switch(switchIndex){ tabView.setId(switch(switchIndex){
case 0 -> R.id.discover_local_timeline; case 0 -> R.id.discover_local_timeline;
case 1 -> R.id.discover_federated_timeline; case 1 -> R.id.discover_federated_timeline;
case 2 -> R.id.discover_hashtags; case 2 -> R.id.discover_lists;
case 3 -> R.id.discover_posts; case 3 -> R.id.discover_hashtags;
case 4 -> R.id.discover_news; case 4 -> R.id.discover_posts;
case 5 -> R.id.discover_users; case 5 -> R.id.discover_news;
case 6 -> R.id.discover_lists; case 6 -> R.id.discover_users;
default -> throw new IllegalStateException("Unexpected value: "+switchIndex); default -> throw new IllegalStateException("Unexpected value: "+switchIndex);
}); });
tabView.setVisibility(View.GONE); tabView.setVisibility(View.GONE);
@@ -165,11 +165,12 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
tab.setText(switch(position){ tab.setText(switch(position){
case 0 -> R.string.local_timeline; case 0 -> R.string.local_timeline;
case 1 -> R.string.sk_federated_timeline; case 1 -> R.string.sk_federated_timeline;
case 2 -> R.string.hashtags; case 2 -> R.string.sk_list_timelines;
case 3 -> R.string.posts; case 3 -> R.string.hashtags;
case 4 -> R.string.news; case 4 -> R.string.posts;
case 5 -> R.string.for_you; case 5 -> R.string.news;
case 6 -> R.string.sk_list_timelines; case 6 -> R.string.for_you;
default -> throw new IllegalStateException("Unexpected value: "+position); default -> throw new IllegalStateException("Unexpected value: "+position);
}); });
tab.view.textView.setAllCaps(true); tab.view.textView.setAllCaps(true);