chore: add firefly-go library, versioning assets, and release configuration files

.gitignore

@@ -16,4 +16,3 @@
 .cxx
 local.properties
 .history/
-.idea/

app/build.gradle.kts

@@ -83,12 +83,6 @@ dependencies {
     // Auto updater library
     implementation(libs.autoupdater)
 
-    // OkHttp Client
-    implementation("com.squareup.okhttp3:okhttp:4.12.0")
-
-    // Chrome Custom Tabs
-    implementation("androidx.browser:browser:1.8.0")
-
     // Unit Test
     testImplementation(libs.junit)
 

app/src/main/AndroidManifest.xml

@@ -34,19 +34,11 @@
         <activity
             android:name=".MainActivity"
             android:exported="true"
-            android:launchMode="singleTask"
-            android:windowSoftInputMode="adjustResize"
             android:theme="@style/Theme.FireflyGoAndroid">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="firefly-launcher" android:host="auth" android:path="/discord" />
-            </intent-filter>
         </activity>
 
         <service

app/src/main/assets/version.json

@@ -20,20 +20,6 @@
     "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_15378559_7514340ac82f_70dad6c56b8bc7",
     "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_15384138_4e4be8cf97ac_1e3fcfa0a93bef"
   },
-  "CNBETAAndroid4.3.54": {
-    "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_15440751_fb99372e1e48_fd11e486274779",
-    "asset_bundle_url_b": "https://autopatchos.starrails.com/asb/BetaLive/output_15440751_fb99372e1e48_fd11e486274779",
-    "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_15497648_6ef97acf9b45_ea8ed0ff303308",
-    "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_15440843_4201511c48d0_34717e44c82e30",
-    "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_0_40d2ce0253_6d871f8bca6eb4"
-  },
-  "CNBETAAndroid4.3.55": {
-    "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_15507822_f63959b7920b_2231084d979019",
-    "asset_bundle_url_b": "https://autopatchos.starrails.com/asb/BetaLive/output_15507822_f63959b7920b_2231084d979019",
-    "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_15537653_09630bf7c4f3_a1967fb1d8635c",
-    "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_15507972_05909e009ba9_54e5377976705e",
-    "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_0_40d2ce0253_6d871f8bca6eb4"
-  },
   "CNBETAWin4.3.51": {
     "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_15261247_f6e6db2125cf_369da465b36faf",
     "asset_bundle_url_b": "https://autopatchos.starrails.com/asb/BetaLive/output_15235885_6091fd15561a_83828f542dc1f3",
@@ -55,20 +41,6 @@
     "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_15378559_7514340ac82f_70dad6c56b8bc7",
     "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_15384138_4e4be8cf97ac_1e3fcfa0a93bef"
   },
-  "CNBETAWin4.3.54": {
-    "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_15440751_fb99372e1e48_fd11e486274779",
-    "asset_bundle_url_b": "https://autopatchos.starrails.com/asb/BetaLive/output_15440751_fb99372e1e48_fd11e486274779",
-    "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_15497648_6ef97acf9b45_ea8ed0ff303308",
-    "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_15440843_4201511c48d0_34717e44c82e30",
-    "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_0_40d2ce0253_6d871f8bca6eb4"
-  },
-  "CNBETAWin4.3.55": {
-    "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_15507822_f63959b7920b_2231084d979019",
-    "asset_bundle_url_b": "https://autopatchos.starrails.com/asb/BetaLive/output_15507822_f63959b7920b_2231084d979019",
-    "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_15537653_09630bf7c4f3_a1967fb1d8635c",
-    "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_15507972_05909e009ba9_54e5377976705e",
-    "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_0_40d2ce0253_6d871f8bca6eb4"
-  },
   "CNBETAiOS4.3.51": {
     "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_15261247_f6e6db2125cf_369da465b36faf",
     "asset_bundle_url_b": "https://autopatchos.starrails.com/asb/BetaLive/output_15235885_6091fd15561a_83828f542dc1f3",
@@ -90,20 +62,6 @@
     "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_15378559_7514340ac82f_70dad6c56b8bc7",
     "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_15384138_4e4be8cf97ac_1e3fcfa0a93bef"
   },
-  "CNBETAiOS4.3.54": {
-    "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_15440751_fb99372e1e48_fd11e486274779",
-    "asset_bundle_url_b": "https://autopatchos.starrails.com/asb/BetaLive/output_15440751_fb99372e1e48_fd11e486274779",
-    "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_15497648_6ef97acf9b45_ea8ed0ff303308",
-    "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_15440843_4201511c48d0_34717e44c82e30",
-    "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_0_40d2ce0253_6d871f8bca6eb4"
-  },
-  "CNBETAiOS4.3.55": {
-    "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_15507822_f63959b7920b_2231084d979019",
-    "asset_bundle_url_b": "https://autopatchos.starrails.com/asb/BetaLive/output_15507822_f63959b7920b_2231084d979019",
-    "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_15537653_09630bf7c4f3_a1967fb1d8635c",
-    "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_15507972_05909e009ba9_54e5377976705e",
-    "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_0_40d2ce0253_6d871f8bca6eb4"
-  },
   "OSBETAAndroid4.3.51": {
     "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_15261247_f6e6db2125cf_369da465b36faf",
     "asset_bundle_url_b": "https://autopatchos.starrails.com/asb/BetaLive/output_15235885_6091fd15561a_83828f542dc1f3",
@@ -125,20 +83,6 @@
     "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_15378559_7514340ac82f_70dad6c56b8bc7",
     "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_15384138_4e4be8cf97ac_1e3fcfa0a93bef"
   },
-  "OSBETAAndroid4.3.54": {
-    "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_15440751_fb99372e1e48_fd11e486274779",
-    "asset_bundle_url_b": "https://autopatchos.starrails.com/asb/BetaLive/output_15440751_fb99372e1e48_fd11e486274779",
-    "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_15497648_6ef97acf9b45_ea8ed0ff303308",
-    "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_15440843_4201511c48d0_34717e44c82e30",
-    "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_0_40d2ce0253_6d871f8bca6eb4"
-  },
-  "OSBETAAndroid4.3.55": {
-    "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_15507822_f63959b7920b_2231084d979019",
-    "asset_bundle_url_b": "https://autopatchos.starrails.com/asb/BetaLive/output_15507822_f63959b7920b_2231084d979019",
-    "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_15537653_09630bf7c4f3_a1967fb1d8635c",
-    "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_15507972_05909e009ba9_54e5377976705e",
-    "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_0_40d2ce0253_6d871f8bca6eb4"
-  },
   "OSBETAWin4.3.51": {
     "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_15261247_f6e6db2125cf_369da465b36faf",
     "asset_bundle_url_b": "https://autopatchos.starrails.com/asb/BetaLive/output_15235885_6091fd15561a_83828f542dc1f3",
@@ -160,20 +104,6 @@
     "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_15378559_7514340ac82f_70dad6c56b8bc7",
     "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_15384138_4e4be8cf97ac_1e3fcfa0a93bef"
   },
-  "OSBETAWin4.3.54": {
-    "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_15440751_fb99372e1e48_fd11e486274779",
-    "asset_bundle_url_b": "https://autopatchos.starrails.com/asb/BetaLive/output_15440751_fb99372e1e48_fd11e486274779",
-    "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_15497648_6ef97acf9b45_ea8ed0ff303308",
-    "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_15440843_4201511c48d0_34717e44c82e30",
-    "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_0_40d2ce0253_6d871f8bca6eb4"
-  },
-  "OSBETAWin4.3.55": {
-    "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_15507822_f63959b7920b_2231084d979019",
-    "asset_bundle_url_b": "https://autopatchos.starrails.com/asb/BetaLive/output_15507822_f63959b7920b_2231084d979019",
-    "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_15537653_09630bf7c4f3_a1967fb1d8635c",
-    "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_15507972_05909e009ba9_54e5377976705e",
-    "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_0_40d2ce0253_6d871f8bca6eb4"
-  },
   "OSBETAiOS4.3.51": {
     "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_15261247_f6e6db2125cf_369da465b36faf",
     "asset_bundle_url_b": "https://autopatchos.starrails.com/asb/BetaLive/output_15235885_6091fd15561a_83828f542dc1f3",
@@ -194,19 +124,5 @@
     "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_15385668_07011a79dadf_1111728953724e",
     "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_15378559_7514340ac82f_70dad6c56b8bc7",
     "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_15384138_4e4be8cf97ac_1e3fcfa0a93bef"
-  },
-  "OSBETAiOS4.3.54": {
-    "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_15440751_fb99372e1e48_fd11e486274779",
-    "asset_bundle_url_b": "https://autopatchos.starrails.com/asb/BetaLive/output_15440751_fb99372e1e48_fd11e486274779",
-    "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_15497648_6ef97acf9b45_ea8ed0ff303308",
-    "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_15440843_4201511c48d0_34717e44c82e30",
-    "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_0_40d2ce0253_6d871f8bca6eb4"
-  },
-  "OSBETAiOS4.3.55": {
-    "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_15507822_f63959b7920b_2231084d979019",
-    "asset_bundle_url_b": "https://autopatchos.starrails.com/asb/BetaLive/output_15507822_f63959b7920b_2231084d979019",
-    "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_15537653_09630bf7c4f3_a1967fb1d8635c",
-    "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_15507972_05909e009ba9_54e5377976705e",
-    "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_0_40d2ce0253_6d871f8bca6eb4"
   }
 }

app/src/main/java/com/example/firefly_go_android/MainActivity.kt

@@ -33,11 +33,8 @@ import androidx.compose.animation.*
 import androidx.compose.animation.core.*
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.border
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.interaction.collectIsPressedAsState
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.BugReport
@@ -77,11 +74,6 @@ import androidx.core.content.ContextCompat
 import androidx.core.net.toUri
 import android.provider.Settings
 
-import com.example.firefly_go_android.network.AuthManager
-import com.example.firefly_go_android.ui.ScamWarningDialog
-import androidx.lifecycle.lifecycleScope
-import kotlinx.coroutines.launch
-
 data class AppVersion(
     val latestVersion: String,
     val changelog: String,
@@ -89,23 +81,19 @@ data class AppVersion(
 )
 
 class MainActivity : ComponentActivity() {
-    private lateinit var authManager: AuthManager
-    private var onAuthStatusChanged: (() -> Unit)? = null
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         requestBatteryExemption(this)
         requestInstallPermission(this)
         requestStoragePermission(this)
 
-        authManager = AuthManager(this)
-
         val appDataPath = File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS), "FireflyGo").absolutePath
         val dataDir = File("$appDataPath/data")
         if (!dataDir.exists()) dataDir.mkdirs()
 
         val sharedPrefs = getSharedPreferences("AppPrefs", MODE_PRIVATE)
 
+        // Lấy thông tin Package
         val packageInfo = if (Build.VERSION.SDK_INT >= 33) {
             packageManager.getPackageInfo(packageName, android.content.pm.PackageManager.PackageInfoFlags.of(0))
         } else {
@@ -154,48 +142,13 @@ class MainActivity : ComponentActivity() {
 
         val appVersion = AppVersion(latestVersion, changelog, apkUrl)
 
-        handleDeepLink(intent)
-
         enableEdgeToEdge()
         setContent {
             FireflyPsAndoridTheme {
-                var isCheckingAuth by remember { mutableStateOf(authManager.isLoggedIn) }
-                var authStateTrigger by remember { mutableIntStateOf(0) }
-                var hasCheckedUpdate by remember { mutableStateOf(false) }
-                var showScamWarning by remember { mutableStateOf(true) }
-
-                onAuthStatusChanged = {
-                    authStateTrigger++
-                }
-
-                LaunchedEffect(Unit) {
-                    if (authManager.isLoggedIn) {
-                        authManager.accessToken?.let { token ->
-                            val result = authManager.fetchProfileAndVerifyRole(token)
-                            if (result.isFailure) {
-                                onAuthStatusChanged?.invoke()
-                            }
-                        }
-                    }
-                    isCheckingAuth = false
-                }
-
                 Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
                     Box(modifier = Modifier.fillMaxSize()) {
-                        key(authStateTrigger) {
+                        ServerControlScreen(appDataPath, dataDir, appVersion, Modifier.padding(innerPadding))
-                            ServerControlScreen(appDataPath, dataDir, appVersion, authManager, Modifier.padding(innerPadding))
+                        AutoUpdateDialog(onDismiss = {}, appVersion, dataDir, true)
-                            if (!showScamWarning && !hasCheckedUpdate) {
-                                AutoUpdateDialog(
-                                    onDismiss = { hasCheckedUpdate = true },
-                                    appVersion,
-                                    dataDir,
-                                    true
-                                )
-                            }
-                        }
-                        if (showScamWarning) {
-                            ScamWarningDialog(onDismiss = { showScamWarning = false })
-                        }
                     }
                 }
             }
@@ -203,30 +156,6 @@ class MainActivity : ComponentActivity() {
 
     }
 
-    override fun onNewIntent(intent: Intent) {
-        super.onNewIntent(intent)
-        handleDeepLink(intent)
-    }
-
-    private fun handleDeepLink(intent: Intent?) {
-        val data = intent?.data ?: return
-        if (data.scheme == "firefly-launcher" && data.host == "auth" && data.path == "/discord") {
-            val token = data.getQueryParameter("token")
-            if (!token.isNullOrBlank()) {
-                authManager.accessToken = token
-                lifecycleScope.launch {
-                    val result = authManager.fetchProfileAndVerifyRole(token)
-                    if (result.isSuccess) {
-                        Toast.makeText(this@MainActivity, "Logged in via Discord successfully!", Toast.LENGTH_SHORT).show()
-                    } else {
-                        Toast.makeText(this@MainActivity, "Failed to get Discord profile: ${result.exceptionOrNull()?.message}", Toast.LENGTH_SHORT).show()
-                    }
-                    onAuthStatusChanged?.invoke()
-                }
-            }
-        }
-    }
-
 }
 @SuppressLint("BatteryLife")
 
@@ -273,7 +202,6 @@ fun requestStoragePermission(context: Context) {
         }
     }
 }
