diff options
author | t895 <clombardo169@gmail.com> | 2023-12-29 16:38:15 -0500 |
---|---|---|
committer | t895 <clombardo169@gmail.com> | 2023-12-30 15:11:36 -0500 |
commit | 278cafb76c016427c9e524a38cd0b42caf25d72a (patch) | |
tree | e3b01a9da62f9cd8a921ccae7d26df0a24cf9406 /src | |
parent | 24a78dba319fc1183a47ec94e6a61add5225eb75 (diff) |
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')
-rw-r--r-- | src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/ThemeHelper.kt | 9 |
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 import android.content.res.Configuration import android.graphics.Color +import android.os.Build import androidx.annotation.ColorInt import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatDelegate @@ -23,7 +24,13 @@ object ThemeHelper { setThemeMode(activity) when (Theme.from(IntSetting.THEME.getInt())) { Theme.Default -> activity.setTheme(R.style.Theme_Yuzu_Main) - Theme.MaterialYou -> activity.setTheme(R.style.Theme_Yuzu_Main_MaterialYou) + Theme.MaterialYou -> { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { + activity.setTheme(R.style.Theme_Yuzu_Main_MaterialYou) + } else { + activity.setTheme(R.style.Theme_Yuzu_Main) + } + } } // Using a specific night mode check because this could apply incorrectly when using the |