From fdbb3b04f3fd27eb60eaecdf49d2f7adc8f698e9 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Fri, 24 Mar 2023 16:27:25 +0100
Subject: [PATCH] custom colors per account

---
 app/build.gradle                                                | 2 +-
 .../app/fedilab/android/mastodon/activities/BaseActivity.java   | 2 +-
 .../java/app/fedilab/android/mastodon/helper/ThemeHelper.java   | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index f2c3a7eef..45941a496 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -99,7 +99,7 @@ dependencies {
 
     implementation 'androidx.appcompat:appcompat:1.6.1'
 
-    implementation 'com.google.android.material:material:1.8.0'
+    implementation 'com.google.android.material:material:1.9.0-beta01'
 
 
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
diff --git a/app/src/main/java/app/fedilab/android/mastodon/activities/BaseActivity.java b/app/src/main/java/app/fedilab/android/mastodon/activities/BaseActivity.java
index b36be9d59..7b2261962 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/activities/BaseActivity.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/activities/BaseActivity.java
@@ -143,8 +143,8 @@ public class BaseActivity extends AppCompatActivity {
             }
         }
         super.onCreate(savedInstanceState);
-        ThemeHelper.applyThemeColor(this);
 
+        ThemeHelper.applyThemeColor(this);
         if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.N) {
             ThemeHelper.adjustFontScale(this, getResources().getConfiguration());
         }
diff --git a/app/src/main/java/app/fedilab/android/mastodon/helper/ThemeHelper.java b/app/src/main/java/app/fedilab/android/mastodon/helper/ThemeHelper.java
index 334d83093..be9ebd975 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/helper/ThemeHelper.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/helper/ThemeHelper.java
@@ -303,6 +303,7 @@ public class ThemeHelper {
             }
             DynamicColorsOptions.Builder builder = new DynamicColorsOptions.Builder();
             builder.setContentBasedSource(bmp);
+            builder.setThemeOverlay(R.style.ThemeOverlay_Material3_DynamicColors_DayNight);
             DynamicColorsOptions dynamicColorsOptions = builder.build();
             DynamicColors.applyToActivityIfAvailable(activity, dynamicColorsOptions);
         } else if (dynamicColor) {