From a1b5975c40c317b99f1c4b621414ed50e93cac79 Mon Sep 17 00:00:00 2001
From: Bnyro <yannick.fehler@web.de>
Date: Wed, 6 Jul 2022 16:47:25 +0200
Subject: [PATCH 1/3] fix material you

---
 app/src/main/java/com/github/libretube/util/ThemeHelper.kt | 2 +-
 app/src/main/res/values-night/themes.xml                   | 2 +-
 app/src/main/res/values-v23/themes.xml                     | 2 +-
 app/src/main/res/values/themes.xml                         | 6 ------
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/github/libretube/util/ThemeHelper.kt b/app/src/main/java/com/github/libretube/util/ThemeHelper.kt
index 4860b93d9..0ab0a76eb 100644
--- a/app/src/main/java/com/github/libretube/util/ThemeHelper.kt
+++ b/app/src/main/java/com/github/libretube/util/ThemeHelper.kt
@@ -22,7 +22,7 @@ object ThemeHelper {
 
     private fun updateAccentColor(context: Context) {
         when (PreferenceHelper.getString(context, "accent_color", "purple")) {
-            "my" -> context.setTheme(R.style.Theme_MY)
+            "my" -> context.setTheme(R.style.MaterialYou)
             "red" -> context.setTheme(R.style.Theme_Red)
             "blue" -> context.setTheme(R.style.Theme_Blue)
             "yellow" -> context.setTheme(R.style.Theme_Yellow)
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index b023f75c9..036992245 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-    <style name="Theme.MY" parent="Theme.Material3.Dark.NoActionBar">
+    <style name="MaterialYou">
 
         <item name="android:statusBarColor" tools:targetApi="m">@android:color/transparent</item>
         <item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
diff --git a/app/src/main/res/values-v23/themes.xml b/app/src/main/res/values-v23/themes.xml
index 8b592d10a..6a771a909 100644
--- a/app/src/main/res/values-v23/themes.xml
+++ b/app/src/main/res/values-v23/themes.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Theme.MY" parent="Theme.Material3.Light.NoActionBar">
+    <style name="MaterialYou">
 
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:windowLightStatusBar">true</item>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 12d40f8c9..216073e05 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,11 +1,5 @@
 <resources>
 
-    <style name="Theme.MY" parent="Theme.Material3.Light.NoActionBar">
-
-        <item name="android:navigationBarColor">@android:color/transparent</item>
-
-    </style>
-
     <style name="Theme.Red" parent="Theme.Material3.Light.NoActionBar">
 
         <item name="colorPrimary">@color/red_light_accentLight</item>

From d024908a5c933e38125e7f886e20528647756edc Mon Sep 17 00:00:00 2001
From: Bnyro <yannick.fehler@web.de>
Date: Wed, 6 Jul 2022 16:57:47 +0200
Subject: [PATCH 2/3] fix theme

---
 .../libretube/activities/MainActivity.kt      | 21 +++++++++++++++----
 .../activities/NoInternetActivity.kt          | 13 ++++++++++--
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/github/libretube/activities/MainActivity.kt b/app/src/main/java/com/github/libretube/activities/MainActivity.kt
index a214973a9..e0e2522d6 100644
--- a/app/src/main/java/com/github/libretube/activities/MainActivity.kt
+++ b/app/src/main/java/com/github/libretube/activities/MainActivity.kt
@@ -47,7 +47,23 @@ class MainActivity : AppCompatActivity() {
     private var startFragmentId = R.id.homeFragment
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        DynamicColors.applyToActivityIfAvailable(this)
+        /**
+         * apply dynamic colors if enabled
+         */
+        val materialColorsEnabled = PreferenceHelper
+            .getString(this, "accent_color", "purple") == "my"
+        if (materialColorsEnabled) {
+            // apply dynamic colors to the current activity
+            DynamicColors.applyToActivityIfAvailable(this)
+            // apply dynamic colors to the all other activities
+            DynamicColors.applyToActivitiesIfAvailable(application)
+        }
+
+        // set the theme
+        ThemeHelper.updateTheme(applicationContext)
+        // set the language
+        LocaleHelper.updateLanguage(applicationContext)
+
         super.onCreate(savedInstanceState)
 
         // start service that gets called on closure
@@ -69,9 +85,6 @@ class MainActivity : AppCompatActivity() {
                 RetrofitInstance.url
             }
 
-        ThemeHelper.updateTheme(this)
-        LocaleHelper.updateLanguage(this)
-
         // show noInternet Activity if no internet available on app startup
         if (!ConnectionHelper.isNetworkAvailable(this)) {
             val noInternetIntent = Intent(this, NoInternetActivity::class.java)
diff --git a/app/src/main/java/com/github/libretube/activities/NoInternetActivity.kt b/app/src/main/java/com/github/libretube/activities/NoInternetActivity.kt
index a2e4d9e4d..bd626a2c1 100644
--- a/app/src/main/java/com/github/libretube/activities/NoInternetActivity.kt
+++ b/app/src/main/java/com/github/libretube/activities/NoInternetActivity.kt
@@ -5,6 +5,7 @@ import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import com.github.libretube.R
 import com.github.libretube.databinding.ActivityNointernetBinding
+import com.github.libretube.preferences.PreferenceHelper
 import com.github.libretube.util.ConnectionHelper
 import com.github.libretube.util.ThemeHelper
 import com.google.android.material.color.DynamicColors
@@ -14,8 +15,16 @@ class NoInternetActivity : AppCompatActivity() {
     private lateinit var binding: ActivityNointernetBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        DynamicColors.applyToActivityIfAvailable(this)
-        ThemeHelper.updateTheme(this)
+
+        /**
+         * apply dynamic colors if enabled
+         */
+        val materialColorsEnabled = PreferenceHelper
+            .getString(this, "accent_color", "purple") == "my"
+        if (materialColorsEnabled) {
+            DynamicColors.applyToActivityIfAvailable(this)
+        }
+
         super.onCreate(savedInstanceState)
 
         binding = ActivityNointernetBinding.inflate(layoutInflater)

From b9ec2134ed25bec2efaa749d7c041905ae250c91 Mon Sep 17 00:00:00 2001
From: Bnyro <yannick.fehler@web.de>
Date: Wed, 6 Jul 2022 16:58:23 +0200
Subject: [PATCH 3/3] lint

---
 .../java/com/github/libretube/activities/NoInternetActivity.kt   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/java/com/github/libretube/activities/NoInternetActivity.kt b/app/src/main/java/com/github/libretube/activities/NoInternetActivity.kt
index bd626a2c1..0478e10b1 100644
--- a/app/src/main/java/com/github/libretube/activities/NoInternetActivity.kt
+++ b/app/src/main/java/com/github/libretube/activities/NoInternetActivity.kt
@@ -15,7 +15,6 @@ class NoInternetActivity : AppCompatActivity() {
     private lateinit var binding: ActivityNointernetBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
-
         /**
          * apply dynamic colors if enabled
          */