Merge pull request #10725 from t895/theme-merge

Android: App redesign with multi-theme system
dolphin-emu · Sep 10, 2022 · 84507ec · 84507ec
2 parents 2bbae05 + 940a38f
commit 84507ec
Show file tree

Hide file tree

Showing 91 changed files with 1,711 additions and 1,008 deletions.
diff --git a/Source/Android/app/src/main/AndroidManifest.xml b/Source/Android/app/src/main/AndroidManifest.xml
@@ -76,19 +76,19 @@
             android:name=".features.settings.ui.SettingsActivity"
             android:exported="false"
             android:configChanges="orientation|screenSize"
-            android:theme="@style/Theme.Dolphin.Settings"
+            android:theme="@style/Theme.Dolphin.Main"
             android:label="@string/settings"/>
 
         <activity
             android:name=".features.cheats.ui.CheatsActivity"
             android:exported="false"
-            android:theme="@style/Theme.Dolphin.Settings"
+            android:theme="@style/Theme.Dolphin.Main"
             android:label="@string/cheats"/>
 
         <activity
             android:name=".activities.EmulationActivity"
             android:exported="false"
-            android:theme="@style/Theme.Dolphin.Main.Emulation"
+            android:theme="@style/Theme.Dolphin.Main"
             android:preferMinimalPostProcessing="true"/>
 
         <activity
@@ -125,7 +125,7 @@
             android:name=".activities.UserDataActivity"
             android:exported="false"
             android:label="@string/user_data_submenu"
-            android:theme="@style/Theme.Dolphin.Settings" />
+            android:theme="@style/Theme.Dolphin.Main" />
 
         <activity
             android:name=".features.riivolution.ui.RiivolutionBootActivity"

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/ConvertActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/ConvertActivity.java
@@ -10,6 +10,7 @@
 
 import org.dolphinemu.dolphinemu.R;
 import org.dolphinemu.dolphinemu.fragments.ConvertFragment;
+import org.dolphinemu.dolphinemu.utils.ThemeHelper;
 
 public class ConvertActivity extends AppCompatActivity
 {
@@ -25,6 +26,8 @@ public static void launch(Context context, String gamePath)
   @Override
   protected void onCreate(Bundle savedInstanceState)
   {
+    ThemeHelper.setTheme(this);
+
     super.onCreate(savedInstanceState);
 
     setContentView(R.layout.activity_convert);