From 15d03ef57fa8d8ba7ac6417235dd3ba00a4566cf Mon Sep 17 00:00:00 2001 From: jonasgaudian <43753916+jonasgaudian@users.noreply.github.com> Date: Thu, 19 Feb 2026 15:29:08 +0100 Subject: [PATCH] Update grammar info string resource naming, add `hasFeatures` helper to `Vocabulary` model, and update grammar count logic in `VocabularyViewModel` --- app/src/main/java/eu/gaudian/translator/model/Vocabulary.kt | 4 ++++ .../eu/gaudian/translator/view/stats/widgets/StatusWidget.kt | 2 +- .../eu/gaudian/translator/viewmodel/VocabularyViewModel.kt | 2 +- app/src/main/res/values-de-rDE/strings.xml | 1 - app/src/main/res/values-pt-rBR/strings.xml | 1 - app/src/main/res/values/strings.xml | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/eu/gaudian/translator/model/Vocabulary.kt b/app/src/main/java/eu/gaudian/translator/model/Vocabulary.kt index 2a985e4..cb7375c 100644 --- a/app/src/main/java/eu/gaudian/translator/model/Vocabulary.kt +++ b/app/src/main/java/eu/gaudian/translator/model/Vocabulary.kt @@ -57,6 +57,10 @@ data class VocabularyItem( features = switchedFeaturesJson ) } + + fun hasFeatures(): Boolean { + return !features.isNullOrBlank() + } } @Serializable diff --git a/app/src/main/java/eu/gaudian/translator/view/stats/widgets/StatusWidget.kt b/app/src/main/java/eu/gaudian/translator/view/stats/widgets/StatusWidget.kt index a1fe70b..25e848e 100644 --- a/app/src/main/java/eu/gaudian/translator/view/stats/widgets/StatusWidget.kt +++ b/app/src/main/java/eu/gaudian/translator/view/stats/widgets/StatusWidget.kt @@ -90,7 +90,7 @@ fun StatusWidget( if (itemsWithoutGrammarCount > 0) { StatusItem( icon = AppIcons.Error, - text = stringResource(R.string.items_without_grammar_infos), + text = stringResource(R.string.label_items_without_grammar), count = itemsWithoutGrammarCount, onClick = onNavigateToNoGrammar, color = MaterialTheme.colorScheme.error diff --git a/app/src/main/java/eu/gaudian/translator/viewmodel/VocabularyViewModel.kt b/app/src/main/java/eu/gaudian/translator/viewmodel/VocabularyViewModel.kt index 483994b..29d2b18 100644 --- a/app/src/main/java/eu/gaudian/translator/viewmodel/VocabularyViewModel.kt +++ b/app/src/main/java/eu/gaudian/translator/viewmodel/VocabularyViewModel.kt @@ -1327,7 +1327,7 @@ class VocabularyViewModel @Inject constructor( val itemsWithoutGrammarCount: StateFlow = vocabularyItems .map { items -> - items.count { it.features.isNullOrEmpty() } + items.count { it.hasFeatures() } } .stateIn( scope = viewModelScope, diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml index 9523bb9..36b5bf1 100644 --- a/app/src/main/res/values-de-rDE/strings.xml +++ b/app/src/main/res/values-de-rDE/strings.xml @@ -419,7 +419,6 @@ Alle Typen Filtern und Sortieren Sprache mit ID %1$d nicht gefunden - Einträge ohne Grammatikinfos Fehlende Sprach-ID auflösen: %1$d %1$d Einträge mit dieser fehlenden Sprach-ID gefunden. Betroffene Einträge ausblenden diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 98f4e40..2989b56 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -415,7 +415,6 @@ Todos os Tipos Filtrar e Ordenar Idioma com id %1$d não encontrado - Itens sem infos de gramática Resolver ID de Idioma Ausente: %1$d Encontrados %1$d itens usando este ID de idioma ausente. Ocultar Itens Afetados diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9b8f5f9..c1bbd27 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -210,7 +210,7 @@ Item ID: %1$d %1$d items - Items without grammar infos + Items without grammar infos Keep Both