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

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

This commit is contained in:
LucasGGamerM 2022-12-11 20:12:27 -03:00
parent cce6ba0746
commit 1f51331f67
2 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java
View File

@ -63,14 +63,14 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
Bundle args=getArguments(); Bundle args=getArguments();
setTitle(R.string.sk_list_timelines); // setTitle(R.string.sk_list_timelines);
accountId=args.getString("account"); accountId=args.getString("account");
if(args.containsKey("profileAccount")){ if(args.containsKey("profileAccount")){
profileAccountId=args.getString("profileAccount"); profileAccountId=args.getString("profileAccount");
profileDisplayUsername=args.getString("profileDisplayUsername"); profileDisplayUsername=args.getString("profileDisplayUsername");
setTitle(getString(R.string.sk_lists_with_user, profileDisplayUsername)); setTitle(getString(R.string.sk_lists_with_user, profileDisplayUsername));
// setHasOptionsMenu(true); setHasOptionsMenu(true);
} }
// toolbarTitle=new TextView(getActivity()); // toolbarTitle=new TextView(getActivity());
// toolbarTitle.setText(R.string.sk_list_timelines); // toolbarTitle.setText(R.string.sk_list_timelines);
@ -85,27 +85,24 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
loadData(); loadData();
} }
// @Override @Override
// public void onAttach(Activity activity){ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
// super.onAttach(activity); Button saveButton=new Button(getActivity());
// setHasOptionsMenu(false); saveButton.setText(R.string.save);
// setTitle(R.string.sk_list_timelines); saveButton.setOnClickListener(this::onSaveClick);
// } LinearLayout wrap=new LinearLayout(getActivity());
wrap.setOrientation(LinearLayout.HORIZONTAL);
wrap.addView(saveButton, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
wrap.setPadding(V.dp(16), V.dp(4), V.dp(16), V.dp(8));
wrap.setClipToPadding(false);
MenuItem item=menu.add(R.string.save);
item.setActionView(wrap);
item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
}
// @Override private void onSaveClick(View view) {
// public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { System.out.println("Save");
// Button saveButton=new Button(getActivity()); }
// saveButton.setText(R.string.save);
// saveButton.setOnClickListener(this::onSaveClick);
// LinearLayout wrap=new LinearLayout(getActivity());
// wrap.setOrientation(LinearLayout.HORIZONTAL);
// wrap.addView(saveButton, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
// wrap.setPadding(V.dp(16), V.dp(4), V.dp(16), V.dp(8));
// wrap.setClipToPadding(false);
// MenuItem item=menu.add(R.string.save);
// item.setActionView(wrap);
// item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
// }
private void saveListMembership(String listId, boolean isMember) { private void saveListMembership(String listId, boolean isMember) {
userInList.put(listId, isMember); userInList.put(listId, isMember);

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);