feat: Icon shape pref move to settings module

hushenghao · hushenghao · commit cd41efc81491 · 2026-01-16T13:40:42.000+08:00
Signed-off-by: Hu Shenghao &lt;dede.hu@qq.com&gt;
diff --git a/app/src/main/java/com/dede/android_eggs/views/main/compose/EasterEggLogo.kt b/app/src/main/java/com/dede/android_eggs/views/main/compose/EasterEggLogo.kt
@@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.lazy.grid.items
-import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.getValue
@@ -31,8 +30,7 @@ import com.dede.android_eggs.util.Receiver
 import com.dede.android_eggs.views.main.util.EasterEggHelp
 import com.dede.android_eggs.views.main.util.EasterEggLogoSensorMatrixConvert
 import com.dede.android_eggs.views.settings.compose.prefs.IconShapePrefUtil
-import com.dede.android_eggs.views.settings.compose.prefs.getIconShapeRoundedPolygon
-import com.dede.android_eggs.views.settings.compose.prefs.toShapePlus
+import com.dede.android_eggs.views.settings.compose.prefs.IconShapePrefUtil.toShapePlus
 import com.dede.basic.isAdaptiveIconDrawable
 import com.dede.basic.provider.EasterEgg
 
@@ -48,7 +46,6 @@ fun PreviewEasterEggLogo() {
     }
 }
 
