diff --git a/app/androidApp/src/main/AndroidManifest.xml b/app/androidApp/src/main/AndroidManifest.xml index 9d7b3fc..3fb0692 100644 --- a/app/androidApp/src/main/AndroidManifest.xml +++ b/app/androidApp/src/main/AndroidManifest.xml @@ -11,6 +11,8 @@ diff --git a/app/androidApp/src/main/res/drawable/ic_launcher_background.xml b/app/androidApp/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..14b6294 --- /dev/null +++ b/app/androidApp/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/androidApp/src/main/res/drawable/ic_launcher_foreground.xml b/app/androidApp/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..7967312 --- /dev/null +++ b/app/androidApp/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/androidApp/src/main/res/drawable/ic_launcher_monochrome.xml b/app/androidApp/src/main/res/drawable/ic_launcher_monochrome.xml new file mode 100644 index 0000000..1279fa1 --- /dev/null +++ b/app/androidApp/src/main/res/drawable/ic_launcher_monochrome.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/androidApp/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/androidApp/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/androidApp/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/androidApp/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/androidApp/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/androidApp/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/androidApp/src/main/res/mipmap-anydpi-v33/ic_launcher.xml b/app/androidApp/src/main/res/mipmap-anydpi-v33/ic_launcher.xml new file mode 100644 index 0000000..b070c76 --- /dev/null +++ b/app/androidApp/src/main/res/mipmap-anydpi-v33/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/androidApp/src/main/res/mipmap-anydpi-v33/ic_launcher_round.xml b/app/androidApp/src/main/res/mipmap-anydpi-v33/ic_launcher_round.xml new file mode 100644 index 0000000..b070c76 --- /dev/null +++ b/app/androidApp/src/main/res/mipmap-anydpi-v33/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/desktopApp/build.gradle.kts b/app/desktopApp/build.gradle.kts index 5109032..8fef8bf 100644 --- a/app/desktopApp/build.gradle.kts +++ b/app/desktopApp/build.gradle.kts @@ -75,6 +75,7 @@ tasks.register("jpackage") { "--input", inputDir.absolutePath, "--main-jar", "desktopApp-all.jar", "--main-class", "iris.desktop.MainKt", + "--icon", file("src/main/resources/icon.png").absolutePath, "--dest", destDir.absolutePath, "--java-options", "-Xmx1g", ) diff --git a/app/desktopApp/src/main/kotlin/iris/desktop/Main.kt b/app/desktopApp/src/main/kotlin/iris/desktop/Main.kt index 48837f8..b4f04b1 100644 --- a/app/desktopApp/src/main/kotlin/iris/desktop/Main.kt +++ b/app/desktopApp/src/main/kotlin/iris/desktop/Main.kt @@ -21,6 +21,7 @@ import iris.platform.DesktopBridge import iris.platform.DesktopSecureStore import java.awt.Color import java.awt.Graphics2D +import javax.imageio.ImageIO import java.awt.RenderingHints import java.awt.SystemTray import java.awt.event.WindowEvent @@ -45,6 +46,10 @@ import kotlinx.serialization.json.jsonPrimitive */ private val windowJson = File(System.getProperty("user.home"), ".iris/window.json") +// Window/taskbar icon (src/main/resources/icon.png). +private class IrisDesktop +private val windowIcon = ImageIO.read(IrisDesktop::class.java.getResource("/icon.png")!!).toComposeImageBitmap() + // Tray icon colors (ARGB). .toInt(): the literals exceed the Int range. private const val TRAY_OFFLINE = 0xFF9E9E9E.toInt() private const val TRAY_CONNECTING = 0xFFFFC107.toInt() @@ -107,6 +112,7 @@ fun main() { } Window( + icon = BitmapPainter(windowIcon), onCloseRequest = { if (closeToTray.get()) { composeWindow?.isVisible = false diff --git a/app/desktopApp/src/main/resources/icon.png b/app/desktopApp/src/main/resources/icon.png new file mode 100644 index 0000000..c8f9ac9 Binary files /dev/null and b/app/desktopApp/src/main/resources/icon.png differ diff --git a/app/icons/concepts/1-winged-bubble.png b/app/icons/concepts/1-winged-bubble.png new file mode 100644 index 0000000..a43f1c1 Binary files /dev/null and b/app/icons/concepts/1-winged-bubble.png differ diff --git a/app/icons/concepts/1-winged-bubble.svg b/app/icons/concepts/1-winged-bubble.svg new file mode 100644 index 0000000..80d9537 --- /dev/null +++ b/app/icons/concepts/1-winged-bubble.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/icons/concepts/2-iris-eye.png b/app/icons/concepts/2-iris-eye.png new file mode 100644 index 0000000..0a2ae44 Binary files /dev/null and b/app/icons/concepts/2-iris-eye.png differ diff --git a/app/icons/concepts/2-iris-eye.svg b/app/icons/concepts/2-iris-eye.svg new file mode 100644 index 0000000..0239ea9 --- /dev/null +++ b/app/icons/concepts/2-iris-eye.svg @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/icons/concepts/3-swift-plane.png b/app/icons/concepts/3-swift-plane.png new file mode 100644 index 0000000..6d57dda Binary files /dev/null and b/app/icons/concepts/3-swift-plane.png differ diff --git a/app/icons/concepts/3-swift-plane.svg b/app/icons/concepts/3-swift-plane.svg new file mode 100644 index 0000000..8ff6105 --- /dev/null +++ b/app/icons/concepts/3-swift-plane.svg @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/icons/concepts/preview-all.png b/app/icons/concepts/preview-all.png new file mode 100644 index 0000000..61184c5 Binary files /dev/null and b/app/icons/concepts/preview-all.png differ diff --git a/app/icons/ic_launcher_fullbleed.svg b/app/icons/ic_launcher_fullbleed.svg new file mode 100644 index 0000000..2737caf --- /dev/null +++ b/app/icons/ic_launcher_fullbleed.svg @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file