From 1a7eaafb7a9096c9c133bc374d501e99ea673d3b Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Mon, 21 Aug 2023 02:01:57 +0200 Subject: [PATCH] Change chip icon size --- .../launcher2/ui/common/FavoritesTagSelector.kt | 8 ++++++-- .../java/de/mm20/launcher2/ui/common/TagChip.kt | 6 ++++-- .../launcher2/ui/launcher/search/SearchColumn.kt | 14 ++++++++++++-- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/common/FavoritesTagSelector.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/common/FavoritesTagSelector.kt index 6f3d6b72..faee979a 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/common/FavoritesTagSelector.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/common/FavoritesTagSelector.kt @@ -12,12 +12,14 @@ import androidx.compose.foundation.layout.fillMaxHeight 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.material.icons.Icons import androidx.compose.material.icons.rounded.Edit import androidx.compose.material.icons.rounded.ExpandLess import androidx.compose.material.icons.rounded.ExpandMore import androidx.compose.material.icons.rounded.Star import androidx.compose.material3.FilterChip +import androidx.compose.material3.FilterChipDefaults import androidx.compose.material3.FloatingActionButtonDefaults import androidx.compose.material3.Icon import androidx.compose.material3.IconButton @@ -84,7 +86,8 @@ fun FavoritesTagSelector( leadingIcon = { Icon( imageVector = Icons.Rounded.Star, - contentDescription = null + contentDescription = null, + modifier = Modifier.size(FilterChipDefaults.IconSize), ) }, label = { Text(stringResource(R.string.favorites)) } @@ -117,7 +120,8 @@ fun FavoritesTagSelector( leadingIcon = { Icon( imageVector = Icons.Rounded.Star, - contentDescription = null + contentDescription = null, + modifier = Modifier.size(FilterChipDefaults.IconSize), ) }, label = { Text(stringResource(R.string.favorites)) } diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/common/TagChip.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/common/TagChip.kt index 77c3c0e2..e735720b 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/common/TagChip.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/common/TagChip.kt @@ -1,6 +1,7 @@ package de.mm20.launcher2.ui.common import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.size import androidx.compose.material.icons.Icons import androidx.compose.material.icons.rounded.Close import androidx.compose.material.icons.rounded.Tag @@ -31,6 +32,7 @@ fun TagChip( onClick = onClick, leadingIcon = { Icon( + modifier = Modifier.size(FilterChipDefaults.IconSize), imageVector = Icons.Rounded.Tag, contentDescription = null ) @@ -47,9 +49,9 @@ fun TagChip( Icon( modifier = Modifier.clickable { onClear?.invoke() - }, + }.size(FilterChipDefaults.IconSize), imageVector = Icons.Rounded.Close, - contentDescription = null + contentDescription = null, ) } } else null diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchColumn.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchColumn.kt index 26535158..59e27e60 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchColumn.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchColumn.kt @@ -10,6 +10,7 @@ import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyItemScope import androidx.compose.foundation.lazy.LazyListScope @@ -24,6 +25,7 @@ import androidx.compose.material.icons.rounded.Star import androidx.compose.material.icons.rounded.Tag import androidx.compose.material.icons.rounded.Work import androidx.compose.material3.FilterChip +import androidx.compose.material3.FilterChipDefaults import androidx.compose.material3.FloatingActionButtonDefaults import androidx.compose.material3.Icon import androidx.compose.material3.IconButton @@ -181,7 +183,11 @@ fun SearchColumn( selected = !showWorkProfileApps, onClick = { showWorkProfileApps = false }, leadingIcon = { - Icon(imageVector = Icons.Rounded.Person, contentDescription = null) + Icon( + imageVector = Icons.Rounded.Person, + contentDescription = null, + modifier = Modifier.size(FilterChipDefaults.IconSize) + ) }, label = { Text( @@ -195,7 +201,11 @@ fun SearchColumn( selected = showWorkProfileApps, onClick = { showWorkProfileApps = true }, leadingIcon = { - Icon(imageVector = Icons.Rounded.Work, contentDescription = null) + Icon( + imageVector = Icons.Rounded.Work, + contentDescription = null, + modifier = Modifier.size(FilterChipDefaults.IconSize) + ) }, label = { Text(