diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/component/OutlinedTagsInputField.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/component/OutlinedTagsInputField.kt index 122cc1a4..b9909970 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/component/OutlinedTagsInputField.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/component/OutlinedTagsInputField.kt @@ -3,15 +3,36 @@ package de.mm20.launcher2.ui.component import androidx.compose.foundation.clickable import androidx.compose.foundation.horizontalScroll import androidx.compose.foundation.interaction.MutableInteractionSource -import androidx.compose.foundation.layout.* +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.text.BasicTextField import androidx.compose.foundation.text.KeyboardActions import androidx.compose.material.icons.Icons import androidx.compose.material.icons.rounded.Clear import androidx.compose.material.icons.rounded.Tag -import androidx.compose.material3.* -import androidx.compose.runtime.* +import androidx.compose.material3.DropdownMenu +import androidx.compose.material3.DropdownMenuItem +import androidx.compose.material3.Icon +import androidx.compose.material3.InputChip +import androidx.compose.material3.InputChipDefaults +import androidx.compose.material3.LocalContentColor +import androidx.compose.material3.LocalTextStyle +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.material3.TextFieldDefaults +import androidx.compose.runtime.Composable +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.focus.onFocusChanged @@ -118,6 +139,8 @@ fun OutlinedTagsInputField( onClick = { }, leadingIcon = { Icon( + modifier = Modifier + .size(InputChipDefaults.IconSize), imageVector = Icons.Rounded.Tag, contentDescription = null ) @@ -125,9 +148,11 @@ fun OutlinedTagsInputField( label = { Text(tag) }, trailingIcon = { Icon( - modifier = Modifier.clickable { - onTagsChange(tags.filterIndexed { index, _ -> index != i }) - }, + modifier = Modifier + .size(InputChipDefaults.IconSize) + .clickable { + onTagsChange(tags.filterIndexed { index, _ -> index != i }) + }, imageVector = Icons.Rounded.Clear, contentDescription = null ) diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/apps/AppItem.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/apps/AppItem.kt index 7aa99452..a4b42d9d 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/apps/AppItem.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/apps/AppItem.kt @@ -36,6 +36,7 @@ import androidx.compose.material.icons.rounded.Visibility import androidx.compose.material.icons.rounded.VisibilityOff import androidx.compose.material3.Icon import androidx.compose.material3.InputChip +import androidx.compose.material3.InputChipDefaults import androidx.compose.material3.MaterialTheme import androidx.compose.material3.SnackbarDuration import androidx.compose.material3.SnackbarResult @@ -172,8 +173,8 @@ fun AppItem( Box(modifier = Modifier.background(Color(not.color))) { AsyncImage( modifier = Modifier - .padding(3.dp) - .requiredSize(18.dp), + .requiredSize(InputChipDefaults.AvatarSize) + .padding(3.dp), model = icon, contentDescription = null ) @@ -186,7 +187,7 @@ fun AppItem( null, modifier = Modifier .clip(CircleShape) - .size(18.dp) + .size(InputChipDefaults.IconSize) .clickable { viewModel.clearNotification(not) }, @@ -242,7 +243,7 @@ fun AppItem( contentDescription = null, modifier = Modifier .clip(CircleShape) - .size(24.dp), + .size(InputChipDefaults.AvatarSize), ) }, trailingIcon = if (LocalFavoritesEnabled.current) { @@ -252,7 +253,7 @@ fun AppItem( null, modifier = Modifier .clip(CircleShape) - .requiredSize(18.dp) + .requiredSize(InputChipDefaults.IconSize) .clickable { if (isPinned) { diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/searchbar/SearchBarActions.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/searchbar/SearchBarActions.kt index 30c81020..789c8f22 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/searchbar/SearchBarActions.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/searchbar/SearchBarActions.kt @@ -61,7 +61,8 @@ fun ColumnScope.SearchBarActions( label = { Text(it.label) }, leadingIcon = { SearchActionIcon( - action = it + action = it, + size = AssistChipDefaults.IconSize, ) } )