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

move edit timelines option

Browse Source
This commit is contained in:
sk
2023-01-23 10:25:14 +01:00
parent cb067ca4fa
commit a26ddfe70f
5 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
View File

@@ -362,9 +362,6 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
item.setIcon(tl.getIcon().iconRes);
}
switcherMenu.add(0, R.id.menu_edit, Menu.NONE, R.string.sk_edit_timelines)
.setIcon(R.drawable.ic_fluent_edit_24_regular);
UiUtils.enablePopupMenuIcons(getContext(), switcherPopup);
}
@@ -377,19 +374,18 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
if (id == R.id.menu_back) {
switcher.post(() -> switcherPopup.show());
return true;
} else if (id == R.id.menu_edit) {
Nav.go(getActivity(), EditTimelinesFragment.class, args);
} else {
TimelineDefinition tl = timelinesByMenuItem.get(id);
if (tl != null) {
for (int i = 0; i < timelines.length; i++) {
if (timelines[i] == tl) {
navigateTo(i);
return true;
}
}
TimelineDefinition tl = timelinesByMenuItem.get(id);
if (tl != null) {
for (int i = 0; i < timelines.length; i++) {
if (timelines[i] == tl) {
navigateTo(i);
return true;
}
}
}
return false;
}
private void navigateTo(int i) {
@@ -422,6 +418,8 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
Nav.go(getActivity(), SettingsFragment.class, args);
} else if (id == R.id.announcements || id == R.id.announcements_action) {
Nav.goForResult(getActivity(), AnnouncementsFragment.class, args, ANNOUNCEMENTS_RESULT, this);
} else if (id == R.id.edit_timelines) {
Nav.go(getActivity(), EditTimelinesFragment.class, args);
} else if ((list = listItems.get(id)) != null) {
args.putString("listID", list.id);
args.putString("listTitle", list.title);