From c0b4850ba3e76c4865e3aefed1a4e965ceab7a61 Mon Sep 17 00:00:00 2001 From: Goooler Date: Tue, 2 Apr 2024 22:29:47 +0800 Subject: [PATCH] Cleanups --- .../src/app/lawnchair/override/CustomizeDialog.kt | 2 ++ lawnchair/src/app/lawnchair/ui/OverflowMenu.kt | 4 +++- .../src/app/lawnchair/ui/preferences/Preferences.kt | 4 +++- .../preferences/components/AnnouncementPreference.kt | 4 +++- .../colorpreference/pickers/CustomColorPicker.kt | 4 +++- .../components/controls/SwitchPreference.kt | 2 +- .../preferences/components/layout/PreferenceGroup.kt | 4 +++- .../components/layout/ScrollContainers.kt | 2 +- .../preferences/destinations/AppDrawerPreferences.kt | 6 +----- .../preferences/destinations/IconPackPreferences.kt | 12 +++--------- 10 files changed, 23 insertions(+), 21 deletions(-) diff --git a/lawnchair/src/app/lawnchair/override/CustomizeDialog.kt b/lawnchair/src/app/lawnchair/override/CustomizeDialog.kt index 745ff108ed2..b87e0984404 100644 --- 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 index c51aefe65c1..f3223837642 100644 --- 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 index df027830a7f..f6ef6704816 100644 --- 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 index 9da05a865a2..9c0775fd86c 100644 --- 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, 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/lawnchair/src/app/lawnchair/ui/preferences/components/colorpreference/pickers/CustomColorPicker.kt b/lawnchair/src/app/lawnchair/ui/preferences/components/colorpreference/pickers/CustomColorPicker.kt index 6cbca2cf4dd..d0fdac4472f 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/components/colorpreference/pickers/CustomColorPicker.kt +++ b/lawnchair/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 index fda49ca9c51..35f8ea07cef 100644 --- 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 index af78ade91f1..a473d9fd6e1 100644 --- 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 index 3385a49a17e..1fbe5cfc9f2 100644 --- 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 index 157cfbd0955..2a37548480a 100644 --- 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 index 2c750166f9b..df1538e6b37 100644 --- 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 {