From f74d995c897e7f8964e67227ab9fdd2ef2279fdf Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Sun, 23 Nov 2025 21:17:26 +0100 Subject: [PATCH] test --- .../launcher2/ui/settings/SettingsActivity.kt | 1 + .../settings/locale/LocaleSettingsScreen.kt | 21 +++++++++++++++++++ .../main/res/values-fr-feminine/strings.xml | 3 +++ .../main/res/values-fr-masculine/strings.xml | 3 +++ core/i18n/src/main/res/values-fr/strings.xml | 2 +- 5 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 core/i18n/src/main/res/values-fr-feminine/strings.xml create mode 100644 core/i18n/src/main/res/values-fr-masculine/strings.xml diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/SettingsActivity.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/SettingsActivity.kt index c51964044..75237862a 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/SettingsActivity.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/SettingsActivity.kt @@ -22,6 +22,7 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.toArgb +import androidx.core.app.GrammaticalInflectionManagerCompat import androidx.core.view.WindowCompat import androidx.navigation3.runtime.NavKey import androidx.navigation3.runtime.entryProvider diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/locale/LocaleSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/locale/LocaleSettingsScreen.kt index bc44715a0..a28b2395a 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/locale/LocaleSettingsScreen.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/locale/LocaleSettingsScreen.kt @@ -13,6 +13,7 @@ import androidx.compose.runtime.remember import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalResources import androidx.compose.ui.res.stringResource +import androidx.core.app.GrammaticalInflectionManagerCompat import androidx.core.net.toUri import androidx.core.os.LocaleListCompat import androidx.lifecycle.compose.collectAsStateWithLifecycle @@ -62,6 +63,26 @@ fun LocaleSettingsScreen() { ) } ) + ListPreference( + icon = R.drawable.wc_24px, + title = "Form of address", + value = GrammaticalInflectionManagerCompat.getApplicationGrammaticalGender(context).let { + if (it == GrammaticalInflectionManagerCompat.GRAMMATICAL_GENDER_NOT_SPECIFIED) { + GrammaticalInflectionManagerCompat.GRAMMATICAL_GENDER_NEUTRAL + } else { + it + } + }, + onValueChanged = { + GrammaticalInflectionManagerCompat.setRequestedApplicationGrammaticalGender(context, it) + }, + enabled = isAtLeastApiLevel(34), + items = listOf( + "Neutral" to GrammaticalInflectionManagerCompat.GRAMMATICAL_GENDER_NEUTRAL, + "Feminine" to GrammaticalInflectionManagerCompat.GRAMMATICAL_GENDER_FEMININE, + "Masculine" to GrammaticalInflectionManagerCompat.GRAMMATICAL_GENDER_MASCULINE, + ) + ) ListPreference( icon = R.drawable.schedule_24px, title = stringResource(R.string.preference_clock_widget_time_format), diff --git a/core/i18n/src/main/res/values-fr-feminine/strings.xml b/core/i18n/src/main/res/values-fr-feminine/strings.xml new file mode 100644 index 000000000..7b37ff3e7 --- /dev/null +++ b/core/i18n/src/main/res/values-fr-feminine/strings.xml @@ -0,0 +1,3 @@ + + Vous n\'êtes pas connectée + \ No newline at end of file diff --git a/core/i18n/src/main/res/values-fr-masculine/strings.xml b/core/i18n/src/main/res/values-fr-masculine/strings.xml new file mode 100644 index 000000000..929c889b9 --- /dev/null +++ b/core/i18n/src/main/res/values-fr-masculine/strings.xml @@ -0,0 +1,3 @@ + + Vous n\'êtes pas connecté + \ No newline at end of file diff --git a/core/i18n/src/main/res/values-fr/strings.xml b/core/i18n/src/main/res/values-fr/strings.xml index 38d7973b9..5018103dc 100644 --- a/core/i18n/src/main/res/values-fr/strings.xml +++ b/core/i18n/src/main/res/values-fr/strings.xml @@ -143,7 +143,7 @@ Infos sur l\'appli Gérer les comptes et les services Connecté en tant que %1$s - Vous n\'êtes pas connecté + Vous n\'êtes pas connecté(e) E-book Dessin Formulaire