fix: Settings ModalDrawerSheet width

ref: [#211](#211) ref: [#212](#212)
hushenghao · Mar 14, 2024 · ee97b8c · ee97b8c
1 parent 810560f
commit ee97b8c
Show file tree

Hide file tree

Showing 10 changed files with 47 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,10 @@
-### v2.4.0
+### v2.4.1
+
+- New Settings UI 🎉
+- Waiting Android Vanilla Ice Cream
+- Fix Settings ModalDrawerSheet width [#211](https://github.com/hushenghao/AndroidEasterEggs/issues/211) [#212](https://github.com/hushenghao/AndroidEasterEggs/issues/212)
+
+### v2.4.0 (2024-03-14)
 
 - New Settings UI 🎉
 - Waiting Android Vanilla Ice Cream

diff --git a/CHANGELOG_zh.md b/CHANGELOG_zh.md
@@ -1,4 +1,10 @@
-### v2.4.0
+### v2.4.1
+
+- 新的设置页面样式 🎉
+- 等待 Android Vanilla Ice Cream
+- 修复设置抽屉宽度 [#211](https://github.com/hushenghao/AndroidEasterEggs/issues/211) [#212](https://github.com/hushenghao/AndroidEasterEggs/issues/212)
+
+### v2.4.0 (2024-03-14)
 
 - 新的设置页面样式 🎉
 - 等待 Android Vanilla Ice Cream

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -10,8 +10,8 @@ android {
 
     defaultConfig {
         applicationId = "com.dede.android_eggs"
-        versionCode = 38
-        versionName = "2.4.0"
+        versionCode = 39
+        versionName = "2.4.1"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
         resourceConfigurations += listOf(

diff --git a/app/src/main/java/com/dede/android_eggs/views/main/EasterEggsActivity.kt b/app/src/main/java/com/dede/android_eggs/views/main/EasterEggsActivity.kt
@@ -10,6 +10,7 @@ import android.os.Bundle
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.material3.DrawerValue
@@ -86,10 +87,11 @@ class EasterEggsActivity : AppCompatActivity() {
                         drawerContent = {
                             ModalDrawerSheet(
                                 drawerShape = shapes.extraLarge.end(0.dp),
-                                modifier = Modifier.fillMaxWidth(0.85f),
                                 windowInsets = WindowInsets(0, 0, 0, 0)
                             ) {
-                                SettingsScreen(drawerState)
+                                Box(modifier = Modifier.fillMaxWidth(0.85f)) {
+                                    SettingsScreen(drawerState)
+                                }
                             }
                         },
                         drawerState = drawerState

diff --git a/app/src/main/java/com/dede/android_eggs/views/settings/SettingsScreen.kt b/app/src/main/java/com/dede/android_eggs/views/settings/SettingsScreen.kt
@@ -39,14 +39,15 @@ import com.dede.android_eggs.views.settings.compose.ContributeGroup
 import com.dede.android_eggs.views.settings.compose.IconShapePref
 import com.dede.android_eggs.views.settings.compose.IconVisualEffectsPref
 import com.dede.android_eggs.views.settings.compose.LanguagePref
+import com.dede.android_eggs.views.settings.compose.LanguagePrefUtil
 import com.dede.android_eggs.views.settings.compose.RetainInRecentsPref
 import com.dede.android_eggs.views.settings.compose.SettingDivider
 import com.dede.android_eggs.views.settings.compose.SettingPrefUtil
 import com.dede.android_eggs.views.settings.compose.ThemePref
 import com.dede.android_eggs.views.settings.compose.TimelinePref
 import kotlinx.coroutines.launch
 
-@Preview
+@Preview(widthDp = 360)
 @Composable
 fun SettingsScreen(drawerState: DrawerState = rememberDrawerState(DrawerValue.Closed)) {
     val scope = rememberCoroutineScope()
@@ -110,7 +111,9 @@ fun SettingsScreen(drawerState: DrawerState = rememberDrawerState(DrawerValue.Cl
 
                 IconShapePref()
 
-                LanguagePref()
+                if (LanguagePrefUtil.isSupported()) {
+                    LanguagePref()
+                }
 
                 IconVisualEffectsPref()
 

diff --git a/app/src/main/java/com/dede/android_eggs/views/settings/compose/DynamicColorPref.kt b/app/src/main/java/com/dede/android_eggs/views/settings/compose/DynamicColorPref.kt
@@ -27,11 +27,17 @@ object DynamicColorPrefUtil {
     const val KEY_DYNAMIC_COLOR = "pref_key_dynamic_color"
     const val ACTION_DYNAMIC_COLOR_CHANGED = "ACTION_DYNAMIC_COLOR_CHANGED"
 
+    fun isSupported(): Boolean {
+        return DynamicColors.isDynamicColorAvailable()
+    }
+
     fun isDynamicEnable(context: Context): Boolean {
         return SettingPrefUtil.getValue(context, KEY_DYNAMIC_COLOR, DEFAULT) == SettingPrefUtil.ON
     }
 
     fun apply(context: Context) {
+        if (!isSupported()) return
+
         val callback = Callback()
         DynamicColors.applyToActivitiesIfAvailable(
             context.applicationContext as Application,

diff --git a/app/src/main/java/com/dede/android_eggs/views/settings/compose/LanguagePref.kt b/app/src/main/java/com/dede/android_eggs/views/settings/compose/LanguagePref.kt
@@ -132,6 +132,12 @@ object LanguagePrefUtil {
     )
     // @formatter:on
 
+    fun isSupported(): Boolean {
+        // For API<24 the application does not have a localeList instead it has a single locale
+        // Unsupported region
+        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.N
+    }
+
     fun checkLocaleConfig(context: Context) {
         // check languageOptions count
         val expected = languageOptions.size

diff --git a/app/src/main/java/com/dede/android_eggs/views/settings/compose/ThemePref.kt b/app/src/main/java/com/dede/android_eggs/views/settings/compose/ThemePref.kt
@@ -127,9 +127,11 @@ fun ThemePref() {
             onOptionClick = onOptionClick,
         )
 
-        Spacer(modifier = Modifier.height(1.dp))
+        if (DynamicColorPrefUtil.isSupported()) {
+            Spacer(modifier = Modifier.height(1.dp))
 
-        DynamicColorPref()
+            DynamicColorPref()
+        }
 
     }
 }
diff --git a/fastlane/metadata/android/en-US/changelogs/39.txt b/fastlane/metadata/android/en-US/changelogs/39.txt
@@ -0,0 +1,3 @@
+- New Settings UI 🎉
+- Waiting Android Vanilla Ice Cream
+- Fix Settings ModalDrawerSheet width
diff --git a/fastlane/metadata/android/zh-CN/changelogs/39.txt b/fastlane/metadata/android/zh-CN/changelogs/39.txt
@@ -0,0 +1,3 @@
+- 新的设置页面样式 🎉
+- 等待 Android Vanilla Ice Cream
+- 修复设置抽屉宽度