From 9961b87f47cf2efcafdd640542d5715dce38907a Mon Sep 17 00:00:00 2001
From: OxygenCobalt <alexyx@tutanota.com>
Date: Mon, 17 Aug 2020 11:28:23 -0600
Subject: [PATCH] Refactor Now Playing into Library

Turns out a dedicated Now Playing screen wont look that good, so refactor that into the Library screen. Also replace the ActionBar with a Toolbar and update the theming a bit.
---
 .../java/org/oxycblt/auxio/MainActivity.kt    |  3 +++
 .../LibraryFragment.kt}                       | 10 ++++----
 app/src/main/res/layout/fragment_library.xml  | 24 +++++++++++++++++++
 app/src/main/res/layout/fragment_player.xml   |  9 -------
 app/src/main/res/navigation/nav_main.xml      |  2 +-
 app/src/main/res/values/colors.xml            |  6 ++---
 app/src/main/res/values/dimens.xml            |  4 ++++
 app/src/main/res/values/strings.xml           |  2 ++
 app/src/main/res/values/styles.xml            |  7 +++---
 9 files changed, 46 insertions(+), 21 deletions(-)
 rename app/src/main/java/org/oxycblt/auxio/{player/PlayerFragment.kt => library/LibraryFragment.kt} (65%)
 create mode 100644 app/src/main/res/layout/fragment_library.xml
 delete mode 100644 app/src/main/res/layout/fragment_player.xml
 create mode 100644 app/src/main/res/values/dimens.xml

diff --git a/app/src/main/java/org/oxycblt/auxio/MainActivity.kt b/app/src/main/java/org/oxycblt/auxio/MainActivity.kt
index 2810d5800..7cda53cc2 100644
--- a/app/src/main/java/org/oxycblt/auxio/MainActivity.kt
+++ b/app/src/main/java/org/oxycblt/auxio/MainActivity.kt
@@ -3,6 +3,7 @@ package org.oxycblt.auxio
 import android.os.Bundle
 import android.util.Log
 import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatDelegate
 
 class MainActivity : AppCompatActivity() {
 
@@ -10,6 +11,8 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
+        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
+
         Log.d(this::class.simpleName, "Activity Created.")
     }
 }
diff --git a/app/src/main/java/org/oxycblt/auxio/player/PlayerFragment.kt b/app/src/main/java/org/oxycblt/auxio/library/LibraryFragment.kt
similarity index 65%
rename from app/src/main/java/org/oxycblt/auxio/player/PlayerFragment.kt
rename to app/src/main/java/org/oxycblt/auxio/library/LibraryFragment.kt
index 60a33f92e..0855a3726 100644
--- a/app/src/main/java/org/oxycblt/auxio/player/PlayerFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/library/LibraryFragment.kt
@@ -1,4 +1,4 @@
-package org.oxycblt.auxio.player
+package org.oxycblt.auxio.library
 
 import android.os.Bundle
 import android.util.Log
@@ -8,9 +8,9 @@ import android.view.ViewGroup
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
 import org.oxycblt.auxio.R
-import org.oxycblt.auxio.databinding.FragmentPlayerBinding
+import org.oxycblt.auxio.databinding.FragmentLibraryBinding
 
-class PlayerFragment : Fragment() {
+class LibraryFragment : Fragment() {
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -18,8 +18,8 @@ class PlayerFragment : Fragment() {
         savedInstanceState: Bundle?
     ): View? {
 
-        val binding = DataBindingUtil.inflate<FragmentPlayerBinding>(
-            inflater, R.layout.fragment_player, container, false
+        val binding = DataBindingUtil.inflate<FragmentLibraryBinding>(
+            inflater, R.layout.fragment_library, container, false
         )
 
         Log.d(this::class.simpleName, "Fragment created.")
diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml
new file mode 100644
index 000000000..c013f3ca6
--- /dev/null
+++ b/app/src/main/res/layout/fragment_library.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/background">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            android:elevation="@dimen/elevation_normal"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:title="@string/fragment_library_title"
+            tools:titleTextColor="@color/primaryTextColor"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml
deleted file mode 100644
index 78e83e1c4..000000000
--- a/app/src/main/res/layout/fragment_player.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/nav_main.xml b/app/src/main/res/navigation/nav_main.xml
index d2dede716..51f313356 100644
--- a/app/src/main/res/navigation/nav_main.xml
+++ b/app/src/main/res/navigation/nav_main.xml
@@ -7,6 +7,6 @@
 
     <fragment
         android:id="@+id/playerFragment"
-        android:name="org.oxycblt.auxio.player.PlayerFragment"
+        android:name="org.oxycblt.auxio.library.LibraryFragment"
         android:label="PlayerFragment" />
 </navigation>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 12077a998..f6fac20d2 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="primaryColor">#0d5af5</color>
-    <color name="primaryLightColor">#6b86ff</color>
-    <color name="primaryDarkColor">#0032c1</color>
+    <color name="primaryColor">#272727</color>
+    <color name="primaryLightColor">#6d6d6d</color>
+    <color name="primaryDarkColor">#1b1b1b</color>
     <color name="secondaryColor">#212121</color>
     <color name="secondaryLightColor">#484848</color>
     <color name="secondaryDarkColor">#000000</color>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
new file mode 100644
index 000000000..aa535fa69
--- /dev/null
+++ b/app/src/main/res/values/dimens.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="elevation_normal">4dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 90d38aa3d..e9d0ac4a7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">Auxio</string>
+
+    <string name="fragment_library_title">Library</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 42e367e8c..d15919c12 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Base theme -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
         <item name="colorPrimary">@color/primaryColor</item>
-        <item name="colorPrimaryDark">@color/primaryDarkColor</item>
-        <item name="colorAccent">@color/secondaryColor</item>
+        <item name="colorPrimaryDark">@color/primaryColor</item>
+        <item name="colorAccent">@color/primaryColor</item>
+        <item name="background">@color/secondaryColor</item>
     </style>
 </resources>
\ No newline at end of file