From 567743df57c0d474fdbadf69af35c51469d2bcc0 Mon Sep 17 00:00:00 2001 From: Ankit Suda Date: Sun, 13 Nov 2022 01:02:20 +0530 Subject: [PATCH] Increase padding values --- .../settings/PopupItemsSettingsItem.kt | 2 +- .../components/settings/RadioGroupCardItem.kt | 6 +++--- .../components/settings/SettingsComponents.kt | 16 ++++++++-------- .../rebound/ui/components/ExerciseItem.kt | 2 +- .../rebound/ui/components/MoreItemCard.kt | 8 ++++---- .../rebound/ui/components/MoreSectionHeader.kt | 2 +- .../ankitsuda/rebound/ui/components/TopBar2.kt | 2 +- .../components/PlateListItemComponent.kt | 2 +- .../rebound/ui/exercises/ExercisesScreen.kt | 2 +- .../rebound/ui/history/HistoryScreen.kt | 4 ++-- .../com/ankitsuda/rebound/ui/home/HomeScreen.kt | 4 ++-- .../part/overview/PartMeasurementsScreen.kt | 6 +++--- .../ThemePresetsPersonalizationScreen.kt | 4 ++-- .../rebound/ui/workout_details/SessionScreen.kt | 17 ++++++----------- .../preview/WorkoutTemplatePreviewScreen.kt | 2 +- .../components/TemplateExerciseComponent.kt | 2 +- .../rebound/ui/workout/WorkoutScreen.kt | 16 ++++++++-------- 17 files changed, 46 insertions(+), 51 deletions(-) diff --git a/modules/common-ui-components-settings/src/main/java/com/ankitsuda/rebound/ui/components/settings/PopupItemsSettingsItem.kt b/modules/common-ui-components-settings/src/main/java/com/ankitsuda/rebound/ui/components/settings/PopupItemsSettingsItem.kt index 4661dbb2..485ff789 100644 --- a/modules/common-ui-components-settings/src/main/java/com/ankitsuda/rebound/ui/components/settings/PopupItemsSettingsItem.kt +++ b/modules/common-ui-components-settings/src/main/java/com/ankitsuda/rebound/ui/components/settings/PopupItemsSettingsItem.kt @@ -49,7 +49,7 @@ fun PopupItemsSettingsItem( isMenuExpanded = true })) { Row( - modifier = Modifier.padding(horizontal = 16.dp, vertical = 20.dp), + modifier = Modifier.padding(horizontal = 24.dp, vertical = 20.dp), verticalAlignment = Alignment.CenterVertically ) { if (icon != null) { diff --git a/modules/common-ui-components-settings/src/main/java/com/ankitsuda/rebound/ui/components/settings/RadioGroupCardItem.kt b/modules/common-ui-components-settings/src/main/java/com/ankitsuda/rebound/ui/components/settings/RadioGroupCardItem.kt index 78550623..649748b6 100644 --- a/modules/common-ui-components-settings/src/main/java/com/ankitsuda/rebound/ui/components/settings/RadioGroupCardItem.kt +++ b/modules/common-ui-components-settings/src/main/java/com/ankitsuda/rebound/ui/components/settings/RadioGroupCardItem.kt @@ -45,14 +45,14 @@ fun RadioGroupCardItem( Box(modifier = modifier) { Column() { Row( - modifier = Modifier.padding(16.dp), + modifier = Modifier.padding(horizontal = 24.dp, vertical = 12.dp), verticalAlignment = Alignment.CenterVertically ) { if (icon != null) { Icon( imageVector = icon, contentDescription = text, - modifier = Modifier.padding(end = 16.dp) + modifier = Modifier.padding(end = 24.dp) ) } Column(modifier = Modifier.weight(1f)) { @@ -73,7 +73,7 @@ fun RadioGroupCardItem( FlowRow( crossAxisSpacing = 8.dp, mainAxisSpacing = 8.dp, - modifier = Modifier.padding(bottom = 16.dp, start = 16.dp, end = 16.dp) + modifier = Modifier.padding(bottom = 12.dp, start = 16.dp, end = 16.dp) ) { for (item in items) { Row( diff --git a/modules/common-ui-components-settings/src/main/java/com/ankitsuda/rebound/ui/components/settings/SettingsComponents.kt b/modules/common-ui-components-settings/src/main/java/com/ankitsuda/rebound/ui/components/settings/SettingsComponents.kt index 48b075ea..5e760b7d 100644 --- a/modules/common-ui-components-settings/src/main/java/com/ankitsuda/rebound/ui/components/settings/SettingsComponents.kt +++ b/modules/common-ui-components-settings/src/main/java/com/ankitsuda/rebound/ui/components/settings/SettingsComponents.kt @@ -77,14 +77,14 @@ fun ColorPickerCardItem( } }) { Row( - modifier = Modifier.padding(horizontal = 16.dp, vertical = 20.dp), + modifier = Modifier.padding(horizontal = 24.dp, vertical = 20.dp), verticalAlignment = Alignment.CenterVertically ) { if (icon != null) { Icon( imageVector = icon, contentDescription = text, - modifier = Modifier.padding(start = 2.dp, end = 18.dp) + modifier = Modifier.padding(end = 24.dp) ) } Column(modifier = Modifier.weight(1f)) { @@ -138,12 +138,12 @@ fun SwitchCardItem( Box(modifier = modifier.clickable { handleOnChange(!checked) }) { - Row(modifier = Modifier.padding(horizontal = 16.dp, vertical = 20.dp), verticalAlignment = Alignment.CenterVertically) { + Row(modifier = Modifier.padding(horizontal = 24.dp, vertical = 20.dp), verticalAlignment = Alignment.CenterVertically) { if (icon != null) { Icon( imageVector = icon, contentDescription = text, - modifier = Modifier.padding(start = 2.dp, end = 18.dp) + modifier = Modifier.padding(end = 24.dp) ) } Column(modifier = Modifier.weight(1f)) { @@ -215,14 +215,14 @@ fun SliderCardItem( Box(modifier = modifier) { Row( - modifier = Modifier.padding(top = 16.dp, start = 16.dp, end = 16.dp, bottom = 8.dp), + modifier = Modifier.padding(top = 20.dp, start = 24.dp, end = 24.dp, bottom = 10.dp), verticalAlignment = Alignment.CenterVertically ) { if (icon != null) { Icon( imageVector = icon, contentDescription = text, - modifier = Modifier.padding(start = 2.dp, end = 18.dp) + modifier = Modifier.padding(end = 24.dp) ) } Column(modifier = Modifier.weight(1f)) { @@ -294,14 +294,14 @@ fun ShapesEditorCardItem( Row( modifier = Modifier .fillMaxWidth() - .padding(top = 16.dp, start = 16.dp, end = 16.dp, bottom = 8.dp), + .padding(top = 20.dp, start = 24.dp, end = 24.dp, bottom = 10.dp), verticalAlignment = Alignment.CenterVertically ) { if (icon != null) { Icon( imageVector = icon, contentDescription = text, - modifier = Modifier.padding(start = 2.dp, end = 18.dp) + modifier = Modifier.padding(end = 24.dp) ) } Column(modifier = Modifier.fillMaxWidth()) { diff --git a/modules/common-ui-components/src/main/java/com/ankitsuda/rebound/ui/components/ExerciseItem.kt b/modules/common-ui-components/src/main/java/com/ankitsuda/rebound/ui/components/ExerciseItem.kt index ff39c451..26b96424 100644 --- a/modules/common-ui-components/src/main/java/com/ankitsuda/rebound/ui/components/ExerciseItem.kt +++ b/modules/common-ui-components/src/main/java/com/ankitsuda/rebound/ui/components/ExerciseItem.kt @@ -38,7 +38,7 @@ fun ExerciseItem( modifier = Modifier .fillMaxWidth() .clickable(onClick = onClick) - .padding(start = 16.dp, end = 16.dp, top = 12.dp, bottom = 12.dp), + .padding(horizontal = 24.dp, vertical = 12.dp), horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically ) { diff --git a/modules/common-ui-components/src/main/java/com/ankitsuda/rebound/ui/components/MoreItemCard.kt b/modules/common-ui-components/src/main/java/com/ankitsuda/rebound/ui/components/MoreItemCard.kt index 24a80aa2..42e517fd 100644 --- a/modules/common-ui-components/src/main/java/com/ankitsuda/rebound/ui/components/MoreItemCard.kt +++ b/modules/common-ui-components/src/main/java/com/ankitsuda/rebound/ui/components/MoreItemCard.kt @@ -26,7 +26,6 @@ import androidx.compose.ui.unit.dp import com.ankitsuda.rebound.ui.theme.LocalThemeState import com.ankitsuda.rebound.ui.theme.ReboundTheme -@OptIn(ExperimentalMaterialApi::class) @Composable fun MoreItemCard( modifier: Modifier = Modifier, @@ -37,21 +36,22 @@ fun MoreItemCard( ) { Box(modifier = modifier.clickable(onClick = onClick)) { Row( - modifier = Modifier.padding(horizontal = 16.dp, vertical = 20.dp), + modifier = Modifier.padding(horizontal = 24.dp, vertical = 20.dp), verticalAlignment = Alignment.CenterVertically ) { if (icon != null) { Icon( + modifier = Modifier.padding(end = 24.dp), imageVector = icon, contentDescription = text, tint = LocalThemeState.current.onBackgroundColor, - modifier = Modifier.padding(start = 2.dp, end = 18.dp) ) } Column() { Text( text = text, - color = LocalThemeState.current.onBackgroundColor + style = ReboundTheme.typography.body1, + color = ReboundTheme.colors.onBackground ) if (description.isNotEmpty()) { Text( diff --git a/modules/common-ui-components/src/main/java/com/ankitsuda/rebound/ui/components/MoreSectionHeader.kt b/modules/common-ui-components/src/main/java/com/ankitsuda/rebound/ui/components/MoreSectionHeader.kt index faf123ed..3065af92 100644 --- a/modules/common-ui-components/src/main/java/com/ankitsuda/rebound/ui/components/MoreSectionHeader.kt +++ b/modules/common-ui-components/src/main/java/com/ankitsuda/rebound/ui/components/MoreSectionHeader.kt @@ -25,7 +25,7 @@ import com.ankitsuda.rebound.ui.theme.LocalThemeState @Composable fun MoreSectionHeader(text: String) { Text( - modifier = Modifier.padding(vertical = 8.dp, horizontal = 16.dp), + modifier = Modifier.padding(vertical = 8.dp, horizontal = 24.dp), text = text, style = MaterialTheme.typography.caption, color = LocalThemeState.current.onBackgroundColor.copy(alpha = 0.75f) diff --git a/modules/common-ui-components/src/main/java/com/ankitsuda/rebound/ui/components/TopBar2.kt b/modules/common-ui-components/src/main/java/com/ankitsuda/rebound/ui/components/TopBar2.kt index ef4330bd..9f8bf3b7 100644 --- a/modules/common-ui-components/src/main/java/com/ankitsuda/rebound/ui/components/TopBar2.kt +++ b/modules/common-ui-components/src/main/java/com/ankitsuda/rebound/ui/components/TopBar2.kt @@ -78,7 +78,7 @@ fun CollapsingToolbarScope.TopBar2( with(LocalDensity.current) { if (statusBarEnabled) LocalWindowInsets.current.statusBars.top.toDp() else 0.dp } val maxTitleOffset = 80 - val minTitleOffset = 16 + val minTitleOffset = 24 val titleOffset = if (navigationIcon != null && toolbarState != null) { (maxTitleOffset + (minTitleOffset - maxTitleOffset) * toolbarState.progress).dp } else { diff --git a/modules/ui-customize-plates/src/main/java/com/ankitsuda/rebound/ui/customizeplates/components/PlateListItemComponent.kt b/modules/ui-customize-plates/src/main/java/com/ankitsuda/rebound/ui/customizeplates/components/PlateListItemComponent.kt index 136766e2..f452fcfa 100644 --- a/modules/ui-customize-plates/src/main/java/com/ankitsuda/rebound/ui/customizeplates/components/PlateListItemComponent.kt +++ b/modules/ui-customize-plates/src/main/java/com/ankitsuda/rebound/ui/customizeplates/components/PlateListItemComponent.kt @@ -58,7 +58,7 @@ internal fun PlateListItemComponent( ) { Row( modifier = Modifier - .padding(start = 16.dp), + .padding(start = 24.dp, end = 8.dp), verticalAlignment = Alignment.CenterVertically ) { Text( diff --git a/modules/ui-exercises/src/main/java/com/ankitsuda/rebound/ui/exercises/ExercisesScreen.kt b/modules/ui-exercises/src/main/java/com/ankitsuda/rebound/ui/exercises/ExercisesScreen.kt index 2ca7c04e..b99f6146 100644 --- a/modules/ui-exercises/src/main/java/com/ankitsuda/rebound/ui/exercises/ExercisesScreen.kt +++ b/modules/ui-exercises/src/main/java/com/ankitsuda/rebound/ui/exercises/ExercisesScreen.kt @@ -155,7 +155,7 @@ private fun ExercisesScreenContent( modifier = Modifier .fillMaxWidth() .background(LocalThemeState.current.backgroundColor) - .padding(horizontal = 16.dp, vertical = 8.dp), + .padding(horizontal = 24.dp, vertical = 8.dp), text = group.key, style = ReboundTheme.typography.caption, color = LocalThemeState.current.onBackgroundColor.copy(alpha = 0.75f) diff --git a/modules/ui-history/src/main/java/com/ankitsuda/rebound/ui/history/HistoryScreen.kt b/modules/ui-history/src/main/java/com/ankitsuda/rebound/ui/history/HistoryScreen.kt index 4a9880f7..92fb2655 100644 --- a/modules/ui-history/src/main/java/com/ankitsuda/rebound/ui/history/HistoryScreen.kt +++ b/modules/ui-history/src/main/java/com/ankitsuda/rebound/ui/history/HistoryScreen.kt @@ -138,8 +138,8 @@ fun HistoryScreen( .fillMaxSize() .background(MaterialTheme.colors.background), state = scrollState, - verticalArrangement = Arrangement.spacedBy(16.dp), - contentPadding = PaddingValues(16.dp) + verticalArrangement = Arrangement.spacedBy(20.dp), + contentPadding = PaddingValues(24.dp) ) { for (map in workoutsMap) { if (map.key != null) { diff --git a/modules/ui-home/src/main/java/com/ankitsuda/rebound/ui/home/HomeScreen.kt b/modules/ui-home/src/main/java/com/ankitsuda/rebound/ui/home/HomeScreen.kt index e2795ac4..7001de51 100644 --- a/modules/ui-home/src/main/java/com/ankitsuda/rebound/ui/home/HomeScreen.kt +++ b/modules/ui-home/src/main/java/com/ankitsuda/rebound/ui/home/HomeScreen.kt @@ -60,8 +60,8 @@ fun HomeScreen(viewModel: HomeScreenViewModel = hiltViewModel()) { LazyColumn( modifier = Modifier .fillMaxSize(), - contentPadding = PaddingValues(16.dp), - verticalArrangement = Arrangement.spacedBy(16.dp) + contentPadding = PaddingValues(24.dp), + verticalArrangement = Arrangement.spacedBy(20.dp) ) { item { diff --git a/modules/ui-part-measure/src/main/java/com/ankitsuda/rebound/ui/measure/part/overview/PartMeasurementsScreen.kt b/modules/ui-part-measure/src/main/java/com/ankitsuda/rebound/ui/measure/part/overview/PartMeasurementsScreen.kt index 1aef7ca8..83a6dc5f 100644 --- a/modules/ui-part-measure/src/main/java/com/ankitsuda/rebound/ui/measure/part/overview/PartMeasurementsScreen.kt +++ b/modules/ui-part-measure/src/main/java/com/ankitsuda/rebound/ui/measure/part/overview/PartMeasurementsScreen.kt @@ -99,7 +99,7 @@ fun PartMeasurementsScreen( if (showChart) { item { - AppCard(modifier = Modifier.padding(start = 16.dp, end = 16.dp)) { + AppCard(modifier = Modifier.padding(horizontal = 24.dp)) { ReboundChart( points = points, modifier = Modifier @@ -117,7 +117,7 @@ fun PartMeasurementsScreen( text = stringResource(id = R.string.history), style = ReboundTheme.typography.h6, color = ReboundTheme.colors.onBackground.copy(alpha = 0.5f), - modifier = Modifier.padding(start = 16.dp, top = 16.dp, bottom = 8.dp) + modifier = Modifier.padding(start = 24.dp, top = 20.dp, bottom = 10.dp) ) } @@ -133,7 +133,7 @@ fun PartMeasurementsScreen( ) ) } - .padding(start = 16.dp, end = 16.dp, top = 16.dp, bottom = 16.dp), + .padding(horizontal = 24.dp, vertical = 20.dp), horizontalArrangement = Arrangement.SpaceBetween ) { Text( diff --git a/modules/ui-personalization/src/main/java/com/ankitsuda/rebound/ui/settings/personalization/presets/ThemePresetsPersonalizationScreen.kt b/modules/ui-personalization/src/main/java/com/ankitsuda/rebound/ui/settings/personalization/presets/ThemePresetsPersonalizationScreen.kt index a3e3cbff..f4b73ef4 100644 --- a/modules/ui-personalization/src/main/java/com/ankitsuda/rebound/ui/settings/personalization/presets/ThemePresetsPersonalizationScreen.kt +++ b/modules/ui-personalization/src/main/java/com/ankitsuda/rebound/ui/settings/personalization/presets/ThemePresetsPersonalizationScreen.kt @@ -109,8 +109,8 @@ private fun ThemePresetsPersonalizationScreen( modifier = Modifier .fillMaxSize() .background(ReboundTheme.colors.background), - contentPadding = PaddingValues(16.dp), - verticalArrangement = Arrangement.spacedBy(16.dp) + contentPadding = PaddingValues(24.dp), + verticalArrangement = Arrangement.spacedBy(20.dp) ) { item { diff --git a/modules/ui-workout-details/src/main/java/com/ankitsuda/rebound/ui/workout_details/SessionScreen.kt b/modules/ui-workout-details/src/main/java/com/ankitsuda/rebound/ui/workout_details/SessionScreen.kt index 7e5c6b5d..e4c61509 100644 --- a/modules/ui-workout-details/src/main/java/com/ankitsuda/rebound/ui/workout_details/SessionScreen.kt +++ b/modules/ui-workout-details/src/main/java/com/ankitsuda/rebound/ui/workout_details/SessionScreen.kt @@ -41,15 +41,12 @@ import com.ankitsuda.navigation.Screen import com.ankitsuda.rebound.ui.components.* import com.ankitsuda.rebound.ui.components.dialogs.DiscardActiveWorkoutDialog import com.ankitsuda.rebound.ui.theme.LocalThemeState -import me.onebone.toolbar.CollapsingToolbarScaffold -import me.onebone.toolbar.rememberCollapsingToolbarScaffoldState import com.ankitsuda.rebound.ui.theme.ReboundTheme import com.ankitsuda.rebound.ui.workout_details.components.SessionMenuComponent +import me.onebone.toolbar.* import me.onebone.toolbar.FabPosition -import me.onebone.toolbar.ScrollStrategy -import me.onebone.toolbar.ToolbarWithFabScaffold -@OptIn(ExperimentalComposeUiApi::class) +@OptIn(ExperimentalComposeUiApi::class, ExperimentalToolbarApi::class) @Composable fun SessionScreen( navigator: Navigator = LocalNavigator.current, @@ -87,8 +84,6 @@ fun SessionScreen( ) } - - ToolbarWithFabScaffold( scrollStrategy = ScrollStrategy.EnterAlwaysCollapsed, state = collapsingState, @@ -142,13 +137,13 @@ fun SessionScreen( modifier = Modifier .fillMaxSize() .background(MaterialTheme.colors.background), - contentPadding = PaddingValues(16.dp) + contentPadding = PaddingValues(24.dp) ) { if (!workout?.personalRecords.isNullOrEmpty()) { item { PersonalRecordsRowComponent( modifier = Modifier - .padding(bottom = 8.dp), + .padding(bottom = 10.dp), prs = workout?.personalRecords!! ) } @@ -160,7 +155,7 @@ fun SessionScreen( verticalAlignment = Alignment.CenterVertically, modifier = Modifier .fillMaxWidth() - .padding(bottom = 16.dp) + .padding(bottom = 20.dp) ) { Column() { Text( @@ -202,7 +197,7 @@ fun SessionScreen( SessionExerciseCardItem( modifier = Modifier .fillMaxWidth() - .padding(bottom = 16.dp), + .padding(bottom = 20.dp), supersetId = log.junction.supersetId, title = log.exercise.name ?: "", entries = log.logEntries diff --git a/modules/ui-workout-template-preview/src/main/java/com/ankitsuda/rebound/ui/workouttemplate/preview/WorkoutTemplatePreviewScreen.kt b/modules/ui-workout-template-preview/src/main/java/com/ankitsuda/rebound/ui/workouttemplate/preview/WorkoutTemplatePreviewScreen.kt index 30eff36f..32f63d4b 100644 --- a/modules/ui-workout-template-preview/src/main/java/com/ankitsuda/rebound/ui/workouttemplate/preview/WorkoutTemplatePreviewScreen.kt +++ b/modules/ui-workout-template-preview/src/main/java/com/ankitsuda/rebound/ui/workouttemplate/preview/WorkoutTemplatePreviewScreen.kt @@ -154,7 +154,7 @@ fun WorkoutTemplatePreviewScreen( lastPerformedStr?.let { item { Column( - modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp), + modifier = Modifier.padding(horizontal = 24.dp, vertical = 10.dp), verticalArrangement = Arrangement.spacedBy(2.dp) ) { Text( diff --git a/modules/ui-workout-template-preview/src/main/java/com/ankitsuda/rebound/ui/workouttemplate/preview/components/TemplateExerciseComponent.kt b/modules/ui-workout-template-preview/src/main/java/com/ankitsuda/rebound/ui/workouttemplate/preview/components/TemplateExerciseComponent.kt index bc5cf0fd..cba0e2a2 100644 --- a/modules/ui-workout-template-preview/src/main/java/com/ankitsuda/rebound/ui/workouttemplate/preview/components/TemplateExerciseComponent.kt +++ b/modules/ui-workout-template-preview/src/main/java/com/ankitsuda/rebound/ui/workouttemplate/preview/components/TemplateExerciseComponent.kt @@ -43,7 +43,7 @@ fun TemplateExerciseComponent( Row( modifier = Modifier .fillMaxWidth() - .padding(start = 16.dp, end = 16.dp, top = 12.dp, bottom = 12.dp), + .padding(horizontal = 24.dp, vertical = 12.dp), horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically ) { diff --git a/modules/ui-workout/src/main/java/com/ankitsuda/rebound/ui/workout/WorkoutScreen.kt b/modules/ui-workout/src/main/java/com/ankitsuda/rebound/ui/workout/WorkoutScreen.kt index 1772e704..577c8f81 100644 --- a/modules/ui-workout/src/main/java/com/ankitsuda/rebound/ui/workout/WorkoutScreen.kt +++ b/modules/ui-workout/src/main/java/com/ankitsuda/rebound/ui/workout/WorkoutScreen.kt @@ -278,7 +278,7 @@ fun WorkoutScreen( modifier = Modifier .fillMaxWidth() .invisible(allItemsInvisibleExceptFolders) - .padding(start = 16.dp, end = 16.dp, bottom = 16.dp, top = 8.dp) + .padding(start = 24.dp, end = 24.dp, bottom = 20.dp, top = 10.dp) .animateItemPlacement(), backgroundColor = ReboundTheme.colors.primary, onClick = { @@ -328,7 +328,7 @@ fun WorkoutScreen( Row( modifier = Modifier .fillMaxWidth() - .padding(start = 16.dp, end = 16.dp, top = 16.dp, bottom = 0.dp), + .padding(start = 24.dp, end = 24.dp, top = 20.dp, bottom = 0.dp), horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically ) { @@ -341,13 +341,13 @@ fun WorkoutScreen( modifier = Modifier .fillMaxWidth() .padding( - start = 16.dp, - end = 16.dp, - top = 16.dp, - bottom = 8.dp + start = 24.dp, + end = 24.dp, + top = 20.dp, + bottom = 10.dp // bottom = if (groupedTemplates.size > 1) 4.dp else 8.dp ), - horizontalArrangement = Arrangement.spacedBy(16.dp) + horizontalArrangement = Arrangement.spacedBy(20.dp) ) { RButtonStyle2( modifier = Modifier.weight(1f), @@ -408,7 +408,7 @@ fun WorkoutScreen( modifier = Modifier .fillMaxWidth() .invisible(allItemsInvisibleExceptFolders) - .padding(horizontal = 16.dp, vertical = 8.dp) + .padding(horizontal = 24.dp, vertical = 10.dp) .animateItemPlacement(), text = stringResource(R.string.add_template), icon = Icons.Outlined.Add,