From 89ede8ff4737bc01751e70c084448518b8005416 Mon Sep 17 00:00:00 2001
From: Andrew Rabert <ar@nullsum.net>
Date: Sun, 25 Aug 2019 22:02:59 -0400
Subject: [PATCH] Add Now Playing to drawer

---
 .../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, 11 insertions(+), 1 deletion(-)

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 8ad40da..91a4b29 100644
--- a/app/src/main/java/net/nullsum/audinaut/activity/SubsonicActivity.java
+++ b/app/src/main/java/net/nullsum/audinaut/activity/SubsonicActivity.java
@@ -248,6 +248,9 @@ 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 e61426c..79e703d 100644
--- a/app/src/main/java/net/nullsum/audinaut/activity/SubsonicFragmentActivity.java
+++ b/app/src/main/java/net/nullsum/audinaut/activity/SubsonicFragmentActivity.java
@@ -551,6 +551,8 @@ 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 de76f30..018dbba 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 = false;
+        primaryFragment = true;
     }
 
     @Override
diff --git a/app/src/main/res/menu/drawer_navigation.xml b/app/src/main/res/menu/drawer_navigation.xml
index c6105de..61597de 100644
--- a/app/src/main/res/menu/drawer_navigation.xml
+++ b/app/src/main/res/menu/drawer_navigation.xml
@@ -14,6 +14,10 @@
             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 f0888a2..d39de74 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -43,6 +43,7 @@
     <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" />