فهرست منبع

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.
t895 2 سال پیش
والد
کامیت
278cafb76c
1فایلهای تغییر یافته به همراه8 افزوده شده و 1 حذف شده
  1. 8 1
      src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/ThemeHelper.kt

+ 8 - 1
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.content.res.Configuration
 import android.graphics.Color
 import android.graphics.Color
+import android.os.Build
 import androidx.annotation.ColorInt
 import androidx.annotation.ColorInt
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.appcompat.app.AppCompatDelegate
@@ -23,7 +24,13 @@ object ThemeHelper {
         setThemeMode(activity)
         setThemeMode(activity)
         when (Theme.from(IntSetting.THEME.getInt())) {
         when (Theme.from(IntSetting.THEME.getInt())) {
             Theme.Default -> activity.setTheme(R.style.Theme_Yuzu_Main)
             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
         // Using a specific night mode check because this could apply incorrectly when using the