From 4b3285cef072f7fb0212ffad2b099ec6e762cbd9 Mon Sep 17 00:00:00 2001
From: OxygenCobalt <alexyx@tutanota.com>
Date: Thu, 3 Sep 2020 19:25:11 -0600
Subject: [PATCH] Change RecyclerView divider color

Change the RecyclerView divider color to not require any transparency changes through ThemeUtils.
---
 .../main/java/org/oxycblt/auxio/music/MusicRepository.kt  | 6 +++---
 .../main/java/org/oxycblt/auxio/recycler/RecyclerUtils.kt | 7 ++-----
 app/src/main/java/org/oxycblt/auxio/theme/ThemeUtils.kt   | 8 --------
 app/src/main/res/values-night/colors.xml                  | 2 +-
 app/src/main/res/values/colors.xml                        | 2 +-
 app/src/main/res/values/strings.xml                       | 7 ++++---
 6 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/org/oxycblt/auxio/music/MusicRepository.kt b/app/src/main/java/org/oxycblt/auxio/music/MusicRepository.kt
index 75c4aa6e7..0789eaa70 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/MusicRepository.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/MusicRepository.kt
@@ -34,9 +34,9 @@ class MusicRepository {
                 loader.albums,
                 loader.songs,
 
-                app.applicationContext.getString(R.string.label_unknown_genre),
-                app.applicationContext.getString(R.string.label_unknown_artist),
-                app.applicationContext.getString(R.string.label_unknown_album)
+                app.applicationContext.getString(R.string.placeholder_unknown_genre),
+                app.applicationContext.getString(R.string.placeholder_unknown_artist),
+                app.applicationContext.getString(R.string.placeholder_unknown_album)
             )
 
             songs = sorter.songs.toList()
diff --git a/app/src/main/java/org/oxycblt/auxio/recycler/RecyclerUtils.kt b/app/src/main/java/org/oxycblt/auxio/recycler/RecyclerUtils.kt
index cb52f0525..9fdb4cb62 100644
--- a/app/src/main/java/org/oxycblt/auxio/recycler/RecyclerUtils.kt
+++ b/app/src/main/java/org/oxycblt/auxio/recycler/RecyclerUtils.kt
@@ -4,8 +4,7 @@ import android.graphics.drawable.ColorDrawable
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.RecyclerView
 import org.oxycblt.auxio.R
-import org.oxycblt.auxio.theme.getDayNightAlpha
-import org.oxycblt.auxio.theme.getTransparentAccent
+import org.oxycblt.auxio.theme.toColor
 
 // Apply a custom vertical divider
 fun RecyclerView.applyDivider() {
@@ -16,9 +15,7 @@ fun RecyclerView.applyDivider() {
 
     div.setDrawable(
         ColorDrawable(
-            getTransparentAccent(
-                context, R.color.divider_color, getDayNightAlpha()
-            )
+            R.color.divider_color.toColor(context)
         )
     )
 
diff --git a/app/src/main/java/org/oxycblt/auxio/theme/ThemeUtils.kt b/app/src/main/java/org/oxycblt/auxio/theme/ThemeUtils.kt
index 286229a9d..304f397c1 100644
--- a/app/src/main/java/org/oxycblt/auxio/theme/ThemeUtils.kt
+++ b/app/src/main/java/org/oxycblt/auxio/theme/ThemeUtils.kt
@@ -1,7 +1,6 @@
 package org.oxycblt.auxio.theme
 
 import android.content.Context
-import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.ColorUtils
 import org.oxycblt.auxio.R
@@ -31,13 +30,6 @@ private val ACCENTS = listOf(
 
 val accent = ACCENTS[5]
 
-fun getDayNightAlpha(): Int {
-    val isDark = AppCompatDelegate.getDefaultNightMode() == AppCompatDelegate.MODE_NIGHT_YES
-
-    // Depending on the theme use a different opacity for the divider
-    return if (isDark) 45 else 85
-}
-
 fun getInactiveAlpha(color: Int): Int {
     return if (color == R.color.yellow) 100 else 150
 }
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 112d01ba3..ecb452524 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="background">#151515</color>
-    <color name="divider_color">#6d6d6d</color>
+    <color name="divider_color">#323232</color>
     <color name="selection_color">#484848</color>
 
     <!--
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 4f1642742..29ff233ac 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="background">#fafafa</color>
-    <color name="divider_color">#6d6d6d</color>
+    <color name="divider_color">#cbcbcb</color>
     <color name="selection_color">#cbcbcb</color>
 
     <!--
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5d86c466f..e6cdeb7fa 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -12,9 +12,10 @@
     <string name="label_retry">Retry</string>
     <string name="label_grant">Grant</string>
     <string name="label_single_song">1 Song</string>
-    <string name="label_unknown_genre">Unknown Genre</string>
-    <string name="label_unknown_artist">Unknown Artist</string>
-    <string name="label_unknown_album">Unknown Album</string>
+
+    <string name="placeholder_unknown_genre">Unknown Genre</string>
+    <string name="placeholder_unknown_artist">Unknown Artist</string>
+    <string name="placeholder_unknown_album">Unknown Album</string>
 
     <string name="format_multi_song_count">%s Songs</string>
     <string name="format_song_info">%s / %s</string>