-@OptIn(ExperimentalMaterial3ExpressiveApi::class)
 @Composable
 fun EasterEggLogo(
     modifier: Modifier = Modifier,
@@ -60,10 +57,10 @@ fun EasterEggLogo(
     val isAdaptiveIcon = remember(res) { context.isAdaptiveIconDrawable(res) }
     if (isAdaptiveIcon) {
         var clipRoundedPolygon by remember {
-            mutableStateOf(getIconShapeRoundedPolygon(context))
+            mutableStateOf(IconShapePrefUtil.getIconShapeRoundedPolygon(context))
         }
         LocalEvent.Receiver(IconShapePrefUtil.ACTION_CHANGED) {
-            clipRoundedPolygon = getIconShapeRoundedPolygon(context)
+            clipRoundedPolygon = IconShapePrefUtil.getIconShapeRoundedPolygon(context)
         }
         var foregroundMatrix by remember { mutableStateOf(Matrix()) }
         var size by remember { mutableStateOf(IntSize.Zero) }
@@ -74,16 +71,16 @@ fun EasterEggLogo(
                     val floats = FloatArray(9)
                     val bounds = Rect(0, 0, size.width, size.height)
                     val listener = object : EasterEggLogoSensorMatrixConvert.Listener(bounds) {
-                            override fun onUpdateMatrix(matrix: android.graphics.Matrix) {
-                                matrix.getValues(floats)
-                                foregroundMatrix = Matrix().apply {
-                                    resetToPivotedTransform(
-                                        translationX = floats[android.graphics.Matrix.MTRANS_X],
-                                        translationY = floats[android.graphics.Matrix.MTRANS_Y]
-                                    )
-                                }
+                        override fun onUpdateMatrix(matrix: android.graphics.Matrix) {
+                            matrix.getValues(floats)
+                            foregroundMatrix = Matrix().apply {
+                                resetToPivotedTransform(
+                                    translationX = floats[android.graphics.Matrix.MTRANS_X],
+                                    translationY = floats[android.graphics.Matrix.MTRANS_Y]
+                                )
                             }
                         }
+                    }
                     sensorGroup.register(listener)
 
                     onDispose {
diff --git a/app/src/main/java/com/dede/android_eggs/views/settings/compose/prefs/IconShapePref.kt b/app/src/main/java/com/dede/android_eggs/views/settings/compose/prefs/IconShapePref.kt
@@ -2,7 +2,6 @@
 
 package com.dede.android_eggs.views.settings.compose.prefs
 
-import android.content.Context
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
@@ -27,25 +26,20 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.layout.Layout
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Constraints
 import androidx.compose.ui.unit.dp
 import androidx.core.os.bundleOf
-import androidx.graphics.shapes.CornerRounding
-import androidx.graphics.shapes.RoundedPolygon
-import androidx.graphics.shapes.rectangle
-import androidx.graphics.shapes.star
 import com.dede.android_eggs.R
-import com.dede.android_eggs.alterable_adaptive_icon.PathShape
 import com.dede.android_eggs.ui.composes.icons.rounded.Shapes
 import com.dede.android_eggs.util.LocalEvent
 import com.dede.android_eggs.views.settings.compose.basic.ExpandOptionsPref
 import com.dede.android_eggs.views.settings.compose.basic.SettingPrefUtil
 import com.dede.android_eggs.views.settings.compose.basic.rememberPrefIntState
-import sv.lib.squircleshape.SquircleShape
+import com.dede.android_eggs.views.settings.compose.prefs.IconShapePrefUtil.polygonItems
+import com.dede.android_eggs.views.settings.compose.prefs.IconShapePrefUtil.toShapePlusNullable
 import com.dede.android_eggs.resources.R as StringsR
 
 private const val SPAN_COUNT = 5
@@ -80,77 +74,6 @@ fun IconShapePref() {
     }
 }
 
-fun getIconShapeRoundedPolygon(context: Context): RoundedPolygon? {
-    val index = IconShapePrefUtil.getIconShapeIndexOf(context)
-    return polygonItems.getOrNull(index)
-}
-
-@Composable
-fun getIconShapePref(): Shape {
-    val roundedPolygon = getIconShapeRoundedPolygon(LocalContext.current)
-    return roundedPolygon.toShapePlus()
-}
-
-@Composable
-fun RoundedPolygon?.toShapePlus(): Shape {
-    val shape = this.toShapePlusNullable()
-    if (shape == null) {
-        val path = IconShapePrefUtil.getSystemIconMaskPath(LocalContext.current)
-        if (path != null) {
-            return PathShape(path)
-        }
-        return defaultSquare.toShape()
-    }
-    return shape
-}
-
-@Composable
-private fun RoundedPolygon?.toShapePlusNullable(): Shape? {
-    if (this == null) return null
-    if (this == _fakeSquircle) return SquircleShape()
-    return this.toShape()
-}
-
-private val defaultSquare = MaterialShapes.Square
-
-@Suppress("ObjectPropertyName")
-private val _fakeSquircle = RoundedPolygon.rectangle()
-
-private val polygonItems: Array<RoundedPolygon?> = arrayOf(
-    null,
-    defaultSquare,
-    // Squircle
-    _fakeSquircle,
-    MaterialShapes.Circle,
-    // CornerSE
-    RoundedPolygon(
-        vertices = floatArrayOf(1f, 1f, -1f, 1f, -1f, -1f, 1f, -1f),
-        perVertexRounding = listOf(
-            CornerRounding(0.4f),
-            CornerRounding(1f),
-            CornerRounding(1f),
-            CornerRounding(1f),
-        ),
-    ).normalized(),
-
-    MaterialShapes.Cookie4Sided,
-    // Scallop
-    RoundedPolygon.star(
-        numVerticesPerRadius = 13,
-        innerRadius = .9f,
-        rounding = CornerRounding(.2f),
-        innerRounding = CornerRounding(.3f)
-    ).normalized(),
-    MaterialShapes.Clover8Leaf,
-    MaterialShapes.Pill,
-    RoundedPolygon.star(
-        numVerticesPerRadius = 10,
-        innerRadius = .6f,
-        rounding = CornerRounding(.3f),
-        innerRounding = CornerRounding(.3f)
-    ).normalized(),
-)
-
 @Composable
 private fun IconShapeGridLayout(spanCount: Int = SPAN_COUNT, content: @Composable () -> Unit) {
     Layout(
diff --git a/app/src/main/java/com/dede/android_eggs/views/timeline/TimelineListDialog.kt b/app/src/main/java/com/dede/android_eggs/views/timeline/TimelineListDialog.kt
@@ -54,7 +54,7 @@ import androidx.lifecycle.ViewModel
 import com.dede.android_eggs.R
 import com.dede.android_eggs.views.main.compose.EasterEggLogo
 import com.dede.android_eggs.views.main.util.AndroidLogoMatcher
-import com.dede.android_eggs.views.settings.compose.prefs.getIconShapePref
+import com.dede.android_eggs.views.settings.compose.prefs.IconShapePrefUtil
 import com.dede.android_eggs.views.timeline.TimelineEventHelp.eventAnnotatedString
 import com.dede.android_eggs.views.timeline.TimelineEventHelp.isNewGroup
 import com.dede.android_eggs.views.timeline.TimelineEventHelp.localMonth
@@ -220,7 +220,7 @@ private fun TimelineItem(
         val isAdaptiveIcon = context.isAdaptiveIconDrawable(logoRes)
         if (!isAdaptiveIcon) {
             imageModifier = Modifier
-                .background(colorScheme.secondaryContainer, getIconShapePref())
+                .background(colorScheme.secondaryContainer, IconShapePrefUtil.getIconShapePref())
                 .then(imageModifier)
                 .padding(6.dp)
         }
diff --git a/core/settings/build.gradle.kts b/core/settings/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("easter.eggs.library")
+    id("easter.eggs.compose.library")
 }
 
 android {
@@ -9,4 +9,13 @@ android {
 dependencies {
     implementation(libs.androidx.core)
     implementation(libs.androidx.appcompat)
+
+    implementation(libs.androidx.compose.runtime)
+    implementation(libs.androidx.compose.ui)
+    implementation(libs.google.accompanist.drawablepainter)
+    implementation(libs.androidx.compose.ui.tooling.preview)
+    implementation(libs.androidx.compose.material3)
+    debugImplementation(libs.androidx.compose.ui.tooling)
+
+    implementation(libs.squircle.shape)
 }
diff --git a/core/settings/src/main/java/com/dede/android_eggs/views/settings/compose/prefs/IconShapePrefUtil.kt b/core/settings/src/main/java/com/dede/android_eggs/views/settings/compose/prefs/IconShapePrefUtil.kt
@@ -1,22 +1,34 @@
+@file:OptIn(ExperimentalMaterial3ExpressiveApi::class)
+
 package com.dede.android_eggs.views.settings.compose.prefs
 
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.res.Resources
-import android.graphics.Path
 import android.os.Build
 import android.text.TextUtils
 import androidx.annotation.RequiresApi
-import com.dede.android_eggs.util.PathInflater
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+import androidx.compose.material3.MaterialShapes
+import androidx.compose.material3.toShape
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.platform.LocalContext
+import androidx.graphics.shapes.CornerRounding
+import androidx.graphics.shapes.RoundedPolygon
+import androidx.graphics.shapes.rectangle
+import androidx.graphics.shapes.star
 import com.dede.android_eggs.views.settings.compose.basic.SettingPrefUtil
+import com.dede.android_eggs.views.settings.compose.utils.PathShape
+import sv.lib.squircleshape.SquircleShape
 
 object IconShapePrefUtil {
 
     const val KEY_ICON_SHAPE = "pref_key_override_icon_shape"
 
     const val ACTION_CHANGED = "com.dede.easter_eggs.IconShapeChanged"
 
-    fun getSystemIconMaskPath(context: Context): Path? {
+    private fun getSystemIconMaskShape(context: Context): Shape? {
         var pathStr: String? = null
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             val resId = getConfigResId(context.resources)
@@ -30,7 +42,7 @@ object IconShapePrefUtil {
         if (pathStr == null || TextUtils.isEmpty(pathStr)) {
             return null
         }
-        return PathInflater.inflate(pathStr)
+        return PathShape(pathStr)
     }
 
     @SuppressLint("DiscouragedApi")
@@ -39,8 +51,71 @@ object IconShapePrefUtil {
         return resources.getIdentifier("config_icon_mask", "string", "android")
     }
 
-    fun getIconShapeIndexOf(context: Context): Int {
-        return SettingPrefUtil.getValue(context, KEY_ICON_SHAPE, 0)
+    fun getIconShapeRoundedPolygon(context: Context): RoundedPolygon? {
+        val index = SettingPrefUtil.getValue(context, KEY_ICON_SHAPE, 0)
+        return polygonItems.getOrNull(index)
+    }
+
+    @Composable
+    fun getIconShapePref(): Shape {
+        val roundedPolygon = getIconShapeRoundedPolygon(LocalContext.current)
+        return roundedPolygon.toShapePlus()
     }
 
+    @Composable
+    fun RoundedPolygon?.toShapePlus(): Shape {
+        val shape = this.toShapePlusNullable()
+        if (shape != null) {
+            return shape
+        }
+        return getSystemIconMaskShape(LocalContext.current) ?: defaultSquare.toShape()
+    }
+
+
+    @Composable
+    fun RoundedPolygon?.toShapePlusNullable(): Shape? {
+        if (this == null) return null
+        if (this == fakeSquircle) return SquircleShape()
+        return this.toShape()
+    }
+
+    private val defaultSquare = MaterialShapes.Square
+
+    private val fakeSquircle = RoundedPolygon.rectangle()
+
+    val polygonItems: Array<RoundedPolygon?> = arrayOf(
+        null,
+        defaultSquare,
+        // Squircle
+        fakeSquircle,
+        MaterialShapes.Circle,
+        // CornerSE
+        RoundedPolygon(
+            vertices = floatArrayOf(1f, 1f, -1f, 1f, -1f, -1f, 1f, -1f),
+            perVertexRounding = listOf(
+                CornerRounding(0.4f),
+                CornerRounding(1f),
+                CornerRounding(1f),
+                CornerRounding(1f),
+            ),
+        ).normalized(),
+
+        MaterialShapes.Cookie4Sided,
+        // Scallop
+        RoundedPolygon.star(
+            numVerticesPerRadius = 13,
+            innerRadius = .9f,
+            rounding = CornerRounding(.2f),
+            innerRounding = CornerRounding(.3f)
+        ).normalized(),
+        MaterialShapes.Clover8Leaf,
+        MaterialShapes.Pill,
+        RoundedPolygon.star(
+            numVerticesPerRadius = 10,
+            innerRadius = .6f,
+            rounding = CornerRounding(.3f),
+            innerRounding = CornerRounding(.3f)
+        ).normalized(),
+    )
+
 }
diff --git a/core/settings/src/main/java/com/dede/android_eggs/views/settings/compose/utils/PathShape.kt b/core/settings/src/main/java/com/dede/android_eggs/views/settings/compose/utils/PathShape.kt
@@ -1,4 +1,4 @@
-package com.dede.android_eggs.alterable_adaptive_icon
+package com.dede.android_eggs.views.settings.compose.utils
 
 import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.graphics.Matrix

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.dede.android_eggs.alterable_adaptive_icon`
	`1`	`+package com.dede.android_eggs.views.settings.compose.utils`
`2`	`2`
`3`	`3`	`import androidx.compose.ui.geometry.Size`
`4`	`4`	`import androidx.compose.ui.graphics.Matrix`