Update compileSdk to 36, add showPrivateSpaces preference, and refactor navigation bundle creation in HomeFragment and SettingsFragment.

Author: CreativeCodeCat

app/build.gradle.kts

@@ -31,11 +31,10 @@ extensions.configure<ApplicationExtension>("android") {
 
     namespace = "com.github.codeworkscreativehub.mlauncher"
 
-    compileSdk = 37
+    compileSdk = 36
 
     defaultConfig {
         minSdk = 28
-        //noinspection OldTargetApi
         targetSdk = 36
         versionCode = baseVersionCode
         versionName = baseVersionName

app/src/main/java/com/github/codeworkscreativehub/mlauncher/data/Prefs.kt

@@ -339,6 +339,10 @@ class Prefs(val context: Context) {
         get() = getSetting(HOME_CLICK_AREA, false)
         set(value) = prefsNormal.edit { putBoolean(HOME_CLICK_AREA, value) }
 
+    var showPrivateSpaces: Boolean
+        get() = getSetting(SHOW_PRIVATE_SPACES, true)
+        set(value) = prefsNormal.edit { putBoolean(SHOW_PRIVATE_SPACES, value) }
+
     var clockAlignment: Gravity
         get() {
             return getEnumSetting(CLOCK_ALIGNMENT, Gravity.Left)

app/src/main/java/com/github/codeworkscreativehub/mlauncher/data/PrefsKeys.kt

@@ -36,6 +36,7 @@ internal const val ENABLE_FILTER_STRENGTH = "ENABLE_FILTER_STRENGTH"
 internal const val HOME_ALIGNMENT = "HOME_ALIGNMENT"
 internal const val HOME_ALIGNMENT_BOTTOM = "HOME_ALIGNMENT_BOTTOM"
 internal const val HOME_CLICK_AREA = "HOME_CLICK_AREA"
+internal const val SHOW_PRIVATE_SPACES = "SHOW_PRIVATE_SPACES"
 internal const val DRAWER_ALIGNMENT = "DRAWER_ALIGNMENT"
 internal const val CLOCK_ALIGNMENT = "CLOCK_ALIGNMENT"
 internal const val DATE_ALIGNMENT = "DATE_ALIGNMENT"

app/src/main/java/com/github/codeworkscreativehub/mlauncher/ui/HomeFragment.kt

@@ -32,7 +32,6 @@ import android.widget.TextView
 import androidx.biometric.BiometricPrompt
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.ContextCompat
-import androidx.core.os.bundleOf
 import androidx.core.view.children
 import androidx.core.view.isVisible
 import androidx.lifecycle.ViewModelProvider
@@ -593,7 +592,11 @@ class HomeFragment : BaseFragment(), View.OnClickListener, View.OnLongClickListe
             if (findNavController().currentDestination?.id == R.id.mainFragment) {
                 findNavController().navigate(
                     R.id.action_mainFragment_to_appListFragment,
-                    bundleOf("flag" to flag.toString(), "n" to n, "profileType" to "SYSTEM")
+                    Bundle().apply {
+                        putString("flag", flag.toString())
+                        putInt("n", n)
+                        putString("profileType", "SYSTEM")
+                    }
                 )
             }
         } catch (e: Exception) {
@@ -742,7 +745,7 @@ class HomeFragment : BaseFragment(), View.OnClickListener, View.OnLongClickListe
             findNavController().navigate(R.id.action_mainFragment_to_notesManagerFragment)
     }
 
-    // This function handles all swipe actions that a independent of the actual swipe direction
+    // This function handles all swipe actions that an independent of the actual swipe direction
     @SuppressLint("NewApi")
     private fun handleOtherAction(action: Action) {
         when (action) {
@@ -925,8 +928,8 @@ class HomeFragment : BaseFragment(), View.OnClickListener, View.OnLongClickListe
         binding.apply {
 
             privateLayout.apply {
-                // Set visibility
-                isVisible = PrivateSpaceManager(requireContext()).isPrivateSpaceSetUp()
+                // Set visibility based on both private space setup and hide logo preference
+                isVisible = PrivateSpaceManager(requireContext()).isPrivateSpaceSetUp() && prefs.showPrivateSpaces
 
                 // Initial icon
                 fun updatePrivateFabIcon() {

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

@@ -48,7 +48,6 @@ import androidx.compose.ui.unit.sp
 import androidx.core.graphics.createBitmap
 import androidx.core.graphics.drawable.toDrawable
 import androidx.core.graphics.toColorInt
-import androidx.core.os.bundleOf
 import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.fragment.findNavController
 import com.github.codeworkscreativehub.common.AppLogger
@@ -2883,14 +2882,18 @@ class SettingsFragment : BaseFragment() {
         viewModel.getHiddenApps()
         findNavController().navigate(
             R.id.action_settingsFragment_to_appListFragment,
-            bundleOf("flag" to AppDrawerFlag.HiddenApps.toString())
+            Bundle().apply {
+                putString("flag", AppDrawerFlag.HiddenApps.toString())
+            }
         )
     }
 
     private fun showFavoriteApps() {
         findNavController().navigate(
             R.id.action_settingsFragment_to_appFavoriteFragment,
-            bundleOf("flag" to AppDrawerFlag.SetHomeApp.toString())
+            Bundle().apply {
+                putString("flag", AppDrawerFlag.SetHomeApp.toString())
+            }
         )
     }
 
@@ -2941,7 +2944,9 @@ class SettingsFragment : BaseFragment() {
                 viewModel.getAppList(true)
                 findNavController().navigate(
                     R.id.action_settingsFragment_to_appListFragment,
-                    bundleOf("flag" to flag.toString())
+                    Bundle().apply {
+                        putString("flag", flag.toString())
+                    }
                 )
             }