-
 fun copyRawToFile(context: Context, targetDir: File, override: Boolean = false): Boolean {
     val files = listOf(
         "data-in-game.json" to "data-in-game.json",
@@ -330,27 +258,749 @@ fun removeFile(targetDir: File, fileName: String): Boolean {
 }
 
 
+@SuppressLint("ImplicitSamInstance")
+@Composable
+fun ServerControlScreen(appDataPath: String, dataDir: File, appVersion: AppVersion, modifier: Modifier = Modifier) {
+    val context = LocalContext.current
+    val isRunning = GolangServerService.isRunning
+
+    var showResetDialog by remember { mutableStateOf(false) }
+    var showUpdateDialog by remember { mutableStateOf(false) }
+    var showLogs by remember { mutableStateOf(false) }
+    Box(
+        modifier = modifier.fillMaxSize()
+    ) {
+        // Background image
+        Image(
+            painter = painterResource(id = R.drawable.background),
+            contentDescription = "Background",
+            contentScale = ContentScale.Crop,
+            modifier = Modifier.fillMaxSize()
+        )
+
+        Box(
+            modifier = Modifier
+                .fillMaxSize()
+                .background(Color.Black.copy(alpha = 0.3f))
+        )
+
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(24.dp),
+            verticalArrangement = Arrangement.SpaceBetween,
+            horizontalAlignment = Alignment.CenterHorizontally
+        ) {
+            // Title
+            Text(
+                text = "Firefly GO for Android",
+                fontSize = 26.sp,
+                fontWeight = FontWeight.Bold,
+                modifier = Modifier.padding(top = 24.dp),
+                color = Color.White,
+                style = TextStyle(
+                    shadow = Shadow(
+                        color = Color.Black,
+                        offset = Offset(2f, 2f),
+                        blurRadius = 4f
+                    )
+                )
+            )
+
+            // Server status with icon
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.Center,
+                modifier = Modifier.padding(8.dp)
+            ) {
+                Icon(
+                    imageVector = if (isRunning) Icons.Default.PlayCircleFilled else Icons.Default.StopCircle,
+                    contentDescription = null,
+                    tint = if (isRunning) Color(0xFF4CAF50) else Color.Gray,
+                    modifier = Modifier.size(40.dp)
+                )
+                Spacer(modifier = Modifier.width(8.dp))
+                Text(
+                    text = if (isRunning) "Server is running" else "Server is stopped",
+                    fontSize = 30.sp,
+                    color = Color.White,
+                    fontWeight = FontWeight.Medium,
+                    style = TextStyle(
+                        shadow = Shadow(
+                            color = Color.Black,
+                            offset = Offset(1f, 1f),
+                            blurRadius = 2f
+                        )
+                    )
+                )
+            }
+
+
+            Spacer(modifier = Modifier.height(200.dp))
+            // Toggle button
+            Button(
+                onClick = {
+                    try {
+                        if (!isRunning) {
+                            val intent = Intent(context, GolangServerService::class.java)
+                            intent.putExtra("appDataPath", appDataPath)
+                            ContextCompat.startForegroundService(context, intent)
+                        } else {
+                            context.stopService(Intent(context, GolangServerService::class.java))
+                        }
+                    } catch (e: Exception) {
+                        Toast.makeText(context, "Error: ${e.message}", Toast.LENGTH_SHORT).show()
+                    }
+                },
+                colors = ButtonDefaults.buttonColors(
+                    containerColor = if (isRunning) Color(0xFFB71C1C) else Color(0xFF2196F3),
+                    contentColor = Color.White
+                ),
+                shape = RoundedCornerShape(12.dp),
+                modifier = Modifier
+                    .fillMaxWidth(0.8f)
+                    .height(50.dp)
+            ) {
+                Icon(
+                    imageVector = if (isRunning) Icons.Default.Stop else Icons.Default.PlayArrow,
+                    contentDescription = null,
+                    modifier = Modifier.size(24.dp)
+                )
+                Spacer(modifier = Modifier.width(8.dp))
+                Text(
+                    text = if (isRunning) "Stop Server" else "Start Server",
+                    fontSize = 20.sp
+                )
+            }
+
+            Spacer(modifier = Modifier.height(4.dp))
+
+            // Widget icons row
+            Row(
+                modifier = Modifier.fillMaxWidth(0.85f),
+                horizontalArrangement = Arrangement.SpaceEvenly,
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+
+                // Check Update widget
+                Column(
+                    horizontalAlignment = Alignment.CenterHorizontally,
+                    modifier = Modifier
+                        .width(80.dp)
+                        .clickable { showUpdateDialog = true }
+                        .background(
+                            Color.White.copy(alpha = 0.8f),
+                            RoundedCornerShape(8.dp)
+                        )
+                        .padding(12.dp)
+                ) {
+                    Icon(
+                        imageVector = Icons.Default.CloudDownload,
+                        contentDescription = "Check Update",
+                        tint = Color.Gray,
+                        modifier = Modifier.size(32.dp)
+                    )
+                    Spacer(modifier = Modifier.height(4.dp))
+                    Text(
+                        text = "Update",
+                        fontSize = 12.sp,
+                        color = Color.Black,
+                        textAlign = TextAlign.Center,
+                        fontWeight = FontWeight.Medium
+                    )
+                }
+
+                // Reset Data widget
+                Column(
+                    horizontalAlignment = Alignment.CenterHorizontally,
+                    modifier = Modifier
+                        .width(80.dp)
+                        .clickable { showResetDialog = true }
+                        .background(
+                            Color.White.copy(alpha = 0.8f),
+                            RoundedCornerShape(8.dp)
+                        )
+                        .padding(12.dp)
+                ) {
+                    Icon(
+                        imageVector = Icons.Default.RestartAlt,
+                        contentDescription = "Reset Data",
+                        tint = Color.Gray,
+                        modifier = Modifier.size(32.dp)
+                    )
+                    Spacer(modifier = Modifier.height(4.dp))
+                    Text(
+                        text = "Reset",
+                        fontSize = 12.sp,
+                        color = Color.Black,
+                        textAlign = TextAlign.Center,
+                        fontWeight = FontWeight.Medium
+                    )
+                }
+
+                // Logcat (Lynx) widget
+                Column(
+                    horizontalAlignment = Alignment.CenterHorizontally,
+                    modifier = Modifier
+                        .width(80.dp)
+                        .clickable {
+                            showLogs = true // mở popup log
+                        }
+                        .background(
+                            Color.White.copy(alpha = 0.8f),
+                            RoundedCornerShape(8.dp)
+                        )
+                        .padding(12.dp)
+                ) {
+                    Icon(
+                        imageVector = Icons.Default.BugReport,
+                        contentDescription = "Open Logcat",
+                        tint = Color.Gray,
+                        modifier = Modifier.size(32.dp)
+                    )
+                    Spacer(modifier = Modifier.height(4.dp))
+                    Text(
+                        text = "Logs",
+                        fontSize = 12.sp,
+                        color = Color.Black,
+                        textAlign = TextAlign.Center,
+                        fontWeight = FontWeight.Medium
+                    )
+                }
+            }
+
+            Spacer(modifier = Modifier.height(75.dp))
+        }
+    }
+
+    if (showLogs) {
+        LogPopup(onDismiss = { showLogs = false })
+    }
+    // Reset Data Confirmation Dialog
+    if (showResetDialog) {
+        AlertDialog(
+            onDismissRequest = { showResetDialog = false },
+            title = {
+                Text(text = "Reset Data")
+            },
+            text = {
+                Text(text = "Do you want reset all data? This action can not rollback.")
+            },
+            confirmButton = {
+                TextButton(
+                    onClick = {
+                        showResetDialog = false
+                        try {
+                            copyRawToFile(context, dataDir, true)
+                            Toast.makeText(context, "Data has been reset successfully", Toast.LENGTH_SHORT).show()
+                        } catch (e: Exception) {
+                            Toast.makeText(context, "Reset failed: ${e.message}", Toast.LENGTH_SHORT).show()
+                        }
+                    }
+                ) {
+                    Text("Yes", color = Color(0xFFFF0606))
+                }
+            },
+            dismissButton = {
+                TextButton(
+                    onClick = { showResetDialog = false }
+                ) {
+                    Text("No")
+                }
+            }
+        )
+    }
+
+    // Auto Update Dialog
+    if (showUpdateDialog) {
+        AutoUpdateDialog(
+            onDismiss = { showUpdateDialog = false },
+            appVersion,
+            dataDir
+        )
+    }
+}
+
+fun parseGoLogLine(line: String): String? {
+    val regex = Regex(""".*GoLog\s*:?\s*(.*)""")
+    val match = regex.find(line)
+    val content = match?.groupValues?.getOrNull(1)?.trim()
+
+    return if (content.isNullOrBlank()) null else content
+}
+
+
+fun parseAnsi(text: String, defaultColor: Color): AnnotatedString {
+    val regex = Regex("\u001B\\[(\\d+)(;\\d+)*m")
+    val builder = buildAnnotatedString {
+        var lastIndex = 0
+        var currentColor = defaultColor
+
+        for (match in regex.findAll(text)) {
+            val start = match.range.first
+
+            // 1. Thêm phần text TRƯỚC mã ANSI với màu HIỆN TẠI
+            val before = text.substring(lastIndex, start)
+            if (before.isNotEmpty()) {
+                withStyle(SpanStyle(color = currentColor)) {
+                    append(before)
+                }
+            }
+
+            // 2. Lấy mã code (ví dụ 31, 36, hoặc 0)
+            val code = try {
+                match.groupValues[1].toInt()
+            } catch (e: NumberFormatException) {
+                0
+            }
+
+            currentColor = when (code) {
+                0 -> defaultColor
+                30 -> Color.Black
+                31 -> Color.Red
+                32 -> Color(0xFF00C853) // Green
+                33 -> Color(0xFFFFD600) // Yellow
+                34 -> Color(0xFF2962FF) // Blue
+                35 -> Color(0xFFD500F9) // Magenta
+                36 -> Color(0xFF00B8D4) // Cyan
+                37 -> Color.White
+                else -> currentColor
+            }
+
+            lastIndex = match.range.last + 1
+        }
+
+        if (lastIndex < text.length) {
+            val remain = text.substring(lastIndex)
+            if (remain.isNotEmpty()) {
+                withStyle(SpanStyle(color = currentColor)) {
+                    append(remain)
+                }
+            }
+        }
+    }
+
+    return builder
+}
+
+@Composable
+fun LogPopup(
+    onDismiss: () -> Unit
+) {
+    var logs by remember { mutableStateOf(listOf<String>()) }
+    val scope = rememberCoroutineScope()
+
+    LaunchedEffect(Unit) {
+        scope.launch(Dispatchers.IO) {
+            try {
+                val process = Runtime.getRuntime().exec("logcat -s GoLog")
+                val reader = BufferedReader(InputStreamReader(process.inputStream))
+
+                var line: String?
+                while (reader.readLine().also { line = it } != null) {
+                    val clean = parseGoLogLine(line!!)
+                    if (!clean.isNullOrBlank()) {
+                        logs = (logs + clean).takeLast(200)
+                    }
+                }
+            } catch (e: Exception) {
+                logs = logs + "Error reading logcat: ${e.message}"
+            }
+        }
+    }
+    val listState = rememberLazyListState()
+
+    LaunchedEffect(logs.size) {
+        if (logs.isNotEmpty()) {
+            listState.animateScrollToItem(logs.size - 1)
+        }
+    }
+
+    val defaultTextColor = LocalContentColor.current
+
+    Dialog(onDismissRequest = { onDismiss() }) {
+        Surface(
+            shape = RoundedCornerShape(12.dp),
+            tonalElevation = 8.dp,
+            modifier = Modifier
+                .fillMaxWidth()
+                .fillMaxHeight(0.7f)
+        ) {
+            Column(modifier = Modifier.padding(16.dp)) {
+                Text(
+                    text = "GoLog Output",
+                    style = MaterialTheme.typography.titleMedium,
+                    fontWeight = FontWeight.Bold
+                )
+                Spacer(modifier = Modifier.height(8.dp))
+
+                LazyColumn(state = listState, modifier = Modifier.weight(1f)) {
+                    items(logs.size) { index ->
+                        Text(
+                            text = parseAnsi(logs[index], defaultTextColor),
+                            fontSize = 12.sp,
+
+                            // 2. DÙNG FONT MONOSPACE
+                            fontFamily = FontFamily.Monospace,
+
+                            // 3. (Tuỳ chọn) Giảm chiều cao dòng để logo liền mạch
+                            lineHeight = 14.sp,
+
+                            modifier = Modifier.padding(vertical = 2.dp)
+                        )
+                    }
+                }
+
+                Spacer(modifier = Modifier.height(8.dp))
+                Button(
+                    onClick = { onDismiss() },
+                    modifier = Modifier.align(Alignment.End)
+                ) {
+                    Text("Close")
+                }
+            }
+        }
+    }
+}
+
 
 
 @Composable
