summaryrefslogtreecommitdiff
path: root/src/android/app
diff options
context:
space:
mode:
authorGravatar t8952023-12-29 16:38:15 -0500
committerGravatar t8952023-12-30 15:11:36 -0500
commit278cafb76c016427c9e524a38cd0b42caf25d72a (patch)
treee3b01a9da62f9cd8a921ccae7d26df0a24cf9406 /src/android/app
parentfrontend_common: config: Do not count "." as a special character (diff)
downloadyuzu-278cafb76c016427c9e524a38cd0b42caf25d72a.tar.gz
yuzu-278cafb76c016427c9e524a38cd0b42caf25d72a.tar.xz
yuzu-278cafb76c016427c9e524a38cd0b42caf25d72a.zip
android: Don't apply material you below android 12
Since you can manually change the config file now, users can force the material you theme under Android 12 and that will result in crashing on startup. This swaps to the default theme if that happens.
Diffstat (limited to 'src/android/app')
-rw-r--r--src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/ThemeHelper.kt9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/ThemeHelper.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/ThemeHelper.kt
index 792f6a253..6f7f40e43 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/ThemeHelper.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/ThemeHelper.kt
@@ -5,6 +5,7 @@ package org.yuzu.yuzu_emu.utils
5 5
6import android.content.res.Configuration 6import android.content.res.Configuration
7import android.graphics.Color 7import android.graphics.Color
8import android.os.Build
8import androidx.annotation.ColorInt 9import androidx.annotation.ColorInt
9import androidx.appcompat.app.AppCompatActivity 10import androidx.appcompat.app.AppCompatActivity
10import androidx.appcompat.app.AppCompatDelegate 11import androidx.appcompat.app.AppCompatDelegate
@@ -23,7 +24,13 @@ object ThemeHelper {
23 setThemeMode(activity) 24 setThemeMode(activity)
24 when (Theme.from(IntSetting.THEME.getInt())) { 25 when (Theme.from(IntSetting.THEME.getInt())) {
25 Theme.Default -> activity.setTheme(R.style.Theme_Yuzu_Main) 26 Theme.Default -> activity.setTheme(R.style.Theme_Yuzu_Main)
26 Theme.MaterialYou -> activity.setTheme(R.style.Theme_Yuzu_Main_MaterialYou) 27 Theme.MaterialYou -> {
28 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
29 activity.setTheme(R.style.Theme_Yuzu_Main_MaterialYou)
30 } else {
31 activity.setTheme(R.style.Theme_Yuzu_Main)
32 }
33 }
27 } 34 }
28 35
29 // Using a specific night mode check because this could apply incorrectly when using the 36 // Using a specific night mode check because this could apply incorrectly when using the