Clean up

NeoApplications · Jul 23, 2024 · 95e7e27 · 95e7e27
1 parent f9ba97b
commit 95e7e27
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/src/main/java/com/machiav3lli/backup/items/SortFilterModel.kt b/src/main/java/com/machiav3lli/backup/items/SortFilterModel.kt
@@ -105,9 +105,9 @@ data class SortFilterModel(
 }
 
 class SpecialFilter(
-    var installedFilter: Int = SPECIAL_FILTER_ALL,
-    var launchableFilter: Int = SPECIAL_FILTER_ALL,
-    var updatedFilter: Int = SPECIAL_FILTER_ALL,
-    var latestFilter: Int = SPECIAL_FILTER_ALL,
-    var enabledFilter: Int = SPECIAL_FILTER_ALL,
+    val installedFilter: Int = SPECIAL_FILTER_ALL,
+    val launchableFilter: Int = SPECIAL_FILTER_ALL,
+    val updatedFilter: Int = SPECIAL_FILTER_ALL,
+    val latestFilter: Int = SPECIAL_FILTER_ALL,
+    val enabledFilter: Int = SPECIAL_FILTER_ALL,
 )
diff --git a/src/main/java/com/machiav3lli/backup/pages/PermissionsPage.kt b/src/main/java/com/machiav3lli/backup/pages/PermissionsPage.kt
@@ -122,7 +122,9 @@ fun PermissionsPage() {
                             mainActivity.requireStorageLocation(askForDirectory)
                         }
 
-                    if (!context.checkBatteryOptimization(powerManager) && none { it.key == Permission.BatteryOptimization })
+                    if (!context.checkBatteryOptimization(powerManager)
+                        && none { it.key == Permission.BatteryOptimization }
+                    )
                         set(Permission.BatteryOptimization) {
                             mainActivity.showBatteryOptimizationDialog(powerManager)
                         }
@@ -139,7 +141,9 @@ fun PermissionsPage() {
                     if (!context.checkContactsPermission && none { it.key == Permission.Contacts })
                         set(Permission.Contacts) { mainActivity.contactsPermission }
 
-                    if (permissionStatePostNotifications?.status?.isGranted == false && none { it.key == Permission.PostNotifications })
+                    if (permissionStatePostNotifications?.status?.isGranted == false
+                        && none { it.key == Permission.PostNotifications }
+                    )
                         set(Permission.PostNotifications) {
                             permissionStatePostNotifications.launchPermissionRequest()
                         }

diff --git a/src/main/java/com/machiav3lli/backup/preferences/AdvancedPreferences.kt b/src/main/java/com/machiav3lli/backup/preferences/AdvancedPreferences.kt
@@ -545,7 +545,7 @@ val persist_skippedEncryptionCounter = IntPref(
 //----------------------------------------
 
 fun publicPreferences(persist: Boolean = false) =
-    Pref.prefGroups.map {
+    Pref.prefGroups.flatMap {
         val (group, prefs) = it
         prefs.mapNotNull { pref ->
             if (pref.private ||
@@ -557,4 +557,4 @@ fun publicPreferences(persist: Boolean = false) =
             else
                 pref
         }
-    }.flatten()
+    }
diff --git a/src/main/java/com/machiav3lli/backup/ui/compose/item/PermissionItem.kt b/src/main/java/com/machiav3lli/backup/ui/compose/item/PermissionItem.kt
@@ -33,7 +33,7 @@ fun PermissionItem(
             .clip(MaterialTheme.shapes.large)
             .clickable(onClick = onClick),
         colors = ListItemDefaults.colors(
-            containerColor = MaterialTheme.colorScheme.surfaceContainer
+            containerColor = MaterialTheme.colorScheme.surfaceContainerHighest
         ),
         headlineContent = {
             Row(