From ebc5aac01195637a4500f6586b348f1a6f007dc8 Mon Sep 17 00:00:00 2001
From: OxygenCobalt <alexyx@tutanota.com>
Date: Wed, 16 Sep 2020 07:00:55 -0600
Subject: [PATCH] Update resources

Update layouts to not assign a primary color through the tools namespace anymore, also bring back the light theme, which apparently disappeared at some point.
---
 app/.gitignore                                |  1 -
 app/proguard-rules.pro                        |  3 +-
 .../oxycblt/auxio/loading/LoadingFragment.kt  |  8 +---
 app/src/main/res/drawable/header_dividers.xml |  9 ----
 .../res/layout/fragment_artist_detail.xml     | 12 ++---
 app/src/main/res/layout/fragment_library.xml  |  3 +-
 app/src/main/res/layout/fragment_loading.xml  |  6 +--
 app/src/main/res/layout/fragment_songs.xml    |  3 +-
 app/src/main/res/layout/item_album.xml        |  3 +-
 app/src/main/res/layout/item_artist.xml       |  3 +-
 app/src/main/res/layout/item_song.xml         |  3 +-
 app/src/main/res/navigation/nav_main.xml      |  2 +
 app/src/main/res/values-night/colors.xml      | 30 +++++++++++++
 app/src/main/res/values/colors.xml            | 44 +++++++++----------
 app/src/main/res/values/styles.xml            |  3 +-
 app/src/main/res/values/themes.xml            |  4 +-
 16 files changed, 71 insertions(+), 66 deletions(-)
 delete mode 100644 app/.gitignore
 create mode 100644 app/src/main/res/values-night/colors.xml

diff --git a/app/.gitignore b/app/.gitignore
deleted file mode 100644
index 42afabfd2..000000000
--- a/app/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
\ No newline at end of file
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 0544a3bb3..f5fb65b3f 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -20,5 +20,4 @@
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
 
--dontobfuscate
--keep class org.oxycblt.auxio.loading.LoadingFragment
\ No newline at end of file
+-dontobfuscate
\ No newline at end of file
diff --git a/app/src/main/java/org/oxycblt/auxio/loading/LoadingFragment.kt b/app/src/main/java/org/oxycblt/auxio/loading/LoadingFragment.kt
index f07f47573..629c9efcc 100644
--- a/app/src/main/java/org/oxycblt/auxio/loading/LoadingFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/loading/LoadingFragment.kt
@@ -3,7 +3,6 @@ package org.oxycblt.auxio.loading
 import android.Manifest
 import android.content.pm.PackageManager
 import android.os.Bundle
