From 5e82e3f9c552a1a96a2ef7ab006a8c3e9ad32bc8 Mon Sep 17 00:00:00 2001 From: Sad Ellie Date: Sat, 13 Aug 2022 21:23:31 +0300 Subject: [PATCH] One style for group headers --- .../{second/components => common}/Header.kt | 15 +++++--- .../unitto/screens/second/SecondScreen.kt | 3 +- .../screens/setttings/SettingsScreen.kt | 6 +-- .../screens/setttings/UnitGroupsScreen.kt | 2 +- .../setttings/components/SettingsHeader.kt | 38 ------------------- 5 files changed, 14 insertions(+), 50 deletions(-) rename app/src/main/java/com/sadellie/unitto/screens/{second/components => common}/Header.kt (82%) delete mode 100644 app/src/main/java/com/sadellie/unitto/screens/setttings/components/SettingsHeader.kt diff --git a/app/src/main/java/com/sadellie/unitto/screens/second/components/Header.kt b/app/src/main/java/com/sadellie/unitto/screens/common/Header.kt similarity index 82% rename from app/src/main/java/com/sadellie/unitto/screens/second/components/Header.kt rename to app/src/main/java/com/sadellie/unitto/screens/common/Header.kt index fe1e1058..36c0ff9b 100644 --- a/app/src/main/java/com/sadellie/unitto/screens/second/components/Header.kt +++ b/app/src/main/java/com/sadellie/unitto/screens/common/Header.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.sadellie.unitto.screens.second.components +package com.sadellie.unitto.screens.common import androidx.compose.foundation.background import androidx.compose.foundation.layout.fillMaxWidth @@ -28,20 +28,23 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp /** - * Unit group header. + * Basic list header. * - * @param text Unit group name. + * @param text Group label. * @param modifier Modifier that will be applied to Text composable. */ @Composable -fun Header(text: String, modifier: Modifier = Modifier) { +fun Header( + text: String, + modifier: Modifier = Modifier +) { Text( modifier = modifier .background(MaterialTheme.colorScheme.background) .fillMaxWidth() - .padding(vertical = 12.dp, horizontal = 8.dp), + .padding(start = 16.dp, end = 16.dp, top = 24.dp, bottom = 12.dp), text = text, - style = MaterialTheme.typography.titleMedium, + style = MaterialTheme.typography.titleSmall, color = MaterialTheme.colorScheme.primary ) } diff --git a/app/src/main/java/com/sadellie/unitto/screens/second/SecondScreen.kt b/app/src/main/java/com/sadellie/unitto/screens/second/SecondScreen.kt index fad008e6..03cd38e9 100644 --- a/app/src/main/java/com/sadellie/unitto/screens/second/SecondScreen.kt +++ b/app/src/main/java/com/sadellie/unitto/screens/second/SecondScreen.kt @@ -33,12 +33,11 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.platform.LocalFocusManager import androidx.compose.ui.res.stringResource import com.sadellie.unitto.R -import com.sadellie.unitto.data.units.ALL_UNIT_GROUPS import com.sadellie.unitto.data.units.AbstractUnit import com.sadellie.unitto.data.units.UnitGroup import com.sadellie.unitto.screens.Formatter import com.sadellie.unitto.screens.second.components.ChipsRow -import com.sadellie.unitto.screens.second.components.Header +import com.sadellie.unitto.screens.common.Header import com.sadellie.unitto.screens.second.components.SearchBar import com.sadellie.unitto.screens.second.components.SearchPlaceholder import com.sadellie.unitto.screens.second.components.UnitListItem diff --git a/app/src/main/java/com/sadellie/unitto/screens/setttings/SettingsScreen.kt b/app/src/main/java/com/sadellie/unitto/screens/setttings/SettingsScreen.kt index f31a8cc3..1ca7e3df 100644 --- a/app/src/main/java/com/sadellie/unitto/screens/setttings/SettingsScreen.kt +++ b/app/src/main/java/com/sadellie/unitto/screens/setttings/SettingsScreen.kt @@ -34,10 +34,10 @@ import com.sadellie.unitto.data.NavRoutes.UNIT_GROUPS_SCREEN import com.sadellie.unitto.data.preferences.OUTPUT_FORMAT import com.sadellie.unitto.data.preferences.PRECISIONS import com.sadellie.unitto.data.preferences.SEPARATORS +import com.sadellie.unitto.screens.common.Header import com.sadellie.unitto.screens.common.UnittoLargeTopAppBar import com.sadellie.unitto.screens.openLink import com.sadellie.unitto.screens.setttings.components.AlertDialogWithList -import com.sadellie.unitto.screens.setttings.components.SettingsHeader import com.sadellie.unitto.screens.setttings.components.SettingsListItem @Composable @@ -58,7 +58,7 @@ fun SettingsScreen( LazyColumn(contentPadding = padding) { // GENERAL GROUP - item { SettingsHeader(stringResource(R.string.general_settings_group)) } + item { Header(stringResource(R.string.general_settings_group)) } // THEME item { @@ -109,7 +109,7 @@ fun SettingsScreen( } // ADDITIONAL GROUP - item { SettingsHeader(stringResource(R.string.additional_settings_group)) } + item { Header(stringResource(R.string.additional_settings_group)) } // TERMS AND CONDITIONS item { diff --git a/app/src/main/java/com/sadellie/unitto/screens/setttings/UnitGroupsScreen.kt b/app/src/main/java/com/sadellie/unitto/screens/setttings/UnitGroupsScreen.kt index deafa62f..fd3e48ba 100644 --- a/app/src/main/java/com/sadellie/unitto/screens/setttings/UnitGroupsScreen.kt +++ b/app/src/main/java/com/sadellie/unitto/screens/setttings/UnitGroupsScreen.kt @@ -43,7 +43,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import com.sadellie.unitto.R import com.sadellie.unitto.screens.common.UnittoLargeTopAppBar -import com.sadellie.unitto.screens.second.components.Header +import com.sadellie.unitto.screens.common.Header import com.sadellie.unitto.screens.setttings.components.SettingsListItem import org.burnoutcrew.reorderable.ReorderableItem import org.burnoutcrew.reorderable.detectReorder diff --git a/app/src/main/java/com/sadellie/unitto/screens/setttings/components/SettingsHeader.kt b/app/src/main/java/com/sadellie/unitto/screens/setttings/components/SettingsHeader.kt deleted file mode 100644 index f45067a0..00000000 --- a/app/src/main/java/com/sadellie/unitto/screens/setttings/components/SettingsHeader.kt +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Unitto is a unit converter for Android - * Copyright (c) 2022 Elshan Agaev - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.sadellie.unitto.screens.setttings.components - -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.padding -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Text -import androidx.compose.runtime.Composable -import androidx.compose.ui.Modifier -import androidx.compose.ui.unit.dp - -@Composable -fun SettingsHeader(text: String) = - Text( - modifier = Modifier - .fillMaxWidth() - .padding(start = 16.dp, end = 16.dp, top = 24.dp, bottom = 12.dp), - text = text, - style = MaterialTheme.typography.titleSmall, - color = MaterialTheme.colorScheme.primary - )