From b9a997730aa8c230a6f25a1da95994a040ea4de9 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Mon, 23 Jan 2023 10:25:14 +0100
Subject: [PATCH] move edit timelines option

---
 .../android/fragments/HomeTabFragment.java    | 24 +++++++++----------
 mastodon/src/main/res/menu/home.xml           |  4 ++++
 .../src/main/res/values-de-rDE/strings_sk.xml |  2 +-
 mastodon/src/main/res/values/ids.xml          |  1 -
 mastodon/src/main/res/values/strings_sk.xml   |  2 +-
 5 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
index c442d76c8..ad870fd8b 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
@@ -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);
diff --git a/mastodon/src/main/res/menu/home.xml b/mastodon/src/main/res/menu/home.xml
index 3ebc28150..d0c5d65c1 100644
--- a/mastodon/src/main/res/menu/home.xml
+++ b/mastodon/src/main/res/menu/home.xml
@@ -29,6 +29,10 @@
 				android:id="@+id/announcements"
 				android:icon="@drawable/ic_fluent_megaphone_24_regular"
 				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
 				android:id="@+id/lists"
 				android:icon="@drawable/ic_fluent_people_list_24_regular"
diff --git a/mastodon/src/main/res/values-de-rDE/strings_sk.xml b/mastodon/src/main/res/values-de-rDE/strings_sk.xml
index 39db08985..881bfa0db 100644
--- a/mastodon/src/main/res/values-de-rDE/strings_sk.xml
+++ b/mastodon/src/main/res/values-de-rDE/strings_sk.xml
@@ -174,7 +174,7 @@
     <string name="sk_unpinned_timeline">Von Start gelöst</string>
     <string name="sk_timeline_icon">Symbol</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_dog">Hund</string>
     <string name="sk_icon_rabbit">Hase</string>
diff --git a/mastodon/src/main/res/values/ids.xml b/mastodon/src/main/res/values/ids.xml
index d1dca4b1c..8c3028318 100644
--- a/mastodon/src/main/res/values/ids.xml
+++ b/mastodon/src/main/res/values/ids.xml
@@ -22,5 +22,4 @@
 
 	<item name="menu_add_timeline" type="id" />
 	<item name="menu_back" type="id" />
-	<item name="menu_edit" type="id" />
 </resources>
\ No newline at end of file
diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml
index a6d3a04d9..aa8bdb1ad 100644
--- a/mastodon/src/main/res/values/strings_sk.xml
+++ b/mastodon/src/main/res/values/strings_sk.xml
@@ -221,7 +221,7 @@
     <string name="sk_icon_globe">Globe</string>
     <string name="sk_icon_pin">Pin</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_post_edited">edited</string>
     <string name="sk_notification_type_update">Edited posts</string>