From b3ae8b1ffffe9d84d321323128aee983715eacbe Mon Sep 17 00:00:00 2001
From: CappielloAntonio <antoniocappiello.play@gmail.com>
Date: Mon, 12 Apr 2021 17:56:09 +0200
Subject: [PATCH] Fix theme and icon color on startup

---
 app/src/main/AndroidManifest.xml                          | 1 +
 app/src/main/java/com/cappielloantonio/play/App.java      | 7 ++++++-
 .../play/adapter/PlayerNowPlayingSongAdapter.java         | 2 ++
 .../com/cappielloantonio/play/helper/ThemeHelper.java     | 8 ++++++++
 .../com/cappielloantonio/play/util/PreferenceUtil.java    | 2 +-
 app/src/main/res/drawable/ic_pause_circle.xml             | 2 +-
 app/src/main/res/drawable/ic_play_circle.xml              | 2 +-
 7 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cf58d399..3d2aeff9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -8,6 +8,7 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" tools:ignore="ScopedStorage" />
 
     <application
+        android:name="App"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
diff --git a/app/src/main/java/com/cappielloantonio/play/App.java b/app/src/main/java/com/cappielloantonio/play/App.java
index 6b837813..c7a025c1 100644
--- a/app/src/main/java/com/cappielloantonio/play/App.java
+++ b/app/src/main/java/com/cappielloantonio/play/App.java
@@ -2,6 +2,9 @@ package com.cappielloantonio.play;
 
 import android.app.Application;
 import android.content.Context;
+import android.content.SharedPreferences;
+
+import androidx.preference.PreferenceManager;
 
 import com.cappielloantonio.play.helper.ThemeHelper;
 import com.cappielloantonio.play.util.PreferenceUtil;
@@ -24,7 +27,9 @@ public class App extends Application {
     public void onCreate() {
         super.onCreate();
 
-        ThemeHelper.applyTheme(PreferenceUtil.getInstance(getApplicationContext()).getTheme());
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+        String themePref = sharedPreferences.getString("themePref", ThemeHelper.DEFAULT_MODE);
+        ThemeHelper.applyTheme(themePref);
     }
 
     public static App getInstance() {
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/PlayerNowPlayingSongAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/PlayerNowPlayingSongAdapter.java
index b2d56b26..31fe938d 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/PlayerNowPlayingSongAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/PlayerNowPlayingSongAdapter.java
@@ -16,6 +16,8 @@ import com.cappielloantonio.play.helper.MusicPlayerRemote;
 import com.cappielloantonio.play.model.Song;
 import com.cappielloantonio.play.repository.SongRepository;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/app/src/main/java/com/cappielloantonio/play/helper/ThemeHelper.java b/app/src/main/java/com/cappielloantonio/play/helper/ThemeHelper.java
index 0ffd264f..be21138a 100644
--- a/app/src/main/java/com/cappielloantonio/play/helper/ThemeHelper.java
+++ b/app/src/main/java/com/cappielloantonio/play/helper/ThemeHelper.java
@@ -1,11 +1,14 @@
 package com.cappielloantonio.play.helper;
 
 import android.os.Build;
+import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatDelegate;
 
 public class ThemeHelper {
+    private static final String TAG = "ThemeHelper";
+
     public static final String LIGHT_MODE = "light";
     public static final String DARK_MODE = "dark";
     public static final String DEFAULT_MODE = "default";
@@ -13,14 +16,19 @@ public class ThemeHelper {
     public static void applyTheme(@NonNull String themePref) {
         switch (themePref) {
             case LIGHT_MODE: {
+                Log.d(TAG, "applyTheme: LIGHT");
                 AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
                 break;
             }
             case DARK_MODE: {
+                Log.d(TAG, "applyTheme: DARK");
+
                 AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
                 break;
             }
             default: {
+                Log.d(TAG, "applyTheme: SYSTEM");
+
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
                     AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
                 } else {
diff --git a/app/src/main/java/com/cappielloantonio/play/util/PreferenceUtil.java b/app/src/main/java/com/cappielloantonio/play/util/PreferenceUtil.java
index a00bfbf2..d6136486 100644
--- a/app/src/main/java/com/cappielloantonio/play/util/PreferenceUtil.java
+++ b/app/src/main/java/com/cappielloantonio/play/util/PreferenceUtil.java
@@ -45,7 +45,7 @@ public class PreferenceUtil {
 
     public static PreferenceUtil getInstance(final Context context) {
         if (sInstance == null) {
-            sInstance = new PreferenceUtil(context.getApplicationContext());
+            sInstance = new PreferenceUtil(context);
         }
 
         return sInstance;
diff --git a/app/src/main/res/drawable/ic_pause_circle.xml b/app/src/main/res/drawable/ic_pause_circle.xml
index 9d47cdd0..33d4d319 100644
--- a/app/src/main/res/drawable/ic_pause_circle.xml
+++ b/app/src/main/res/drawable/ic_pause_circle.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="@color/titleTextColor"
       android:pathData="M10,16c0.55,0 1,-0.45 1,-1L11,9c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v6c0,0.55 0.45,1 1,1zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM14,16c0.55,0 1,-0.45 1,-1L15,9c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v6c0,0.55 0.45,1 1,1z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_play_circle.xml b/app/src/main/res/drawable/ic_play_circle.xml
index a8530bec..cd005165 100644
--- a/app/src/main/res/drawable/ic_play_circle.xml
+++ b/app/src/main/res/drawable/ic_play_circle.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="@color/titleTextColor"
       android:pathData="M10.8,15.9l4.67,-3.5c0.27,-0.2 0.27,-0.6 0,-0.8L10.8,8.1c-0.33,-0.25 -0.8,-0.01 -0.8,0.4v7c0,0.41 0.47,0.65 0.8,0.4zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"/>
 </vector>