Refactor: Move icon preferences to ProfilePrefsPage category

Author: saulhdev

Omega/src/com/neoapps/neolauncher/compose/pages/preferences/IconShapePage.kt

@@ -27,20 +27,16 @@ import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.GridItemSpan
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.lazy.grid.itemsIndexed
-import androidx.compose.material3.HorizontalDivider
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
-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.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.android.launcher3.R
 import com.neoapps.neolauncher.compose.components.ViewWithActionBar
-import com.neoapps.neolauncher.compose.components.preferences.PreferenceGroup
 import com.neoapps.neolauncher.icons.IconShape
 import com.neoapps.neolauncher.icons.IconShapeItem
 import com.neoapps.neolauncher.icons.IconShapeManager
@@ -71,16 +67,6 @@ fun IconShapePage() {
             IconShape.Teardrop,
         )
         val listItems = iconShapes.distinctBy { it.getMaskPath() }.map { ShapeModel(it.toString()) }
-        val iconPrefs = listOf(
-            prefs.profileIconAdaptify,
-            prefs.profileIconColoredBackground
-        )
-        val openDialog = remember { mutableStateOf(false) }
-        var dialogPref by remember { mutableStateOf<Any?>(null) }
-        val onPrefDialog = { pref: Any ->
-            dialogPref = pref
-            openDialog.value = true
-        }
 
         Column(
             modifier = Modifier
@@ -111,20 +97,6 @@ fun IconShapePage() {
                         }
                     )
                 }
-                item(span = { GridItemSpan(maxLineSpan) }) {
-                    HorizontalDivider(
-                        modifier = Modifier.padding(horizontal = 16.dp),
-                        thickness = 1.dp
-                    )
-                }
-
-                item(span = { GridItemSpan(maxLineSpan) }) {
-                    PreferenceGroup(
-                        heading = null,
-                        prefs = iconPrefs,
-                        onPrefDialog = onPrefDialog
-                    )
-                }
             }
         }
     }

Omega/src/com/neoapps/neolauncher/compose/pages/preferences/ProfilePrefsPage.kt

@@ -68,15 +68,20 @@ fun ProfilePrefsPage() {
         prefs.profileLanguage,
         /*prefs.profileTheme,
         prefs.profileAccentColor,*/
+    )
+
+    val iconPrefs = listOfNotNull(
         prefs.profileIconPack,
         prefs.profileIconShape,
-        /*
-                if (customIconsCount > 0) {
-                    prefs.profileResetCustomIcons
-                } else {
-                    null
-                }*/
+        prefs.profileIconAdaptify,
+        prefs.profileIconColoredBackground,
+        if (customIconsCount > 0) {
+            prefs.profileResetCustomIcons
+        } else {
+            null
+        }
     )
+
     val others = remember(prefs.changePoker.collectAsState(initial = 1).value) {
         mutableStateListOf(
             *listOfNotNull(
@@ -104,6 +109,13 @@ fun ProfilePrefsPage() {
                     onPrefDialog = onPrefDialog
                 )
             }
+            item {
+                PreferenceGroup(
+                    stringResource(id = R.string.cat_drawer_icons),
+                    prefs = iconPrefs,
+                    onPrefDialog = onPrefDialog
+                )
+            }
             item {
                 PreferenceGroup(
                     stringResource(id = R.string.pref_category__others),