-import android.transition.TransitionInflater
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
@@ -100,12 +99,7 @@ class LoadingFragment : Fragment(R.layout.fragment_loading) {
     }
 
     private fun onMusicLoadResponse(response: MusicLoaderResponse?) {
-        binding.loadingBar.visibility = View.GONE
-
         if (response == MusicLoaderResponse.DONE) {
-            exitTransition = TransitionInflater.from(requireContext())
-                .inflateTransition(R.transition.transition_to_main)
-
             findNavController().navigate(
                 LoadingFragmentDirections.actionToMain()
             )
@@ -119,6 +113,8 @@ class LoadingFragment : Fragment(R.layout.fragment_loading) {
 
                 // If the response wasn't a success, then show the specific error message
                 // depending on which error response was given, along with a retry button
+                binding.loadingBar.visibility = View.GONE
+
                 binding.errorText.visibility = View.VISIBLE
                 binding.statusIcon.visibility = View.VISIBLE
                 binding.retryButton.visibility = View.VISIBLE
diff --git a/app/src/main/res/drawable/header_dividers.xml b/app/src/main/res/drawable/header_dividers.xml
index 3a83b8b1e..566591e13 100644
--- a/app/src/main/res/drawable/header_dividers.xml
+++ b/app/src/main/res/drawable/header_dividers.xml
@@ -12,13 +12,4 @@ https://stackoverflow.com/a/61157571/14143986
                 android:color="@color/divider_color" />
         </shape>
     </item>
-    <item>
-        <ripple android:color="@color/selection_color">
-            <item android:id="@android:id/mask">
-                <shape android:shape="rectangle">
-                    <solid android:color="@color/selection_color" />
-                </shape>
-            </item>
-        </ripple>
-    </item>
 </layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_artist_detail.xml b/app/src/main/res/layout/fragment_artist_detail.xml
index f280cd120..60c521dec 100644
--- a/app/src/main/res/layout/fragment_artist_detail.xml
+++ b/app/src/main/res/layout/fragment_artist_detail.xml
@@ -27,8 +27,7 @@
 
         <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:overScrollMode="ifContentScrolls">
+            android:layout_height="match_parent">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
@@ -45,8 +44,7 @@
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
-                    tools:src="@drawable/ic_artist"
-                    tools:tint="@color/blue" />
+                    tools:src="@drawable/ic_artist" />
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/artist_name"
@@ -56,9 +54,7 @@
                     android:layout_marginTop="@dimen/margin_medium"
                     android:layout_marginEnd="@dimen/margin_medium"
                     android:layout_marginStart="@dimen/margin_medium"
-                    android:fontFamily="@font/inter_black"
                     android:text="@{artist.name}"
-                    android:textSize="@dimen/detail_header_size_max"
                     app:autoSizeMaxTextSize="@dimen/detail_header_size_max"
                     app:autoSizeMinTextSize="@dimen/detail_header_size_min"
                     app:autoSizeStepGranularity="@dimen/detail_header_size_increment"
@@ -67,8 +63,7 @@
                     app:layout_constraintHorizontal_bias="0.5"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/artist_image"
-                    tools:text="Artist Name"
-                    tools:textColor="@color/blue" />
+                    tools:text="Artist Name" />
 
                 <TextView
                     android:id="@+id/artist_genre"
@@ -94,7 +89,6 @@
                     app:layout_constraintTop_toBottomOf="@+id/artist_genre"
                     tools:text="2 Albums, 20 Songs" />
 
-
                 <TextView
                     android:id="@+id/header_albums"
                     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml
index 43b621af1..406a6f57b 100644
--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@@ -16,8 +16,7 @@
             android:background="?android:attr/windowBackground"
             android:elevation="@dimen/elevation_normal"
             app:titleTextAppearance="@style/TextAppearance.Toolbar.Bold"
-            app:title="@string/title_library_fragment"
-            tools:titleTextColor="@color/blue" />
+            app:title="@string/title_library_fragment" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/library_recycler"
diff --git a/app/src/main/res/layout/fragment_loading.xml b/app/src/main/res/layout/fragment_loading.xml
index 584c771ce..85936ab0e 100644
--- a/app/src/main/res/layout/fragment_loading.xml
+++ b/app/src/main/res/layout/fragment_loading.xml
@@ -27,8 +27,7 @@
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_chainStyle="packed"
-            tools:indeterminateTint="@color/blue" />
+            app:layout_constraintVertical_chainStyle="packed" />
 
         <ImageView
             android:id="@+id/status_icon"
@@ -43,7 +42,6 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/loading_bar"
             app:srcCompat="@drawable/ic_error"
-            tools:tint="@color/blue"
             tools:ignore="ContentDescription" />
 
         <TextView
@@ -78,7 +76,6 @@
             app:layout_constraintTop_toBottomOf="@+id/error_text"
             app:layout_constraintBottom_toTopOf="@+id/grant_button"
             app:layout_constraintVertical_bias="0.673"
-            tools:textColor="@color/blue"
             tools:visibility="visible" />
 
         <Button
@@ -95,7 +92,6 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/retry_button"
-            tools:textColor="@color/blue"
             tools:visibility="visible" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_songs.xml b/app/src/main/res/layout/fragment_songs.xml
index 85d5caa91..2c68fca57 100644
--- a/app/src/main/res/layout/fragment_songs.xml
+++ b/app/src/main/res/layout/fragment_songs.xml
@@ -16,8 +16,7 @@
             android:background="?android:attr/windowBackground"
             android:elevation="@dimen/elevation_normal"
             app:titleTextAppearance="@style/TextAppearance.Toolbar.Bold"
-            app:title="@string/title_all_songs"
-            tools:titleTextColor="@color/blue" />
+            app:title="@string/title_all_songs" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/song_recycler"
diff --git a/app/src/main/res/layout/item_album.xml b/app/src/main/res/layout/item_album.xml
index a843b9027..7ecf97575 100644
--- a/app/src/main/res/layout/item_album.xml
+++ b/app/src/main/res/layout/item_album.xml
@@ -27,8 +27,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             tools:ignore="ContentDescription"
-            tools:src="@drawable/ic_album"
-            tools:tint="@color/blue" />
+            tools:src="@drawable/ic_album" />
 
         <TextView
             android:id="@+id/album_name"
diff --git a/app/src/main/res/layout/item_artist.xml b/app/src/main/res/layout/item_artist.xml
index 4e6c72967..da5dfa04a 100644
--- a/app/src/main/res/layout/item_artist.xml
+++ b/app/src/main/res/layout/item_artist.xml
@@ -28,8 +28,7 @@
             app:layout_constraintTop_toTopOf="parent"
             app:artistImage="@{artist}"
             tools:ignore="ContentDescription"
-            tools:src="@drawable/ic_artist"
-            tools:tint="@color/blue" />
+            tools:src="@drawable/ic_artist" />
 
         <TextView
             android:id="@+id/artist_name"
diff --git a/app/src/main/res/layout/item_song.xml b/app/src/main/res/layout/item_song.xml
index 2b1fa0af7..05d1e576f 100644
--- a/app/src/main/res/layout/item_song.xml
+++ b/app/src/main/res/layout/item_song.xml
@@ -27,8 +27,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             tools:ignore="ContentDescription"
-            tools:src="@drawable/ic_song"
-            tools:tint="@color/blue" />
+            tools:src="@drawable/ic_song" />
 
         <TextView
             android:id="@+id/song_name"
diff --git a/app/src/main/res/navigation/nav_main.xml b/app/src/main/res/navigation/nav_main.xml
index 0ec53d7c1..bd1560d72 100644
--- a/app/src/main/res/navigation/nav_main.xml
+++ b/app/src/main/res/navigation/nav_main.xml
@@ -12,6 +12,8 @@
         <action
             android:id="@+id/action_to_main"
             app:destination="@id/main_fragment"
+            app:enterAnim="@anim/fragment_fade_enter"
+            app:exitAnim="@anim/fragment_open_exit"
             app:popUpTo="@id/loading_fragment"
             app:popUpToInclusive="true" />
     </fragment>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
new file mode 100644
index 000000000..ecb452524
--- /dev/null
+++ b/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="background">#151515</color>
+    <color name="divider_color">#323232</color>
+    <color name="selection_color">#484848</color>
+
+    <!--
+    Base color set derived from Music Player GO.
+    https://github.com/enricocid/Music-Player-GO
+    -->
+    <color name="red">#ef9a9a</color>
+    <color name="pink">#f48fb1</color>
+    <color name="purple">#ce93d8</color>
+    <color name="deep_purple">#b39ddb</color>
+    <color name="indigo">#9fa8da</color>
+    <color name="blue">#90caf9</color>
+    <color name="light_blue">#81d4fa</color>
+    <color name="cyan">#80deea</color>
+    <color name="teal">#80cbc4</color>
+    <color name="green">#a5d6a7</color>
+    <color name="light_green">#c5e1a5</color>
+    <color name="lime">#e6ee9c</color>
+    <color name="yellow">#fff59d</color>
+    <color name="amber">#ffe082</color>
+    <color name="orange">#ffcc80</color>
+    <color name="deep_orange">#ffab91</color>
+    <color name="brown">#bcaaa4</color>
+    <color name="grey">#eeeeee</color>
+    <color name="blue_grey">#b0bec5</color>
+</resources>
\ 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 ecb452524..29ff233ac 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="background">#151515</color>
-    <color name="divider_color">#323232</color>
-    <color name="selection_color">#484848</color>
+    <color name="background">#fafafa</color>
+    <color name="divider_color">#cbcbcb</color>
+    <color name="selection_color">#cbcbcb</color>
 
     <!--
     Base color set derived from Music Player GO.
     https://github.com/enricocid/Music-Player-GO
     -->
-    <color name="red">#ef9a9a</color>
-    <color name="pink">#f48fb1</color>
-    <color name="purple">#ce93d8</color>
-    <color name="deep_purple">#b39ddb</color>
-    <color name="indigo">#9fa8da</color>
-    <color name="blue">#90caf9</color>
-    <color name="light_blue">#81d4fa</color>
-    <color name="cyan">#80deea</color>
-    <color name="teal">#80cbc4</color>
-    <color name="green">#a5d6a7</color>
-    <color name="light_green">#c5e1a5</color>
-    <color name="lime">#e6ee9c</color>
-    <color name="yellow">#fff59d</color>
-    <color name="amber">#ffe082</color>
-    <color name="orange">#ffcc80</color>
-    <color name="deep_orange">#ffab91</color>
-    <color name="brown">#bcaaa4</color>
-    <color name="grey">#eeeeee</color>
-    <color name="blue_grey">#b0bec5</color>
+    <color name="red">#f44336</color>
+    <color name="pink">#e91e63</color>
+    <color name="purple">#9c27b0</color>
+    <color name="deep_purple">#673ab7</color>
+    <color name="indigo">#3f51b5</color>
+    <color name="blue">#2196f3</color>
+    <color name="light_blue">#03a9f4</color>
+    <color name="cyan">#00bcd4</color>
+    <color name="teal">#009688</color>
+    <color name="green">#4caf50</color>
+    <color name="light_green">#8bc34a</color>
+    <color name="lime">#cddc39</color>
+    <color name="yellow">#ffeb3b</color>
+    <color name="amber">#ffc107</color>
+    <color name="orange">#ff9800</color>
+    <color name="deep_orange">#ff5722</color>
+    <color name="brown">#795548</color>
+    <color name="grey">#9e9e9e</color>
+    <color name="blue_grey">#607d8b</color>
 </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 e43d5d0c8..9de8a7b57 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Base theme -->
-    <style name="Theme.Base" parent="Theme.AppCompat.NoActionBar">
+    <style name="Theme.Base" parent="Theme.AppCompat.DayNight.NoActionBar">
         <item name="android:windowBackground">@color/background</item>
         <item name="android:statusBarColor">@android:color/black</item>
         <item name="android:fontFamily">@font/inter</item>
@@ -16,5 +16,6 @@
         <item name="android:textAppearance">?android:attr/textAppearanceLarge</item>
         <item name="android:textColor">?android:attr/colorPrimary</item>
         <item name="android:fontFamily">@font/inter_black</item>
+        <item name="android:textSize">@dimen/detail_header_size_max</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index e8977cac7..2b87501ae 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
+    <!--
+    All the base themes/accents.
+    -->
     <style name="Theme.Red" parent="Theme.Base">
         <item name="colorPrimary">@color/red</item>
         <item name="colorSecondary">@color/red</item>