From 0cd0898c992503cae980f969b4fc72cb18b6af72 Mon Sep 17 00:00:00 2001 From: Diego Beraldin Date: Tue, 23 Jan 2024 20:05:40 +0100 Subject: [PATCH] fix: some UI fixes; new l10n (#477) * chore: add tok l10n * clearer bar theme message * fix broken link * fix: remove duplicate setting item --- .../commonui/modals/LanguageBottomSheet.kt | 1 + .../raccoonforlemmy/core/utils/Extensions.kt | 2 + docs/tech_manual/module_structure.md | 3 +- .../feature/settings/main/SettingsScreen.kt | 13 - .../commonMain/resources/MR/base/strings.xml | 3 +- .../commonMain/resources/MR/it/strings.xml | 2 +- .../commonMain/resources/MR/tok/strings.xml | 327 ++++++++++++++++++ 7 files changed, 334 insertions(+), 17 deletions(-) create mode 100755 resources/src/commonMain/resources/MR/tok/strings.xml diff --git a/core/commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/LanguageBottomSheet.kt b/core/commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/LanguageBottomSheet.kt index 6a9134af2..8967b0c04 100644 --- a/core/commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/LanguageBottomSheet.kt +++ b/core/commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/LanguageBottomSheet.kt @@ -88,6 +88,7 @@ class LanguageBottomSheet : Screen { "sq", "fi", "se", + "tok", "tr", "uk", ) diff --git a/core/utils/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/utils/Extensions.kt b/core/utils/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/utils/Extensions.kt index daf494220..89ca01ef2 100644 --- a/core/utils/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/utils/Extensions.kt +++ b/core/utils/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/utils/Extensions.kt @@ -44,6 +44,7 @@ fun String.toLanguageName() = when (this) { "sk" -> stringResource(MR.strings.language_sk) "sl" -> stringResource(MR.strings.language_sl) "sq" -> stringResource(MR.strings.language_sq) + "tok" -> stringResource(MR.strings.language_tok) "tr" -> stringResource(MR.strings.language_tr) "uk" -> stringResource(MR.strings.language_uk) else -> stringResource(MR.strings.language_en) @@ -81,6 +82,7 @@ fun String.toLanguageFlag(): AnnotatedString = when (this) { "sk" -> "🇸🇰" "sl" -> "🇸🇮" "sq" -> "🇦🇱" + "tok" -> "🦝️" "tr" -> "🇹🇷" "uk" -> "🇺🇦" else -> "" diff --git a/docs/tech_manual/module_structure.md b/docs/tech_manual/module_structure.md index 77d3256ad..9db861a71 100644 --- a/docs/tech_manual/module_structure.md +++ b/docs/tech_manual/module_structure.md @@ -136,8 +136,7 @@ are called throughout the whole project. Here is a short description of them: - `:core:appearance` contains the look and feel repository which exposes the information about the current theme as observable states and allows to change them; - `:core:architecture` contains the building blocks for the Model-View-Intent architecture used in - all the screens of the application (see the section - about [architectural patterns](#61-architectural-patterns)); + all the screens of the application; - `:core:commonui` contains a series of sub-modules that are used to define UI components used in the app and reusable UI blocks: - `:components`: a collection of components that represent graphical widgets diff --git a/feature/settings/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/settings/main/SettingsScreen.kt b/feature/settings/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/settings/main/SettingsScreen.kt index 98ec75b2e..76aeb5e2e 100644 --- a/feature/settings/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/settings/main/SettingsScreen.kt +++ b/feature/settings/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/settings/main/SettingsScreen.kt @@ -261,19 +261,6 @@ class SettingsScreen : Screen { ) } - // dynamic colors - if (uiState.supportsDynamicColors) { - SettingsSwitchRow( - title = stringResource(MR.strings.settings_dynamic_colors), - value = uiState.dynamicColors, - onValueChanged = rememberCallbackArgs(model) { value -> - model.reduce( - SettingsMviModel.Intent.ChangeDynamicColors(value) - ) - }, - ) - } - // custom scheme seed color SettingsColorRow( title = stringResource(MR.strings.settings_custom_seed_color), diff --git a/resources/src/commonMain/resources/MR/base/strings.xml b/resources/src/commonMain/resources/MR/base/strings.xml index f17ac3716..3ae7a777e 100755 --- a/resources/src/commonMain/resources/MR/base/strings.xml +++ b/resources/src/commonMain/resources/MR/base/strings.xml @@ -128,6 +128,7 @@ Slovenčina Slovenščina Shqip + toki pona Türkçe Українська Instance name @@ -354,5 +355,5 @@ Add new Opaque Transparent - Status and navigation bar theme + System notification and navigation bar theme \ No newline at end of file diff --git a/resources/src/commonMain/resources/MR/it/strings.xml b/resources/src/commonMain/resources/MR/it/strings.xml index bafe7caf0..560874e46 100755 --- a/resources/src/commonMain/resources/MR/it/strings.xml +++ b/resources/src/commonMain/resources/MR/it/strings.xml @@ -328,5 +328,5 @@ Aggiungi nuovo Opaco Trasparente - Tema barra di stato e di navigazione + Tema barra notifiche di sistema e navigazione \ No newline at end of file diff --git a/resources/src/commonMain/resources/MR/tok/strings.xml b/resources/src/commonMain/resources/MR/tok/strings.xml new file mode 100755 index 000000000..7374a85db --- /dev/null +++ b/resources/src/commonMain/resources/MR/tok/strings.xml @@ -0,0 +1,327 @@ + + + o tawa sewi + o open e toki + lukin la, o weka + o pali e lipu + o toki lili + o open e nasin pi jan moli + o pini e nasin pi jan moli + o pini + ni li pona + o kama jo + o weka sin + o lukin lon nanpa tu + o weka + o pini + o pini e ilo nanpa + sona kulupu + sona pi ilo nanpa + toki lili + jan (tenpo suno) + jan (tenpo mun) + lipu + jan pi wile lukin + jan (tenpo esun) + sijelo pi toki lili + toki lili sin + sijelo lipu + kulupu + o lipu lon nanpa tu: + nimi lipu + NSFW + ilo ante + lukin lon tenpo open + lipu sin + URL + sitelen (sina wile la) + o pana e toki lili tawa jan lawa + o pana e lipu tawa jan lawa + sitelen + nimi + URL + o ante e ilo nanpa + sitelen toki + o anu e kulupu + o ante e toki lili + o ante e lipu + ale + toki lili + kulupu + lipu + jan + o lukin + tan %1$s + lipu mute + ale + tomo + wile lukin + o nanpa + wawa + utala + nasa + toki lili mute + sin + toki lili sin + majuna + suli en lili + mute + mute pi 12 tenpo kalama + 12tk + mute pi 6 tenpo kalama + 6tk + mute pi tenpo suno + ts + mute pi tenpo kalam + 1tk + mute pi tenpo mun + tm + mute pi tenpo esun + te + mute pi tenpo pi sike suno + tpss + o sitelen sama lukin + o sitelen sama lukin ala + toki + li nimi e sina lon + li toki tawa toki lili lon + li toki tawa lipu sina lon + ale + nasin lukin + lukin ala + ilo li sona ala e ni: sina seme.\no tawa insa lon lipu + "sona jan" tawa ni: sina lukin e toki sina. + + nimi + toki + toki lili + kulupu + ilo nanpa: %1$s + tok + nimi pi ilo nanpa + (sina wile la) + nimi pi sona ala + TOTP 2FA nimi lili + nimi jan (anu lipu toki) + o sin e sona jan + o lawa e sona jan + mute-kulupu + sina wile lukin e + kalama ala li lon ni.\nsina wile ala wile sitelen e toki + lili nanpa wan? + + Ala li lon ni + kama jo e toki lili la, pakala li lon + pakala pi sona ala li lon + kama jo e sitelen la, pakala li lon + sona li ike + sona li lon ala + pali li pini pona + kulupu + sitelen lili + nimi + ante e mute-kulupu + nimi ala + tenpo nanpa tu + o lawa e wile lukin + lipu + poki toki + sona jan + lukin + nasin + o lipu lon nanpa tu + o ante + o weka + o pana tawa jan lawa + o lukin e sitelen toki + o pana + lipu kin lon: + o kama jo e toki lili mute + tk + tkl + tkll + o taka insa + ts + m + tm + ilo li sona ala e ni: sina seme.\no insa tawa + sinpin. + + toki lili + lipu + k + tss + sona pi ilo ni + nanpa + o lukin e ante mute + o moli e pipi (GitHub) + o moli e pipi (lipu toki) + o lukin lon ilo Kitapu + kulupu pi ilo Lemi + o suli e toki lili kepeken jan ala + o kama jo e sitelen kepeken jan ala + o lukin ala e sitelen NSFW + 🐬 kala lili + 🦔 misa kiki + 🐳 kala suli + wike + A + B + G + R + o kama jo e kule + 🦝 kijetesantakalu + 🐸 akesi telo + 🦊 soweli pi ma tomo + 🦄 soweli taka pi kiwen wan + 🐙 kala pi noka luka tu wan + 🦀 pipi telo + 🐼 soweli pi moku ko jelo + suli + suli mute + suli mute mute + pona + suli sitelen + lili + lili mute + lili mute mute + kule lukin + nanpa pi toki lili + nasin lipu + nanpa lipu + kule pi pana wile ike + kepeken kule wile + o open e moli pipi + o open e luka pi nanpa tu + o open e tawa luka + sitelen suli + o jo e NSFW + toki + o lukin e nimi lon linja anpa + o open e URL kepeken ilo pi insa ala + pt + lukin lipu + leko + lili + suli + nasin lukin + nasin pali + moli e pipi + lipu en toki lili + NSFW + pimeja mute + pimeja + walo + nasin sitelen ilo + nasin sitelen sitelen + nasin kule + kule pi pana wile pona + tawa la, o lukin ala e linja anpa + tenpo nasin pi jan moli + tawa nasin pi jan moli + tawa la, o sitelen e lipu sama lukin + + o toki lon tenpo nanpa tu + o insa e jan + o insa ala e jan + o open e lipu pi jan lawa + o sitelen sama sewi + o sitelen ala sama sewi + o pini e toki lili + o pini ala e toki lili + o weka + o sitelen sama tan jan lawa + o sitelen ala sama tan jan lawa + lipu pi jan lawa + nasin lipu pi jan lawa + ale + wile weka + o weka + o weka ala + o kama pona lon ilo Rakun tawa ilo Lemi!\n\nsina tawa + insa ala la, o kepeken e ilo (▼) tawa ante e ilo nanpa.\n\nwile la, tenpo ale la, sina ken + tawa insa e ilo nanpa sina lon lipo "sona jan".\n\no musi lon ilo Lemi! + + nasin pi poki toki + o sin e jan lawa + o sin ala e jan lawa + nasin pi pana wile + kulupu + kulupu ala + nanpa + ilo + tan: + nasin lukin linja pi toki lili + 🌊 telo suli + 🥑 kili pi ma seli + 🍓 kili loje + 🌈 sike kule + o 🔙 lon nanpa tu tawa pini + o wike ala lukin + o lukin e lipu tan nimi taso + nasin sitelen lipu + jan lawa + o sin tawa ijo pona + o weka tan ijo pona + o lukin e lipu pi jan lawa + lipu pi jan lawa + li jan lawa sin + li jan lawa sin ala + li pini + li pini ala + li sitelen sama lipu sewi + li sitelen ala sama lipu sewi + li pini e toki lili + li pini ala e toki lili + li weka + li weka ala + li weka tan toki lili lon + li weka ala tan toki lili lon + kulupu li tawa + o pini e jan + o pini e kulupu + sona jan + jan lawa + jan lawa pi ilo nanpa + o toki lon ilo Maturi + kule pi pali toki + nasin pi sona jan + nasin pi linja sona + sona jan + ijo + kalama + sitelen jan + sitelen suli + sona + ilo + nimi + jan lon ilo Maturi + lipu toki + o jo e ilo + o jo e NSFW + o jo e lipu lukin + o kalama lon lipu toki + pini en nasin lukin + o pini ala + ilo nanpa + o lukin e jo + nanpa linja pi sijelo lipu + ale + (jo ni li weka) + o kama jo e lipu mute + o pini e tawa lon tenpo ale + o sin e ilo nanpa + kule pi pali awen + o lawa e pali pi tawa luka + o pana wile pona + o pana wile ike + o awen + o sitelen sama lukin/lukin ala + pali pi luka wawa + pali pi luka ike + o anu e pali + o sin + lukin ala + lukin + nasin lukin pi linja sewi pi linja anpa + \ No newline at end of file