From d6fbba857f1775ac4357510782ca7e06a96b61f9 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Tue, 30 Jun 2020 17:33:23 +0200
Subject: [PATCH] Reorder menu

---
 .../java/app/fedilab/fedilabtube/MainActivity.java   |  4 +++-
 app/src/main/res/menu/main_menu.xml                  | 12 ++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/app/fedilab/fedilabtube/MainActivity.java b/app/src/main/java/app/fedilab/fedilabtube/MainActivity.java
index 2a65301..14764f0 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/MainActivity.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/MainActivity.java
@@ -74,15 +74,17 @@ public class MainActivity extends AppCompatActivity {
                 return false;
             }
         });
-
+        MenuItem instanceItem = menu.findItem(R.id.action_change_instance);
         MenuItem uploadItem = menu.findItem(R.id.action_upload);
         MenuItem myVideosItem = menu.findItem(R.id.action_myvideos);
         MenuItem playslistItem = menu.findItem(R.id.action_playlist);
         if (Helper.isLoggedIn(MainActivity.this)) {
+            instanceItem.setVisible(false);
             uploadItem.setVisible(true);
             myVideosItem.setVisible(true);
             playslistItem.setVisible(true);
         } else {
+            instanceItem.setVisible(true);
             uploadItem.setVisible(false);
             myVideosItem.setVisible(false);
             playslistItem.setVisible(false);
diff --git a/app/src/main/res/menu/main_menu.xml b/app/src/main/res/menu/main_menu.xml
index a4206ac..86801fc 100644
--- a/app/src/main/res/menu/main_menu.xml
+++ b/app/src/main/res/menu/main_menu.xml
@@ -15,7 +15,11 @@
         android:icon="@drawable/ic_baseline_track_changes_24"
         android:title="@string/change_instance"
         app:showAsAction="ifRoom" />
-
+    <item
+        android:id="@+id/action_playlist"
+        android:icon="@drawable/ic_baseline_playlist_play_24"
+        android:title="@string/playlists"
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/action_account"
         android:icon="@drawable/ic_outline_account_circle_24"
@@ -31,9 +35,5 @@
         android:icon="@drawable/ic_baseline_personal_video_24"
         android:title="@string/my_videos"
         app:showAsAction="ifRoom" />
-    <item
-        android:id="@+id/action_playlist"
-        android:icon="@drawable/ic_baseline_playlist_play_24"
-        android:title="@string/playlists"
-        app:showAsAction="ifRoom" />
+
 </menu>