From d3448771c8cad646f7656073695028b4aa83e37b Mon Sep 17 00:00:00 2001 From: Damontecres Date: Thu, 29 Jan 2026 19:35:42 -0500 Subject: [PATCH] More consistent titles --- .../main/settings/HomeLibraryRowTypeList.kt | 4 +- .../ui/main/settings/HomeRowSettings.kt | 7 +--- .../ui/main/settings/HomeSettingsAddRow.kt | 42 ++----------------- .../main/settings/HomeSettingsFavoriteList.kt | 4 +- .../ui/main/settings/HomeSettingsGlobal.kt | 4 +- .../ui/main/settings/HomeSettingsRowList.kt | 29 +++++++------ app/src/main/res/values/strings.xml | 1 + 7 files changed, 27 insertions(+), 64 deletions(-) diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/main/settings/HomeLibraryRowTypeList.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/main/settings/HomeLibraryRowTypeList.kt index 421bc9bf..ea4ba9e2 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/ui/main/settings/HomeLibraryRowTypeList.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/ui/main/settings/HomeLibraryRowTypeList.kt @@ -32,9 +32,7 @@ fun HomeLibraryRowTypeList( ) { LaunchedEffect(Unit) { firstFocus.tryRequestFocus() } Column(modifier = modifier) { - Text( - text = "Add row for ${library.name}", - ) + TitleText(stringResource(R.string.add_row_for, library.name)) LazyColumn( contentPadding = PaddingValues(8.dp), verticalArrangement = Arrangement.spacedBy(8.dp), diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/main/settings/HomeRowSettings.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/main/settings/HomeRowSettings.kt index b31245e8..adcb3124 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/ui/main/settings/HomeRowSettings.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/ui/main/settings/HomeRowSettings.kt @@ -13,7 +13,6 @@ import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.unit.dp import androidx.tv.material3.MaterialTheme -import androidx.tv.material3.Text import androidx.tv.material3.surfaceColorAtElevation import com.github.damontecres.wholphin.R import com.github.damontecres.wholphin.data.model.HomeRowViewOptions @@ -45,11 +44,7 @@ fun HomeRowSettings( val firstFocus = remember { FocusRequester() } LaunchedEffect(Unit) { firstFocus.tryRequestFocus() } Column(modifier = modifier) { - Text( - text = title, - style = MaterialTheme.typography.titleLarge, - color = MaterialTheme.colorScheme.onSurface, - ) + TitleText(title) LazyColumn { itemsIndexed(options) { index, pref -> pref as AppPreference diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/main/settings/HomeSettingsAddRow.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/main/settings/HomeSettingsAddRow.kt index d805c4be..09f14bfc 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/ui/main/settings/HomeSettingsAddRow.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/ui/main/settings/HomeSettingsAddRow.kt @@ -5,8 +5,6 @@ import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.fillMaxHeight -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.itemsIndexed import androidx.compose.material3.HorizontalDivider @@ -17,9 +15,7 @@ import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.focus.focusRestorer import androidx.compose.ui.res.stringResource -import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import androidx.tv.material3.MaterialTheme import androidx.tv.material3.Text import com.github.damontecres.wholphin.R import com.github.damontecres.wholphin.ui.ifElse @@ -35,9 +31,7 @@ fun HomeSettingsAddRow( ) { // LaunchedEffect(Unit) { firstFocus.tryRequestFocus() } Column(modifier = modifier) { - Text( - text = "Add row for...", - ) + TitleText(stringResource(R.string.add_row)) LazyColumn( contentPadding = PaddingValues(8.dp), verticalArrangement = Arrangement.spacedBy(8.dp), @@ -46,18 +40,6 @@ fun HomeSettingsAddRow( .fillMaxHeight() .focusRestorer(firstFocus), ) { - item { - Text( - text = stringResource(R.string.continue_watching), - style = MaterialTheme.typography.titleMedium, - color = MaterialTheme.colorScheme.onSurface, - textAlign = TextAlign.Start, - modifier = - Modifier - .fillMaxWidth() - .padding(top = 8.dp, bottom = 4.dp), - ) - } itemsIndexed( listOf( MetaRowType.CONTINUE_WATCHING, @@ -75,17 +57,8 @@ fun HomeSettingsAddRow( ) } item { + TitleText(stringResource(R.string.library)) HorizontalDivider() - Text( - text = stringResource(R.string.library), - style = MaterialTheme.typography.titleMedium, - color = MaterialTheme.colorScheme.onSurface, - textAlign = TextAlign.Start, - modifier = - Modifier - .fillMaxWidth() - .padding(top = 8.dp, bottom = 4.dp), - ) } itemsIndexed(libraries) { index, library -> HomeSettingsListItem( @@ -98,17 +71,8 @@ fun HomeSettingsAddRow( ) } item { + TitleText(stringResource(R.string.more)) HorizontalDivider() - Text( - text = stringResource(R.string.more), - style = MaterialTheme.typography.titleMedium, - color = MaterialTheme.colorScheme.onSurface, - textAlign = TextAlign.Start, - modifier = - Modifier - .fillMaxWidth() - .padding(top = 8.dp, bottom = 4.dp), - ) } item { HomeSettingsListItem( diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/main/settings/HomeSettingsFavoriteList.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/main/settings/HomeSettingsFavoriteList.kt index 7e78e739..3dbea064 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/ui/main/settings/HomeSettingsFavoriteList.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/ui/main/settings/HomeSettingsFavoriteList.kt @@ -29,8 +29,8 @@ fun HomeSettingsFavoriteList( ) { LaunchedEffect(Unit) { firstFocus.tryRequestFocus() } Column(modifier = modifier) { - Text( - text = "Add favorites row...", + TitleText( + stringResource(R.string.add_row_for, stringResource(R.string.favorites)), ) LazyColumn( contentPadding = PaddingValues(8.dp), diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/main/settings/HomeSettingsGlobal.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/main/settings/HomeSettingsGlobal.kt index 3c619e4e..f9a57777 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/ui/main/settings/HomeSettingsGlobal.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/ui/main/settings/HomeSettingsGlobal.kt @@ -56,7 +56,7 @@ fun HomeSettingsGlobal( selected = false, headlineContent = { Text( - text = "Increase card sizes", + text = "Increase all card size", ) }, leadingContent = { @@ -74,7 +74,7 @@ fun HomeSettingsGlobal( selected = false, headlineContent = { Text( - text = "Decrease card sizes", + text = "Decrease all card size", ) }, leadingContent = { diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/main/settings/HomeSettingsRowList.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/main/settings/HomeSettingsRowList.kt index 3a1da2fd..f0fc6661 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/ui/main/settings/HomeSettingsRowList.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/ui/main/settings/HomeSettingsRowList.kt @@ -18,6 +18,7 @@ import androidx.compose.material.icons.filled.Settings import androidx.compose.material3.HorizontalDivider import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.NonRestartableComposable import androidx.compose.runtime.getValue import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope @@ -72,12 +73,7 @@ fun HomeSettingsRowList( LaunchedEffect(Unit) { focusRequesters.getOrNull(position)?.tryRequestFocus() } Column(modifier = modifier) { - Text( - text = stringResource(R.string.customize_home), - style = MaterialTheme.typography.titleLarge, - textAlign = TextAlign.Center, - modifier = Modifier.fillMaxWidth(), - ) + TitleText(stringResource(R.string.customize_home)) LazyColumn( state = listState, verticalArrangement = Arrangement.spacedBy(8.dp), @@ -129,12 +125,7 @@ fun HomeSettingsRowList( ) } item { - Text( - text = stringResource(R.string.home_rows), - style = MaterialTheme.typography.titleLarge, - textAlign = TextAlign.Center, - modifier = Modifier.fillMaxWidth(), - ) + TitleText(stringResource(R.string.home_rows)) HorizontalDivider() } itemsIndexed(state.rows, key = { _, row -> row.id }) { index, row -> @@ -248,3 +239,17 @@ fun HomeRowConfigContent( } } } + +@Composable +@NonRestartableComposable +fun TitleText( + title: String, + modifier: Modifier = Modifier, +) { + Text( + text = title, + style = MaterialTheme.typography.titleLarge, + textAlign = TextAlign.Center, + modifier = modifier.fillMaxWidth(), + ) +} diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f81e123b..103b4529 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -473,6 +473,7 @@ Save to server Load from web client Use series image + Add row for %1$s Disabled