Add logo

MGP6775 · Feb 22, 2025 · 2aec51d · 2aec51d
1 parent 81e1417
commit 2aec51d
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 27 deletions.
diff --git a/client/build.gradle.kts b/client/build.gradle.kts
@@ -36,6 +36,7 @@ dependencies {
     implementation(compose.ui)
     implementation(compose.material3)
     implementation(compose.materialIconsExtended)
+    implementation(compose.components.resources)
     implementation(libs.compose.navigation)
     implementation(libs.androidx.lifecycle.viewmodel.compose)
 }
@@ -55,36 +56,43 @@ tasks {
     }
 }
 
-compose.desktop {
-    application {
-        mainClass = "dev.schlaubi.mastermind.LauncherKt"
-        jvmArgs("--enable-native-access=ALL-UNNAMED")
+compose {
+    resources {
+        packageOfResClass = "dev.schlaubi.mastermind.resources"
+        customDirectory("main", provider { layout.projectDirectory.dir("src/main/composeResources") })
+    }
+    desktop {
+        application {
+            mainClass = "dev.schlaubi.mastermind.LauncherKt"
+            jvmArgs("--enable-native-access=ALL-UNNAMED")
 
-        nativeDistributions {
-            modules(
-                "java.naming" // required by logback
-            )
-            targetFormats(TargetFormat.Msi)
+            nativeDistributions {
+                modules(
+                    "java.naming" // required by logback
+                )
+                targetFormats(TargetFormat.Msi)
 
-            appResourcesRootDir.set(layout.buildDirectory.dir("dll"))
+                appResourcesRootDir.set(layout.buildDirectory.dir("dll"))
 
-            licenseFile = rootProject.file("LICENSE")
-            vendor = "Schlaubi"
-            description = "GTA kill script"
-            copyright = "(c) 2025 Michael Rittmeister"
-            packageName = "GTA Killer"
+                licenseFile = rootProject.file("LICENSE")
+                vendor = "Schlaubi"
+                description = "GTA kill script"
+                copyright = "(c) 2025 Michael Rittmeister"
+                packageName = "GTA Killer"
 
-            windows {
-                menuGroup = "GTA Killer"
-                upgradeUuid = "8193b8f9-1355-4d0f-9c6f-6619d0f18604"
+                windows {
+                    iconFile = layout.projectDirectory.file("icons/icon.ico")
+                    menuGroup = "GTA Killer"
+                    upgradeUuid = "8193b8f9-1355-4d0f-9c6f-6619d0f18604"
+                }
             }
-        }
 
-        buildTypes {
-            release {
-                proguard {
-                    version = libs.versions.proguard
-                    configurationFiles.from(project.file("rules.pro"))
+            buildTypes {
+                release {
+                    proguard {
+                        version = libs.versions.proguard
+                        configurationFiles.from(project.file("rules.pro"))
+                    }
                 }
             }
         }

diff --git a/client/icons/icon.ico b/client/icons/icon.ico
diff --git a/client/src/main/composeResources/drawable/icon.jpg b/client/src/main/composeResources/drawable/icon.jpg
diff --git a/client/src/main/kotlin/Launcher.kt b/client/src/main/kotlin/Launcher.kt
@@ -10,14 +10,18 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.window.singleWindowApplication
+import androidx.compose.ui.window.Window
+import androidx.compose.ui.window.application
 import dev.schlaubi.mastermind.core.registerKeyBoardListener
+import dev.schlaubi.mastermind.resources.Res
+import dev.schlaubi.mastermind.resources.icon
 import dev.schlaubi.mastermind.theme.AppTheme
 import dev.schlaubi.mastermind.ui.GTAKiller
 import dev.schlaubi.mastermind.windows_helper.WindowsAPI
+import org.jetbrains.compose.resources.painterResource
 
-fun main() {
-    singleWindowApplication(title = "GTA Killer") {
+fun main() = application {
+    Window(title = "GTA Killer", icon = painterResource(Res.drawable.icon), onCloseRequest = ::exitApplication) {
         var loading by remember { mutableStateOf(true) }
         if (loading) {
             SideEffect {