feat: add app icon

budchirp · Feb 4, 2025 · 62b1939 · 62b1939
1 parent d373d74
commit 62b1939
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 17 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
-      - name: Build Linux package
+      - name: Build Linux deb
         run: ./gradlew packageDeb
 
       - name: Build Linux jar
@@ -54,24 +54,15 @@ jobs:
           distribution: 'zulu'
           java-version: '21'
 
-      - name: Build Windows package
+      - name: Build Windows exe
         run: .\gradlew.bat packageExe
 
-      - name: Build Windows jar
-        run: ./gradlew packageUberJarForCurrentOS
-
       - name: Upload Windows exe artifact
         uses: actions/upload-artifact@v4
         with:
           name: windows-exe
           path: app/build/compose/binaries/main/exe/
 
-      - name: Upload Windows jar artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: windows-jar
-          path: app/build/compose/jars/
-
   build-macos:
     runs-on: macos-latest
     steps:

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -57,20 +57,22 @@ compose.desktop {
 
         nativeDistributions {
             targetFormats(TargetFormat.Dmg, TargetFormat.Deb, TargetFormat.Exe)
-            packageName = "me.budchirp.plak"
+            packageName = "plak"
             packageVersion = "1.0.0"
 
-//            val iconsRoot = project.file("desktop-icons")
+            val iconsRoot = project.file("icons")
             macOS {
-//                iconFile.set(iconsRoot.resolve("icon-mac.icns"))
+                iconFile.set(iconsRoot.resolve("icon-macos.icns"))
             }
+
             windows {
-//                iconFile.set(iconsRoot.resolve("icon-windows.ico"))
+                iconFile.set(iconsRoot.resolve("icon-windows.ico"))
                 menuGroup = "plak"
                 upgradeUuid = "297b565f-9f0d-40e6-9116-7ea95f71cac7"
             }
+
             linux {
-//                iconFile.set(iconsRoot.resolve("icon-linux.png"))
+                iconFile.set(iconsRoot.resolve("icon-linux.png"))
             }
         }
     }

diff --git a/app/icons/icon-linux.png b/app/icons/icon-linux.png
diff --git a/app/icons/icon-macos.icns b/app/icons/icon-macos.icns
diff --git a/app/icons/icon-windows.ico b/app/icons/icon-windows.ico
diff --git a/app/src/desktopMain/kotlin/me/budchirp/plak/ui/views/InstanceView.kt b/app/src/desktopMain/kotlin/me/budchirp/plak/ui/views/InstanceView.kt
@@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
@@ -59,7 +60,11 @@ fun InstanceView(slug: String? = null) {
     }
 
     if (instance == null) {
-        Column {
+        Row(
+            modifier = Modifier.fillMaxSize(),
+            horizontalArrangement = Arrangement.Center,
+            verticalAlignment = Alignment.CenterVertically
+        ) {
             Text(text = "No instance found")
         }
     }