diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts
index c17db16..13b9e12 100644
--- a/composeApp/build.gradle.kts
+++ b/composeApp/build.gradle.kts
@@ -146,6 +146,12 @@ compose.desktop {
packageVersion = "1.0.0"
modules("java.base", "java.desktop", "jdk.unsupported", "java.naming")
+ windows {
+ iconFile.set(project.file("icons/icon.ico"))
+ }
+ linux {
+ iconFile.set(project.file("icons/icon-linux.png"))
+ }
buildTypes.release.proguard {
isEnabled.set(false)
}
diff --git a/composeApp/icons/icon-linux.png b/composeApp/icons/icon-linux.png
new file mode 100644
index 0000000..76461a1
Binary files /dev/null and b/composeApp/icons/icon-linux.png differ
diff --git a/composeApp/icons/icon.ico b/composeApp/icons/icon.ico
new file mode 100644
index 0000000..abe9d5e
Binary files /dev/null and b/composeApp/icons/icon.ico differ
diff --git a/composeApp/src/androidMain/ic_launcher-playstore.png b/composeApp/src/androidMain/ic_launcher-playstore.png
new file mode 100644
index 0000000..8519886
Binary files /dev/null and b/composeApp/src/androidMain/ic_launcher-playstore.png differ
diff --git a/composeApp/src/androidMain/res/drawable-v24/ic_launcher_foreground.xml b/composeApp/src/androidMain/res/drawable-v24/ic_launcher_foreground.xml
deleted file mode 100644
index 2b068d1..0000000
--- a/composeApp/src/androidMain/res/drawable-v24/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/composeApp/src/androidMain/res/drawable/ic_launcher_foreground.xml b/composeApp/src/androidMain/res/drawable/ic_launcher_foreground.xml
new file mode 100644
index 0000000..26b8957
--- /dev/null
+++ b/composeApp/src/androidMain/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
diff --git a/composeApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher.xml b/composeApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher.xml
index eca70cf..6f2acb4 100644
--- a/composeApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/composeApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
-
-
+
+
\ No newline at end of file
diff --git a/composeApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher_round.xml b/composeApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher_round.xml
index eca70cf..6f2acb4 100644
--- a/composeApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/composeApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
-
-
+
+
\ No newline at end of file
diff --git a/composeApp/src/androidMain/res/mipmap-hdpi/ic_launcher.png b/composeApp/src/androidMain/res/mipmap-hdpi/ic_launcher.png
index a571e60..7c58d15 100644
Binary files a/composeApp/src/androidMain/res/mipmap-hdpi/ic_launcher.png and b/composeApp/src/androidMain/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/composeApp/src/androidMain/res/mipmap-hdpi/ic_launcher_background.png b/composeApp/src/androidMain/res/mipmap-hdpi/ic_launcher_background.png
new file mode 100644
index 0000000..cce0ead
Binary files /dev/null and b/composeApp/src/androidMain/res/mipmap-hdpi/ic_launcher_background.png differ
diff --git a/composeApp/src/androidMain/res/mipmap-hdpi/ic_launcher_round.png b/composeApp/src/androidMain/res/mipmap-hdpi/ic_launcher_round.png
index 61da551..dc5f377 100644
Binary files a/composeApp/src/androidMain/res/mipmap-hdpi/ic_launcher_round.png and b/composeApp/src/androidMain/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/composeApp/src/androidMain/res/mipmap-mdpi/ic_launcher.png b/composeApp/src/androidMain/res/mipmap-mdpi/ic_launcher.png
index c41dd28..2456d5a 100644
Binary files a/composeApp/src/androidMain/res/mipmap-mdpi/ic_launcher.png and b/composeApp/src/androidMain/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/composeApp/src/androidMain/res/mipmap-mdpi/ic_launcher_background.png b/composeApp/src/androidMain/res/mipmap-mdpi/ic_launcher_background.png
new file mode 100644
index 0000000..39bda3c
Binary files /dev/null and b/composeApp/src/androidMain/res/mipmap-mdpi/ic_launcher_background.png differ
diff --git a/composeApp/src/androidMain/res/mipmap-mdpi/ic_launcher_round.png b/composeApp/src/androidMain/res/mipmap-mdpi/ic_launcher_round.png
index db5080a..f6495ce 100644
Binary files a/composeApp/src/androidMain/res/mipmap-mdpi/ic_launcher_round.png and b/composeApp/src/androidMain/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/composeApp/src/androidMain/res/mipmap-xhdpi/ic_launcher.png b/composeApp/src/androidMain/res/mipmap-xhdpi/ic_launcher.png
index 6dba46d..9f97232 100644
Binary files a/composeApp/src/androidMain/res/mipmap-xhdpi/ic_launcher.png and b/composeApp/src/androidMain/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/composeApp/src/androidMain/res/mipmap-xhdpi/ic_launcher_background.png b/composeApp/src/androidMain/res/mipmap-xhdpi/ic_launcher_background.png
new file mode 100644
index 0000000..89a0fb5
Binary files /dev/null and b/composeApp/src/androidMain/res/mipmap-xhdpi/ic_launcher_background.png differ
diff --git a/composeApp/src/androidMain/res/mipmap-xhdpi/ic_launcher_round.png b/composeApp/src/androidMain/res/mipmap-xhdpi/ic_launcher_round.png
index da31a87..b7a2227 100644
Binary files a/composeApp/src/androidMain/res/mipmap-xhdpi/ic_launcher_round.png and b/composeApp/src/androidMain/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/composeApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher.png b/composeApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher.png
index 15ac681..8a8b1a2 100644
Binary files a/composeApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher.png and b/composeApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/composeApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher_background.png b/composeApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher_background.png
new file mode 100644
index 0000000..4a72d13
Binary files /dev/null and b/composeApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher_background.png differ
diff --git a/composeApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher_round.png b/composeApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher_round.png
index b216f2d..400422d 100644
Binary files a/composeApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher_round.png and b/composeApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/composeApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher.png b/composeApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher.png
index f25a419..a676a36 100644
Binary files a/composeApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher.png and b/composeApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/composeApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher_background.png b/composeApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher_background.png
new file mode 100644
index 0000000..37c1b75
Binary files /dev/null and b/composeApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher_background.png differ
diff --git a/composeApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher_round.png b/composeApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher_round.png
index e96783c..7b0bdc7 100644
Binary files a/composeApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher_round.png and b/composeApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/composeApp/src/commonMain/composeResources/drawable/icon.png b/composeApp/src/commonMain/composeResources/drawable/icon.png
new file mode 100644
index 0000000..2514cb0
Binary files /dev/null and b/composeApp/src/commonMain/composeResources/drawable/icon.png differ
diff --git a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/ui/QRDisplay.kt b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/ui/QRDisplay.kt
index 14607da..06ae2cd 100644
--- a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/ui/QRDisplay.kt
+++ b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/ui/QRDisplay.kt
@@ -29,6 +29,7 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import feufaro.composeapp.generated.resources.Res
import feufaro.composeapp.generated.resources.compose_multiplatform
+import feufaro.composeapp.generated.resources.icon
import mg.dot.feufaro.FileRepository
import mg.dot.feufaro.MGButton
import mg.dot.feufaro.solfa.ColorPrefixA
@@ -136,7 +137,7 @@ fun QRDisplay(sharedScreenModel: SharedScreenModel, fileRepository: FileReposito
contentAlignment = Alignment.Center
) {
Image(
- painter = painterResource(Res.drawable.compose_multiplatform),
+ painter = painterResource(Res.drawable.icon),
contentDescription = "App Logo",
modifier = Modifier
.fillMaxSize()
diff --git a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/ui/SimpleDrawerContent.kt b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/ui/SimpleDrawerContent.kt
index 4ad72e8..0421814 100644
--- a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/ui/SimpleDrawerContent.kt
+++ b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/ui/SimpleDrawerContent.kt
@@ -2,6 +2,7 @@ package mg.dot.feufaro.ui
import SharedScreenModel
import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.clickable
@@ -30,12 +31,15 @@ import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
+import feufaro.composeapp.generated.resources.Res
+import feufaro.composeapp.generated.resources.icon
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.launch
import mg.dot.feufaro.data.DrawerItem
import mg.dot.feufaro.getPlatform
import mg.dot.feufaro.solfa.Solfa
import mg.dot.feufaro.viewmodel.SolfaScreenModel
+import org.jetbrains.compose.resources.painterResource
@OptIn(ExperimentalMaterial3Api::class)
@Composable
@@ -325,14 +329,14 @@ fun SimpleDrawerContent(
) {
TooltipBox(
positionProvider = TooltipDefaults.rememberPlainTooltipPositionProvider(),
- tooltip = { PlainTooltip { Text("") } },
+ tooltip = { PlainTooltip { Text("Feufaro") } },
state = rememberTooltipState()
) {
- IconButton(onClick = {
- scope.launch { drawerState.close() }
- }) {
- Icon(Icons.Default.GraphicEq, contentDescription = null, tint = MaterialTheme.colorScheme.onSecondary)
- }
+ Image(
+ painter = painterResource(Res.drawable.icon),
+ contentDescription = null,
+ modifier = Modifier.size(45.dp)
+ )
}
TooltipBox(
diff --git a/composeApp/src/desktopMain/kotlin/mg/dot/feufaro/main.kt b/composeApp/src/desktopMain/kotlin/mg/dot/feufaro/main.kt
index 16fb10b..1999c50 100644
--- a/composeApp/src/desktopMain/kotlin/mg/dot/feufaro/main.kt
+++ b/composeApp/src/desktopMain/kotlin/mg/dot/feufaro/main.kt
@@ -3,24 +3,20 @@ package mg.dot.feufaro
import androidx.compose.runtime.DisposableEffect
import androidx.compose.runtime.remember
-import androidx.compose.ui.Alignment
import androidx.compose.ui.unit.DpSize
import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.Window
import androidx.compose.ui.window.WindowPosition
import androidx.compose.ui.window.application
import androidx.compose.ui.window.rememberWindowState
+import feufaro.composeapp.generated.resources.Res
+import feufaro.composeapp.generated.resources.icon
//import androidx.compose.ui.window.rememberWindowState
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
import mg.dot.feufaro.di.commonModule
-import mg.dot.feufaro.di.desktopModule
import mg.dot.feufaro.di.platformModule
+import org.jetbrains.compose.resources.painterResource
import org.koin.compose.KoinContext
import org.koin.core.context.GlobalContext.startKoin
-import org.koin.core.context.KoinContext
import org.koin.core.logger.Level
import mg.dot.feufaro.WindowState as MyWindowState
@@ -48,6 +44,7 @@ fun main() = application {
exitApplication();
},
title = "Feufaro",
+ icon = painterResource(Res.drawable.icon)
) {
KoinContext {
App()