feat: Settings screen add icon shape

Signed-off-by: Hu Shenghao <dede.hu@qq.com>

Author: hushenghao

app/src/main/java/com/dede/android_eggs/startup/ApplicationInitializer.kt

@@ -3,13 +3,16 @@ package com.dede.android_eggs.startup
 import android.app.Application
 import android.content.Context
 import androidx.startup.Initializer
+import com.dede.android_eggs.views.settings.compose.basic.SettingPrefUtil
 import com.dede.android_eggs.views.settings.compose.prefs.ThemePrefUtil
 import com.dede.basic.GlobalContext
 
 class ApplicationInitializer : Initializer<Unit> {
 
     override fun create(context: Context) {
         val application = context.applicationContext as Application
+        // setup states value
+        SettingPrefUtil.setup(application)
         // apply compat style
         ThemePrefUtil.apply(application)
     }

app/src/main/java/com/dede/android_eggs/views/settings/compose/basic/SettingPref.kt

@@ -23,6 +23,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import com.dede.android_eggs.views.main.compose.Wavy
+import com.dede.android_eggs.views.settings.compose.prefs.SettingPrefIcon
 
 
 @Composable
@@ -76,9 +77,11 @@ fun SettingPref(
     SettingPref(
         modifier = modifier,
         leadingIcon = {
-            Box(Modifier.padding(start = 14.dp)) {
-                Icon(imageVector = leadingIcon, contentDescription = title)
-            }
+            SettingPrefIcon(
+                icon = leadingIcon,
+                contentDescription = title,
+                modifier = Modifier.padding(start = 14.dp),
+            )
         },
         title = title,
         desc = desc,

app/src/main/java/com/dede/android_eggs/views/settings/compose/prefs/IconShapePref.kt

@@ -61,6 +61,7 @@ fun IconShapePref() {
                         onClick = onClick@{
                             if (selectedIndex == index) return@onClick
                             selectedIndex = index
+                            SettingPrefUtil.iconShapeValueState.value = index
                             val extras = bundleOf(SettingPrefUtil.EXTRA_VALUE to index)
                             with(LocalEvent.poster()) {
                                 post(IconShapePrefUtil.ACTION_CHANGED, extras)

core/settings/src/main/java/com/dede/android_eggs/views/settings/compose/basic/SettingPrefUtil.kt

@@ -1,8 +1,10 @@
 package com.dede.android_eggs.views.settings.compose.basic
 
 import android.content.Context
+import androidx.compose.runtime.mutableStateOf
 import androidx.core.content.edit
 import com.dede.android_eggs.util.pref
+import com.dede.android_eggs.views.settings.compose.prefs.IconShapePrefUtil
 
 object SettingPrefUtil {
     const val ON = 1
@@ -19,4 +21,10 @@ object SettingPrefUtil {
     fun setValue(context: Context, key: String, value: Int) {
         context.pref.edit { putInt(key, value) }
     }
+
+    val iconShapeValueState = mutableStateOf(OFF)
+
+    fun setup(context: Context) {
+        iconShapeValueState.value = getValue(context, IconShapePrefUtil.KEY_ICON_SHAPE, OFF)
+    }
 }

core/settings/src/main/java/com/dede/android_eggs/views/settings/compose/prefs/IconShapePrefUtil.kt

@@ -56,6 +56,10 @@ object IconShapePrefUtil {
         return polygonItems.getOrNull(index)
     }
 
+    fun getIconShapeRoundedPolygon(index: Int): RoundedPolygon? {
+        return polygonItems.getOrNull(index)
+    }
+
     @Composable
     fun getIconShapePref(): Shape {
         val roundedPolygon = getIconShapeRoundedPolygon(LocalContext.current)

core/settings/src/main/java/com/dede/android_eggs/views/settings/compose/prefs/SettingPrefIcon.kt

@@ -0,0 +1,59 @@
+package com.dede.android_eggs.views.settings.compose.prefs
+
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme.colorScheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.unit.dp
+import androidx.graphics.shapes.RoundedPolygon
+import com.dede.android_eggs.views.settings.compose.basic.SettingPrefUtil
+import com.dede.android_eggs.views.settings.compose.prefs.IconShapePrefUtil.toShapePlus
+
+@Composable
+fun SettingPrefIcon(
+    icon: ImageVector,
+    modifier: Modifier = Modifier,
+    contentDescription: String? = null,
+) {
+    val iconShapeIndex by SettingPrefUtil.iconShapeValueState
+    var newPolygon: RoundedPolygon? by remember { mutableStateOf(null) }
+    LaunchedEffect(iconShapeIndex) {
+        newPolygon = IconShapePrefUtil.getIconShapeRoundedPolygon(iconShapeIndex)
+    }
+    SettingPrefIcon(
+        icon = icon,
+        modifier = modifier,
+        shape = newPolygon.toShapePlus(),
+        contentDescription = contentDescription,
+    )
+}
+
+@Composable
+fun SettingPrefIcon(
+    icon: ImageVector,
+    shape: Shape,
+    modifier: Modifier = Modifier,
+    contentDescription: String? = null,
+) {
+    Card(
+        modifier = modifier,
+        shape = shape,
+        colors = CardDefaults.cardColors(containerColor = colorScheme.primaryContainer)
+    ) {
+        Icon(
+            imageVector = icon,
+            contentDescription = contentDescription,
+            modifier = Modifier.padding(6.dp)
+        )
+    }
+}