From 4afabdd2cb90f4c05642a62a18d95c73efbe182c Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Sat, 21 Nov 2026 10:54:33 +0000 Subject: [PATCH] Fix issue #22: localize Stats UI and minor UX fixes Move Stats period and heatmap weekday labels into resources with Hungarian translations, fix plurals/rounding/theme dialog, and sanitize common network errors. Co-authored-by: T0liver --- .../hu/toliver/vinotes/domain/WineYears.kt | 11 +++++++ .../usecases/stats/GetFullStatsUseCase.kt | 8 ----- .../screen/addtasting/AddTastingViewModel.kt | 13 ++++++-- .../ui/screen/settings/SettingsScreen.kt | 30 ++++++++++++++----- .../ui/screen/settings/SettingsViewModel.kt | 19 +++++++++--- .../ui/screen/stats/StatPeriodLabels.kt | 13 ++++++++ .../ui/screen/stats/charts/TastingHeatmap.kt | 12 +++++--- .../stats/components/HeaderCountersRow.kt | 3 +- .../screen/stats/components/PeriodStatsRow.kt | 3 +- .../stats/components/StatPeriodSelector.kt | 4 ++- .../ui/screen/stats/components/StreakBadge.kt | 7 ++++- .../screen/winedetail/WineDetailViewModel.kt | 18 ++++++++++- .../winedetail/components/WineHeroSection.kt | 3 +- .../ui/screen/winelist/WineListViewModel.kt | 13 ++++++++ .../screen/winelist/components/RatingBadge.kt | 2 +- .../ui/screen/winelist/components/WineCard.kt | 6 +++- .../vinotes/ui/util/UserFacingErrors.kt | 21 +++++++++++++ app/src/main/res/values-hu/plurals.xml | 11 +++++++ app/src/main/res/values-hu/strings.xml | 18 +++++++++++ app/src/main/res/values/plurals.xml | 11 +++++++ app/src/main/res/values/strings.xml | 18 +++++++++++ 21 files changed, 210 insertions(+), 34 deletions(-) create mode 100644 app/src/main/java/hu/toliver/vinotes/domain/WineYears.kt create mode 100644 app/src/main/java/hu/toliver/vinotes/ui/screen/stats/StatPeriodLabels.kt create mode 100644 app/src/main/java/hu/toliver/vinotes/ui/util/UserFacingErrors.kt create mode 100644 app/src/main/res/values-hu/plurals.xml create mode 100644 app/src/main/res/values/plurals.xml diff --git a/app/src/main/java/hu/toliver/vinotes/domain/WineYears.kt b/app/src/main/java/hu/toliver/vinotes/domain/WineYears.kt new file mode 100644 index 0000000..842cda6 --- /dev/null +++ b/app/src/main/java/hu/toliver/vinotes/domain/WineYears.kt @@ -0,0 +1,11 @@ +package hu.toliver.vinotes.domain + +import java.util.Calendar + +object WineYears { + const val MIN_YEAR = 1900 + + fun maxYear(): Int = Calendar.getInstance().get(Calendar.YEAR) + 1 + + fun isValid(year: Int): Boolean = year in MIN_YEAR..maxYear() +} \ No newline at end of file diff --git a/app/src/main/java/hu/toliver/vinotes/domain/usecases/stats/GetFullStatsUseCase.kt b/app/src/main/java/hu/toliver/vinotes/domain/usecases/stats/GetFullStatsUseCase.kt index 3d0f454..ee87260 100644 --- a/app/src/main/java/hu/toliver/vinotes/domain/usecases/stats/GetFullStatsUseCase.kt +++ b/app/src/main/java/hu/toliver/vinotes/domain/usecases/stats/GetFullStatsUseCase.kt @@ -145,13 +145,5 @@ enum class StatPeriod { ALL_TIME -> null } } - - val label: String - get() = when (this) { - LAST_30_DAYS -> "30 days" - LAST_3_MONTHS -> "3 months" - THIS_YEAR -> "This year" - ALL_TIME -> "All time" - } } diff --git a/app/src/main/java/hu/toliver/vinotes/ui/screen/addtasting/AddTastingViewModel.kt b/app/src/main/java/hu/toliver/vinotes/ui/screen/addtasting/AddTastingViewModel.kt index 5736d08..e57af2e 100644 --- a/app/src/main/java/hu/toliver/vinotes/ui/screen/addtasting/AddTastingViewModel.kt +++ b/app/src/main/java/hu/toliver/vinotes/ui/screen/addtasting/AddTastingViewModel.kt @@ -6,6 +6,7 @@ import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.qualifiers.ApplicationContext import hu.toliver.vinotes.R +import hu.toliver.vinotes.ui.util.userFacingErrorMessage import hu.toliver.vinotes.domain.model.Taste import hu.toliver.vinotes.domain.usecases.location.GetCurrentLocationUseCase import hu.toliver.vinotes.domain.usecases.location.ReverseGeocodeUseCase @@ -131,7 +132,12 @@ class AddTastingViewModel @Inject constructor( longitude = longitude, ) } - emitLocationError(error.message ?: context.getString(R.string.reverse_geocoding_failed)) + emitLocationError( + userFacingErrorMessage( + context, + error.message ?: context.getString(R.string.reverse_geocoding_failed), + ), + ) } } .onFailure { error -> @@ -147,8 +153,9 @@ class AddTastingViewModel @Inject constructor( } private suspend fun emitLocationError(message: String) { - _state.update { it.copy(locationError = message, isLoadingLocation = false) } - _effect.send(AddTastingEffect.ShowLocationError(message)) + val friendly = userFacingErrorMessage(context, message) + _state.update { it.copy(locationError = friendly, isLoadingLocation = false) } + _effect.send(AddTastingEffect.ShowLocationError(friendly)) } private fun loadForEdit(tasteId: String) { diff --git a/app/src/main/java/hu/toliver/vinotes/ui/screen/settings/SettingsScreen.kt b/app/src/main/java/hu/toliver/vinotes/ui/screen/settings/SettingsScreen.kt index 09fb508..8d8b09e 100644 --- a/app/src/main/java/hu/toliver/vinotes/ui/screen/settings/SettingsScreen.kt +++ b/app/src/main/java/hu/toliver/vinotes/ui/screen/settings/SettingsScreen.kt @@ -2,6 +2,7 @@ package hu.toliver.vinotes.ui.screen.settings import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.result.contract.ActivityResultContracts +import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues @@ -128,32 +129,47 @@ fun SettingsScreen( Text(stringResource(R.string.cancel)) } }, - title = { Text(stringResource(R.string.settings)) }, + title = { Text(stringResource(R.string.theme)) }, text = { Column { val current = state.themeMode Row( - Modifier.fillMaxWidth(), + Modifier + .fillMaxWidth() + .clickable { viewModel.onEvent(SettingsEvent.ThemeSelected(ThemeMode.LIGHT)) }, horizontalArrangement = Arrangement.Start, verticalAlignment = Alignment.CenterVertically ) { - RadioButton(selected = current == ThemeMode.LIGHT, onClick = { viewModel.onEvent(SettingsEvent.ThemeSelected(ThemeMode.LIGHT)) }) + RadioButton( + selected = current == ThemeMode.LIGHT, + onClick = null, + ) Text(text = stringResource(R.string.light)) } Row( - Modifier.fillMaxWidth(), + Modifier + .fillMaxWidth() + .clickable { viewModel.onEvent(SettingsEvent.ThemeSelected(ThemeMode.DARK)) }, horizontalArrangement = Arrangement.Start, verticalAlignment = Alignment.CenterVertically ) { - RadioButton(selected = current == ThemeMode.DARK, onClick = { viewModel.onEvent(SettingsEvent.ThemeSelected(ThemeMode.DARK)) }) + RadioButton( + selected = current == ThemeMode.DARK, + onClick = null, + ) Text(text = stringResource(R.string.dark)) } Row( - Modifier.fillMaxWidth(), + Modifier + .fillMaxWidth() + .clickable { viewModel.onEvent(SettingsEvent.ThemeSelected(ThemeMode.SYSTEM)) }, horizontalArrangement = Arrangement.Start, verticalAlignment = Alignment.CenterVertically ) { - RadioButton(selected = current == ThemeMode.SYSTEM, onClick = { viewModel.onEvent(SettingsEvent.ThemeSelected(ThemeMode.SYSTEM)) }) + RadioButton( + selected = current == ThemeMode.SYSTEM, + onClick = null, + ) Text(text = stringResource(R.string.system_settings)) } } diff --git a/app/src/main/java/hu/toliver/vinotes/ui/screen/settings/SettingsViewModel.kt b/app/src/main/java/hu/toliver/vinotes/ui/screen/settings/SettingsViewModel.kt index 6c684f9..0ba7f06 100644 --- a/app/src/main/java/hu/toliver/vinotes/ui/screen/settings/SettingsViewModel.kt +++ b/app/src/main/java/hu/toliver/vinotes/ui/screen/settings/SettingsViewModel.kt @@ -9,6 +9,7 @@ import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.qualifiers.ApplicationContext import hu.toliver.vinotes.R +import hu.toliver.vinotes.ui.util.userFacingErrorMessage import hu.toliver.vinotes.domain.model.enums.AppLanguage import hu.toliver.vinotes.domain.usecases.catalog.ImportFromFileUseCase import hu.toliver.vinotes.domain.usecases.catalog.PerformDeltaSyncUseCase @@ -171,11 +172,16 @@ class SettingsViewModel @Inject constructor( } .onFailure { error -> _state.update { it.copy(isSyncingCatalog = false) } - val msg = error.message ?: context.getString(R.string.error_syncing_catalog) + val msg = userFacingErrorMessage( + context, + error.message ?: context.getString(R.string.error_syncing_catalog), + ) // Detect DNS resolution failures and show actionable hint if (msg.contains(context.getString(R.string.dns_resolution_failed), ignoreCase = true) || msg.contains(context.getString(R.string.unable_to_resolve_host), ignoreCase = true) - || msg.contains(context.getString(R.string.no_address_associated_with_hostname), ignoreCase = true)) { + || msg.contains(context.getString(R.string.no_address_associated_with_hostname), ignoreCase = true) + || msg == context.getString(R.string.cannot_resolve_catalog_host) + ) { _effect.send( SettingsEffect.ShowSnackbar( context.getString(R.string.cannot_resolve_catalog_host) @@ -196,11 +202,16 @@ class SettingsViewModel @Inject constructor( } .onFailure { error -> _state.update { it.copy(isSyncingCatalog = false) } - val msg = error.message ?: context.getString(R.string.error_syncing_catalog) + val msg = userFacingErrorMessage( + context, + error.message ?: context.getString(R.string.error_syncing_catalog), + ) // Detect DNS resolution failures and show actionable hint if (msg.contains(context.getString(R.string.dns_resolution_failed), ignoreCase = true) || msg.contains(context.getString(R.string.unable_to_resolve_host), ignoreCase = true) - || msg.contains(context.getString(R.string.no_address_associated_with_hostname), ignoreCase = true)) { + || msg.contains(context.getString(R.string.no_address_associated_with_hostname), ignoreCase = true) + || msg == context.getString(R.string.cannot_resolve_catalog_host) + ) { _effect.send( SettingsEffect.ShowSnackbar( context.getString(R.string.cannot_resolve_catalog_host) diff --git a/app/src/main/java/hu/toliver/vinotes/ui/screen/stats/StatPeriodLabels.kt b/app/src/main/java/hu/toliver/vinotes/ui/screen/stats/StatPeriodLabels.kt new file mode 100644 index 0000000..fbe9bd7 --- /dev/null +++ b/app/src/main/java/hu/toliver/vinotes/ui/screen/stats/StatPeriodLabels.kt @@ -0,0 +1,13 @@ +package hu.toliver.vinotes.ui.screen.stats + +import androidx.annotation.StringRes +import hu.toliver.vinotes.R +import hu.toliver.vinotes.domain.usecases.stats.StatPeriod + +@StringRes +fun StatPeriod.labelRes(): Int = when (this) { + StatPeriod.LAST_30_DAYS -> R.string.stats_period_30_days + StatPeriod.LAST_3_MONTHS -> R.string.stats_period_3_months + StatPeriod.THIS_YEAR -> R.string.stats_period_this_year + StatPeriod.ALL_TIME -> R.string.stats_period_all_time +} \ No newline at end of file diff --git a/app/src/main/java/hu/toliver/vinotes/ui/screen/stats/charts/TastingHeatmap.kt b/app/src/main/java/hu/toliver/vinotes/ui/screen/stats/charts/TastingHeatmap.kt index 0d2ce0b..e16d2db 100644 --- a/app/src/main/java/hu/toliver/vinotes/ui/screen/stats/charts/TastingHeatmap.kt +++ b/app/src/main/java/hu/toliver/vinotes/ui/screen/stats/charts/TastingHeatmap.kt @@ -32,7 +32,9 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.scale +import androidx.compose.ui.res.stringArrayResource import androidx.compose.ui.res.stringResource +import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import hu.toliver.vinotes.R @@ -74,7 +76,7 @@ fun TastingHeatmap( .format(getInstance().time) } - val dayLabels = listOf("M", "Tu", "W", "Th", "F", "Sa", "Su") + val dayLabels = stringArrayResource(R.array.heatmap_weekday_labels).toList() Column(modifier = modifier) { Row(horizontalArrangement = Arrangement.spacedBy(3.dp)) { @@ -192,9 +194,11 @@ fun HeatmapTooltip(day: String, count: Int, onDismiss: () -> Unit, modifier: Mod ) { Text(formatted, style = typography.bodyMedium) Text( - text = if (count == 0) stringResource(R.string.no_tastings_yet) else stringResource( - R.string.amount_tastings, count - ), + text = if (count == 0) { + stringResource(R.string.no_tastings_yet) + } else { + pluralStringResource(R.plurals.tasting_count, count, count) + }, style = typography.bodyMedium, color = if (count > 0) colorScheme.primary else colorScheme.onSurfaceVariant ) diff --git a/app/src/main/java/hu/toliver/vinotes/ui/screen/stats/components/HeaderCountersRow.kt b/app/src/main/java/hu/toliver/vinotes/ui/screen/stats/components/HeaderCountersRow.kt index f1dd1c7..1132b56 100644 --- a/app/src/main/java/hu/toliver/vinotes/ui/screen/stats/components/HeaderCountersRow.kt +++ b/app/src/main/java/hu/toliver/vinotes/ui/screen/stats/components/HeaderCountersRow.kt @@ -8,6 +8,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import hu.toliver.vinotes.R +import kotlin.math.round import hu.toliver.vinotes.domain.model.FullStatsData @Composable @@ -32,7 +33,7 @@ fun HeaderCountersRow( playAnimations = playAnimations, ) AnimatedStatCounter( - targetValue = data.averageRating.toInt(), + targetValue = round(data.averageRating).toInt(), label = stringResource(R.string.average), modifier = Modifier.weight(1f), playAnimations = playAnimations, diff --git a/app/src/main/java/hu/toliver/vinotes/ui/screen/stats/components/PeriodStatsRow.kt b/app/src/main/java/hu/toliver/vinotes/ui/screen/stats/components/PeriodStatsRow.kt index 5f84581..7bea8a4 100644 --- a/app/src/main/java/hu/toliver/vinotes/ui/screen/stats/components/PeriodStatsRow.kt +++ b/app/src/main/java/hu/toliver/vinotes/ui/screen/stats/components/PeriodStatsRow.kt @@ -8,6 +8,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import hu.toliver.vinotes.R +import kotlin.math.round @Composable fun PeriodStatsRow( @@ -26,7 +27,7 @@ fun PeriodStatsRow( onPlayed = onPlayed, ) AnimatedStatCounter( - targetValue = avgRating.toInt(), + targetValue = round(avgRating).toInt(), label = stringResource(R.string.average_score), modifier = Modifier.weight(1f), playAnimations = playAnimations, diff --git a/app/src/main/java/hu/toliver/vinotes/ui/screen/stats/components/StatPeriodSelector.kt b/app/src/main/java/hu/toliver/vinotes/ui/screen/stats/components/StatPeriodSelector.kt index 18d457a..c3c4195 100644 --- a/app/src/main/java/hu/toliver/vinotes/ui/screen/stats/components/StatPeriodSelector.kt +++ b/app/src/main/java/hu/toliver/vinotes/ui/screen/stats/components/StatPeriodSelector.kt @@ -8,10 +8,12 @@ import androidx.compose.material3.MaterialTheme.typography import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import hu.toliver.vinotes.domain.usecases.stats.StatPeriod +import hu.toliver.vinotes.ui.screen.stats.labelRes @Composable fun StatPeriodSelector( @@ -29,7 +31,7 @@ fun StatPeriodSelector( onClick = { onSelect(period) }, label = { Text( - period.label, + stringResource(period.labelRes()), style = typography.labelSmall, textAlign = TextAlign.Center, fontWeight = if (period == selected) FontWeight.SemiBold else FontWeight.Normal, diff --git a/app/src/main/java/hu/toliver/vinotes/ui/screen/stats/components/StreakBadge.kt b/app/src/main/java/hu/toliver/vinotes/ui/screen/stats/components/StreakBadge.kt index ed4e64a..ad7dc78 100644 --- a/app/src/main/java/hu/toliver/vinotes/ui/screen/stats/components/StreakBadge.kt +++ b/app/src/main/java/hu/toliver/vinotes/ui/screen/stats/components/StreakBadge.kt @@ -25,6 +25,7 @@ import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color +import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import hu.toliver.vinotes.R @@ -100,7 +101,11 @@ fun StreakSection(data: FullStatsData, modifier: Modifier = Modifier) { color = colorScheme.onSurfaceVariant ) Text( - text = stringResource(R.string.amount_day, data.longestStreak), + text = pluralStringResource( + R.plurals.day_count, + data.longestStreak, + data.longestStreak, + ), style = typography.titleMedium, color = colorScheme.primary ) diff --git a/app/src/main/java/hu/toliver/vinotes/ui/screen/winedetail/WineDetailViewModel.kt b/app/src/main/java/hu/toliver/vinotes/ui/screen/winedetail/WineDetailViewModel.kt index f190231..aabb605 100644 --- a/app/src/main/java/hu/toliver/vinotes/ui/screen/winedetail/WineDetailViewModel.kt +++ b/app/src/main/java/hu/toliver/vinotes/ui/screen/winedetail/WineDetailViewModel.kt @@ -7,6 +7,7 @@ import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.qualifiers.ApplicationContext import hu.toliver.vinotes.R +import hu.toliver.vinotes.domain.WineYears import hu.toliver.vinotes.ui.screen.UIConverter.toFloat import hu.toliver.vinotes.domain.model.Taste import hu.toliver.vinotes.domain.usecases.wine.DeleteWineUseCase @@ -57,9 +58,24 @@ class WineDetailViewModel @Inject constructor( WineDetailEvent.EditSheetDismissed -> _state.value = _state.value.copy(isEditSheetOpen = false) is WineDetailEvent.WineSaved -> viewModelScope.launch { + if (!WineYears.isValid(event.wine.year)) { + _effect.send( + WineDetailEffect.ShowSnackbar( + context.getString( + R.string.invalid_wine_year, + WineYears.MIN_YEAR, + WineYears.maxYear(), + ), + ), + ) + return@launch + } runCatching { updateWine(event.wine) } .onSuccess { - _state.value = _state.value.copy(isEditSheetOpen = false) + _state.value = _state.value.copy( + isEditSheetOpen = false, + wine = event.wine, + ) _effect.send(WineDetailEffect.ShowSnackbar(context.getString(R.string.wine_updated))) } .onFailure { e -> diff --git a/app/src/main/java/hu/toliver/vinotes/ui/screen/winedetail/components/WineHeroSection.kt b/app/src/main/java/hu/toliver/vinotes/ui/screen/winedetail/components/WineHeroSection.kt index 3557a2e..f9f92dd 100644 --- a/app/src/main/java/hu/toliver/vinotes/ui/screen/winedetail/components/WineHeroSection.kt +++ b/app/src/main/java/hu/toliver/vinotes/ui/screen/winedetail/components/WineHeroSection.kt @@ -16,6 +16,7 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import hu.toliver.vinotes.R @@ -80,7 +81,7 @@ fun WineHeroSection( Text("·", color = MaterialTheme.colorScheme.onSurfaceVariant) } Text( - text = stringResource(R.string.amount_tasting, tastingCount), + text = pluralStringResource(R.plurals.tasting_count, tastingCount, tastingCount), style = MaterialTheme.typography.labelSmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) diff --git a/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/WineListViewModel.kt b/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/WineListViewModel.kt index af62d99..0e26594 100644 --- a/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/WineListViewModel.kt +++ b/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/WineListViewModel.kt @@ -6,6 +6,7 @@ import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.qualifiers.ApplicationContext import hu.toliver.vinotes.R +import hu.toliver.vinotes.domain.WineYears import hu.toliver.vinotes.domain.model.WineWithStats import hu.toliver.vinotes.domain.usecases.wine.DeleteWineUseCase import hu.toliver.vinotes.domain.usecases.wine.GetWinesWithStatsUseCase @@ -97,6 +98,18 @@ class WineListViewModel @Inject constructor( _state.update { it.copy(editingWine = null) } is WineListEvent.WineSaved -> viewModelScope.launch { + if (!WineYears.isValid(event.wine.year)) { + _effect.send( + WineListEffect.ShowSnackbar( + context.getString( + R.string.invalid_wine_year, + WineYears.MIN_YEAR, + WineYears.maxYear(), + ), + ), + ) + return@launch + } runCatching { if (event.isNew) addWine(event.wine) else updateWine(event.wine) }.onSuccess { diff --git a/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/components/RatingBadge.kt b/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/components/RatingBadge.kt index 40b4420..276aed7 100644 --- a/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/components/RatingBadge.kt +++ b/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/components/RatingBadge.kt @@ -35,7 +35,7 @@ fun RatingBadge(rating: Int, tastingCount: Int) { modifier = Modifier.size(12.dp), ) Text( - text = "★ $rating · ${tastingCount}×", + text = "$rating · ${tastingCount}×", style = MaterialTheme.typography.labelSmall, color = MaterialTheme.colorScheme.onPrimaryContainer, ) diff --git a/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/components/WineCard.kt b/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/components/WineCard.kt index b72dc1e..c0e5cc7 100644 --- a/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/components/WineCard.kt +++ b/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/components/WineCard.kt @@ -88,7 +88,11 @@ fun WineCard( } Text( - text = "${item.wine.producer} · ${item.wine.year} · ${item.wine.country}", + text = buildList { + if (item.wine.producer.isNotBlank()) add(item.wine.producer) + add(item.wine.year.toString()) + if (item.wine.country.isNotBlank()) add(item.wine.country) + }.joinToString(" · "), style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.onSurfaceVariant, maxLines = 1, diff --git a/app/src/main/java/hu/toliver/vinotes/ui/util/UserFacingErrors.kt b/app/src/main/java/hu/toliver/vinotes/ui/util/UserFacingErrors.kt new file mode 100644 index 0000000..f902203 --- /dev/null +++ b/app/src/main/java/hu/toliver/vinotes/ui/util/UserFacingErrors.kt @@ -0,0 +1,21 @@ +package hu.toliver.vinotes.ui.util + +import android.content.Context +import hu.toliver.vinotes.R + +fun userFacingErrorMessage(context: Context, raw: String?): String { + val message = raw?.trim().orEmpty() + if (message.isEmpty()) return context.getString(R.string.unknown_error) + if (message.contains("nominatim.openstreetmap.org", ignoreCase = true) || + message.contains("Unable to resolve host", ignoreCase = true) || + message.contains("UnknownHostException", ignoreCase = true) + ) { + return context.getString(R.string.place_lookup_unavailable) + } + if (message.contains("CLEARTEXT", ignoreCase = true) || + message.contains("network security policy", ignoreCase = true) + ) { + return context.getString(R.string.catalog_url_requires_https) + } + return message +} \ No newline at end of file diff --git a/app/src/main/res/values-hu/plurals.xml b/app/src/main/res/values-hu/plurals.xml new file mode 100644 index 0000000..baa6367 --- /dev/null +++ b/app/src/main/res/values-hu/plurals.xml @@ -0,0 +1,11 @@ + + + + %d kóstolás + %d kóstolás + + + %d nap + %d nap + + \ No newline at end of file diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 84f356c..374dc50 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -265,4 +265,22 @@ Citrom Gránátalma Arany + + + 30 nap + 3 hónap + Ez az év + Összes + + H + K + Sze + Cs + P + Szo + V + + Adj meg %1$d és %2$d közötti évet. + A hely keresése offline állapotban nem érhető el. + A katalógus URL-nek HTTPS-t kell használnia (sima HTTP nem engedélyezett). \ No newline at end of file diff --git a/app/src/main/res/values/plurals.xml b/app/src/main/res/values/plurals.xml new file mode 100644 index 0000000..6237131 --- /dev/null +++ b/app/src/main/res/values/plurals.xml @@ -0,0 +1,11 @@ + + + + %d tasting + %d tastings + + + %d day + %d days + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f20d16d..4ae25f0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -266,4 +266,22 @@ Yellow Yes, definitely! Youthful + + + 30 days + 3 months + This year + All time + + M + Tu + W + Th + F + Sa + Su + + Enter a year between %1$d and %2$d. + Place lookup is unavailable while offline. + Catalog URL must use HTTPS (cleartext HTTP is not allowed). \ No newline at end of file