From a67927c29ce5e3f60ed628fb307bda3333e28774 Mon Sep 17 00:00:00 2001
From: litetex <40789489+litetex@users.noreply.github.com>
Date: Sun, 1 May 2022 21:56:49 +0200
Subject: [PATCH 1/3] Fix dialogs having incorrect color when opened via
 RouterActivity

---
 app/src/main/res/values/styles.xml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 7c126558079..894e70bad92 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -131,10 +131,6 @@
     </style>
 
     <style name="RouterActivityThemeLight" parent="LightTheme">
-        <item name="colorPrimary">@android:color/transparent</item>
-        <item name="colorPrimaryDark">@android:color/transparent</item>
-        <item name="colorAccent">@android:color/transparent</item>
-
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:colorBackgroundCacheHint">@null</item>
@@ -143,10 +139,6 @@
     </style>
 
     <style name="RouterActivityThemeDark" parent="DarkTheme">
-        <item name="colorPrimary">@android:color/transparent</item>
-        <item name="colorPrimaryDark">@android:color/transparent</item>
-        <item name="colorAccent">@android:color/transparent</item>
-
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:colorBackgroundCacheHint">@null</item>

From 6f0942ac6e20e17f593a6fb6935ad003fd8bd3f1 Mon Sep 17 00:00:00 2001
From: litetex <40789489+litetex@users.noreply.github.com>
Date: Sun, 1 May 2022 21:58:20 +0200
Subject: [PATCH 2/3] Make sure Routeractivity does the same as MainActivity

---
 app/src/main/java/org/schabi/newpipe/RouterActivity.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/java/org/schabi/newpipe/RouterActivity.java b/app/src/main/java/org/schabi/newpipe/RouterActivity.java
index adef3c0e4ba..d1c5c851152 100644
--- a/app/src/main/java/org/schabi/newpipe/RouterActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/RouterActivity.java
@@ -2,6 +2,7 @@
 
 import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.AUDIO;
 import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.VIDEO;
+import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
 
 import android.annotation.SuppressLint;
 import android.app.IntentService;
@@ -127,8 +128,10 @@ protected void onCreate(final Bundle savedInstanceState) {
             }
         }
 
+        ThemeHelper.setDayNightMode(this);
         setTheme(ThemeHelper.isLightThemeSelected(this)
                 ? R.style.RouterActivityThemeLight : R.style.RouterActivityThemeDark);
+        assureCorrectAppLanguage(this);
     }
 
     @Override

From 1e2d76a686b095a65f8052f68e4bbc12625a2108 Mon Sep 17 00:00:00 2001
From: litetex <40789489+litetex@users.noreply.github.com>
Date: Wed, 4 May 2022 19:09:41 +0200
Subject: [PATCH 3/3] Use non-static method

---
 app/src/main/java/org/schabi/newpipe/RouterActivity.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/RouterActivity.java b/app/src/main/java/org/schabi/newpipe/RouterActivity.java
index d1c5c851152..22e84e93dfb 100644
--- a/app/src/main/java/org/schabi/newpipe/RouterActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/RouterActivity.java
@@ -2,7 +2,6 @@
 
 import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.AUDIO;
 import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.VIDEO;
-import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
 
 import android.annotation.SuppressLint;
 import android.app.IntentService;
@@ -73,6 +72,7 @@
 import org.schabi.newpipe.util.DeviceUtils;
 import org.schabi.newpipe.util.ExtractorHelper;
 import org.schabi.newpipe.util.ListHelper;
+import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.PermissionHelper;
 import org.schabi.newpipe.util.ThemeHelper;
@@ -131,7 +131,7 @@ protected void onCreate(final Bundle savedInstanceState) {
         ThemeHelper.setDayNightMode(this);
         setTheme(ThemeHelper.isLightThemeSelected(this)
                 ? R.style.RouterActivityThemeLight : R.style.RouterActivityThemeDark);
-        assureCorrectAppLanguage(this);
+        Localization.assureCorrectAppLanguage(this);
     }
 
     @Override