Refactor: Moved private spaces to main settings

Author: CreativeCodeCat

app/src/main/java/com/github/droidworksstudio/mlauncher/ui/SettingsFragment.kt

@@ -39,6 +39,7 @@ import com.github.droidworksstudio.mlauncher.data.Prefs
 import com.github.droidworksstudio.mlauncher.databinding.FragmentSettingsBinding
 import com.github.droidworksstudio.mlauncher.helper.isSystemInDarkMode
 import com.github.droidworksstudio.mlauncher.helper.setThemeMode
+import com.github.droidworksstudio.mlauncher.helper.togglePrivateSpaceLock
 import com.github.droidworksstudio.mlauncher.listener.DeviceAdmin
 import com.github.droidworksstudio.mlauncher.style.SettingsTheme
 import com.github.droidworksstudio.mlauncher.ui.compose.SettingsComposable.SettingsHomeItem
@@ -140,6 +141,17 @@ class SettingsFragment : Fragment() {
                 },
             )
 
+            SettingsHomeItem(
+                title = stringResource(R.string.private_space),
+                imageVector = ImageVector.vectorResource(id = R.drawable.private_space),
+                titleFontSize = titleFontSize,
+                descriptionFontSize = descriptionFontSize,
+                iconSize = iconSize,
+                onClick = {
+                    togglePrivateSpaceLock(requireContext())
+                }
+            )
+
             SettingsHomeItem(
                 title = stringResource(R.string.settings_favorite_apps_title),
                 imageVector = ImageVector.vectorResource(id = R.drawable.ic_favorite),

app/src/main/java/com/github/droidworksstudio/mlauncher/ui/settings/AdvancedFragment.kt

@@ -45,7 +45,6 @@ import com.github.droidworksstudio.mlauncher.helper.ismlauncherDefault
 import com.github.droidworksstudio.mlauncher.helper.openAppInfo
 import com.github.droidworksstudio.mlauncher.helper.setThemeMode
 import com.github.droidworksstudio.mlauncher.helper.shareApplicationButton
-import com.github.droidworksstudio.mlauncher.helper.togglePrivateSpaceLock
 import com.github.droidworksstudio.mlauncher.listener.DeviceAdmin
 import com.github.droidworksstudio.mlauncher.style.SettingsTheme
 import com.github.droidworksstudio.mlauncher.ui.compose.SettingsComposable.PageHeader
@@ -203,17 +202,6 @@ class AdvancedFragment : Fragment() {
                     shareApplicationButton(requireContext())
                 }
             )
-
-            SettingsHomeItem(
-                title = stringResource(R.string.private_space),
-                imageVector = ImageVector.vectorResource(id = R.drawable.private_space),
-                titleFontSize = titleFontSize,
-                descriptionFontSize = descriptionFontSize,
-                iconSize = iconSize,
-                onClick = {
-                    togglePrivateSpaceLock(requireContext())
-                }
-            )
         }
     }