Cleanups

LawnchairLauncher · Apr 2, 2024 · c0b4850 · c0b4850
1 parent 2da7e54
commit c0b4850
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 21 deletions.
diff --git a/lawnchair/src/app/lawnchair/override/CustomizeDialog.kt b/lawnchair/src/app/lawnchair/override/CustomizeDialog.kt
@@ -110,6 +110,7 @@ fun CustomizeAppDialog(
     defaultTitle: String,
     componentKey: ComponentKey,
     onClose: () -> Unit,
+    modifier: Modifier = Modifier,
 ) {
     val prefs = preferenceManager()
     val preferenceManager2 = preferenceManager2()
@@ -147,6 +148,7 @@ fun CustomizeAppDialog(
         onTitleChange = { title = it },
         defaultTitle = defaultTitle,
         launchSelectIcon = openIconPicker,
+        modifier = modifier,
     ) {
         PreferenceGroup(
             description = componentKey.componentName.flattenToString(),

diff --git a/lawnchair/src/app/lawnchair/ui/OverflowMenu.kt b/lawnchair/src/app/lawnchair/ui/OverflowMenu.kt
@@ -21,7 +21,9 @@ fun OverflowMenu(
     val showMenu = remember { mutableStateOf(false) }
     val overflowMenuScope = remember { OverflowMenuScopeImpl(showMenu) }
 
-    Box(modifier = modifier) {
+    Box(
+        modifier = modifier,
+    ) {
         ClickableIcon(
             imageVector = Icons.Rounded.MoreVert,
             onClick = { showMenu.value = true },

diff --git a/lawnchair/src/app/lawnchair/ui/preferences/Preferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/Preferences.kt
@@ -99,7 +99,9 @@ fun Preferences(
     val isExpandedScreen = windowSizeClass.widthSizeClass == WindowWidthSizeClass.Expanded
 
     Providers(isExpandedScreen) {
-        Surface(modifier = modifier) {
+        Surface(
+            modifier = modifier,
+        ) {
             CompositionLocalProvider(
                 LocalNavController provides navController,
                 LocalPreferenceInteractor provides interactor,

diff --git a/lawnchair/src/app/lawnchair/ui/preferences/components/AnnouncementPreference.kt b/lawnchair/src/app/lawnchair/ui/preferences/components/AnnouncementPreference.kt
@@ -62,7 +62,9 @@ fun AnnouncementPreference(
     announcements: ImmutableList<Announcement>,
     modifier: Modifier = Modifier,
 ) {
-    Column(modifier = modifier) {
+    Column(
+        modifier = modifier,
+    ) {
         announcements.forEachIndexed { index, announcement ->
             var show by remember { mutableStateOf(true) }
             AnnouncementItem(show, { show = false }, announcement)

diff --git a/.../src/app/lawnchair/ui/preferences/components/colorpreference/pickers/CustomColorPicker.kt b/.../src/app/lawnchair/ui/preferences/components/colorpreference/pickers/CustomColorPicker.kt
@@ -96,7 +96,9 @@ fun CustomColorPicker(
         )
     }
 
-    Column(modifier = modifier) {
+    Column(
+        modifier = modifier,
+    ) {
         PreferenceGroup(
             heading = stringResource(id = R.string.hex),
             modifier = Modifier.padding(top = 8.dp),

diff --git a/lawnchair/src/app/lawnchair/ui/preferences/components/controls/SwitchPreference.kt b/lawnchair/src/app/lawnchair/ui/preferences/components/controls/SwitchPreference.kt
@@ -69,7 +69,7 @@ fun SwitchPreference(
     onClick: (() -> Unit)? = null,
 ) {
     PreferenceTemplate(
-        modifier = Modifier.clickable(enabled = enabled) {
+        modifier = modifier.clickable(enabled = enabled) {
             if (onClick != null) {
                 onClick()
             } else {

diff --git a/lawnchair/src/app/lawnchair/ui/preferences/components/layout/PreferenceGroup.kt b/lawnchair/src/app/lawnchair/ui/preferences/components/layout/PreferenceGroup.kt
@@ -44,7 +44,9 @@ fun PreferenceGroup(
     dividersToSkip: Int = 0,
     content: @Composable () -> Unit,
 ) {
-    Column(modifier = modifier) {
+    Column(
+        modifier = modifier,
+    ) {
         PreferenceGroupHeading(heading)
         Surface(
             modifier = Modifier.padding(horizontal = 16.dp),

diff --git a/lawnchair/src/app/lawnchair/ui/preferences/components/layout/ScrollContainers.kt b/lawnchair/src/app/lawnchair/ui/preferences/components/layout/ScrollContainers.kt
@@ -32,6 +32,7 @@ fun PreferenceColumn(
     content: @Composable ColumnScope.() -> Unit,
 ) {
     NestedScrollStretch(
+        modifier = modifier,
         content = {
             Column(
                 verticalArrangement = verticalArrangement,
@@ -47,7 +48,6 @@ fun PreferenceColumn(
                 content = content,
             )
         },
-        modifier = modifier,
     )
 }
 

diff --git a/lawnchair/src/app/lawnchair/ui/preferences/destinations/AppDrawerPreferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/destinations/AppDrawerPreferences.kt
@@ -96,11 +96,7 @@ fun AppDrawerPreferences(
             val enableSmartHide = prefs2.enableSmartHide.getAdapter()
             NavigationActionPreference(
                 label = stringResource(id = R.string.hidden_apps_label),
-                subtitle = resources.getQuantityString(
-                    R.plurals.apps_count,
-                    hiddenApps.size,
-                    hiddenApps.size,
-                ),
+                subtitle = resources.getQuantityString(R.plurals.apps_count, hiddenApps.size, hiddenApps.size),
                 destination = subRoute(name = AppDrawerRoutes.HIDDEN_APPS),
             )
             ExpandAndShrink(

diff --git a/lawnchair/src/app/lawnchair/ui/preferences/destinations/IconPackPreferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/destinations/IconPackPreferences.kt
@@ -140,11 +140,7 @@ fun IconPackPreferences(
                         .clip(MaterialTheme.shapes.large),
                 ) {
                     WallpaperPreview(modifier = Modifier.fillMaxSize())
-                    key(
-                        iconPackAdapter.state.value,
-                        themedIconPackAdapter.state.value,
-                        themedIconsAdapter.state.value,
-                    ) {
+                    key(iconPackAdapter.state.value, themedIconPackAdapter.state.value, themedIconsAdapter.state.value) {
                         DummyLauncherLayout(
                             idp = invariantDeviceProfile(),
                             modifier = Modifier.fillMaxSize(),
@@ -257,8 +253,7 @@ fun IconPackGrid(
             themedIconPacks.filter { it.packageName != "" }
         }
     } else if (drawerThemedIcons) {
-        iconPacksLocal =
-            iconPacks.filter { it.packageName == "" || !themedIconPacksName.contains(it.name) }
+        iconPacksLocal = iconPacks.filter { it.packageName == "" || !themedIconPacksName.contains(it.name) }
     }
 
     val selectedPack = adapter.state.value
@@ -311,8 +306,7 @@ private fun getIconPackItemWidth(
     while (true) {
         gutterCount += 1f
         visibleItemCount += 1f
-        val possibleIconPackItemWidth =
-            (availableWidth - gutterCount * gutterWidth) / visibleItemCount
+        val possibleIconPackItemWidth = (availableWidth - gutterCount * gutterWidth) / visibleItemCount
         if (possibleIconPackItemWidth >= minimumWidth) {
             iconPackItemWidth = possibleIconPackItemWidth
         } else {