From d8f11a04c74ed999032ae20e41249a3f2117065f Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Tue, 15 Aug 2023 21:23:19 +0200 Subject: [PATCH] Remove useless bottom sheet buttons --- .../launcher2/ui/common/RestoreBackupSheet.kt | 9 ----- .../ui/common/WeatherLocationSearchDialog.kt | 12 ++----- .../sheets/CustomizeSearchableSheet.kt | 17 ++++------ .../ui/launcher/sheets/EditFavoritesSheet.kt | 10 ++---- .../ui/launcher/sheets/HiddenItemsSheet.kt | 5 --- .../ui/settings/backup/CreateBackupSheet.kt | 9 ----- .../ui/settings/tags/EditTagSheet.kt | 33 +++++++++---------- 7 files changed, 28 insertions(+), 67 deletions(-) diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/common/RestoreBackupSheet.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/common/RestoreBackupSheet.kt index 403a7095..02ecd6e5 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/common/RestoreBackupSheet.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/common/RestoreBackupSheet.kt @@ -64,15 +64,6 @@ fun RestoreBackupSheet( } } }, - dismissButton = if (state == RestoreBackupState.Ready && compatibility != BackupCompatibility.Incompatible) { - { - OutlinedButton( - onClick = onDismissRequest - ) { - Text(stringResource(android.R.string.cancel)) - } - } - } else null ) { Box( modifier = Modifier diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/common/WeatherLocationSearchDialog.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/common/WeatherLocationSearchDialog.kt index d28902dc..ef5cb76c 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/common/WeatherLocationSearchDialog.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/common/WeatherLocationSearchDialog.kt @@ -3,6 +3,7 @@ package de.mm20.launcher2.ui.common import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn @@ -38,19 +39,10 @@ fun WeatherLocationSearchDialog( text = stringResource(R.string.preference_location), ) }, - confirmButton = { - TextButton( - onClick = onDismissRequest, - ) { - Text( - text = stringResource(android.R.string.cancel), - ) - } - } ) { var query by remember { mutableStateOf("") } Column( - modifier = Modifier.fillMaxWidth().padding(it) + modifier = Modifier.fillMaxSize().padding(it) ) { Row( Modifier.padding(bottom = 16.dp) diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/CustomizeSearchableSheet.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/CustomizeSearchableSheet.kt index dcf4ecd3..ae5adca3 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/CustomizeSearchableSheet.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/CustomizeSearchableSheet.kt @@ -28,7 +28,6 @@ import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.DropdownMenu import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.Icon -import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme import androidx.compose.material3.OutlinedButton import androidx.compose.material3.OutlinedTextField @@ -87,17 +86,13 @@ fun CustomizeSearchableSheet( Text(stringResource(if (pickIcon) R.string.icon_picker_title else R.string.menu_customize)) }, dismissible = { !pickIcon }, - confirmButton = { - if (pickIcon) { + confirmButton = if (pickIcon) { + { OutlinedButton(onClick = { viewModel.closeIconPicker() }) { Text(stringResource(id = android.R.string.cancel)) } - } else { - OutlinedButton(onClick = onDismiss) { - Text(stringResource(id = R.string.close)) - } } - } + } else null ) { if (!pickIcon) { Column( @@ -328,10 +323,12 @@ fun CustomizeSearchableSheet( } } Text( - text = filterIconPack?.name ?: stringResource(id = R.string.icon_picker_filter_all_packs), + text = filterIconPack?.name + ?: stringResource(id = R.string.icon_picker_filter_all_packs), modifier = Modifier.animateContentSize() ) - Icon(Icons.Rounded.ArrowDropDown, + Icon( + Icons.Rounded.ArrowDropDown, modifier = Modifier .padding(start = ButtonDefaults.IconSpacing) .size(ButtonDefaults.IconSize), diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/EditFavoritesSheet.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/EditFavoritesSheet.kt index 1afb577e..158e178a 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/EditFavoritesSheet.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/EditFavoritesSheet.kt @@ -118,17 +118,13 @@ fun EditFavoritesSheet( dismissible = { createShortcutTarget == null }, - confirmButton = { - if (createShortcutTarget != null) { + confirmButton = if (createShortcutTarget != null) { + { OutlinedButton(onClick = { viewModel.cancelPickShortcut() }) { Text(stringResource(id = android.R.string.cancel)) } - } else { - OutlinedButton(onClick = onDismiss) { - Text(stringResource(id = R.string.close)) - } } - } + } else null ) { if (loading) { Box( diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/HiddenItemsSheet.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/HiddenItemsSheet.kt index f04b5b15..2e7eb3b8 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/HiddenItemsSheet.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/HiddenItemsSheet.kt @@ -45,11 +45,6 @@ fun HiddenItemsSheet( Icon(imageVector = Icons.Rounded.Edit, contentDescription = null) } }, - confirmButton = { - OutlinedButton(onClick = onDismiss) { - Text(stringResource(id = R.string.close)) - } - } ) { SearchResultGrid( diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/backup/CreateBackupSheet.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/backup/CreateBackupSheet.kt index eec262eb..4acd9860 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/backup/CreateBackupSheet.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/backup/CreateBackupSheet.kt @@ -77,15 +77,6 @@ fun CreateBackupSheet( } } }, - dismissButton = if (state == CreateBackupState.Ready) { - { - OutlinedButton( - onClick = onDismissRequest - ) { - Text(stringResource(android.R.string.cancel)) - } - } - } else null ) { Box( modifier = Modifier diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/tags/EditTagSheet.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/tags/EditTagSheet.kt index 189adef0..2f0b4113 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/tags/EditTagSheet.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/tags/EditTagSheet.kt @@ -24,7 +24,6 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.rounded.Check import androidx.compose.material.icons.rounded.Warning import androidx.compose.material3.Button -import androidx.compose.material3.Checkbox import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.OutlinedButton @@ -77,31 +76,29 @@ fun EditTagSheet( ) ) }, - confirmButton = { - if (viewModel.page == EditTagSheetPage.CustomizeTag) { - OutlinedButton(onClick = { - viewModel.save() - onTagSaved(viewModel.tagName) - onDismiss() - }) { - Text(stringResource(R.string.close)) - } - } else if (isCreatingNewTag) { + confirmButton = if (viewModel.page == EditTagSheetPage.CustomizeTag) { + null + } else if (isCreatingNewTag) { + { Button( enabled = (viewModel.tagName.isNotBlank() && viewModel.page == EditTagSheetPage.CreateTag && !viewModel.tagNameExists) || (viewModel.page == EditTagSheetPage.PickItems && viewModel.taggedItems.isNotEmpty()), onClick = { viewModel.onClickContinue() }) { Text(stringResource(R.string.action_next)) } - } else { + } + } else { + { OutlinedButton(onClick = { viewModel.closeItemPicker() }) { Text(stringResource(id = R.string.ok)) } } - }, onDismissRequest = { - if (viewModel.page == EditTagSheetPage.CustomizeTag) viewModel.save() + if (viewModel.page == EditTagSheetPage.CustomizeTag) { + viewModel.save() + onTagSaved(viewModel.tagName) + } onDismiss() }, dismissible = { @@ -204,9 +201,11 @@ fun ListItem( ShapedLauncherIcon( icon = { icon }, size = 48.dp, - modifier = Modifier.padding(4.dp).clickable { - onTagChanged(!item.isTagged) - }, + modifier = Modifier + .padding(4.dp) + .clickable { + onTagChanged(!item.isTagged) + }, ) if (item.isTagged) { Surface(