feat: GUI Overhaul

.github/workflows/build_pull_request.yml

@@ -14,12 +14,19 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
+
     steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
       - name: Cache Gradle
         uses: burrunan/gradle-cache-action@v1
 
@@ -35,4 +42,3 @@ jobs:
         with:
           archive: false
           path: build/libs/morphe-cli-*-all.jar
-

.gitignore

@@ -4,6 +4,7 @@ build/
 
 # Local configuration file (sdk path, etc)
 local.properties
+old_build.gradle.kts
 
 # Log/OS Files
 *.log

build.gradle.kts

@@ -19,7 +19,7 @@ group = "app.morphe"
 kotlin {
     jvmToolchain {
         languageVersion.set(JavaLanguageVersion.of(17))
-        vendor.set(JvmVendorSpec.ADOPTIUM)
+        vendor.set(JvmVendorSpec.JETBRAINS)
     }
     compilerOptions {
         jvmTarget.set(JvmTarget.JVM_17)
@@ -100,6 +100,10 @@ dependencies {
     implementation(libs.voyager.koin)
     implementation(libs.voyager.transitions)
 
+    // -- JNA (Windows DWM title bar tinting) -------------------------------
+    implementation(libs.jna)
+    implementation(libs.jna.platform)
+
     // -- APK Parsing (GUI) -------------------------------------------------
     implementation(libs.apk.parser)
 
@@ -154,6 +158,8 @@ tasks {
             exclude(dependency("io.insert-koin:.*"))
             // Coroutines Swing provides Dispatchers.Main via ServiceLoader
             exclude(dependency("org.jetbrains.kotlinx:kotlinx-coroutines-swing"))
+            // JNA uses reflection + native loading for DWM title bar tinting
+            exclude(dependency("net.java.dev.jna:.*"))
         }
 
         mergeServiceFiles()

gradle/libs.versions.toml

@@ -26,6 +26,9 @@ voyager = "1.1.0-beta03"
 coroutines = "1.10.2"
 kotlinx-serialization = "1.9.0"
 
+# JNA (Windows DWM title bar tinting)
+jna = "5.14.0"
+
 # APK
 apk-parser = "2.6.10"
 
@@ -65,6 +68,10 @@ kotlinx-coroutines-swing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-
 # Serialization
 kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
 
+# JNA (Windows DWM title bar tinting)
+jna = { module = "net.java.dev.jna:jna", version.ref = "jna" }
+jna-platform = { module = "net.java.dev.jna:jna-platform", version.ref = "jna" }
+
 # APK
 apk-parser = { module = "net.dongliu:apk-parser", version.ref = "apk-parser" }
 

settings.gradle.kts

@@ -1,9 +1,9 @@
 pluginManagement {
     repositories {
+        gradlePluginPortal()
         maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
         google()
         mavenCentral()
-        gradlePluginPortal()
     }
 }
 

src/main/kotlin/app/morphe/cli/command/PatchCommand.kt

@@ -22,6 +22,7 @@ import app.morphe.cli.command.model.withUpdatedBundle
 import app.morphe.engine.PatchEngine
 import app.morphe.engine.PatchEngine.Config.Companion.DEFAULT_KEYSTORE_ALIAS
 import app.morphe.engine.PatchEngine.Config.Companion.DEFAULT_KEYSTORE_PASSWORD
+import app.morphe.engine.PatchEngine.Config.Companion.DEFAULT_SIGNER_NAME
 import app.morphe.engine.PatchEngine.Config.Companion.LEGACY_KEYSTORE_ALIAS
 import app.morphe.engine.PatchEngine.Config.Companion.LEGACY_KEYSTORE_PASSWORD
 import app.morphe.engine.UpdateChecker
@@ -219,7 +220,7 @@ internal object PatchCommand : Callable<Int> {
         description = ["The name of the signer to sign the patched APK file with."],
         showDefaultValue = ALWAYS,
     )
-    private var signer = "Morphe"
+    private var signer = DEFAULT_SIGNER_NAME
 
     @CommandLine.Option(
         names = ["-t", "--temporary-files-path"],

src/main/kotlin/app/morphe/engine/PatchEngine.kt

@@ -50,7 +50,7 @@ object PatchEngine {
         val forceCompatibility: Boolean = false,
         val patchOptions: Map<String, Map<String, Any?>> = emptyMap(),
         val unsigned: Boolean = false,
-        val signerName: String = "Morphe",
+        val signerName: String = DEFAULT_SIGNER_NAME,
         val keystoreDetails: ApkUtils.KeyStoreDetails? = null,
         val architecturesToKeep: Set<CpuArchitecture> = emptySet(),
         val aaptBinaryPath: File? = null,
@@ -60,6 +60,7 @@ object PatchEngine {
         companion object {
             internal const val DEFAULT_KEYSTORE_ALIAS = "Morphe"
             internal const val DEFAULT_KEYSTORE_PASSWORD = "Morphe"
+            internal const val DEFAULT_SIGNER_NAME = "Morphe"
             internal const val LEGACY_KEYSTORE_ALIAS = "Morphe Key"
             internal const val LEGACY_KEYSTORE_PASSWORD = ""
         }
@@ -222,7 +223,19 @@ object PatchEngine {
                 // 7. Sign APK (unless unsigned)
                 val tempOutput = File(tempDir, config.outputApk.name)
                 if (!config.unsigned) {
-                    onProgress("Signing APK...")
+                    val keystoreDetails = config.keystoreDetails ?: ApkUtils.KeyStoreDetails(
+                        File(tempDir, "morphe.keystore"),
+                        null,
+                        Config.DEFAULT_KEYSTORE_ALIAS,
+                        Config.DEFAULT_KEYSTORE_PASSWORD,
+                    )
+
+                    if (config.keystoreDetails != null) {
+                        onProgress("Signing APK with custom keystore: ${keystoreDetails.keyStore.name}")
+                    } else {
+                        onProgress("Signing APK...")
+                    }
+
                     try {
                         fun signApk(details: ApkUtils.KeyStoreDetails) {
                             ApkUtils.signApk(
@@ -233,16 +246,9 @@ object PatchEngine {
                             )
                         }
 
-                        val keystoreDetails = config.keystoreDetails ?: ApkUtils.KeyStoreDetails(
-                            File(tempDir, "morphe.keystore"),
-                            null,
-                            Config.DEFAULT_KEYSTORE_ALIAS,
-                            Config.DEFAULT_KEYSTORE_PASSWORD,
-                        )
-
                         try {
                             signApk(keystoreDetails)
-                        } catch (e: Exception){
+                        } catch (e: Exception) {
                             // Retry with legacy keystore defaults.
                             if (config.keystoreDetails == null && keystoreDetails.keyStore.exists()) {
                                 logger.info("Using legacy keystore credentials")

src/main/kotlin/app/morphe/gui/App.kt

@@ -6,22 +6,32 @@
 package app.morphe.gui
 
 import androidx.compose.animation.Crossfade
-import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.window.WindowDraggableArea
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clipToBounds
+import androidx.compose.ui.unit.dp
+import app.morphe.gui.ui.components.LocalFrameWindowScope
+import app.morphe.gui.ui.components.LottieAnimation
+import app.morphe.gui.ui.components.SakuraPetals
+import app.morphe.gui.util.applyTitleBarTint
 import cafe.adriel.voyager.navigator.Navigator
 import cafe.adriel.voyager.transitions.SlideTransition
 import app.morphe.gui.data.repository.ConfigRepository
-import app.morphe.gui.data.repository.PatchRepository
-import app.morphe.gui.util.PatchService
+import app.morphe.gui.data.repository.PatchSourceManager
 import app.morphe.gui.di.appModule
 import kotlinx.coroutines.launch
 import org.koin.compose.KoinApplication
 import org.koin.compose.koinInject
 import app.morphe.gui.ui.screens.home.HomeScreen
 import app.morphe.gui.ui.screens.quick.QuickPatchContent
 import app.morphe.gui.ui.screens.quick.QuickPatchViewModel
+import app.morphe.gui.util.PatchService
 import app.morphe.gui.ui.theme.LocalThemeState
 import app.morphe.gui.ui.theme.MorpheTheme
 import app.morphe.gui.ui.theme.ThemePreference
@@ -42,31 +52,35 @@ val LocalModeState = staticCompositionLocalOf<ModeState> {
 }
 
 @Composable
-fun App(initialSimplifiedMode: Boolean = true) {
+fun App(
+    initialSimplifiedMode: Boolean = true
+) {
     LaunchedEffect(Unit) {
         Logger.init()
     }
 
     KoinApplication(application = {
         modules(appModule)
     }) {
-        AppContent(initialSimplifiedMode)
+        AppContent(initialSimplifiedMode = initialSimplifiedMode)
     }
 }
 
 @Composable
-private fun AppContent(initialSimplifiedMode: Boolean) {
+private fun AppContent(
+    initialSimplifiedMode: Boolean
+) {
     val configRepository: ConfigRepository = koinInject()
-    val patchRepository: PatchRepository = koinInject()
-    val patchService: PatchService = koinInject()
+    val patchSourceManager: PatchSourceManager = koinInject()
     val scope = rememberCoroutineScope()
 
     var themePreference by remember { mutableStateOf(ThemePreference.SYSTEM) }
     var isSimplifiedMode by remember { mutableStateOf(initialSimplifiedMode) }
     var isLoading by remember { mutableStateOf(true) }
 
-    // Load config on startup
+    // Initialize PatchSourceManager and load config on startup
     LaunchedEffect(Unit) {
+        patchSourceManager.initialize()
         val config = configRepository.loadConfig()
         themePreference = config.getThemePreference()
         isSimplifiedMode = config.useSimplifiedMode
@@ -114,25 +128,97 @@ private fun AppContent(initialSimplifiedMode: Boolean) {
             LocalThemeState provides themeState,
             LocalModeState provides modeState
         ) {
+            // Tint the OS title bar (Windows DWM caption color, macOS traffic
+            // light contrast) to match the active theme's surface color.
+            val titleBarColor = MaterialTheme.colorScheme.surface
+            val frameScope = LocalFrameWindowScope.current
+            LaunchedEffect(titleBarColor, frameScope) {
+                frameScope?.window?.let { applyTitleBarTint(it, titleBarColor) }
+            }
+
+            // macOS only: render a 28dp colored band at the very top of the
+            // window, sitting underneath the (now-transparent) OS title bar.
+            // The traffic lights overlay this band at their default position.
+            // Wrapped in WindowDraggableArea so the band acts as a drag region.
+            val isMac = remember {
+                System.getProperty("os.name")?.lowercase()?.contains("mac") == true
+            }
+
             Surface(modifier = Modifier.fillMaxSize()) {
-                if (!isLoading) {
-                    // Create QuickPatchViewModel outside Crossfade so it persists across mode switches.
-                    // Otherwise every expert→simplified switch creates a new VM that re-fetches from GitHub.
-                    val quickViewModel = remember {
-                        QuickPatchViewModel(patchRepository, patchService, configRepository)
+                Column(modifier = Modifier.fillMaxSize()) {
+                    if (isMac && frameScope != null) {
+                        with(frameScope) {
+                            WindowDraggableArea {
+                                Box(
+                                    modifier = Modifier
+                                        .fillMaxWidth()
+                                        .height(16.dp)
+                                        .background(titleBarColor)
+                                )
+                            }
+                        }
                     }
 
-                    Crossfade(targetState = isSimplifiedMode) { simplified ->
-                        if (simplified) {
-                            // Quick/Simplified mode
-                            QuickPatchContent(quickViewModel)
-                        } else {
-                            // Full mode
-                            Navigator(HomeScreen()) { navigator ->
-                                SlideTransition(navigator)
+                    Box(modifier = Modifier.fillMaxWidth().weight(1f)) {
+                        if (!isLoading) {
+                        val patchService: PatchService = koinInject()
+                        val quickViewModel = remember {
+                            QuickPatchViewModel(patchSourceManager, patchService, configRepository)
+                        }
+
+                        Crossfade(targetState = isSimplifiedMode) { simplified ->
+                            if (simplified) {
+                                QuickPatchContent(quickViewModel)
+                            } else {
+                                Navigator(HomeScreen()) { navigator ->
+                                    SlideTransition(navigator)
+                                }
+                            }
+                        }
+                    }
+
+                    // Falling petals — on top of everything (Sakura)
+                    SakuraPetals(
+                        enabled = themePreference == ThemePreference.SAKURA
+                    )
+
+                    // Matcha cat — top-right corner
+                    if (themePreference == ThemePreference.MATCHA) {
+                        val catJson = remember {
+                            try {
+                                object {}.javaClass.getResourceAsStream("/cat2333s.json")
+                                    ?.bufferedReader()?.readText()
+                            } catch (e: Exception) {
+                                null
+                            }
+                        }
+                        catJson?.let { json ->
+                            // 1080px canvas, rendered at 350dp (1dp ≈ 3.086 canvas px).
+                            // Ears ~y385 → 125dp, bar bottom ~y576 → 187dp.
+                            // Body shrunk to 85% so it hides behind bar.
+                            // Clip from 120dp to 192dp (72dp visible) — ears to just past bar.
+                            val renderSize = 350.dp
+                            val clipTop = 120.dp   // just above ears
+                            val clipHeight = 72.dp  // ears → just past bar bottom
+                            Box(
+                                modifier = Modifier
+                                    .align(Alignment.TopEnd)
+                                    .padding(top = 24.dp, end = 16.dp)
+                                    .requiredWidth(renderSize)
+                                    .requiredHeight(clipHeight)
+                                    .clipToBounds()
+                            ) {
+                                LottieAnimation(
+                                    jsonString = json,
+                                    modifier = Modifier
+                                        .requiredSize(renderSize)
+                                        .offset(y = -clipTop),
+                                    alpha = 0.28f
+                                )
                             }
                         }
                     }
+                    }
                 }
             }
         }