diff --git a/android_app/app/src/main/java/com/health/openscale/core/data/Enums.kt b/android_app/app/src/main/java/com/health/openscale/core/data/Enums.kt
index c201b4f8..5953f59a 100644
--- a/android_app/app/src/main/java/com/health/openscale/core/data/Enums.kt
+++ b/android_app/app/src/main/java/com/health/openscale/core/data/Enums.kt
@@ -42,12 +42,16 @@ enum class SupportedLanguage(val code: String, val nativeDisplayName: String) {
}
}
-enum class GenderType {
- MALE,
- FEMALE;
+enum class GenderType(@StringRes val displayNameResId: Int) {
+ MALE(R.string.gender_male),
+ FEMALE(R.string.gender_female);
fun isMale(): Boolean {
return this == MALE}
+
+ fun getDisplayName(context: android.content.Context): String {
+ return context.getString(displayNameResId)
+ }
}
enum class ActivityLevel {
diff --git a/android_app/app/src/main/java/com/health/openscale/ui/screen/settings/UserDetailScreen.kt b/android_app/app/src/main/java/com/health/openscale/ui/screen/settings/UserDetailScreen.kt
index 4d7bc157..1d7ac75c 100644
--- a/android_app/app/src/main/java/com/health/openscale/ui/screen/settings/UserDetailScreen.kt
+++ b/android_app/app/src/main/java/com/health/openscale/ui/screen/settings/UserDetailScreen.kt
@@ -313,8 +313,7 @@ fun UserDetailScreen(
selected = gender == option,
onClick = { gender = option }
)
- // Display gender options with first letter capitalized.
- Text(option.name.lowercase().replaceFirstChar { it.uppercaseChar().toString() })
+ Text(option.getDisplayName(LocalContext.current))
}
}
}
diff --git a/android_app/app/src/main/java/com/health/openscale/ui/screen/settings/UserSettingsScreen.kt b/android_app/app/src/main/java/com/health/openscale/ui/screen/settings/UserSettingsScreen.kt
index ebe4d17d..8fc43360 100644
--- a/android_app/app/src/main/java/com/health/openscale/ui/screen/settings/UserSettingsScreen.kt
+++ b/android_app/app/src/main/java/com/health/openscale/ui/screen/settings/UserSettingsScreen.kt
@@ -36,6 +36,7 @@ import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import com.health.openscale.R
@@ -97,16 +98,11 @@ fun UserSettingsScreen(
ListItem(
headlineContent = { Text(user.name) },
supportingContent = {
- val heightText = if (user.heightCm != null) {
- stringResource(R.string.height_value_cm, user.heightCm)
- } else {
- stringResource(R.string.not_available)
- }
Text(
stringResource(
id = R.string.user_settings_item_details_conditional,
age,
- heightText
+ user.gender.getDisplayName(LocalContext.current)
)
)
}
diff --git a/android_app/app/src/main/res/values-de/strings.xml b/android_app/app/src/main/res/values-de/strings.xml
index 15204a5f..4dc6b13c 100644
--- a/android_app/app/src/main/res/values-de/strings.xml
+++ b/android_app/app/src/main/res/values-de/strings.xml
@@ -50,11 +50,13 @@
Name
Größe
Geschlecht
+ Männlich
+ Weiblich
Aktivitätslevel
Geburtsdatum
Bitte geben Sie gültige Daten ein
%.1f cm
- Alter: %1$d, Größe: %2$s
+ Alter: %1$d, Geschlecht: %2$s
Benutzer bearbeiten
Benutzer löschen
Neuen Benutzer hinzufügen
diff --git a/android_app/app/src/main/res/values/strings.xml b/android_app/app/src/main/res/values/strings.xml
index bd61054b..968ff822 100644
--- a/android_app/app/src/main/res/values/strings.xml
+++ b/android_app/app/src/main/res/values/strings.xml
@@ -51,11 +51,13 @@
Name
Height
Gender
+ Male
+ Female
Activity Level
Birth Date
Please enter valid data
%.1f cm
- Age: %1$d, Height: %2$s
+ Age: %1$d, Gender: %2$s
Edit user
Delete user
Add new user