-fun Modifier.bounceClick(
+fun AutoUpdateDialog(
-    interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
+    onDismiss: () -> Unit,
-    onClick: () -> Unit
+    appVersion: AppVersion,
-): Modifier {
+    dataDir: File,
-    val isPressed by interactionSource.collectIsPressedAsState()
+    isFirstOpen: Boolean = false
-    val scale by animateFloatAsState(
+) {
-        targetValue = if (isPressed) 0.93f else 1f,
+    val context = LocalContext.current
-        animationSpec = spring(
+    val autoUpdaterManager = AutoUpdaterManager(context)
-            dampingRatio = Spring.DampingRatioMediumBouncy,
+    var update by remember { mutableStateOf<UpdateFeatures?>(null) }
-            stiffness = Spring.StiffnessLow
+    var progress by remember { mutableStateOf(0) }
-        ),
+    var showDialog by remember { mutableStateOf(false) }
-        label = "bounceScale"
+    var isDownloading by remember { mutableStateOf(false) }
+    var downloadComplete by remember { mutableStateOf(false) }
+    val coroutineScope = rememberCoroutineScope()
+
+    val progressAnimation by animateFloatAsState(
+        targetValue = progress / 100f,
+        animationSpec = tween(300, easing = FastOutSlowInEasing),
+        label = "progress"
     )
-    return this
+
-        .scale(scale)
+    val scaleAnimation by animateFloatAsState(
-        .clickable(
+        targetValue = if (showDialog) 1f else 0.8f,
-            interactionSource = interactionSource,
+        animationSpec = spring(dampingRatio = Spring.DampingRatioMediumBouncy),
-            indication = null,
+        label = "scale"
-            onClick = onClick
+    )
+
+    // Check for update
+    LaunchedEffect(Unit) {
+        val result = withContext(Dispatchers.IO) {
+            autoUpdaterManager.checkForUpdate(
+                JSONfileURL = "https://git.kain.io.vn/Firefly-Shelter/FireflyGo_Andoid/raw/branch/master/app/src/main/res/raw/app_version_json.json"
             )
         }
+
+        val hasUpdate = result != null && appVersion.latestVersion != result.latestversion
+
+        update = if (hasUpdate) result else null
+
+        showDialog = if (isFirstOpen) {
+            hasUpdate
+        } else {
+            result != null
+        }
+    }
+
+
+    // Download progress
+    LaunchedEffect(progress) {
+        if (progress >= 100 && isDownloading) {
+            downloadComplete = true
+        }
+    }
+
+    if (showDialog) {
+        Dialog(
+            onDismissRequest = {
+                if (!isDownloading) showDialog = false
+                onDismiss()
+            },
+            properties = DialogProperties(
+                dismissOnBackPress = !isDownloading,
+                dismissOnClickOutside = !isDownloading
+            )
+        ) {
+            Card(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(16.dp)
+                    .scale(scaleAnimation)
+                    .animateContentSize(),
+                shape = RoundedCornerShape(24.dp),
+                colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface),
+                elevation = CardDefaults.cardElevation(defaultElevation = 8.dp)
+            ) {
+                Column(
+                    modifier = Modifier.padding(24.dp),
+                    horizontalAlignment = Alignment.CenterHorizontally
+                ) {
+                    // Header icon
+                    Box(
+                        modifier = Modifier
+                            .size(72.dp)
+                            .background(
+                                MaterialTheme.colorScheme.primaryContainer,
+                                CircleShape
+                            ),
+                        contentAlignment = Alignment.Center
+                    ) {
+                        Icon(
+                            imageVector = if (update != null) Icons.Rounded.SystemUpdate
+                            else Icons.Rounded.CheckCircle,
+                            contentDescription = null,
+                            modifier = Modifier.size(36.dp),
+                            tint = MaterialTheme.colorScheme.onPrimaryContainer
+                        )
+                    }
+
+                    Spacer(modifier = Modifier.height(16.dp))
+
+                    // Title
+                    Text(
+                        text = if (update != null) "Update Available" else "No Update Available",
+                        style = MaterialTheme.typography.headlineSmall,
+                        fontWeight = FontWeight.Bold,
+                        color = MaterialTheme.colorScheme.onSurface,
+                        textAlign = TextAlign.Center
+                    )
+
+                    Spacer(modifier = Modifier.height(12.dp))
+
+                    if (update != null) {
+                        VersionInfoSection(update!!)
+                        ChangelogSection(update!!)
+                        DownloadProgressSection(
+                            isDownloading = isDownloading,
+                            downloadComplete = downloadComplete,
+                            progress = progressAnimation
+                        )
+                        ActionButtons(
+                            isDownloading = isDownloading,
+                            downloadComplete = downloadComplete,
+                            onDownloadClick = {
+                                isDownloading = true
+                                coroutineScope.launch {
+                                    withContext(Dispatchers.IO) {
+                                        autoUpdaterManager.downloadapk(
+                                            context,
+                                            update!!.apk_url,
+                                            "FireflyGO_${update!!.latestversion}.apk"
+                                        ) { prog -> progress = prog }
+                                    }
+                                }
+                            },
+                            onDismiss = { showDialog = false; onDismiss() }
+                        )
+                    } else {
+
+                        Column(
+                            horizontalAlignment = Alignment.CenterHorizontally,
+                            modifier = Modifier.fillMaxWidth()
+                        ) {
+                            Text(
+                                text = "Your app is up to date",
+                                style = MaterialTheme.typography.bodyMedium,
+                                color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.7f),
+                                textAlign = TextAlign.Center
+                            )
+
+                            Spacer(modifier = Modifier.height(24.dp))
+
+
+                            Button(
+                                onClick = { showDialog = false; onDismiss() },
+                                modifier = Modifier.wrapContentWidth(),
+                                shape = RoundedCornerShape(12.dp),
+                                colors = ButtonDefaults.buttonColors(
+                                    containerColor = MaterialTheme.colorScheme.primary,
+                                    contentColor = MaterialTheme.colorScheme.onPrimary
+                                ),
+                                contentPadding = PaddingValues(horizontal = 32.dp, vertical = 12.dp)
+                            ) {
+                                Text(
+                                    text = "OK",
+                                    style = MaterialTheme.typography.labelMedium
+                                )
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+// Version info card
+@Composable
+fun VersionInfoSection(update: UpdateFeatures) {
+    Card(
+        modifier = Modifier.fillMaxWidth(),
+        colors = CardDefaults.cardColors(
+            containerColor = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.7f)
+        ),
+        shape = RoundedCornerShape(12.dp)
+    ) {
+        Column(modifier = Modifier.padding(16.dp)) {
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.SpaceBetween,
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                Text(
+                    text = "Latest Version",
+                    style = MaterialTheme.typography.labelMedium,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant
+                )
+                Surface(
+                    shape = RoundedCornerShape(8.dp),
+                    color = MaterialTheme.colorScheme.primary
+                ) {
+                    Text(
+                        text = "v${update.latestversion}",
+                        modifier = Modifier.padding(horizontal = 8.dp, vertical = 4.dp),
+                        style = MaterialTheme.typography.labelSmall,
+                        color = MaterialTheme.colorScheme.onPrimary,
+                        fontWeight = FontWeight.Medium
+                    )
+                }
+            }
+        }
+    }
+    Spacer(modifier = Modifier.height(12.dp))
+}
+
+// Changelog section
+@Composable
+fun ChangelogSection(update: UpdateFeatures) {
+    Column(modifier = Modifier.fillMaxWidth()) {
+        Row(verticalAlignment = Alignment.CenterVertically) {
+            Icon(
+                imageVector = Icons.Rounded.AutoAwesome,
+                contentDescription = null,
+                modifier = Modifier.size(16.dp),
+                tint = MaterialTheme.colorScheme.primary
+            )
+            Spacer(modifier = Modifier.width(8.dp))
+            Text(
+                text = "What's New",
+                style = MaterialTheme.typography.titleSmall,
+                fontWeight = FontWeight.Medium,
+                color = MaterialTheme.colorScheme.onSurface
+            )
+        }
+        Spacer(modifier = Modifier.height(8.dp))
+        Text(
+            text = update.changelog,
+            style = MaterialTheme.typography.bodyMedium,
+            color = MaterialTheme.colorScheme.onSurfaceVariant,
+            lineHeight = 20.sp
+        )
+    }
+}
+
+// Progress section
+@Composable
+fun DownloadProgressSection(
+    isDownloading: Boolean,
+    downloadComplete: Boolean,
+    progress: Float
+) {
+    if (!isDownloading && !downloadComplete) return
+    Spacer(modifier = Modifier.height(16.dp))
+    Column(modifier = Modifier.fillMaxWidth()) {
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.SpaceBetween,
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Text(
+                text = if (downloadComplete) "Installation Ready" else "Downloading...",
+                style = MaterialTheme.typography.labelMedium,
+                color = MaterialTheme.colorScheme.primary,
+                fontWeight = FontWeight.Medium
+            )
+            Text(
+                text = "${(progress*100).toInt()}%",
+                style = MaterialTheme.typography.labelMedium,
+                color = MaterialTheme.colorScheme.onSurfaceVariant
+            )
+        }
+        Spacer(modifier = Modifier.height(8.dp))
+        LinearProgressIndicator(
+        progress = { progress },
+        modifier = Modifier
+                        .fillMaxWidth()
+                        .height(8.dp)
+                        .clip(RoundedCornerShape(4.dp)),
+        color = if (downloadComplete) MaterialTheme.colorScheme.tertiary else MaterialTheme.colorScheme.primary,
+        trackColor = MaterialTheme.colorScheme.surfaceVariant,
+        )
+    }
+}
+
+// Action buttons
+@Composable
+fun ActionButtons(
+    isDownloading: Boolean,
+    downloadComplete: Boolean,
+    onDownloadClick: () -> Unit,
+    onDismiss: () -> Unit
+) {
+    Spacer(modifier = Modifier.height(24.dp))
+    Row(
+        modifier = Modifier.fillMaxWidth(),
+        horizontalArrangement = if (!isDownloading && !downloadComplete) Arrangement.spacedBy(12.dp) else Arrangement.Center
+    ) {
+        if (!downloadComplete) {
+            OutlinedButton(
+                onClick = onDismiss,
+                modifier = Modifier.weight(1f),
+                enabled = !isDownloading,
+                shape = RoundedCornerShape(12.dp)
+            ) {
+                Text(text = "Later", style = MaterialTheme.typography.labelLarge)
+            }
+        }
+
+        Button(
+            onClick = onDownloadClick,
+            modifier = if (downloadComplete) Modifier.widthIn(min = 160.dp) else Modifier.weight(1f),
+            enabled = !isDownloading || downloadComplete,
+            shape = RoundedCornerShape(12.dp),
+            colors = ButtonDefaults.buttonColors(
+                containerColor = if (downloadComplete) MaterialTheme.colorScheme.tertiary else MaterialTheme.colorScheme.primary
+            )
+        ) {
+            Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.Center) {
+                when {
+                    downloadComplete -> {
+                        Icon(Icons.Rounded.InstallMobile, contentDescription = null, modifier = Modifier.size(18.dp))
+                        Spacer(modifier = Modifier.width(8.dp))
+                        Text("Install Now", style = MaterialTheme.typography.labelLarge, fontWeight = FontWeight.Medium)
+                    }
+                    isDownloading -> {
+                        CircularProgressIndicator(modifier = Modifier.size(24.dp), color = MaterialTheme.colorScheme.onPrimary)
+                    }
+                    else -> {
+                        Icon(
+                            imageVector = Icons.Rounded.Download,
+                            contentDescription = "Download",
+                            modifier = Modifier.size(24.dp)
+                        )
+                    }
+                }
+            }
+        }
+    }
+}

app/src/main/java/com/example/firefly_go_android/network/AuthManager.kt

@@ -1,128 +0,0 @@
-package com.example.firefly_go_android.network
-
-import android.content.Context
-import android.util.Log
-import okhttp3.*
-import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.RequestBody.Companion.toRequestBody
-import org.json.JSONObject
-import java.io.IOException
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-
-class AuthManager(private val context: Context) {
-    private val sharedPrefs = context.getSharedPreferences("auth_prefs", Context.MODE_PRIVATE)
-    private val client = OkHttpClient()
-
-    companion object {
-        private const val BASE_URL = "https://api.punklorde.org"
-        private const val TOKEN_KEY = "access_token"
-        private const val EMAIL_KEY = "user_email"
-        private const val IS_PLAYER_KEY = "is_player"
-    }
-
-    var accessToken: String?
-        get() = sharedPrefs.getString(TOKEN_KEY, null)
-        set(value) = sharedPrefs.edit().putString(TOKEN_KEY, value).apply()
-
-    var userEmail: String?
-        get() = sharedPrefs.getString(EMAIL_KEY, null)
-        set(value) = sharedPrefs.edit().putString(EMAIL_KEY, value).apply()
-
-    var isPlayer: Boolean
-        get() = sharedPrefs.getBoolean(IS_PLAYER_KEY, false)
-        set(value) = sharedPrefs.edit().putBoolean(IS_PLAYER_KEY, value).apply()
-
-    val isLoggedIn: Boolean
-        get() = accessToken != null
-
-    suspend fun login(email: String, password: String): Result<Boolean> = withContext(Dispatchers.IO) {
-        val json = JSONObject().apply {
-            put("email", email)
-            put("password", password)
-        }
-        val body = json.toString().toRequestBody("application/json; charset=utf-8".toMediaType())
-        val request = Request.Builder()
-            .url("$BASE_URL/auth/signin")
-            .post(body)
-            .build()
-
-        try {
-            client.newCall(request).execute().use { response ->
-                val bodyStr = response.body?.string() ?: ""
-                if (!response.isSuccessful) {
-                    val errMsg = try {
-                        JSONObject(bodyStr).getString("message")
-                    } catch (e: Exception) {
-                        "Login failed: ${response.code}"
-                    }
-                    return@withContext Result.failure(Exception(errMsg))
-                }
-
-                val jsonResponse = JSONObject(bodyStr)
-                if (!jsonResponse.getBoolean("status")) {
-                    return@withContext Result.failure(Exception(jsonResponse.optString("message", "Login failed")))
-                }
-
-                val data = jsonResponse.getJSONObject("data")
-                val token = data.getString("access_token")
-                accessToken = token
-                userEmail = email
-
-                // Fetch user profile to verify role
-                return@withContext fetchProfileAndVerifyRole(token)
-            }
-        } catch (e: Exception) {
-            return@withContext Result.failure(e)
-        }
-    }
-
-    suspend fun fetchProfileAndVerifyRole(token: String): Result<Boolean> = withContext(Dispatchers.IO) {
-        val request = Request.Builder()
-            .url("$BASE_URL/users/current")
-            .header("Authorization", "Bearer $token")
-            .get()
-            .build()
-
-        try {
-            client.newCall(request).execute().use { response ->
-                val bodyStr = response.body?.string() ?: ""
-                if (!response.isSuccessful) {
-                    // Token might have expired, clear local credentials
-                    if (response.code == 401) {
-                        logout()
-                    }
-                    return@withContext Result.failure(Exception("Failed to fetch profile: ${response.code}"))
-                }
-
-                val jsonResponse = JSONObject(bodyStr)
-                if (!jsonResponse.getBoolean("status")) {
-                    return@withContext Result.failure(Exception(jsonResponse.optString("message", "Failed to fetch profile")))
-                }
-
-                val data = jsonResponse.getJSONObject("data")
-                val rolesArray = data.getJSONArray("roles")
-                var hasPlayerRole = false
-                for (i in 0 until rolesArray.length()) {
-                    val roleObj = rolesArray.getJSONObject(i)
-                    val roleName = roleObj.getString("name").uppercase()
-                    if (roleName == "PLAYER" || roleName == "ADMIN" || roleName == "MOD") {
-                        hasPlayerRole = true
-                        break
-                    }
-                }
-
-                isPlayer = hasPlayerRole
-                return@withContext Result.success(hasPlayerRole)
-            }
-        } catch (e: Exception) {
-            return@withContext Result.failure(e)
-        }
-    }
-
-    fun logout() {
-        accessToken = null
-        userEmail = null
-        isPlayer = false
-    }
-}

app/src/main/java/com/example/firefly_go_android/ui/AutoUpdateDialog.kt

@@ -1,376 +0,0 @@
-package com.example.firefly_go_android
-
-import AutoUpdaterManager
-import android.content.Context
-import androidx.compose.animation.animateContentSize
-import androidx.compose.animation.core.FastOutSlowInEasing
-import androidx.compose.animation.core.Spring
-import androidx.compose.animation.core.animateFloatAsState
-import androidx.compose.animation.core.spring
-import androidx.compose.animation.core.tween
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-import androidx.compose.foundation.BorderStroke
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.rounded.*
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.draw.scale
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.compose.ui.window.Dialog
-import androidx.compose.ui.window.DialogProperties
-import androidx.compose.ui.res.stringResource
-import com.example.firefly_go_android.R
-import com.example.autoupdater.UpdateFeatures
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import java.io.File
-
-@Composable
-fun AutoUpdateDialog(
-    onDismiss: () -> Unit,
-    appVersion: AppVersion,
-    dataDir: File,
-    isFirstOpen: Boolean = false
-) {
-    val context = LocalContext.current
-    val autoUpdaterManager = AutoUpdaterManager(context)
-    var update by remember { mutableStateOf<UpdateFeatures?>(null) }
-    var progress by remember { mutableStateOf(0) }
-    var showDialog by remember { mutableStateOf(false) }
-    var isDownloading by remember { mutableStateOf(false) }
-    var downloadComplete by remember { mutableStateOf(false) }
-    val coroutineScope = rememberCoroutineScope()
-
-    val progressAnimation by animateFloatAsState(
-        targetValue = progress / 100f,
-        animationSpec = tween(300, easing = FastOutSlowInEasing),
-        label = "progress"
-    )
-
-    val scaleAnimation by animateFloatAsState(
-        targetValue = if (showDialog) 1f else 0.8f,
-        animationSpec = spring(dampingRatio = Spring.DampingRatioMediumBouncy),
-        label = "scale"
-    )
-
-    // Check for update
-    LaunchedEffect(Unit) {
-        val result = withContext(Dispatchers.IO) {
-            autoUpdaterManager.checkForUpdate(
-                JSONfileURL = "https://git.kain.io.vn/Firefly-Shelter/FireflyGo_Andoid/raw/branch/master/app/src/main/res/raw/app_version_json.json"
-            )
-        }
-
-        val hasUpdate = result != null && appVersion.latestVersion != result.latestversion
-
-        update = if (hasUpdate) result else null
-
-        showDialog = if (isFirstOpen) {
-            hasUpdate
-        } else {
-            result != null
-        }
-    }
-
-
-    // Download progress
-    LaunchedEffect(progress) {
-        if (progress >= 100 && isDownloading) {
-            downloadComplete = true
-        }
-    }
-
-    if (showDialog) {
-        Dialog(
-            onDismissRequest = {
-                if (!isDownloading) showDialog = false
-                onDismiss()
-            },
-            properties = DialogProperties(
-                dismissOnBackPress = !isDownloading,
-                dismissOnClickOutside = !isDownloading,
-                usePlatformDefaultWidth = false
-            )
-        ) {
-            Box(
-                modifier = Modifier
-                    .fillMaxWidth(0.9f)
-                    .scale(scaleAnimation)
-                    .animateContentSize()
-                    .background(Color.Black.copy(alpha = 0.85f), RoundedCornerShape(24.dp))
-                    .border(1.5.dp, Color.White.copy(alpha = 0.2f), RoundedCornerShape(24.dp))
-            ) {
-                Column(
-                    modifier = Modifier.padding(24.dp),
-                    horizontalAlignment = Alignment.CenterHorizontally
-                ) {
-                    Box(
-                        modifier = Modifier
-                            .size(72.dp)
-                            .background(
-                                Color.White.copy(alpha = 0.1f),
-                                CircleShape
-                            ),
-                        contentAlignment = Alignment.Center
-                    ) {
-                        Icon(
-                            imageVector = if (update != null) Icons.Rounded.SystemUpdate
-                            else Icons.Rounded.CheckCircle,
-                            contentDescription = null,
-                            modifier = Modifier.size(36.dp),
-                            tint = if (update != null) Color(0xFF2196F3) else Color(0xFF4CAF50)
-                        )
-                    }
-
-                    Spacer(modifier = Modifier.height(16.dp))
-
-                    Text(
-                        text = if (update != null) stringResource(id = R.string.update_available) else stringResource(id = R.string.no_update_available),
-                        style = MaterialTheme.typography.headlineSmall,
-                        fontWeight = FontWeight.Bold,
-                        color = Color.White,
-                        textAlign = TextAlign.Center
-                    )
-
-                    Spacer(modifier = Modifier.height(12.dp))
-
-                    if (update != null) {
-                        VersionInfoSection(update!!)
-                        ChangelogSection(update!!)
-                        DownloadProgressSection(
-                            isDownloading = isDownloading,
-                            downloadComplete = downloadComplete,
-                            progress = progressAnimation
-                        )
-                        ActionButtons(
-                            isDownloading = isDownloading,
-                            downloadComplete = downloadComplete,
-                            onDownloadClick = {
-                                isDownloading = true
-                                coroutineScope.launch {
-                                    withContext(Dispatchers.IO) {
-                                        autoUpdaterManager.downloadapk(
-                                            context,
-                                            update!!.apk_url,
-                                            "FireflyGO_${update!!.latestversion}.apk"
-                                        ) { prog -> progress = prog }
-                                    }
-                                }
-                            },
-                            onDismiss = { showDialog = false; onDismiss() }
-                        )
-                    } else {
-
-                        Column(
-                            horizontalAlignment = Alignment.CenterHorizontally,
-                            modifier = Modifier.fillMaxWidth()
-                        ) {
-                            Text(
-                                text = stringResource(id = R.string.app_up_to_date),
-                                style = MaterialTheme.typography.bodyMedium,
-                                color = Color.White.copy(alpha = 0.7f),
-                                textAlign = TextAlign.Center
-                            )
-
-                            Spacer(modifier = Modifier.height(24.dp))
-
-
-                            Button(
-                                onClick = { showDialog = false; onDismiss() },
-                                modifier = Modifier.wrapContentWidth(),
-                                shape = RoundedCornerShape(12.dp),
-                                colors = ButtonDefaults.buttonColors(
-                                    containerColor = Color(0xCC0D47A1),
-                                    contentColor = Color.White
-                                ),
-                                contentPadding = PaddingValues(horizontal = 32.dp, vertical = 12.dp)
-                            ) {
-                                Text(
-                                    text = stringResource(id = R.string.ok),
-                                    style = MaterialTheme.typography.labelMedium
-                                )
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-@Composable
-fun VersionInfoSection(update: UpdateFeatures) {
-    Card(
-        modifier = Modifier.fillMaxWidth(),
-        colors = CardDefaults.cardColors(
-            containerColor = Color.White.copy(alpha = 0.08f)
-        ),
-        shape = RoundedCornerShape(12.dp)
-    ) {
-        Column(modifier = Modifier.padding(16.dp)) {
-            Row(
-                modifier = Modifier.fillMaxWidth(),
-                horizontalArrangement = Arrangement.SpaceBetween,
-                verticalAlignment = Alignment.CenterVertically
-            ) {
-                Text(
-                    text = stringResource(id = R.string.latest_version),
-                    style = MaterialTheme.typography.labelMedium,
-                    color = Color.White.copy(alpha = 0.7f)
-                )
-                Surface(
-                    shape = RoundedCornerShape(8.dp),
-                    color = Color(0xCC0D47A1)
-                ) {
-                    Text(
-                        text = "v${update.latestversion}",
-                        modifier = Modifier.padding(horizontal = 8.dp, vertical = 4.dp),
-                        style = MaterialTheme.typography.labelSmall,
-                        color = Color.White,
-                        fontWeight = FontWeight.Medium
-                    )
-                }
-            }
-        }
-    }
-    Spacer(modifier = Modifier.height(12.dp))
-}
-
-@Composable
-fun ChangelogSection(update: UpdateFeatures) {
-    Column(modifier = Modifier.fillMaxWidth()) {
-        Row(verticalAlignment = Alignment.CenterVertically) {
-            Icon(
-                imageVector = Icons.Rounded.AutoAwesome,
-                contentDescription = null,
-                modifier = Modifier.size(16.dp),
-                tint = Color(0xFF4CAF50)
-            )
-            Spacer(modifier = Modifier.width(8.dp))
-            Text(
-                text = stringResource(id = R.string.whats_new),
-                style = MaterialTheme.typography.titleSmall,
-                fontWeight = FontWeight.Medium,
-                color = Color.White
-            )
-        }
-        Spacer(modifier = Modifier.height(8.dp))
-        Text(
-            text = update.changelog,
-            style = MaterialTheme.typography.bodyMedium,
-            color = Color.White.copy(alpha = 0.8f),
-            lineHeight = 20.sp
-        )
-    }
-}
-
-@Composable
-fun DownloadProgressSection(
-    isDownloading: Boolean,
-    downloadComplete: Boolean,
-    progress: Float
-) {
-    if (!isDownloading && !downloadComplete) return
-    Spacer(modifier = Modifier.height(16.dp))
-    Column(modifier = Modifier.fillMaxWidth()) {
-        Row(
-            modifier = Modifier.fillMaxWidth(),
-            horizontalArrangement = Arrangement.SpaceBetween,
-            verticalAlignment = Alignment.CenterVertically
-        ) {
-            Text(
-                text = if (downloadComplete) stringResource(id = R.string.installation_ready) else stringResource(id = R.string.downloading),
-                style = MaterialTheme.typography.labelMedium,
-                color = Color.White,
-                fontWeight = FontWeight.Medium
-            )
-            Text(
-                text = "${(progress * 100).toInt()}%",
-                style = MaterialTheme.typography.labelMedium,
-                color = Color.White.copy(alpha = 0.8f)
-            )
-        }
-        Spacer(modifier = Modifier.height(8.dp))
-        LinearProgressIndicator(
-            progress = { progress },
-            modifier = Modifier
-                .fillMaxWidth()
-                .height(8.dp)
-                .clip(RoundedCornerShape(4.dp)),
-            color = if (downloadComplete) Color(0xFF4CAF50) else Color(0xFF2196F3),
-            trackColor = Color.White.copy(alpha = 0.15f),
-        )
-    }
-}
-
-@Composable
-fun ActionButtons(
-    isDownloading: Boolean,
-    downloadComplete: Boolean,
-    onDownloadClick: () -> Unit,
-    onDismiss: () -> Unit
-) {
-    Spacer(modifier = Modifier.height(24.dp))
-    Row(
-        modifier = Modifier.fillMaxWidth(),
-        horizontalArrangement = if (!isDownloading && !downloadComplete) Arrangement.spacedBy(12.dp) else Arrangement.Center
-    ) {
-        if (!downloadComplete) {
-            OutlinedButton(
-                onClick = onDismiss,
-                modifier = Modifier.weight(1f),
-                enabled = !isDownloading,
-                shape = RoundedCornerShape(12.dp),
-                colors = ButtonDefaults.outlinedButtonColors(contentColor = Color.White),
-                border = BorderStroke(1.dp, Color.White.copy(alpha = 0.3f))
-            ) {
-                Text(text = stringResource(id = R.string.later), style = MaterialTheme.typography.labelLarge)
-            }
-        }
-
-        Button(
-            onClick = onDownloadClick,
-            modifier = if (downloadComplete) Modifier.widthIn(min = 160.dp) else Modifier.weight(1f),
-            enabled = !isDownloading || downloadComplete,
-            shape = RoundedCornerShape(12.dp),
-            colors = ButtonDefaults.buttonColors(
-                containerColor = if (downloadComplete) Color(0xFF4CAF50) else Color(0xCC0D47A1)
-            )
-        ) {
-            Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.Center) {
-                when {
-                    downloadComplete -> {
-                        Icon(Icons.Rounded.InstallMobile, contentDescription = null, modifier = Modifier.size(18.dp), tint = Color.White)
-                        Spacer(modifier = Modifier.width(8.dp))
-                        Text(stringResource(id = R.string.install_now), style = MaterialTheme.typography.labelLarge, fontWeight = FontWeight.Medium, color = Color.White)
-                    }
-                    isDownloading -> {
-                        CircularProgressIndicator(modifier = Modifier.size(24.dp), color = Color.White)
-                    }
-                    else -> {
-                        Icon(
-                            imageVector = Icons.Rounded.Download,
-                            contentDescription = "Download",
-                            modifier = Modifier.size(24.dp),
-                            tint = Color.White
-                        )
-                    }
-                }
-            }
-        }
-    }
-}

app/src/main/java/com/example/firefly_go_android/ui/LogPopup.kt

@@ -1,254 +0,0 @@
-package com.example.firefly_go_android
-
-import android.util.Log
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.ui.window.DialogProperties
-import androidx.compose.ui.res.stringResource
-import com.example.firefly_go_android.R
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.text.AnnotatedString
-import androidx.compose.ui.text.SpanStyle
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.buildAnnotatedString
-import androidx.compose.ui.text.font.FontFamily
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.withStyle
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.compose.ui.window.Dialog
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.shape.CircleShape
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.withContext
-import java.io.BufferedReader
-import java.io.InputStreamReader
-
-data class LogEntry(val id: Long, val text: String)
-
-@Composable
-fun LogPopup(
-    onDismiss: () -> Unit
-) {
-    val logs = remember { mutableStateListOf<LogEntry>() }
-    var nextLogId by remember { mutableLongStateOf(0L) }
-    var autoScroll by remember { mutableStateOf(true) }
-    val listState = rememberLazyListState()
-
-    LaunchedEffect(Unit) {
-        withContext(Dispatchers.IO) {
-            var process: Process? = null
-            var reader: BufferedReader? = null
-            try {
-                process = Runtime.getRuntime().exec("logcat -T 300 -s GoLog")
-                reader = BufferedReader(InputStreamReader(process.inputStream))
-
-                // Safely destroy the logcat process and close the stream when the coroutine is cancelled
-                coroutineContext[Job]?.invokeOnCompletion {
-                    try {
-                        process?.destroy()
-                        reader?.close()
-                    } catch (e: Exception) {
-                        // ignore
-                    }
-                }
-
-                var line: String?
-                while (reader.readLine().also { line = it } != null) {
-                    val clean = parseGoLogLine(line!!)
-                    if (!clean.isNullOrBlank()) {
-                        withContext(Dispatchers.Main) {
-                            logs.add(LogEntry(nextLogId++, clean))
-                            if (logs.size > 500) {
-                                logs.removeAt(0)
-                            }
-                        }
-                    }
-                }
-            } catch (e: Exception) {
-                withContext(Dispatchers.Main) {
-                    logs.add(LogEntry(nextLogId++, "Error reading logcat: ${e.message}"))
-                }
-            } finally {
-                try {
-                    process?.destroy()
-                    reader?.close()
-                } catch (e: Exception) {
-                    // ignore
-                }
-                Log.i("LogPopup", "Logcat process destroyed and stream closed successfully")
-            }
-        }
-    }
-
-    LaunchedEffect(logs.size) {
-        if (autoScroll && logs.isNotEmpty()) {
-            listState.scrollToItem(logs.size - 1)
-        }
-    }
-
-    val defaultTextColor = Color.White.copy(alpha = 0.9f)
-
-    Dialog(
-        onDismissRequest = { onDismiss() },
-        properties = DialogProperties(usePlatformDefaultWidth = false)
-    ) {
-        Box(
-            modifier = Modifier
-                .fillMaxWidth(0.9f)
-                .fillMaxHeight(0.7f)
-                .background(Color.Black.copy(alpha = 0.8f), RoundedCornerShape(16.dp))
-                .border(1.5.dp, Color.White.copy(alpha = 0.2f), RoundedCornerShape(16.dp))
-        ) {
-            Column(modifier = Modifier.padding(16.dp)) {
-                Row(
-                    modifier = Modifier.fillMaxWidth(),
-                    horizontalArrangement = Arrangement.SpaceBetween,
-                    verticalAlignment = Alignment.CenterVertically
-                ) {
-                    Text(
-                        text = stringResource(id = R.string.golog_output),
-                        style = MaterialTheme.typography.titleMedium,
-                        fontWeight = FontWeight.Bold,
-                        color = Color.White
-                    )
-
-                    // Auto-Scroll Toggle Button
-                    val activeColor = Color(0xFF4CAF50)
-                    val inactiveColor = Color.White.copy(alpha = 0.4f)
-                    Row(
-                        verticalAlignment = Alignment.CenterVertically,
-                        modifier = Modifier
-                            .clickable { autoScroll = !autoScroll }
-                            .padding(4.dp)
-                    ) {
-                        Box(
-                            modifier = Modifier
-                                .size(8.dp)
-                                .background(if (autoScroll) activeColor else inactiveColor, CircleShape)
-                        )
-                        Spacer(modifier = Modifier.width(6.dp))
-                        Text(
-                            text = stringResource(id = R.string.auto_scroll),
-                            fontSize = 11.sp,
-                            color = if (autoScroll) Color.White else Color.White.copy(alpha = 0.5f),
-                            fontWeight = FontWeight.Medium
-                        )
-                    }
-                }
-
-                Spacer(modifier = Modifier.height(8.dp))
-
-                LazyColumn(state = listState, modifier = Modifier.weight(1f)) {
-                    items(
-                        items = logs,
-                        key = { log -> log.id }
-                    ) { log ->
-                        Text(
-                            text = parseAnsi(log.text, defaultTextColor),
-                            fontSize = 12.sp,
-                            fontFamily = FontFamily.Monospace,
-                            lineHeight = 14.sp,
-                            modifier = Modifier.padding(vertical = 2.dp)
-                        )
-                    }
-                }
-
-                Spacer(modifier = Modifier.height(8.dp))
-                Row(
-                    modifier = Modifier.fillMaxWidth(),
-                    horizontalArrangement = Arrangement.SpaceBetween,
-                    verticalAlignment = Alignment.CenterVertically
-                ) {
-                    TextButton(
-                        onClick = {
-                            logs.clear()
-                            try {
-                                Runtime.getRuntime().exec("logcat -c")
-                            } catch (e: Exception) {
-                                // ignore
-                            }
-                        }
-                    ) {
-                        Text(stringResource(id = R.string.clear), color = Color(0xFFE53935), fontWeight = FontWeight.SemiBold)
-                    }
-
-                    TextButton(
-                        onClick = { onDismiss() }
-                    ) {
-                        Text(stringResource(id = R.string.close), color = Color.White)
-                    }
-                }
-            }
-        }
-    }
-}
-
-fun parseGoLogLine(line: String): String? {
-    val regex = Regex(""".*GoLog\s*:?\s*(.*)""")
-    val match = regex.find(line)
-    val content = match?.groupValues?.getOrNull(1)?.trim()
-
-    return if (content.isNullOrBlank()) null else content
-}
-
-fun parseAnsi(text: String, defaultColor: Color): AnnotatedString {
-    val regex = Regex("\u001B\\[(\\d+)(;\\d+)*m")
-    val builder = buildAnnotatedString {
-        var lastIndex = 0
-        var currentColor = defaultColor
-
-        for (match in regex.findAll(text)) {
-            val start = match.range.first
-
-            val before = text.substring(lastIndex, start)
-            if (before.isNotEmpty()) {
-                withStyle(SpanStyle(color = currentColor)) {
-                    append(before)
-                }
-            }
-
-            val code = try {
-                match.groupValues[1].toInt()
-            } catch (e: NumberFormatException) {
-                0
-            }
-
-            currentColor = when (code) {
-                0 -> defaultColor
-                30 -> Color.Black
-                31 -> Color.Red
-                32 -> Color(0xFF00C853) // Green
-                33 -> Color(0xFFFFD600) // Yellow
-                34 -> Color(0xFF2962FF) // Blue
-                35 -> Color(0xFFD500F9) // Magenta
-                36 -> Color(0xFF00B8D4) // Cyan
-                37 -> Color.White
-                else -> currentColor
-            }
-
-            lastIndex = match.range.last + 1
-        }
-
-        if (lastIndex < text.length) {
-            val remain = text.substring(lastIndex)
-            if (remain.isNotEmpty()) {
-                withStyle(SpanStyle(color = currentColor)) {
-                    append(remain)
-                }
-            }
-        }
-    }
-
-    return builder
-}

app/src/main/java/com/example/firefly_go_android/ui/LoginDialog.kt

@@ -1,328 +0,0 @@
-package com.example.firefly_go_android
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Visibility
-import androidx.compose.material.icons.filled.VisibilityOff
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.input.KeyboardType
-import androidx.compose.ui.text.input.PasswordVisualTransformation
-import androidx.compose.ui.text.input.VisualTransformation
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.compose.ui.window.Dialog
-import androidx.compose.ui.window.DialogProperties
-import android.content.Intent
-import android.net.Uri
-import androidx.browser.customtabs.CustomTabsIntent
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalSoftwareKeyboardController
-import androidx.compose.ui.focus.FocusRequester
-import androidx.compose.ui.focus.focusRequester
-import androidx.compose.foundation.BorderStroke
-import androidx.compose.ui.res.stringResource
-import com.example.firefly_go_android.network.AuthManager
-import kotlinx.coroutines.launch
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun LoginDialog(
-    authManager: AuthManager,
-    onDismiss: () -> Unit,
-    onLoginSuccess: () -> Unit
-) {
-    val coroutineScope = rememberCoroutineScope()
-    var email by remember { mutableStateOf("") }
-    var password by remember { mutableStateOf("") }
-    var passwordVisible by remember { mutableStateOf(false) }
-    var isLoading by remember { mutableStateOf(false) }
-    var errorMessage by remember { mutableStateOf<String?>(null) }
-
-    val focusRequester = remember { FocusRequester() }
-    val keyboardController = LocalSoftwareKeyboardController.current
-
-    LaunchedEffect(Unit) {
-        kotlinx.coroutines.delay(250)
-        try {
-            focusRequester.requestFocus()
-            keyboardController?.show()
-        } catch (e: Exception) {
-            // ignore
-        }
-    }
-
-    Dialog(
-        onDismissRequest = { if (!isLoading) { keyboardController?.hide(); onDismiss() } },
-        properties = DialogProperties(
-            usePlatformDefaultWidth = false
-        )
-    ) {
-        Box(
-            modifier = Modifier
-                .fillMaxWidth(0.9f)
-                .background(Color.Black.copy(alpha = 0.85f), RoundedCornerShape(20.dp))
-                .border(1.5.dp, Color.White.copy(alpha = 0.2f), RoundedCornerShape(20.dp))
-                .padding(24.dp)
-        ) {
-            if (authManager.isLoggedIn) {
-                // Profile & Logout view
-                Column(
-                    horizontalAlignment = Alignment.CenterHorizontally,
-                    modifier = Modifier.fillMaxWidth()
-                ) {
-                    Text(
-                        text = stringResource(id = R.string.account_profile),
-                        fontSize = 20.sp,
-                        fontWeight = FontWeight.Bold,
-                        color = Color.White
-                    )
-                    Spacer(modifier = Modifier.height(16.dp))
-
-                    Text(
-                        text = stringResource(id = R.string.logged_in_as),
-                        fontSize = 12.sp,
-                        color = Color.White.copy(alpha = 0.6f)
-                    )
-                    Text(
-                        text = authManager.userEmail ?: "Unknown User",
-                        fontSize = 16.sp,
-                        fontWeight = FontWeight.Medium,
-                        color = Color.White
-                    )
-                    Spacer(modifier = Modifier.height(12.dp))
-
-                    Text(
-                        text = stringResource(id = R.string.auto_update_status),
-                        fontSize = 12.sp,
-                        color = Color.White.copy(alpha = 0.6f)
-                    )
-                    val statusText = if (authManager.isPlayer) stringResource(id = R.string.unlocked_player) else stringResource(id = R.string.locked_no_permission)
-                    val statusColor = if (authManager.isPlayer) Color(0xFF4CAF50) else Color(0xFFE53935)
-                    Text(
-                        text = statusText,
-                        fontSize = 15.sp,
-                        fontWeight = FontWeight.SemiBold,
-                        color = statusColor
-                    )
-
-                    Spacer(modifier = Modifier.height(28.dp))
-
-                    Row(
-                        modifier = Modifier.fillMaxWidth(),
-                        horizontalArrangement = Arrangement.spacedBy(12.dp)
-                    ) {
-                        OutlinedButton(
-                            onClick = { keyboardController?.hide(); onDismiss() },
-                            modifier = Modifier.weight(1f),
-                            shape = RoundedCornerShape(12.dp),
-                            colors = ButtonDefaults.outlinedButtonColors(contentColor = Color.White),
-                            border = BorderStroke(1.dp, Color.White.copy(alpha = 0.3f))
-                        ) {
-                            Text(stringResource(id = R.string.back))
-                        }
-
-                        Button(
-                            onClick = {
-                                keyboardController?.hide()
-                                authManager.logout()
-                                onLoginSuccess() // triggers UI refresh
-                                onDismiss()
-                            },
-                            modifier = Modifier.weight(1f),
-                            shape = RoundedCornerShape(12.dp),
-                            colors = ButtonDefaults.buttonColors(containerColor = Color(0xFFD32F2F))
-                        ) {
-                            Text(stringResource(id = R.string.logout), color = Color.White)
-                        }
-                    }
-                }
-            } else {
-                // Sign In view
-                Column(
-                    horizontalAlignment = Alignment.CenterHorizontally,
-                    modifier = Modifier.fillMaxWidth()
-                ) {
-                    Text(
-                        text = stringResource(id = R.string.sign_in),
-                        fontSize = 22.sp,
-                        fontWeight = FontWeight.Bold,
-                        color = Color.White
-                    )
-                    Spacer(modifier = Modifier.height(16.dp))
-
-                    val pleaseEnterBothText = stringResource(id = R.string.please_enter_both)
-
-                    TextField(
-                        value = email,
-                        onValueChange = { email = it; errorMessage = null },
-                        placeholder = { Text(stringResource(id = R.string.email), color = Color.White.copy(alpha = 0.4f)) },
-                        colors = TextFieldDefaults.colors(
-                            focusedTextColor = Color.White,
-                            unfocusedTextColor = Color.White,
-                            focusedContainerColor = Color.White.copy(alpha = 0.08f),
-                            unfocusedContainerColor = Color.White.copy(alpha = 0.04f),
-                            focusedIndicatorColor = Color.Transparent,
-                            unfocusedIndicatorColor = Color.Transparent,
-                            cursorColor = Color.White
-                        ),
-                        shape = RoundedCornerShape(12.dp),
-                        singleLine = true,
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .border(1.dp, Color.White.copy(alpha = 0.15f), RoundedCornerShape(12.dp))
-                            .focusRequester(focusRequester),
-                        keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Email)
-                    )
-
-                    Spacer(modifier = Modifier.height(12.dp))
-
-                    TextField(
-                        value = password,
-                        onValueChange = { password = it; errorMessage = null },
-                        placeholder = { Text(stringResource(id = R.string.password), color = Color.White.copy(alpha = 0.4f)) },
-                        visualTransformation = if (passwordVisible) VisualTransformation.None else PasswordVisualTransformation(),
-                        trailingIcon = {
-                            val image = if (passwordVisible) Icons.Filled.Visibility else Icons.Filled.VisibilityOff
-                            IconButton(onClick = { passwordVisible = !passwordVisible }) {
-                                Icon(imageVector = image, contentDescription = "Toggle password visibility", tint = Color.White.copy(alpha = 0.5f))
-                            }
-                        },
-                        colors = TextFieldDefaults.colors(
-                            focusedTextColor = Color.White,
-                            unfocusedTextColor = Color.White,
-                            focusedContainerColor = Color.White.copy(alpha = 0.08f),
-                            unfocusedContainerColor = Color.White.copy(alpha = 0.04f),
-                            focusedIndicatorColor = Color.Transparent,
-                            unfocusedIndicatorColor = Color.Transparent,
-                            cursorColor = Color.White
-                        ),
-                        shape = RoundedCornerShape(12.dp),
-                        singleLine = true,
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .border(1.dp, Color.White.copy(alpha = 0.15f), RoundedCornerShape(12.dp)),
-                        keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password)
-                    )
-
-                    if (errorMessage != null) {
-                        Spacer(modifier = Modifier.height(8.dp))
-                        Text(
-                            text = errorMessage!!,
-                            color = Color(0xFFE53935),
-                            fontSize = 13.sp,
-                            fontWeight = FontWeight.Medium,
-                            modifier = Modifier.align(Alignment.Start)
-                        )
-                    }
-
-                    Spacer(modifier = Modifier.height(24.dp))
-
-                    Row(
-                        modifier = Modifier.fillMaxWidth(),
-                        horizontalArrangement = Arrangement.spacedBy(12.dp)
-                    ) {
-                        OutlinedButton(
-                            onClick = { keyboardController?.hide(); onDismiss() },
-                            modifier = Modifier.weight(1f),
-                            enabled = !isLoading,
-                            shape = RoundedCornerShape(12.dp),
-                            colors = ButtonDefaults.outlinedButtonColors(contentColor = Color.White),
-                            border = BorderStroke(1.dp, Color.White.copy(alpha = 0.3f))
-                        ) {
-                            Text(stringResource(id = R.string.cancel))
-                        }
-
-                        Button(
-                            onClick = {
-                                if (email.isBlank() || password.isBlank()) {
-                                    errorMessage = pleaseEnterBothText
-                                    return@Button
-                                }
-                                keyboardController?.hide()
-                                isLoading = true
-                                coroutineScope.launch {
-                                    val result = authManager.login(email, password)
-                                    isLoading = false
-                                    if (result.isSuccess) {
-                                        onLoginSuccess()
-                                        onDismiss()
-                                    } else {
-                                        errorMessage = result.exceptionOrNull()?.message ?: "Login failed"
-                                    }
-                                }
-                            },
-                            modifier = Modifier.weight(1f),
-                            enabled = !isLoading,
-                            shape = RoundedCornerShape(12.dp),
-                            colors = ButtonDefaults.buttonColors(containerColor = Color(0xCC0D47A1))
-                        ) {
-                            if (isLoading) {
-                                CircularProgressIndicator(modifier = Modifier.size(20.dp), color = Color.White, strokeWidth = 2.dp)
-                            } else {
-                                Text(stringResource(id = R.string.login), color = Color.White)
-                            }
-                        }
-                    }
-
-                    Spacer(modifier = Modifier.height(16.dp))
-
-                    // Divider "or"
-                    Row(
-                        verticalAlignment = Alignment.CenterVertically,
-                        modifier = Modifier.fillMaxWidth()
-                    ) {
-                        HorizontalDivider(
-                            modifier = Modifier.weight(1f),
-                            color = Color.White.copy(alpha = 0.2f)
-                        )
-                        Text(
-                            text = stringResource(id = R.string.or),
-                            fontSize = 11.sp,
-                            color = Color.White.copy(alpha = 0.5f),
-                            modifier = Modifier.padding(horizontal = 8.dp)
-                        )
-                        HorizontalDivider(
-                            modifier = Modifier.weight(1f),
-                            color = Color.White.copy(alpha = 0.2f)
-                        )
-                    }
-
-                    Spacer(modifier = Modifier.height(16.dp))
-
-                    val context = LocalContext.current
-                    Button(
-                        onClick = {
-                            keyboardController?.hide()
-                            val url = "https://api.punklorde.org/auth/discord/login?redirect=https://area999.punklorde.org/auth/launcher/discord&origin=firefly-launcher&is_return_token=true"
-                            try {
-                                val customTabsIntent = CustomTabsIntent.Builder()
-                                    .setShowTitle(true)
-                                    .build()
-                                customTabsIntent.launchUrl(context, Uri.parse(url))
-                            } catch (e: Exception) {
-                                // Fallback to system browser
-                                val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
-                                context.startActivity(intent)
-                            }
-                        },
-                        modifier = Modifier.fillMaxWidth().height(48.dp),
-                        enabled = !isLoading,
-                        shape = RoundedCornerShape(12.dp),
-                        colors = ButtonDefaults.buttonColors(containerColor = Color(0xCC5865F2))
-                    ) {
-                        Text(stringResource(id = R.string.login_with_discord), color = Color.White, fontWeight = FontWeight.Medium)
-                    }
-                }
-            }
-        }
-    }
-}

app/src/main/java/com/example/firefly_go_android/ui/ScamWarningDialog.kt

@@ -1,87 +0,0 @@
-package com.example.firefly_go_android.ui
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Warning
-import androidx.compose.material3.*
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.compose.ui.window.Dialog
-import androidx.compose.ui.window.DialogProperties
-import com.example.firefly_go_android.R
-
-@Composable
-fun ScamWarningDialog(
-    onDismiss: () -> Unit
-) {
-    Dialog(
-        onDismissRequest = onDismiss,
-        properties = DialogProperties(
-            dismissOnBackPress = false,
-            dismissOnClickOutside = false,
-            usePlatformDefaultWidth = false
-        )
-    ) {
-        Box(
-            modifier = Modifier
-                .fillMaxWidth(0.9f)
-                .background(Color.Black.copy(alpha = 0.85f), RoundedCornerShape(20.dp))
-                .border(1.5.dp, Color.White.copy(alpha = 0.2f), RoundedCornerShape(20.dp))
-                .padding(24.dp)
-        ) {
-            Column(
-                horizontalAlignment = Alignment.CenterHorizontally,
-                modifier = Modifier.fillMaxWidth()
-            ) {
-                Icon(
-                    imageVector = Icons.Default.Warning,
-                    contentDescription = "Warning",
-                    tint = Color(0xFFFFB300),
-                    modifier = Modifier.size(48.dp)
-                )
-                Spacer(modifier = Modifier.height(16.dp))
-
-                Text(
-                    text = stringResource(id = R.string.scam_warning_title),
-                    fontSize = 20.sp,
-                    fontWeight = FontWeight.Bold,
-                    color = Color.White
-                )
-                Spacer(modifier = Modifier.height(12.dp))
-
-                Text(
-                    text = stringResource(id = R.string.scam_warning_text),
-                    fontSize = 14.sp,
-                    color = Color.White.copy(alpha = 0.85f),
-                    textAlign = TextAlign.Center,
-                    lineHeight = 20.sp
-                )
-
-                Spacer(modifier = Modifier.height(28.dp))
-
-                Button(
-                    onClick = onDismiss,
-                    modifier = Modifier.fillMaxWidth().height(48.dp),
-                    shape = RoundedCornerShape(12.dp),
-                    colors = ButtonDefaults.buttonColors(containerColor = Color(0xFF0D47A1))
-                ) {
-                    Text(
-                        text = stringResource(id = R.string.i_understand),
-                        color = Color.White,
-                        fontWeight = FontWeight.SemiBold
-                    )
-                }
-            }
-        }
-    }
-}

app/src/main/java/com/example/firefly_go_android/ui/ServerControlScreen.kt

@@ -1,429 +0,0 @@
-package com.example.firefly_go_android
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.content.Intent
-import android.widget.Toast
-import androidx.compose.animation.animateColorAsState
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.*
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.Shadow
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.core.content.ContextCompat
-import com.example.firefly_go_android.network.AuthManager
-import java.io.File
-import androidx.compose.ui.window.Dialog
-import androidx.compose.ui.window.DialogProperties
-import androidx.compose.foundation.BorderStroke
-
-@SuppressLint("ImplicitSamInstance")
-@Composable
-fun ServerControlScreen(
-    appDataPath: String,
-    dataDir: File,
-    appVersion: AppVersion,
-    authManager: AuthManager,
-    modifier: Modifier = Modifier
-) {
-    val context = LocalContext.current
-    val isRunning = GolangServerService.isRunning
-
-    var showResetDialog by remember { mutableStateOf(false) }
-    var showUpdateDialog by remember { mutableStateOf(false) }
-    var showLoginDialog by remember { mutableStateOf(false) }
-    var showLogs by remember { mutableStateOf(false) }
-    var refreshTrigger by remember { mutableIntStateOf(0) } // Used to trigger UI refresh on login/logout
-
-    Box(
-        modifier = modifier.fillMaxSize()
-    ) {
-        // Background image
-        Image(
-            painter = painterResource(id = R.drawable.background),
-            contentDescription = "Background",
-            contentScale = ContentScale.Crop,
-            modifier = Modifier.fillMaxSize()
-        )
-
-        Box(
-            modifier = Modifier
-                .fillMaxSize()
-                .background(Color.Black.copy(alpha = 0.3f))
-        )
-
-        Column(
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(horizontal = 24.dp, vertical = 16.dp),
-            horizontalAlignment = Alignment.CenterHorizontally
-        ) {
-            // Header Row (Branding and Account Status Chip)
-            Row(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(top = 16.dp),
-                horizontalArrangement = Arrangement.SpaceBetween,
-                verticalAlignment = Alignment.CenterVertically
-            ) {
-                // Brand Title
-                Column {
-                    Text(
-                        text = stringResource(id = R.string.app_name),
-                        fontSize = 24.sp,
-                        fontWeight = FontWeight.Bold,
-                        color = Color.White,
-                        style = TextStyle(
-                            shadow = Shadow(
-                                color = Color.Black,
-                                offset = Offset(2f, 2f),
-                                blurRadius = 4f
-                            )
-                        )
-                    )
-                    Text(
-                        text = stringResource(id = R.string.android_edition),
-                        fontSize = 12.sp,
-                        fontWeight = FontWeight.Medium,
-                        color = Color.White.copy(alpha = 0.7f),
-                        style = TextStyle(
-                            shadow = Shadow(
-                                color = Color.Black,
-                                offset = Offset(1f, 1f),
-                                blurRadius = 2f
-                            )
-                        )
-                    )
-                }
-
-                // Brand Logo / Icon (instead of Login Chip since login is disabled)
-                Box(
-                    contentAlignment = Alignment.Center,
-                    modifier = Modifier
-                        .size(42.dp)
-                        .background(Color.White.copy(alpha = 0.08f), CircleShape)
-                        .border(1.dp, Color.White.copy(alpha = 0.15f), CircleShape)
-                ) {
-                    Icon(
-                        imageVector = Icons.Default.Android,
-                        contentDescription = "Logo",
-                        tint = Color.White,
-                        modifier = Modifier.size(28.dp)
-                    )
-                }
-            }
-
-            Spacer(modifier = Modifier.height(28.dp))
-
-            // Server status capsule
-            val statusColor = if (isRunning) Color(0xFF4CAF50) else Color(0xFF9E9E9E)
-            val statusText = if (isRunning) stringResource(id = R.string.server_running) else stringResource(id = R.string.server_stopped)
-
-            Box(
-                modifier = Modifier
-                    .background(Color.Black.copy(alpha = 0.4f), RoundedCornerShape(20.dp))
-                    .border(1.dp, Color.White.copy(alpha = 0.15f), RoundedCornerShape(20.dp))
-                    .padding(horizontal = 20.dp, vertical = 8.dp)
-            ) {
-                Row(
-                    verticalAlignment = Alignment.CenterVertically,
-                    horizontalArrangement = Arrangement.Center
-                ) {
-                    Box(
-                        modifier = Modifier
-                            .size(10.dp)
-                            .background(statusColor, CircleShape)
-                    )
-                    Spacer(modifier = Modifier.width(10.dp))
-                    Text(
-                        text = statusText,
-                        fontSize = 18.sp,
-                        color = Color.White,
-                        fontWeight = FontWeight.Medium
-                    )
-                }
-            }
-
-            Spacer(modifier = Modifier.weight(1.8f).heightIn(min = 24.dp))
-            // Toggle button
-            val buttonColor by animateColorAsState(
-                targetValue = if (isRunning) Color(0xCCB71C1C) else Color(0xCC0D47A1),
-                label = "buttonColor"
-            )
-            Box(
-                contentAlignment = Alignment.Center,
-                modifier = Modifier
-                    .fillMaxWidth(0.75f)
-                    .height(54.dp)
-                    .bounceClick {
-                        try {
-                            if (!isRunning) {
-                                val intent = Intent(context, GolangServerService::class.java)
-                                intent.putExtra("appDataPath", appDataPath)
-                                ContextCompat.startForegroundService(context, intent)
-                            } else {
-                                context.stopService(Intent(context, GolangServerService::class.java))
-                            }
-                        } catch (e: Exception) {
-                            Toast.makeText(context, "Error: ${e.message}", Toast.LENGTH_SHORT).show()
-                        }
-                    }
-                    .background(buttonColor, RoundedCornerShape(14.dp))
-                    .border(1.dp, Color.White.copy(alpha = 0.25f), RoundedCornerShape(14.dp))
-            ) {
-                Row(
-                    verticalAlignment = Alignment.CenterVertically,
-                    horizontalArrangement = Arrangement.Center
-                ) {
-                    Icon(
-                        imageVector = if (isRunning) Icons.Default.Stop else Icons.Default.PlayArrow,
-                        contentDescription = null,
-                        tint = Color.White,
-                        modifier = Modifier.size(24.dp)
-                    )
-                    Spacer(modifier = Modifier.width(8.dp))
-                    Text(
-                        text = if (isRunning) stringResource(id = R.string.stop_server) else stringResource(id = R.string.start_server),
-                        fontSize = 18.sp,
-                        color = Color.White,
-                        fontWeight = FontWeight.SemiBold
-                    )
-                }
-            }
-
-            Spacer(modifier = Modifier.height(20.dp))
-
-            // Widget icons row
-            Row(
-                modifier = Modifier.fillMaxWidth(),
-                horizontalArrangement = Arrangement.spacedBy(16.dp),
-                verticalAlignment = Alignment.CenterVertically
-            ) {
-                // Check Update widget (Now shown for all users since login is disabled)
-                if (true) {
-                    Column(
-                        horizontalAlignment = Alignment.CenterHorizontally,
-                        verticalArrangement = Arrangement.Center,
-                        modifier = Modifier
-                            .weight(1f)
-                            .height(96.dp)
-                            .bounceClick { showUpdateDialog = true }
-                            .background(
-                                Color.White.copy(alpha = 0.15f),
-                                RoundedCornerShape(16.dp)
-                            )
-                            .border(
-                                1.dp,
-                                Color.White.copy(alpha = 0.2f),
-                                RoundedCornerShape(16.dp)
-                            )
-                            .padding(horizontal = 8.dp)
-                    ) {
-                        Icon(
-                            imageVector = Icons.Default.CloudDownload,
-                            contentDescription = "Check Update",
-                            tint = Color.White.copy(alpha = 0.85f),
-                            modifier = Modifier.size(28.dp)
-                        )
-                        Spacer(modifier = Modifier.height(6.dp))
-                        Text(
-                            text = stringResource(id = R.string.update),
-                            fontSize = 12.sp,
-                            color = Color.White,
-                            textAlign = TextAlign.Center,
-                            fontWeight = FontWeight.Medium,
-                            maxLines = 2
-                        )
-                    }
-                }
-
-                // Reset Data widget
-                Column(
-                    horizontalAlignment = Alignment.CenterHorizontally,
-                    verticalArrangement = Arrangement.Center,
-                    modifier = Modifier
-                        .weight(1f)
-                        .height(96.dp)
-                        .bounceClick { showResetDialog = true }
-                        .background(
-                            Color.White.copy(alpha = 0.15f),
-                            RoundedCornerShape(16.dp)
-                        )
-                        .border(
-                            1.dp,
-                            Color.White.copy(alpha = 0.2f),
-                            RoundedCornerShape(16.dp)
-                        )
-                        .padding(horizontal = 8.dp)
-                ) {
-                    Icon(
-                        imageVector = Icons.Default.RestartAlt,
-                        contentDescription = "Reset Data",
-                        tint = Color.White.copy(alpha = 0.85f),
-                        modifier = Modifier.size(28.dp)
-                    )
-                    Spacer(modifier = Modifier.height(6.dp))
-                    Text(
-                        text = stringResource(id = R.string.reset),
-                        fontSize = 12.sp,
-                        color = Color.White,
-                        textAlign = TextAlign.Center,
-                        fontWeight = FontWeight.Medium,
-                        maxLines = 2
-                    )
-                }
-
-                // Logcat (Lynx) widget
-                Column(
-                    horizontalAlignment = Alignment.CenterHorizontally,
-                    verticalArrangement = Arrangement.Center,
-                    modifier = Modifier
-                        .weight(1f)
-                        .height(96.dp)
-                        .bounceClick { showLogs = true }
-                        .background(
-                            Color.White.copy(alpha = 0.15f),
-                            RoundedCornerShape(16.dp)
-                        )
-                        .border(
-                            1.dp,
-                            Color.White.copy(alpha = 0.2f),
-                            RoundedCornerShape(16.dp)
-                        )
-                        .padding(horizontal = 8.dp)
-                ) {
-                    Icon(
-                        imageVector = Icons.Default.BugReport,
-                        contentDescription = "Open Logcat",
-                        tint = Color.White.copy(alpha = 0.85f),
-                        modifier = Modifier.size(28.dp)
-                    )
-                    Spacer(modifier = Modifier.height(6.dp))
-                    Text(
-                        text = stringResource(id = R.string.logs),
-                        fontSize = 12.sp,
-                        color = Color.White,
-                        textAlign = TextAlign.Center,
-                        fontWeight = FontWeight.Medium,
-                        maxLines = 2
-                    )
-                }
-            }
-
-            Spacer(modifier = Modifier.weight(0.4f).heightIn(min = 16.dp))
-        }
-    }
-
-    if (showLogs) {
-        LogPopup(onDismiss = { showLogs = false })
-    }
-
-    if (showLoginDialog) {
-        LoginDialog(
-            authManager = authManager,
-            onDismiss = { showLoginDialog = false },
-            onLoginSuccess = {
-                refreshTrigger++ // Force UI update
-            }
-        )
-    }
-
-    // Reset Data Confirmation Dialog
-    if (showResetDialog) {
-        Dialog(
-            onDismissRequest = { showResetDialog = false },
-            properties = DialogProperties(usePlatformDefaultWidth = false)
-        ) {
-            Box(
-                modifier = Modifier
-                    .fillMaxWidth(0.9f)
-                    .background(Color.Black.copy(alpha = 0.85f), RoundedCornerShape(20.dp))
-                    .border(1.5.dp, Color.White.copy(alpha = 0.2f), RoundedCornerShape(20.dp))
-                    .padding(24.dp)
-            ) {
-                Column(
-                    horizontalAlignment = Alignment.CenterHorizontally,
-                    modifier = Modifier.fillMaxWidth()
-                ) {
-                    Text(
-                        text = stringResource(id = R.string.reset_data_title),
-                        fontSize = 20.sp,
-                        fontWeight = FontWeight.Bold,
-                        color = Color.White
-                    )
-                    Spacer(modifier = Modifier.height(16.dp))
-
-                    Text(
-                        text = stringResource(id = R.string.reset_data_confirm),
-                        fontSize = 14.sp,
-                        color = Color.White.copy(alpha = 0.8f),
-                        textAlign = TextAlign.Center
-                    )
-
-                    Spacer(modifier = Modifier.height(28.dp))
-
-                    Row(
-                        modifier = Modifier.fillMaxWidth(),
-                        horizontalArrangement = Arrangement.spacedBy(12.dp)
-                    ) {
-                        OutlinedButton(
-                            onClick = { showResetDialog = false },
-                            modifier = Modifier.weight(1f),
-                            shape = RoundedCornerShape(12.dp),
-                            colors = ButtonDefaults.outlinedButtonColors(contentColor = Color.White),
-                            border = BorderStroke(1.dp, Color.White.copy(alpha = 0.3f))
-                        ) {
-                            Text(stringResource(id = R.string.no))
-                        }
-
-                        Button(
-                            onClick = {
-                                showResetDialog = false
-                                try {
-                                    copyRawToFile(context, dataDir, true)
-                                    Toast.makeText(context, "Data has been reset successfully", Toast.LENGTH_SHORT).show()
-                                } catch (e: Exception) {
-                                    Toast.makeText(context, "Reset failed: ${e.message}", Toast.LENGTH_SHORT).show()
-                                }
-                            },
-                            modifier = Modifier.weight(1f),
-                            shape = RoundedCornerShape(12.dp),
-                            colors = ButtonDefaults.buttonColors(containerColor = Color(0xFFD32F2F))
-                        ) {
-                            Text(stringResource(id = R.string.yes), color = Color.White)
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    // Auto Update Dialog
-    if (showUpdateDialog) {
-        AutoUpdateDialog(
-            onDismiss = { showUpdateDialog = false },
-            appVersion,
-            dataDir
-        )
-    }
-}

app/src/main/res/raw/app_version_json.json

@@ -1,5 +1,5 @@
 {
-  "latest_version": "4.3.5-01",
+  "latest_version": "4.3.3-01",
   "changelog": "UPDATE: 4.3.5X",
-  "apk_url": "https://git.kain.io.vn/Firefly-Shelter/FireflyGo_Android/releases/download/4.3.5-01/firefly_go_android.apk"
+  "apk_url": "https://git.kain.io.vn/Firefly-Shelter/FireflyGo_Android/releases/download/4.3.3-01/firefly_go_android.apk"
 }

app/src/main/res/values-ja/strings.xml

@@ -1,57 +0,0 @@
-<resources>
-    <string name="app_name">Firefly Go</string>
-    <string name="android_edition">Android版</string>
-    <string name="sign_in">サインイン</string>
-    <string name="server_running">サーバー稼働中</string>
-    <string name="server_stopped">サーバー停止</string>
-    <string name="start_server">サーバー起動</string>
-    <string name="stop_server">サーバー停止</string>
-    <string name="update">アップデート</string>
-    <string name="reset">リセット</string>
-    <string name="logs">ログ</string>
-    <string name="reset_data_title">データリセット</string>
-    <string name="reset_data_confirm">すべてのデータをリセットしますか？この操作は取り消せません。</string>
-    <string name="no">いいえ</string>
-    <string name="yes">はい</string>
-    
-    <!-- Scam Warning -->
-    <string name="scam_warning_title">セキュリティ警告</string>
-    <string name="scam_warning_text">これはオープンソースプロジェクトです。もし誰かからこのアプリを購入した場合、あなたは詐欺に遭っています。</string>
-    <string name="i_understand">了解しました</string>
-
-    <!-- LoginDialog -->
-    <string name="account_profile">アカウントプロフィール</string>
-    <string name="logged_in_as">ログイン中:</string>
-    <string name="auto_update_status">自動更新ステータス:</string>
-    <string name="unlocked_player">ロック解除 (PLAYER)</string>
-    <string name="locked_no_permission">ロック中 (権限なし)</string>
-    <string name="back">戻る</string>
-    <string name="logout">ログアウト</string>
-    <string name="email">メールアドレス</string>
-    <string name="password">パスワード</string>
-    <string name="cancel">キャンセル</string>
-    <string name="login">ログイン</string>
-    <string name="or">または</string>
-    <string name="login_with_discord">Discordでログイン</string>
-    <string name="please_enter_both">メールアドレスとパスワードを入力してください</string>
-    <string name="login_failed">ログイン失敗</string>
-    <string name="failed_to_fetch_profile">プロフィールの取得に失敗しました</string>
-
-    <!-- AutoUpdateDialog -->
-    <string name="update_available">アップデートがあります</string>
-    <string name="no_update_available">アップデートはありません</string>
-    <string name="app_up_to_date">アプリは最新状態です</string>
-    <string name="ok">確定</string>
-    <string name="latest_version">最新バージョン</string>
-    <string name="whats_new">更新内容</string>
-    <string name="downloading">ダウンロード中...</string>
-    <string name="installation_ready">インストールの準備完了</string>
-    <string name="later">後で</string>
-    <string name="install_now">今すぐインストール</string>
-
-    <!-- LogPopup -->
-    <string name="golog_output">GoLog出力</string>
-    <string name="auto_scroll">自動スクロール</string>
-    <string name="clear">消去</string>
-    <string name="close">閉じる</string>
-</resources>

app/src/main/res/values-ko/strings.xml

@@ -1,57 +0,0 @@
-<resources>
-    <string name="app_name">Firefly Go</string>
-    <string name="android_edition">안드로이드 버전</string>
-    <string name="sign_in">로그인</string>
-    <string name="server_running">서버 실행 중</string>
-    <string name="server_stopped">서버 정지됨</string>
-    <string name="start_server">서버 시작</string>
-    <string name="stop_server">서버 정지</string>
-    <string name="update">업데이트</string>
-    <string name="reset">초기화</string>
-    <string name="logs">로그</string>
-    <string name="reset_data_title">데이터 초기화</string>
-    <string name="reset_data_confirm">모든 데이터를 초기화하시겠습니까? 이 작업은 취소할 수 없습니다.</string>
-    <string name="no">아니오</string>
-    <string name="yes">예</string>
-    
-    <!-- Scam Warning -->
-    <string name="scam_warning_title">보안 경고</string>
-    <string name="scam_warning_text">이것은 오픈 소스 프로젝트입니다. 누군가로부터 이 앱을 구매하셨다면, 귀하는 사기를 당한 것입니다.</string>
-    <string name="i_understand">확인했습니다</string>
-
-    <!-- LoginDialog -->
-    <string name="account_profile">계정 프로필</string>
-    <string name="logged_in_as">로그인 계정:</string>
-    <string name="auto_update_status">자동 업데이트 상태:</string>
-    <string name="unlocked_player">잠금 해제 (PLAYER)</string>
-    <string name="locked_no_permission">잠김 (권한 없음)</string>
-    <string name="back">뒤로</string>
-    <string name="logout">로그아웃</string>
-    <string name="email">이메일</string>
-    <string name="password">비밀번호</string>
-    <string name="cancel">취소</string>
-    <string name="login">로그인</string>
-    <string name="or">또는</string>
-    <string name="login_with_discord">Discord로 로그인</string>
-    <string name="please_enter_both">이메일과 비밀번호를 모두 입력하세요</string>
-    <string name="login_failed">로그인 실패</string>
-    <string name="failed_to_fetch_profile">프로필을 불러오지 못했습니다</string>
-
-    <!-- AutoUpdateDialog -->
-    <string name="update_available">업데이트 가능</string>
-    <string name="no_update_available">업데이트 없음</string>
-    <string name="app_up_to_date">앱이 최신 상태입니다</string>
-    <string name="ok">확인</string>
-    <string name="latest_version">최신 버전</string>
-    <string name="whats_new">업데이트 내역</string>
-    <string name="downloading">다운로드 중...</string>
-    <string name="installation_ready">설치 준비 완료</string>
-    <string name="later">나중에</string>
-    <string name="install_now">지금 설치</string>
-
-    <!-- LogPopup -->
-    <string name="golog_output">GoLog 출력</string>
-    <string name="auto_scroll">자동 스크롤</string>
-    <string name="clear">지우기</string>
-    <string name="close">닫기</string>
-</resources>

app/src/main/res/values-vi/strings.xml

@@ -1,57 +0,0 @@
-<resources>
-    <string name="app_name">Firefly Go</string>
-    <string name="android_edition">Phiên bản Android</string>
-    <string name="sign_in">Đăng nhập</string>
-    <string name="server_running">Máy chủ đang chạy</string>
-    <string name="server_stopped">Máy chủ đã dừng</string>
-    <string name="start_server">Khởi động máy chủ</string>
-    <string name="stop_server">Dừng máy chủ</string>
-    <string name="update">Cập nhật</string>
-    <string name="reset">Đặt lại</string>
-    <string name="logs">Nhật ký</string>
-    <string name="reset_data_title">Đặt lại dữ liệu</string>
-    <string name="reset_data_confirm">Bạn có muốn đặt lại tất cả dữ liệu? Hành động này không thể hoàn tác.</string>
-    <string name="no">Không</string>
-    <string name="yes">Có</string>
-    
-    <!-- Scam Warning -->
-    <string name="scam_warning_title">Cảnh báo bảo mật</string>
-    <string name="scam_warning_text">Đây là dự án mã nguồn mở. Nếu bạn mua ứng dụng này từ bất kỳ ai, bạn đã bị lừa đảo (scam).</string>
-    <string name="i_understand">Tôi đã hiểu</string>
-
-    <!-- LoginDialog -->
-    <string name="account_profile">Thông tin tài khoản</string>
-    <string name="logged_in_as">Đăng nhập bằng:</string>
-    <string name="auto_update_status">Trạng thái tự cập nhật:</string>
-    <string name="unlocked_player">Đã mở khóa (PLAYER)</string>
-    <string name="locked_no_permission">Bị khóa (Không có quyền)</string>
-    <string name="back">Quay lại</string>
-    <string name="logout">Đăng xuất</string>
-    <string name="email">Email</string>
-    <string name="password">Mật khẩu</string>
-    <string name="cancel">Hủy</string>
-    <string name="login">Đăng nhập</string>
-    <string name="or">HOẶC</string>
-    <string name="login_with_discord">Đăng nhập bằng Discord</string>
-    <string name="please_enter_both">Vui lòng nhập cả Email và Mật khẩu</string>
-    <string name="login_failed">Đăng nhập thất bại</string>
-    <string name="failed_to_fetch_profile">Không thể tải thông tin cá nhân</string>
-
-    <!-- AutoUpdateDialog -->
-    <string name="update_available">Có bản cập nhật mới</string>
-    <string name="no_update_available">Không có bản cập nhật</string>
-    <string name="app_up_to_date">Ứng dụng đã được cập nhật mới nhất</string>
-    <string name="ok">Đồng ý</string>
-    <string name="latest_version">Phiên bản mới nhất</string>
-    <string name="whats_new">Có gì mới</string>
-    <string name="downloading">Đang tải xuống...</string>
-    <string name="installation_ready">Sẵn sàng cài đặt</string>
-    <string name="later">Để sau</string>
-    <string name="install_now">Cài đặt ngay</string>
-
-    <!-- LogPopup -->
-    <string name="golog_output">Nhật ký GoLog</string>
-    <string name="auto_scroll">Tự động cuộn</string>
-    <string name="clear">Xóa</string>
-    <string name="close">Đóng</string>
-</resources>

app/src/main/res/values-zh/strings.xml

@@ -1,57 +0,0 @@
-<resources>
-    <string name="app_name">Firefly Go</string>
-    <string name="android_edition">安卓版</string>
-    <string name="sign_in">登录</string>
-    <string name="server_running">服务器正在运行</string>
-    <string name="server_stopped">服务器已停止</string>
-    <string name="start_server">启动服务器</string>
-    <string name="stop_server">停止服务器</string>
-    <string name="update">更新</string>
-    <string name="reset">重置</string>
-    <string name="logs">日志</string>
-    <string name="reset_data_title">重置数据</string>
-    <string name="reset_data_confirm">您确定要重置所有数据吗？此操作无法撤销。</string>
-    <string name="no">取消</string>
-    <string name="yes">确定</string>
-    
-    <!-- Scam Warning -->
-    <string name="scam_warning_title">安全警告</string>
-    <string name="scam_warning_text">这是一个开源项目。如果您是从别人那里购买的这个应用，您就被骗了（欺诈）。</string>
-    <string name="i_understand">我已知晓</string>
-
-    <!-- LoginDialog -->
-    <string name="account_profile">账户信息</string>
-    <string name="logged_in_as">已登录为:</string>
-    <string name="auto_update_status">自动更新状态:</string>
-    <string name="unlocked_player">已解锁 (PLAYER)</string>
-    <string name="locked_no_permission">已锁定 (无权限)</string>
-    <string name="back">返回</string>
-    <string name="logout">退出登录</string>
-    <string name="email">邮箱</string>
-    <string name="password">密码</string>
-    <string name="cancel">取消</string>
-    <string name="login">登录</string>
-    <string name="or">或</string>
-    <string name="login_with_discord">使用 Discord 登录</string>
-    <string name="please_enter_both">请输入邮箱和密码</string>
-    <string name="login_failed">登录失败</string>
-    <string name="failed_to_fetch_profile">获取个人资料失败</string>
-
-    <!-- AutoUpdateDialog -->
-    <string name="update_available">有可用更新</string>
-    <string name="no_update_available">没有可用更新</string>
-    <string name="app_up_to_date">您的应用已是最新版本</string>
-    <string name="ok">确定</string>
-    <string name="latest_version">最新版本</string>
-    <string name="whats_new">更新日志</string>
-    <string name="downloading">正在下载...</string>
-    <string name="installation_ready">准备安装</string>
-    <string name="later">稍后</string>
-    <string name="install_now">立即安装</string>
-
-    <!-- LogPopup -->
-    <string name="golog_output">GoLog 输出</string>
-    <string name="auto_scroll">自动滚动</string>
-    <string name="clear">清除</string>
-    <string name="close">关闭</string>
-</resources>

app/src/main/res/values/strings.xml

@@ -1,57 +1,3 @@
 <resources>
     <string name="app_name">Firefly Go</string>
-    <string name="android_edition">Android Edition</string>
-    <string name="sign_in">Sign In</string>
-    <string name="server_running">Server is running</string>
-    <string name="server_stopped">Server is stopped</string>
-    <string name="start_server">Start Server</string>
-    <string name="stop_server">Stop Server</string>
-    <string name="update">Update</string>
-    <string name="reset">Reset</string>
-    <string name="logs">Logs</string>
-    <string name="reset_data_title">Reset Data</string>
-    <string name="reset_data_confirm">Do you want to reset all data? This action cannot be rolled back.</string>
-    <string name="no">No</string>
-    <string name="yes">Yes</string>
-    
-    <!-- Scam Warning -->
-    <string name="scam_warning_title">Security Warning</string>
-    <string name="scam_warning_text">This is an open-source project. If you bought this application from someone, you have been scammed (fraud).</string>
-    <string name="i_understand">I Understand</string>
-
-    <!-- LoginDialog -->
-    <string name="account_profile">Account Profile</string>
-    <string name="logged_in_as">Logged in as:</string>
-    <string name="auto_update_status">Auto-Update Status:</string>
-    <string name="unlocked_player">Unlocked (PLAYER)</string>
-    <string name="locked_no_permission">Locked (No permission)</string>
-    <string name="back">Back</string>
-    <string name="logout">Logout</string>
-    <string name="email">Email</string>
-    <string name="password">Password</string>
-    <string name="cancel">Cancel</string>
-    <string name="login">Login</string>
-    <string name="or">OR</string>
-    <string name="login_with_discord">Login with Discord</string>
-    <string name="please_enter_both">Please enter both Email and Password</string>
-    <string name="login_failed">Login failed</string>
-    <string name="failed_to_fetch_profile">Failed to fetch profile</string>
-
-    <!-- AutoUpdateDialog -->
-    <string name="update_available">Update Available</string>
-    <string name="no_update_available">No Update Available</string>
-    <string name="app_up_to_date">Your app is up to date</string>
-    <string name="ok">OK</string>
-    <string name="latest_version">Latest Version</string>
-    <string name="whats_new">What\'s New</string>
-    <string name="downloading">Downloading...</string>
-    <string name="installation_ready">Installation Ready</string>
-    <string name="later">Later</string>
-    <string name="install_now">Install Now</string>
-
-    <!-- LogPopup -->
-    <string name="golog_output">GoLog Output</string>
-    <string name="auto_scroll">Auto-Scroll</string>
-    <string name="clear">Clear</string>
-    <string name="close">Close</string>
 </resources>

gradlew.bat

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 @rem
 @rem Copyright 2015 the original author or authors.
 @rem
@@ -88,94 +87,3 @@ exit /b 1
 if "%OS%"=="Windows_NT" endlocal
 
 :omega
-=======
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
->>>>>>> 2459650 (feat: v4)

script/release.json

@@ -1,4 +1,4 @@
 {
-    "tag": "4.3.5-01",
+    "tag": "4.3.3-01",
-    "title": "PreBuild Version 4.3.55 - 01"
+    "title": "PreBuild Version 4.3.53 - 01"
 }