Add app icon for Android, Windows, Linux; on Drawer & Qr

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)
             }

composeApp/src/androidMain/res/drawable-v24/ic_launcher_foreground.xml

@@ -1,30 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="85.84757"
-                android:endY="92.4963"
-                android:startX="42.9492"
-                android:startY="49.59793"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000" />
-</vector>

composeApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
+    <background android:drawable="@mipmap/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>

composeApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
+    <background android:drawable="@mipmap/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>

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()

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 = {
+                    Image(
-                        scope.launch { drawerState.close() }
+                        painter = painterResource(Res.drawable.icon),
-                    }) {
+                        contentDescription = null,
-                        Icon(Icons.Default.GraphicEq, contentDescription = null, tint = MaterialTheme.colorScheme.onSecondary)
+                        modifier = Modifier.size(45.dp)
-                    }
+                    )
                 }
 
                 TooltipBox(

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()