Trae/solo agent 1z6 t4 s

.gitignore

@@ -31,3 +31,6 @@ FCL/src/main/java/com/mio/Main.kt
 .DS_Store
 /LWJGL-Pojav/bin
 LWJGL-Pojav/compileOnly/jspecify-1.0.0.jar
+
+# Isolated worktrees
+.worktrees/

FCL/build.gradle.kts

@@ -8,6 +8,7 @@ import java.util.Properties
 plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
+    id("org.jetbrains.kotlin.plugin.compose") version "2.3.20"
     id("org.jetbrains.kotlin.plugin.serialization") version "2.3.20"
 }
 
@@ -43,7 +44,8 @@ android {
 
     defaultConfig {
         applicationId = "com.tungsten.fcl"
-        minSdk = libs.versions.minSdk.get().toInt()
+        // 液态玻璃 UI 依赖 Backdrop 效果，需要 Android 12+ (API 31)
+        minSdk = 31
         targetSdk = libs.versions.targetSdk.get().toInt()
         versionCode = 1313
         versionName = "1.3.1.3"
@@ -84,8 +86,10 @@ android {
         viewBinding = true
         buildConfig = true
         resValues = true
+        compose = true
     }
 
+
     splits {
         val arch = System.getProperty("arch", "all")
         if (arch != "all") {
@@ -166,6 +170,14 @@ dependencies {
     implementation(libs.segmented.button)
     implementation(libs.datastore)
     implementation(libs.kotlinx.serialization.json)
+    implementation(platform(libs.compose.bom))
+    implementation(libs.compose.ui)
+    implementation(libs.compose.material3)
+    implementation(libs.compose.activity)
+    implementation(libs.compose.navigation)
+    implementation(libs.compose.ui.tooling)
+    implementation(libs.compose.ui.tooling.preview)
+    implementation(libs.backdrop)
 }
 
 tasks.register("updateMap") {

FCL/src/main/AndroidManifest.xml

@@ -47,11 +47,11 @@
         tools:ignore="DiscouragedApi"
         tools:targetApi="33">
         <activity
-            android:name=".activity.SplashActivity"
+            android:name=".activity.GlassMainActivity"
             android:configChanges="keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout|keyboard|navigation"
             android:exported="true"
             android:screenOrientation="sensorLandscape"
-            android:theme="@style/Theme.Splash">
+            android:theme="@style/Theme.FoldCraftLauncher">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -91,9 +91,16 @@
                 <data android:pathPattern=".*\\.7z" />
             </intent-filter>
         </activity-alias>
+        <activity
+            android:name=".activity.SplashActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout|keyboard|navigation"
+            android:exported="false"
+            android:screenOrientation="sensorLandscape"
+            android:theme="@style/Theme.Splash" />
         <activity
             android:name=".activity.MainActivity"
             android:configChanges="keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout|keyboard|navigation"
+            android:exported="false"
             android:screenOrientation="sensorLandscape" />
         <activity
             android:name=".activity.WebActivity"
@@ -172,4 +179,4 @@
             <action android:name="android.intent.action.MAIN" />
         </intent>
     </queries>
-</manifest>
+</manifest>

FCL/src/main/java/com/tungsten/fcl/activity/GlassMainActivity.kt

@@ -0,0 +1,41 @@
+package com.tungsten.fcl.activity
+
+import android.os.Bundle
+import androidx.compose.ui.platform.ComposeView
+import androidx.core.view.WindowCompat
+import com.tungsten.fcl.ui.glass.FCLGlassApp
+import com.tungsten.fcllibrary.component.FCLActivity
+import com.tungsten.fcllibrary.component.view.FCLUILayout
+
+/**
+ * FCL 液态玻璃 UI 主入口。
+ *
+ * 作为 SplashActivity 之后的主 Activity，负责展示 Compose + Backdrop 构建的液态玻璃界面。
+ * 以 FCLUILayout 为根容器，方便旧版页面在 Compose UI 上层添加视图。
+ */
+class GlassMainActivity : FCLActivity() {
+
+    lateinit var layout: FCLUILayout
+        private set
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        WindowCompat.setDecorFitsSystemWindows(window, false)
+
+        layout = FCLUILayout(this)
+        val composeView = ComposeView(this).apply {
+            setContent {
+                FCLGlassApp()
+            }
+        }
+        layout.addView(
+            composeView,
+            android.widget.RelativeLayout.LayoutParams(
+                android.widget.RelativeLayout.LayoutParams.MATCH_PARENT,
+                android.widget.RelativeLayout.LayoutParams.MATCH_PARENT
+            )
+        )
+        setContentView(layout)
+    }
+}

FCL/src/main/java/com/tungsten/fcl/activity/SplashActivity.kt

@@ -149,7 +149,7 @@ class SplashActivity : FCLActivity() {
                 }
             }
             startActivity(
-                handleModpack(Intent(this@SplashActivity, MainActivity::class.java)),
+                handleModpack(Intent(this@SplashActivity, GlassMainActivity::class.java)),
                 ActivityOptionsCompat.makeCustomAnimation(this@SplashActivity, 0, 0).toBundle()
             )
             finish()

FCL/src/main/java/com/tungsten/fcl/setting/Profiles.kt

@@ -192,6 +192,11 @@ object Profiles {
         versionsListeners.add(listener)
     }
 
+    @JvmStatic
+    fun unregisterVersionsListener(listener: Consumer<Profile>) {
+        versionsListeners.remove(listener)
+    }
+
     fun getSelectedGameVersion(): String {
         val gameVersion: Optional<String> =
             getSelectedProfile().repository.getGameVersion(getSelectedVersion())

FCL/src/main/java/com/tungsten/fcl/ui/glass/FCLGlassApp.kt

@@ -0,0 +1,105 @@
+package com.tungsten.fcl.ui.glass
+
+import android.content.Context
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.darkColorScheme
+import androidx.compose.material3.lightColorScheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.unit.dp
+import androidx.navigation.compose.currentBackStackEntryAsState
+import androidx.navigation.compose.rememberNavController
+import androidx.navigation.hasRoute
+import com.kyant.backdrop.backdrops.rememberLayerBackdrop
+import com.tungsten.fcl.activity.GlassMainActivity
+import com.tungsten.fcl.ui.glass.component.GlassBottomBar
+import com.tungsten.fcl.ui.glass.component.GlassNavHost
+import com.tungsten.fcl.ui.glass.component.dialog.GlassDialogHost
+import com.tungsten.fcl.ui.glass.theme.GlassTheme
+import com.tungsten.fcllibrary.component.theme.ThemePreset
+
+@Composable
+fun FCLGlassApp(
+    initialPreset: ThemePreset = ThemePreset.DEFAULT
+) {
+    val context = LocalContext.current
+    val sharedPreferences = remember { context.getSharedPreferences("launcher", Context.MODE_PRIVATE) }
+    val presetOrdinal = remember { sharedPreferences.getInt("themePreset", initialPreset.ordinal) }
+    var currentPreset by remember { mutableStateOf(ThemePreset.values()[presetOrdinal]) }
+
+    val isDark = isSystemInDarkTheme()
+    val backgroundColor = GlassTheme.backgroundColor()
+
+    val onPresetChange: (ThemePreset) -> Unit = { preset ->
+        currentPreset = preset
+        sharedPreferences.edit().putInt("themePreset", preset.ordinal).apply()
+    }
+
+    val layout = remember(context) {
+        (context as? GlassMainActivity)?.layout
+    }
+
+    CompositionLocalProvider(LocalFCLUILayout provides layout) {
+        MaterialTheme(
+            colorScheme = if (isDark) darkColorScheme() else lightColorScheme()
+        ) {
+            val navController = rememberNavController()
+            val navBackStackEntry by navController.currentBackStackEntryAsState()
+            val currentDestination = navBackStackEntry?.destination
+            val currentRoute = when {
+                currentDestination?.hasRoute<FCLGlassRoute.Home>() == true -> FCLGlassRoute.Home
+                currentDestination?.hasRoute<FCLGlassRoute.Versions>() == true -> FCLGlassRoute.Versions
+                currentDestination?.hasRoute<FCLGlassRoute.Download>() == true -> FCLGlassRoute.Download
+                currentDestination?.hasRoute<FCLGlassRoute.Account>() == true -> FCLGlassRoute.Account
+                currentDestination?.hasRoute<FCLGlassRoute.Settings>() == true -> FCLGlassRoute.Settings
+                else -> FCLGlassRoute.Home
+            }
+
+            val backdrop = rememberLayerBackdrop {
+                drawRect(backgroundColor)
+                drawContent()
+            }
+
+            Box(modifier = Modifier.fillMaxSize()) {
+                GlassNavHost(
+                    navController = navController,
+                    backdrop = backdrop,
+                    currentPreset = currentPreset,
+                    onPresetChange = onPresetChange,
+                    modifier = Modifier
+                        .fillMaxSize()
+                        .padding(bottom = 80.dp)
+                )
+
+                GlassBottomBar(
+                    backdrop = backdrop,
+                    preset = currentPreset,
+                    currentRoute = currentRoute,
+                    onRouteSelected = { route ->
+                        navController.navigate(route) {
+                            popUpTo(navController.graph.startDestinationId) {
+                                saveState = true
+                            }
+                            launchSingleTop = true
+                            restoreState = true
+                        }
+                    },
+                    modifier = Modifier.align(Alignment.BottomCenter)
+                )
+
+                GlassDialogHost(backdrop = backdrop)
+            }
+        }
+    }
+}

FCL/src/main/java/com/tungsten/fcl/ui/glass/FCLGlassDownloadRoute.kt

@@ -0,0 +1,49 @@
+package com.tungsten.fcl.ui.glass
+
+import kotlinx.serialization.Serializable
+
+sealed class FCLGlassDownloadRoute {
+    @Serializable
+    data object Home : FCLGlassDownloadRoute()
+
+    @Serializable
+    data object VersionInstallList : FCLGlassDownloadRoute()
+
+    @Serializable
+    data class VersionInstallInfo(val gameVersion: String) : FCLGlassDownloadRoute()
+
+    @Serializable
+    data class InstallerVersionSelect(
+        val gameVersion: String,
+        val libraryId: String
+    ) : FCLGlassDownloadRoute()
+
+    @Serializable
+    data class ModDownload(val gameVersion: String = "") : FCLGlassDownloadRoute()
+
+    @Serializable
+    data class ModpackDownload(val gameVersion: String = "") : FCLGlassDownloadRoute()
+
+    @Serializable
+    data class ResourcePackDownload(val gameVersion: String = "") : FCLGlassDownloadRoute()
+
+    @Serializable
+    data class ShaderPackDownload(val gameVersion: String = "") : FCLGlassDownloadRoute()
+
+    @Serializable
+    data class RemoteModInfo(
+        val typeName: String,
+        val modSlug: String,
+        val modTitle: String,
+        val gameVersion: String,
+        val cacheKey: String
+    ) : FCLGlassDownloadRoute()
+
+    @Serializable
+    data class RemoteModVersions(
+        val typeName: String,
+        val modSlug: String,
+        val targetGameVersion: String,
+        val cacheKey: String
+    ) : FCLGlassDownloadRoute()
+}

FCL/src/main/java/com/tungsten/fcl/ui/glass/FCLGlassRoute.kt

@@ -0,0 +1,79 @@
+package com.tungsten.fcl.ui.glass
+
+import kotlinx.serialization.Serializable
+
+sealed class FCLGlassRoute {
+    @Serializable
+    data object Home : FCLGlassRoute()
+
+    @Serializable
+    data object Versions : FCLGlassRoute()
+
+    @Serializable
+    data object Download : FCLGlassRoute()
+
+    @Serializable
+    data object Account : FCLGlassRoute()
+
+    @Serializable
+    data object Settings : FCLGlassRoute()
+
+    @Serializable
+    data object LauncherSettings : FCLGlassRoute()
+
+    @Serializable
+    data object JavaRuntime : FCLGlassRoute()
+
+    @Serializable
+    data object JvmArgs : FCLGlassRoute()
+
+    @Serializable
+    data class QuickInput(
+        val title: String,
+        val initialValue: String,
+        val hint: String
+    ) : FCLGlassRoute()
+
+    @Serializable
+    data class VersionSettings(
+        val profileName: String,
+        val version: String
+    ) : FCLGlassRoute()
+
+    @Serializable
+    data class VersionInstall(
+        val profileName: String,
+        val version: String? = null
+    ) : FCLGlassRoute()
+
+    @Serializable
+    data class VersionMods(
+        val profileName: String,
+        val version: String
+    ) : FCLGlassRoute()
+
+    @Serializable
+    data class VersionWorlds(
+        val profileName: String,
+        val version: String
+    ) : FCLGlassRoute()
+
+    @Serializable
+    data class VersionResourcePacks(
+        val profileName: String,
+        val version: String
+    ) : FCLGlassRoute()
+
+    @Serializable
+    data class VersionShaderPacks(
+        val profileName: String,
+        val version: String
+    ) : FCLGlassRoute()
+
+    @Serializable
+    data class ModInfo(
+        val modFileName: String,
+        val profileName: String,
+        val version: String
+    ) : FCLGlassRoute()
+}

FCL/src/main/java/com/tungsten/fcl/ui/glass/FCLUILayoutProvider.kt

@@ -0,0 +1,6 @@
+package com.tungsten.fcl.ui.glass
+
+import androidx.compose.runtime.staticCompositionLocalOf
+import com.tungsten.fcllibrary.component.view.FCLUILayout
+
+val LocalFCLUILayout = staticCompositionLocalOf<FCLUILayout?> { null }