From eaef36849ae3ec2bd4db065603af278dc054d620 Mon Sep 17 00:00:00 2001
From: Andrew Rabert <ar@nullsum.net>
Date: Wed, 27 Nov 2019 18:12:51 -0500
Subject: [PATCH] Revert "Add Now Playing to drawer"

This reverts commit 89ede8ff4737bc01751e70c084448518b8005416.
---
 .../java/net/nullsum/audinaut/activity/SubsonicActivity.java  | 3 ---
 .../nullsum/audinaut/activity/SubsonicFragmentActivity.java   | 2 --
 .../net/nullsum/audinaut/fragments/NowPlayingFragment.java    | 2 +-
 app/src/main/res/menu/drawer_navigation.xml                   | 4 ----
 app/src/main/res/values/attrs.xml                             | 1 -
 5 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/app/src/main/java/net/nullsum/audinaut/activity/SubsonicActivity.java b/app/src/main/java/net/nullsum/audinaut/activity/SubsonicActivity.java
index 91a4b29..8ad40da 100644
--- a/app/src/main/java/net/nullsum/audinaut/activity/SubsonicActivity.java
+++ b/app/src/main/java/net/nullsum/audinaut/activity/SubsonicActivity.java
@@ -248,9 +248,6 @@ public class SubsonicActivity extends AppCompatActivity implements OnItemSelecte
                     case R.id.drawer_downloading:
                         drawerItemSelected("Download");
                         return true;
-                    case R.id.drawer_now_playing:
-                        drawerItemSelected("Now Playing");
-                        return true;
                     case R.id.drawer_offline:
                         toggleOffline();
                         return true;
diff --git a/app/src/main/java/net/nullsum/audinaut/activity/SubsonicFragmentActivity.java b/app/src/main/java/net/nullsum/audinaut/activity/SubsonicFragmentActivity.java
index 79e703d..e61426c 100644
--- a/app/src/main/java/net/nullsum/audinaut/activity/SubsonicFragmentActivity.java
+++ b/app/src/main/java/net/nullsum/audinaut/activity/SubsonicFragmentActivity.java
@@ -551,8 +551,6 @@ public class SubsonicFragmentActivity extends SubsonicActivity implements Downlo
         switch (fragmentType) {
             case "Playlist":
                 return new SelectPlaylistFragment();
-            case "Now Playing":
-                return new NowPlayingFragment();
             case "Download":
                 return new DownloadFragment();
             default:
diff --git a/app/src/main/java/net/nullsum/audinaut/fragments/NowPlayingFragment.java b/app/src/main/java/net/nullsum/audinaut/fragments/NowPlayingFragment.java
index 433c681..3f832fd 100644
--- a/app/src/main/java/net/nullsum/audinaut/fragments/NowPlayingFragment.java
+++ b/app/src/main/java/net/nullsum/audinaut/fragments/NowPlayingFragment.java
@@ -128,7 +128,7 @@ public class NowPlayingFragment extends SubsonicFragment implements OnGestureLis
                 startFlipped = true;
             }
         }
-        primaryFragment = true;
+        primaryFragment = false;
     }
 
     @Override
diff --git a/app/src/main/res/menu/drawer_navigation.xml b/app/src/main/res/menu/drawer_navigation.xml
index 61597de..c6105de 100644
--- a/app/src/main/res/menu/drawer_navigation.xml
+++ b/app/src/main/res/menu/drawer_navigation.xml
@@ -14,10 +14,6 @@
             android:icon="?attr/drawerDownloading"
             android:title="@string/button_bar.downloading"
             android:visible="false" />
-        <item
-            android:id="@+id/drawer_now_playing"
-            android:icon="?attr/drawerNowPlaying"
-            android:title="@string/button_bar.now_playing" />
     </group>
 
     <group android:checkableBehavior="single">
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index d39de74..f0888a2 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -43,7 +43,6 @@
     <attr name="drawerLibrary" format="reference" />
     <attr name="drawerPlaylists" format="reference" />
     <attr name="drawerDownloading" format="reference" />
-    <attr name="drawerNowPlaying" format="reference" />
     <attr name="drawerSettings" format="reference" />
     <attr name="actionbarThemeStyle" format="reference" />
     <attr name="actionbarTitleStyle" format="reference" />