diff --git a/commonUI/src/commonMain/composeResources/values-de/strings.xml b/commonUI/src/commonMain/composeResources/values-de/strings.xml
new file mode 100644
index 0000000..734b043
--- /dev/null
+++ b/commonUI/src/commonMain/composeResources/values-de/strings.xml
@@ -0,0 +1,89 @@
+
+ NERä
+ Noch so ein Einstein Rätsel
+ Gratulation!
+ Du hast das Rätsel in %1$s gelöst
+ Von Anfang beginnen
+ Heller Modus
+ Dunkler Modus
+ Fenster minimieren
+ Fenster maximieren
+ Fenster schließen
+
+
+ %1$s ist neben %2$s
+ %1$s ist links von %2$s
+ %2$s ist zwischen den Nachbarn %1$s und %3$s auf beiden Seiten
+ %1$s und %2$s sind in der gleichen Spalte
+ %1$s auf Position %2$i
+
+
+ Zebra
+ Oktopus
+ Ziege
+ Faultier
+ Hund
+ Schnecke
+ Ameise
+
+
+ Eis
+ Donut
+ Keks
+ Torte
+ Cupcake
+ Kuchen
+ Schokolade
+ Lollipop
+ Vanillepudding
+
+
+ Milch
+ Wein
+ Cocktail
+ Kaffee
+ Tee
+ Bier
+ Süssgetränk
+
+
+ Banane
+ Kirsche
+ Trauben
+ Kiwi
+ Zitrone
+ Mango
+ Birne
+ Ananas
+ Erdbeere
+ Wassermelone
+
+
+ Kanada
+ Japan
+ Norwegen
+ Spanien
+ Schweden
+ Schweiz
+ Großbritannien
+ Ukraine
+
+
+ Astronauty
+ Pflegy
+ Bauy
+ Rock Star
+ Wissenschaftly
+ Softwareentwickly
+ Feuerwehrperson
+ Lehry
+
+
+ Fahrrad
+ Roller
+ Rollbrett
+ Taxi
+ Lok
+ Tram
+ Bus
+
\ No newline at end of file
diff --git a/commonUI/src/commonMain/composeResources/values/strings.xml b/commonUI/src/commonMain/composeResources/values/strings.xml
index f0c52d8..927963e 100644
--- a/commonUI/src/commonMain/composeResources/values/strings.xml
+++ b/commonUI/src/commonMain/composeResources/values/strings.xml
@@ -4,6 +4,18 @@
Congratulations!
You solved the puzzle in %1$s
Restart
+ Use light mode
+ Use dark mode
+ Minimize window
+ Maximize window
+ Close window
+
+
+ %1$s is next to %2$s
+ %1$s is left of %2$s
+ %2$s is between the neighbours %1$s and %3$s to both sides
+ %1$s and %2$s are in the same column
+ %1$s at position %2$i
Zebra
@@ -50,19 +62,19 @@
Canadian
Japanese
Norwegian
- Spanish
- Swedish
+ Spaniard
+ Swede
Swiss
British
Ukrainian
Astronaut
- Health_worker
+ Health Worker
Farmer
- Rock_star
+ Rock Star
Scientist
- Software_dev
+ Software Developer
Firefighter
Teacher
diff --git a/desktop/src/main/kotlin/ch/dissem/yaep/ui/desktop/desktop window.kt b/desktop/src/main/kotlin/ch/dissem/yaep/ui/desktop/desktop window.kt
index 4125aac..fac2c93 100644
--- a/desktop/src/main/kotlin/ch/dissem/yaep/ui/desktop/desktop window.kt
+++ b/desktop/src/main/kotlin/ch/dissem/yaep/ui/desktop/desktop window.kt
@@ -16,18 +16,12 @@ import androidx.compose.material3.SwitchDefaults
import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBar
import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.scale
import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.WindowPlacement
import androidx.compose.ui.window.WindowScope
import androidx.compose.ui.window.WindowState
-import ch.dissem.yaep.domain.Game
import ch.dissem.yaep.ui.common.theme.AppTheme
import org.jetbrains.compose.resources.painterResource
import org.jetbrains.compose.resources.stringResource
@@ -36,6 +30,8 @@ import yaep.commonui.generated.resources.app_name_full
import yaep.commonui.generated.resources.moon
import yaep.commonui.generated.resources.restart
import yaep.commonui.generated.resources.sun
+import yaep.commonui.generated.resources.use_dark_mode
+import yaep.commonui.generated.resources.use_light_mode
import yaep.commonui.generated.resources.window_close
import yaep.commonui.generated.resources.window_maximize
import yaep.commonui.generated.resources.window_minimize
@@ -70,15 +66,7 @@ fun AppBar(
onCloseRequest: () -> Unit,
onRestart: () -> Unit,
windowState: WindowState,
- game: Game,
) {
- var gameSolved by remember { mutableStateOf(false) }
- LaunchedEffect(game) {
- game.onSolved {
- gameSolved = true
- }
- }
-
TopAppBar(
navigationIcon = {
Image(
@@ -111,7 +99,13 @@ fun AppBar(
CRes.drawable.moon
}
),
- contentDescription = null,
+ contentDescription = stringResource(
+ if (useDarkMode) {
+ CRes.string.use_light_mode
+ } else {
+ CRes.string.use_dark_mode
+ }
+ ),
modifier = Modifier.size(SwitchDefaults.IconSize),
)
}
@@ -122,12 +116,11 @@ fun AppBar(
) {
Icon(
painter = painterResource(CRes.drawable.window_minimize),
- contentDescription = null,
+ contentDescription = stringResource(CRes.string.window_minimize),
modifier = Modifier.size(SwitchDefaults.IconSize),
)
}
IconButton(
- enabled = !gameSolved,
onClick = {
windowState.placement =
if (windowState.placement == WindowPlacement.Maximized)
@@ -136,7 +129,7 @@ fun AppBar(
) {
Icon(
painter = painterResource(CRes.drawable.window_maximize),
- contentDescription = null,
+ contentDescription = stringResource(CRes.string.window_maximize),
modifier = Modifier.size(SwitchDefaults.IconSize),
)
}
@@ -145,7 +138,7 @@ fun AppBar(
) {
Icon(
painter = painterResource(CRes.drawable.window_close),
- contentDescription = null,
+ contentDescription = stringResource(CRes.string.window_close),
modifier = Modifier.size(SwitchDefaults.IconSize),
)
}
diff --git a/desktop/src/main/kotlin/ch/dissem/yaep/ui/desktop/main.kt b/desktop/src/main/kotlin/ch/dissem/yaep/ui/desktop/main.kt
index 16aa1e3..8868d99 100644
--- a/desktop/src/main/kotlin/ch/dissem/yaep/ui/desktop/main.kt
+++ b/desktop/src/main/kotlin/ch/dissem/yaep/ui/desktop/main.kt
@@ -62,7 +62,6 @@ fun main() = application {
resetCluesBeacon = Any()
},
windowState = windowState,
- game = game,
)
}
) {