diff --git a/android/src/main/ic_launcher-playstore.png b/android/src/main/ic_launcher-playstore.png index a224038..def4b7f 100644 Binary files a/android/src/main/ic_launcher-playstore.png and b/android/src/main/ic_launcher-playstore.png differ diff --git a/android/src/main/res/drawable/ic_launcher_foreground.xml b/android/src/main/res/drawable/ic_launcher_foreground.xml index 5b1b9f6..f523238 100644 --- a/android/src/main/res/drawable/ic_launcher_foreground.xml +++ b/android/src/main/res/drawable/ic_launcher_foreground.xml @@ -1,15 +1,59 @@ - + android:viewportWidth="128" + android:viewportHeight="128"> + + android:pathData="M48.37,30.91c0,0 -11.64,-10.14 -12.76,-11.26c-1.13,-1.13 -3.94,-3.19 -3.38,-4.69c0.56,-1.5 9.95,-5.26 16.52,-6.57s20.23,-3.38 32.43,2.25s22.01,13.14 30.64,27.03s10.91,33.24 11.45,43.92c0.56,11.23 -3.63,27.24 -3.63,27.24l-1.82,2.79L48.37,30.91z" + android:fillColor="#464C4F"/> + + + + + + + + + + + + + + + diff --git a/android/src/main/res/values/ic_launcher_background.xml b/android/src/main/res/values/ic_launcher_background.xml index 8fcb224..394f05e 100644 --- a/android/src/main/res/values/ic_launcher_background.xml +++ b/android/src/main/res/values/ic_launcher_background.xml @@ -1,4 +1,4 @@ - #165295 + #64BB8B \ No newline at end of file diff --git a/commonUI/src/commonMain/composeResources/values/strings.xml b/commonUI/src/commonMain/composeResources/values/strings.xml new file mode 100644 index 0000000..0f55b09 --- /dev/null +++ b/commonUI/src/commonMain/composeResources/values/strings.xml @@ -0,0 +1,4 @@ + + YAEP + Yet Another Einstein Puzzle + \ No newline at end of file diff --git a/desktop/src/main/composeResources/drawable/ic_launcher.svg b/desktop/src/main/composeResources/drawable/ic_launcher.svg new file mode 100644 index 0000000..cfe3871 --- /dev/null +++ b/desktop/src/main/composeResources/drawable/ic_launcher.svg @@ -0,0 +1,141 @@ + + + + + + + + + + + + + + + + + + + + + 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 488951a..63acdd5 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 @@ -19,7 +19,9 @@ import androidx.compose.ui.window.WindowScope import androidx.compose.ui.window.WindowState import ch.dissem.yaep.ui.common.theme.AppTheme import org.jetbrains.compose.resources.painterResource +import org.jetbrains.compose.resources.stringResource import yaep.commonui.generated.resources.Res +import yaep.commonui.generated.resources.app_name_full import yaep.commonui.generated.resources.lightbulb import yaep.commonui.generated.resources.moon import yaep.commonui.generated.resources.sun @@ -58,7 +60,7 @@ fun AppBar( navigationIcon = { Icon(painterResource(Res.drawable.lightbulb), null) }, - title = { Text(text = "Yet Another Einstein Puzzle") }, + title = { Text(text = stringResource(Res.string.app_name_full)) }, actions = { Switch( checked = useDarkMode, 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 ac23945..d0e63c9 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 @@ -17,8 +17,11 @@ import androidx.compose.ui.window.rememberWindowState import ch.dissem.yaep.ui.common.App import ch.dissem.yaep.ui.common.theme.emojiFontFamily import org.jetbrains.compose.resources.painterResource -import yaep.commonui.generated.resources.Res -import yaep.commonui.generated.resources.moon +import org.jetbrains.compose.resources.stringResource +import yaep.commonui.generated.resources.app_name +import yaep.desktop.generated.resources.ic_launcher +import yaep.commonui.generated.resources.Res as CRes +import yaep.desktop.generated.resources.Res as DRes fun main() = application { emojiFontFamily = FontFamily( @@ -36,9 +39,9 @@ fun main() = application { Window( onCloseRequest = ::exitApplication, undecorated = true, - title = "YAEP", + title = stringResource(CRes.string.app_name), state = windowState, - icon = painterResource(Res.drawable.moon) + icon = painterResource(DRes.drawable.ic_launcher) ) { var useDarkMode by remember { mutableStateOf(true) } DesktopWindow(