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

12
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); 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); UiUtils.enablePopupMenuIcons(getContext(), switcherPopup);
} }
@@ -377,9 +374,8 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
if (id == R.id.menu_back) { if (id == R.id.menu_back) {
switcher.post(() -> switcherPopup.show()); switcher.post(() -> switcherPopup.show());
return true; return true;
} else if (id == R.id.menu_edit) { }
Nav.go(getActivity(), EditTimelinesFragment.class, args);
} else {
TimelineDefinition tl = timelinesByMenuItem.get(id); TimelineDefinition tl = timelinesByMenuItem.get(id);
if (tl != null) { if (tl != null) {
for (int i = 0; i < timelines.length; i++) { for (int i = 0; i < timelines.length; i++) {
@@ -389,7 +385,7 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
} }
} }
} }
}
return false; return false;
} }
private void navigateTo(int i) { private void navigateTo(int i) {
@@ -422,6 +418,8 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
Nav.go(getActivity(), SettingsFragment.class, args); Nav.go(getActivity(), SettingsFragment.class, args);
} else if (id == R.id.announcements || id == R.id.announcements_action) { } else if (id == R.id.announcements || id == R.id.announcements_action) {
Nav.goForResult(getActivity(), AnnouncementsFragment.class, args, ANNOUNCEMENTS_RESULT, this); 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) { } else if ((list = listItems.get(id)) != null) {
args.putString("listID", list.id); args.putString("listID", list.id);
args.putString("listTitle", list.title); args.putString("listTitle", list.title);

4
mastodon/src/main/res/menu/home.xml
View File

@@ -29,6 +29,10 @@
android:id="@+id/announcements" android:id="@+id/announcements"
android:icon="@drawable/ic_fluent_megaphone_24_regular" android:icon="@drawable/ic_fluent_megaphone_24_regular"
android:title="@string/sk_announcements" /> android:title="@string/sk_announcements" />
<item
android:id="@+id/edit_timelines"
android:icon="@drawable/ic_fluent_edit_24_regular"
android:title="@string/sk_edit_timelines" />
<item <item
android:id="@+id/lists" android:id="@+id/lists"
android:icon="@drawable/ic_fluent_people_list_24_regular" android:icon="@drawable/ic_fluent_people_list_24_regular"

2
mastodon/src/main/res/values-de-rDE/strings_sk.xml
View File

@@ -174,7 +174,7 @@
<string name="sk_unpinned_timeline">Von Start gelöst</string> <string name="sk_unpinned_timeline">Von Start gelöst</string>
<string name="sk_timeline_icon">Symbol</string> <string name="sk_timeline_icon">Symbol</string>
<string name="sk_edit_timeline">Timeline bearbeiten</string> <string name="sk_edit_timeline">Timeline bearbeiten</string>
<string name="sk_edit_timelines">Timelines bearbeiten…</string> <string name="sk_edit_timelines">Timelines bearbeiten</string>
<string name="sk_icon_cat">Katze</string> <string name="sk_icon_cat">Katze</string>
<string name="sk_icon_dog">Hund</string> <string name="sk_icon_dog">Hund</string>
<string name="sk_icon_rabbit">Hase</string> <string name="sk_icon_rabbit">Hase</string>

1
mastodon/src/main/res/values/ids.xml
View File

@@ -21,5 +21,4 @@
<item name="menu_add_timeline" type="id" /> <item name="menu_add_timeline" type="id" />
<item name="menu_back" type="id" /> <item name="menu_back" type="id" />
<item name="menu_edit" type="id" />
</resources> </resources>

2
mastodon/src/main/res/values/strings_sk.xml
View File

@@ -221,7 +221,7 @@
<string name="sk_icon_globe">Globe</string> <string name="sk_icon_globe">Globe</string>
<string name="sk_icon_pin">Pin</string> <string name="sk_icon_pin">Pin</string>
<string name="sk_edit_timeline">Edit timeline</string> <string name="sk_edit_timeline">Edit timeline</string>
<string name="sk_edit_timelines">Edit timelines…</string> <string name="sk_edit_timelines">Edit timelines</string>
<string name="sk_alt_button">ALT</string> <string name="sk_alt_button">ALT</string>
<string name="sk_post_edited">edited</string> <string name="sk_post_edited">edited</string>
<string name="sk_notification_type_update">Edited posts</string> <string name="sk_notification_type_update">Edited posts</string>