FIX: Update new resource

.gitea/workflows/build.yml

@@ -0,0 +1,61 @@
+name: Build
+run-name: ${{ gitea.actor }} build 🚀
+
+on:
+  push:
+    branches:
+      - master
+
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v5
+
+      - name: Set Up JDK
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: '17'
+
+      - name: Setup Android SDK
+        uses: amyu/setup-android@v5
+        with:
+          cache-disabled: true
+
+      - name: Grant execute permissions
+        run: |
+          chmod +x ./gradlew
+          chmod +x ./script/release-uploader
+
+      - name: Download AAR manually
+        run: |
+          FILE="app/libs/firefly-go.aar"
+          URL="https://git.kain.io.vn/Firefly-Shelter/FireflyGo_Android/media/branch/master/app/libs/firefly-go.aar"
+          echo "📥 Downloading $FILE from $URL"
+          curl -L -o "$FILE" "$URL"
+
+      - name: Build signed release APK
+        env:
+          KEYSTORE_PATH: ${{ github.workspace }}/KeyStore.jks
+          KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
+          KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+          KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
+        run: |
+          ./gradlew assembleRelease \
+            -Pandroid.injected.signing.store.file=$KEYSTORE_PATH \
+            -Pandroid.injected.signing.store.password=$KEYSTORE_PASSWORD \
+            -Pandroid.injected.signing.key.alias=$KEY_ALIAS \
+            -Pandroid.injected.signing.key.password=$KEY_PASSWORD
+
+      - name: Find and rename release APK
+        run: |
+          APK_FILE=$(ls app/build/outputs/apk/release/*.apk | head -n 1)
+          echo "Found APK: $APK_FILE"
+          mv "$APK_FILE" app/build/outputs/apk/release/firefly_go_android.apk
+
+      - name: Upload release
+        env:
+          REPO_TOKEN: ${{ secrets.REPO_TOKEN }}
+        run: script/release-uploader -token=$REPO_TOKEN -release-url="https://git.kain.io.vn/api/v1/repos/Firefly-Shelter/FireflyGo_Android/releases" -files="app/build/outputs/apk/release/firefly_go_android.apk"

.gitignore

@@ -15,3 +15,4 @@
 .externalNativeBuild
 .cxx
 local.properties
+.history/

.idea/.name

@@ -1 +1 @@
-FireflyPsAndorid
+FireflyGoAndroid

.idea/compiler.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="21" />
+    <bytecodeTargetLevel target="17" />
   </component>
 </project>

.idea/deviceManager.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DeviceTable">
+    <option name="columnSorters">
+      <list>
+        <ColumnSorterState>
+          <option name="column" value="Name" />
+          <option name="order" value="ASCENDING" />
+        </ColumnSorterState>
+      </list>
+    </option>
+  </component>
+</project>

.idea/misc.xml

@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

app/build.gradle.kts

@@ -1,16 +1,22 @@
+@file:Suppress("UnstableApiUsage")
+
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
 }
+kotlin {
+    jvmToolchain(17)
+}
 
 android {
-    namespace = "com.example.fireflypsandorid"
-    compileSdk = 35
+    namespace = "com.example.firefly_go_android"
+    compileSdk = 36
 
     defaultConfig {
-        applicationId = "com.example.fireflypsandorid"
+        applicationId = "com.kain344.firefly_go_android"
         minSdk = 24
+        //noinspection OldTargetApi
         targetSdk = 35
         versionCode = 1
         versionName = "1.0"
@@ -20,41 +26,69 @@ android {
 
     buildTypes {
         release {
-            isMinifyEnabled = false
+            isMinifyEnabled = true
+            isShrinkResources = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
         }
     }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
-    }
-    kotlinOptions {
-        jvmTarget = "11"
-    }
+
     buildFeatures {
         compose = true
+        viewBinding = true
+    }
+
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.5.0"
+    }
+    buildToolsVersion = "36.0.0"
+    ndkVersion = "27.2.12479018"
+    dependenciesInfo {
+        includeInApk = false
+        includeInBundle = false
     }
 }
 
 dependencies {
-
     implementation(libs.androidx.core.ktx)
-    implementation(libs.androidx.lifecycle.runtime.ktx)
-    implementation(libs.androidx.activity.compose)
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.androidx.ui)
-    implementation(libs.androidx.ui.graphics)
-    implementation(libs.androidx.ui.tooling.preview)
-    implementation(libs.androidx.material3)
+    implementation(libs.androidx.lifecycle.runtime.ktx.v293)
+    implementation(libs.androidx.activity.compose.v1101)
+    // Compose UI
+    implementation(libs.ui)
+    implementation(libs.ui.graphics)
+    implementation(libs.ui.tooling.preview)
+
+    // Foundation & Animation
+    implementation(libs.androidx.foundation)
+    implementation(libs.androidx.animation)
+    implementation(libs.androidx.animation.core)
+
+    // Material & Material3
+    implementation(libs.androidx.material)
+    implementation(libs.androidx.material.icons.extended)
+    implementation(libs.material3)
+    implementation(libs.androidx.material3.window.size.class1)
+
+    // Auto updater library
+    implementation(libs.autoupdater)
+
+    // Unit Test
     testImplementation(libs.junit)
-    androidTestImplementation(libs.androidx.junit)
-    androidTestImplementation(libs.androidx.espresso.core)
-    androidTestImplementation(platform(libs.androidx.compose.bom))
-    androidTestImplementation(libs.androidx.ui.test.junit4)
-    debugImplementation(libs.androidx.ui.tooling)
-    debugImplementation(libs.androidx.ui.test.manifest)
-    implementation(files("../library/firefly-go.aar"))
+
+    // Android Instrumentation Test
+    androidTestImplementation(libs.androidx.junit.v130)
+    androidTestImplementation(libs.androidx.espresso.core.v370)
+    androidTestImplementation(libs.ui.test.junit4)
+
+    // Debug
+    debugImplementation(libs.ui.tooling)
+    debugImplementation(libs.ui.test.manifest)
+
+    // Local AAR library
+    implementation(files("libs/firefly-go.aar"))
+
+    implementation("org.slf4j:slf4j-android:1.7.36")
 }
+

app/src/androidTest/java/com/example/firefly_go_android/ExampleInstrumentedTest.kt

@@ -1,4 +1,4 @@
-package com.example.fireflypsandorid
+package com.example.firefly_go_android
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4

app/src/main/AndroidManifest.xml

@@ -6,6 +6,8 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+    <uses-permission android:name="android.permission.READ_LOGS"/>
 
     <application
         android:allowBackup="true"
@@ -16,12 +18,12 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:requestLegacyExternalStorage="true"
-        android:theme="@style/Theme.FireflyPsAndorid"
+        android:theme="@style/Theme.FireflyGoAndroid"
         tools:targetApi="31">
         <activity
             android:name=".MainActivity"
             android:exported="true"
-            android:theme="@style/Theme.FireflyPsAndorid">
+            android:theme="@style/Theme.FireflyGoAndroid">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -32,6 +34,17 @@
             android:name=".GolangServerService"
             android:foregroundServiceType="dataSync"
             android:exported="false" />
+
+
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
     </application>
 
 </manifest>

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

@@ -1,11 +1,11 @@
-package com.example.fireflypsandorid
+package com.example.firefly_go_android
 
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.app.PendingIntent
 import android.app.Service
-import android.content.Context
 import android.content.Intent
+import android.graphics.BitmapFactory
 import android.os.Build
 import android.os.IBinder
 import android.os.PowerManager
@@ -14,6 +14,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.core.app.NotificationCompat
+import androidx.core.content.ContextCompat
 import libandroid.Libandroid
 
 class GolangServerService : Service() {
@@ -47,20 +48,29 @@ class GolangServerService : Service() {
             notificationIntent,
             PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
         )
+        val largeIcon = BitmapFactory.decodeResource(resources, R.mipmap.ic_launcher)
 
         val notification = NotificationCompat.Builder(this, CHANNEL_ID)
+            .setSmallIcon(R.mipmap.ic_launcher_round)
+            .setLargeIcon(largeIcon)
             .setContentTitle("FireflyGO Server")
-            .setContentText("FireflyGO is running...")
-            .setSmallIcon(R.drawable.ic_launcher_foreground)
+            .setContentText("Server is running...")
+            .setColor(ContextCompat.getColor(this, R.color.teal_700))
+            .setOngoing(true)
+            .setOnlyAlertOnce(true)
             .setContentIntent(pendingIntent)
+            .setPriority(NotificationCompat.PRIORITY_DEFAULT)
+            .setShowWhen(false)
+            .setCategory(NotificationCompat.CATEGORY_SERVICE)
             .build()
 
+
         startForeground(NOTIFICATION_ID, notification)
 
         try {
             val powerManager = getSystemService(POWER_SERVICE) as PowerManager
             wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "GolangServer::WakeLock")
-            wakeLock?.acquire()
+            wakeLock?.acquire(10*60*1000L)
             Log.d(TAG, "✅ WakeLock acquired")
         } catch (e: Exception) {
             Log.e(TAG, "❌ WakeLock failed", e)
@@ -106,7 +116,6 @@ class GolangServerService : Service() {
             Log.e(TAG, "Error shutting down server", e)
         }
 
-        // 2. Giải phóng WakeLock nếu còn giữ
         try {
             wakeLock?.let {
                 if (it.isHeld) {
@@ -132,7 +141,7 @@ class GolangServerService : Service() {
                 description = "Channel for running Golang backend in foreground"
             }
 
-            val manager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+            val manager = getSystemService(NOTIFICATION_SERVICE) as NotificationManager
             manager.createNotificationChannel(channel)
             Log.d(TAG, "✅ Notification channel created")
         }

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

@@ -0,0 +1,898 @@
+package com.example.firefly_go_android
+
+import AutoUpdaterManager
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+
+import android.util.Log
+import android.widget.Toast
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.example.autoupdater.UpdateFeatures
+import com.example.firefly_go_android.ui.theme.FireflyPsAndoridTheme
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import java.io.*
+import androidx.compose.animation.*
+import androidx.compose.animation.core.*
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.BugReport
+import androidx.compose.material.icons.filled.CloudDownload
+import androidx.compose.material.icons.filled.PlayArrow
+import androidx.compose.material.icons.filled.PlayCircleFilled
+import androidx.compose.material.icons.filled.RestartAlt
+import androidx.compose.material.icons.filled.Stop
+import androidx.compose.material.icons.filled.StopCircle
+import androidx.compose.material.icons.rounded.AutoAwesome
+import androidx.compose.material.icons.rounded.CheckCircle
+import androidx.compose.material.icons.rounded.Download
+import androidx.compose.material.icons.rounded.InstallMobile
+import androidx.compose.material.icons.rounded.SystemUpdate
+import androidx.compose.material3.LinearProgressIndicator
+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.geometry.Offset
+import androidx.compose.ui.graphics.Shadow
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.withStyle
+import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import kotlinx.coroutines.delay
+import org.json.JSONObject
+import androidx.compose.ui.graphics.Color
+
+data class AppVersion(
+    val latestVersion: String,
+    val changelog: String,
+    val apkUrl: String
+)
+
+class MainActivity : ComponentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val appDataPath = filesDir.absolutePath
+        val dataDir = File("$appDataPath/data")
+        dataDir.mkdirs()
+
+        copyRawToFile(this, dataDir, "data-in-game.json", R.raw.data_in_game_json)
+        copyRawToFile(this, dataDir, "freesr-data.json", R.raw.freesr_data_json)
+        copyRawToFile(this, dataDir, "version.json", R.raw.version_json)
+
+        val jsonString = resources.openRawResource(R.raw.app_version_json).use { input ->
+            input.bufferedReader().use { it.readText() }
+        }
+
+        val jsonObject = JSONObject(jsonString)
+        val latestVersion = jsonObject.getString("latest_version")
+        val changelog = jsonObject.getString("changelog")
+        val apkUrl = jsonObject.getString("apk_url")
+
+        val appVersion = AppVersion(latestVersion, changelog, apkUrl)
+
+        enableEdgeToEdge()
+        setContent {
+            FireflyPsAndoridTheme {
+                Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
+                    Box(modifier = Modifier.fillMaxSize()) {
+                        ServerControlScreen(appDataPath, dataDir, appVersion, Modifier.padding(innerPadding))
+                        AutoUpdateDialog(onDismiss = {}, appVersion, dataDir, true)
+                    }
+                }
+            }
+        }
+
+    }
+
+}
+
+fun copyRawToFile(context: Context, targetDir: File, fileName: String, resId: Int, override: Boolean = false) {
+    val outFile = File(targetDir, fileName)
+    if (!outFile.exists() || override) {
+        try {
+            context.resources.openRawResource(resId).use { input ->
+                FileOutputStream(outFile).use { output ->
+                    input.copyTo(output)
+                }
+            }
+            Log.i("FileCopy", "${if (override) "✅ Overridden" else "✅ Copied"} $fileName to ${outFile.absolutePath}")
+        } catch (e: Exception) {
+            Log.e("FileCopy", "❌ Failed to copy $fileName: ${e.message}")
+        }
+    } else {
+        Log.i("FileCopy", "ℹ️ $fileName already exists at ${outFile.absolutePath}")
+    }
+}
+
+fun removeFile(targetDir: File, fileName: String): Boolean {
+    val file = File(targetDir, fileName)
+    return if (file.exists()) {
+        try {
+            if (file.delete()) {
+                Log.i("FileRemove", "🗑️ Removed $fileName from ${file.absolutePath}")
+                true
+            } else {
+                Log.e("FileRemove", "❌ Failed to remove $fileName from ${file.absolutePath}")
+                false
+            }
+        } catch (e: Exception) {
+            Log.e("FileRemove", "❌ Error removing $fileName: ${e.message}")
+            false
+        }
+    } else {
+        Log.i("FileRemove", "ℹ️ $fileName does not exist in ${targetDir.absolutePath}")
+        false
+    }
+}
+
+
+@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)
+                            context.startService(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(
+                horizontalArrangement = Arrangement.spacedBy(32.dp),
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+
+                // Check Update widget
+                Column(
+                    horizontalAlignment = Alignment.CenterHorizontally,
+                    modifier = Modifier
+                        .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
+                        .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
+                        .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, "data-in-game.json", R.raw.data_in_game_json, true)
+                            copyRawToFile(context, dataDir, "freesr-data.json", R.raw.freesr_data_json, true)
+                            copyRawToFile(context, dataDir, "version.json", R.raw.version_json, 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): AnnotatedString {
+    val regex = Regex("\u001B\\[(\\d+)(;\\d+)*m")
+    val builder = buildAnnotatedString {
+        var lastIndex = 0
+        var currentColor = Color.Black
+
+        for (match in regex.findAll(text)) {
+            val start = match.range.first
+            val before = text.substring(lastIndex, start)
+            withStyle(SpanStyle(color = currentColor)) {
+                append(before)
+            }
+
+            val code = match.groupValues[1].toInt()
+            currentColor = when (code) {
+                30 -> {
+                    Color.Black
+                }
+                31 -> {
+                    Color.Red
+                }
+                32 -> {
+                    Color(0xFF00C853)
+                }
+                33 -> {
+                    Color(0xFFFFD600)
+                }
+                34 -> {
+                    Color(0xFF2962FF)
+                }
+                35 -> {
+                    Color(0xFFD500F9)
+                }
+                36 -> {
+                    Color(0xFF00B8D4)
+                }
+
+                37 -> {
+                    Color.White
+                }
+                else -> {
+                    Color.Black
+                }
+            }
+
+            lastIndex = match.range.last + 1
+        }
+
+        val remain = text.substring(lastIndex)
+        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)
+        }
+    }
+
+    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]),
+                            fontSize = 12.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 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 { mutableIntStateOf(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
+
+            removeFile(dataDir, "data-in-game.json" )
+            removeFile(dataDir, "freesr-data.json")
+            removeFile(dataDir, "version.json")
+            delay(500)
+        }
+    }
+
+    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/ui/theme/Color.kt

@@ -1,4 +1,4 @@
-package com.example.fireflypsandorid.ui.theme
+package com.example.firefly_go_android.ui.theme
 
 import androidx.compose.ui.graphics.Color
 

app/src/main/java/com/example/firefly_go_android/ui/theme/Theme.kt

@@ -1,6 +1,5 @@
-package com.example.fireflypsandorid.ui.theme
+package com.example.firefly_go_android.ui.theme
 
-import android.app.Activity
 import android.os.Build
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material3.MaterialTheme

app/src/main/java/com/example/firefly_go_android/ui/theme/Type.kt

@@ -1,4 +1,4 @@
-package com.example.fireflypsandorid.ui.theme
+package com.example.firefly_go_android.ui.theme
 
 import androidx.compose.material3.Typography
 import androidx.compose.ui.text.TextStyle

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

@@ -1,154 +0,0 @@
-package com.example.fireflypsandorid
-
-import android.annotation.SuppressLint
-import android.content.Intent
-import android.os.Bundle
-import android.util.Log
-import android.widget.Toast
-import androidx.activity.ComponentActivity
-import androidx.activity.compose.setContent
-import androidx.activity.enableEdgeToEdge
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.*
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import com.example.fireflypsandorid.ui.theme.FireflyPsAndoridTheme
-import java.io.*
-
-class MainActivity : ComponentActivity() {
-    private val tag = "AppInit"
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        val appDataPath = filesDir.absolutePath
-        val dataDir = File("$appDataPath/data")
-        dataDir.mkdirs()
-
-        checkAndCreateFile(dataDir, "data-in-game.json", R.raw.data_in_game_json)
-        checkAndCreateFile(dataDir, "freesr-data.json", R.raw.freesr_data_json)
-        checkAndCreateFile(dataDir, "version.json", R.raw.version_json)
-
-        enableEdgeToEdge()
-        setContent {
-            FireflyPsAndoridTheme {
-                Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
-                    ServerControlScreen(appDataPath, Modifier.padding(innerPadding))
-                }
-            }
-        }
-    }
-
-    private fun checkAndCreateFile(targetDir: File, fileName: String, resId: Int) {
-        val outFile = File(targetDir, fileName)
-        if (!outFile.exists()) {
-            try {
-                resources.openRawResource(resId).use { input ->
-                    FileOutputStream(outFile).use { output ->
-                        input.copyTo(output)
-                    }
-                }
-                Log.i(tag, "✅ Copied $fileName to ${outFile.absolutePath}")
-            } catch (e: Exception) {
-                Log.e(tag, "❌ Failed to copy $fileName: ${e.message}")
-            }
-        } else {
-            Log.i(tag, "ℹ️ $fileName already exists at ${outFile.absolutePath}")
-        }
-    }
-}
-
-
-@SuppressLint("ImplicitSamInstance")
-@Composable
-fun ServerControlScreen(appDataPath: String, modifier: Modifier = Modifier) {
-    val context = LocalContext.current
-    val isRunning = GolangServerService.isRunning
-    val serverImage = if (isRunning)
-        painterResource(id = R.drawable.server_running)
-    else
-        painterResource(id = R.drawable.server_stopped)
-
-    Column(
-        modifier = modifier
-            .fillMaxSize()
-            .padding(24.dp),
-        verticalArrangement = Arrangement.SpaceBetween,
-        horizontalAlignment = Alignment.CenterHorizontally
-    ) {
-        // Title
-        Text(
-            text = "Firefly Ps for Android",
-            fontSize = 26.sp,
-            fontWeight = FontWeight.Bold,
-            modifier = Modifier
-                .padding(top = 24.dp),
-            color = Color(0xFF4CAF50).copy(alpha = 0.9f) // Lime Green
-        )
-
-        Spacer(modifier = Modifier.height(8.dp))
-
-        // Server status image
-        Image(
-            painter = serverImage,
-            contentDescription = null,
-            contentScale = ContentScale.Crop,
-            modifier = Modifier
-                .fillMaxWidth()
-                .height(250.dp)
-                .padding(8.dp)
-        )
-
-        Spacer(modifier = Modifier.height(8.dp))
-
-        // Toggle button
-        Button(
-            onClick = {
-                try {
-                    if (!isRunning) {
-                        val intent = Intent(context, GolangServerService::class.java)
-                        intent.putExtra("appDataPath", appDataPath)
-                        context.startService(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.7f)
-                .height(50.dp)
-        ) {
-            Text(
-                text = if (isRunning) "Stop Server" else "Start Server",
-                fontSize = 20.sp
-            )
-        }
-
-        Spacer(modifier = Modifier.height(4.dp))
-
-        // Server status text
-        Text(
-            text = if (isRunning) "Server is running" else "Server is stopped",
-            fontSize = 24.sp,
-            color = if (isRunning) Color(0xFF4CAF50) else Color.Gray
-        )
-
-        Spacer(modifier = Modifier.height(24.dp))
-    }
-}

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

@@ -0,0 +1,5 @@
+{
+  "latest_version": "3.6.4-02",
+  "changelog": "UPDATE: Update to 3.6.54",
+  "apk_url": "https://git.kain.io.vn/Firefly-Shelter/FireflyGo_Android/releases/download/3.6.4-02/firefly_go_android.apk"
+}

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

@@ -1,22 +1,25 @@
 {
-  "leader": 1,
+  "leader": 0,
   "lineups": {
-    "0": 1310,
-    "1": 1410,
+    "0": 1413,
+    "1": 1415,
     "2": 1409,
     "3": 1407
   },
   "position": {
-    "x": -4030,
-    "z": -13006,
-    "y": 0,
-    "rot_y": 270000
+    "x": 218004,
+    "z": 259263,
+    "y": 53915,
+    "rot_y": 79863
   },
   "scene": {
-    "plane_id": 10000,
-    "floor_id": 10000000,
-    "entry_id": 100000104
+    "plane_id": 20423,
+    "floor_id": 20423001,
+    "entry_id": 2042301
   },
+  "player_outfit": [
+    1001
+  ],
   "char_path": {
     "main": 8008,
     "march_7": 1224
@@ -27,32 +30,141 @@
     "1205": 1,
     "1212": 1
   },
-  "battle": {
-    "battle_id": 0,
+  "challenge": {
+    "challenge_id": 0,
     "skip_half": 0,
     "blessings": [],
-    "freesr": false,
-    "current_half": 0,
+    "is_in_challenge": false,
+    "current_stage_id": 30118121,
     "path_resonance_id": 0,
     "maze_buff": 0,
     "first_lineup": [],
     "second_lineup": []
   },
+  "challenge_peak": {
+    "current_mode": "Knight",
+    "group_id": 2,
+    "is_in_challenge_peak": false,
+    "challenge_peak_data": {
+      "1": {
+        "checkmate_data": {
+          "challenge_id": 104,
+          "blessing": 3033006,
+          "lineup": [
+            1413,
+            1409,
+            1407,
+            1403
+          ],
+          "stage_id": 30501022,
+          "is_hard_mode": true
+        },
+        "knight_data": {
+          "current_challenge_id": 103,
+          "details_data": [
+            {
+              "lineup": [
+                1222,
+                1225,
+                1310,
+                1303
+              ],
+              "stage_id": 30501011,
+              "challenge_id": 101
+            },
+            {
+              "lineup": [
+                1412,
+                1414,
+                1408,
+                1313
+              ],
+              "stage_id": 30501012,
+              "challenge_id": 102
+            },
+            {
+              "lineup": [
+                1407,
+                1403,
+                1409,
+                1413
+              ],
+              "stage_id": 30501013,
+              "challenge_id": 103
+            }
+          ]
+        }
+      },
+      "2": {
+        "checkmate_data": {
+          "challenge_id": 204,
+          "blessing": 3033021,
+          "lineup": [
+            1415,
+            1413,
+            1409,
+            1407
+          ],
+          "stage_id": 30502022,
+          "is_hard_mode": true
+        },
+        "knight_data": {
+          "current_challenge_id": 203,
+          "details_data": [
+            {
+              "lineup": [
+                1302,
+                1309,
+                1410
+              ],
+              "stage_id": 30502011,
+              "challenge_id": 201
+            },
+            {
+              "lineup": [
+                1221,
+                1222
+              ],
+              "stage_id": 30502012,
+              "challenge_id": 202
+            },
+            {
+              "lineup": [
+                1415,
+                8001,
+                1414,
+                1313
+              ],
+              "stage_id": 30502013,
+              "challenge_id": 203
+            }
+          ]
+        }
+      }
+    }
+  },
   "theory_craft": {
     "hp": {
-      "1": 600000,
-      "2": 10000000
+      "1": [
+        200000,
+        1000000,
+        200000
+      ],
+      "2": [
+        2000000000,
+        2000000000,
+        2000000000
+      ]
     },
     "cycle_count": 1,
-    "log": false,
     "mode": false
   },
   "profile_data": {
     "cur_chat_bubble_id": 220008,
-    "cur_phone_theme_id": 221011,
+    "cur_phone_theme_id": 221012,
     "cur_phone_case_id": 254001,
     "cur_pam_skin_id": 252000,
-    "cur_pet_id": 1002,
+    "cur_pet_id": 1003,
     "cur_avatar_player_icon": 202034,
     "cur_player_personal_card": 253001,
     "cur_signature": "Firefly GO By Kain",
@@ -60,13 +172,19 @@
       1310,
       1309,
       1407,
-      1412,
-      1001
+      1413,
+      1412
     ],
     "cur_is_display_avatar": true
   },
   "skin_data": {
     "1001": 1100101,
     "1310": 1131001
+  },
+  "extra_setting": {
+    "censorship": false,
+    "cm": false,
+    "first_person": false,
+    "hide_ui": false
   }
 }

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

@@ -1,38 +1,128 @@
 {
-  "CNBETAAndroid3.4.55": {
-    "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_11217430_23c5cfd2cafc_071126dd600bae",
-    "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_11218061_68ee992558e3_fe33df3598d887",
-    "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_11218130_15360461a27a_91a0fd1d2b4db3",
-    "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_0_40d2ce0253_c61ba99f70b885"
+  "CNBETAAndroid3.6.51": {
+    "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_12066992_f083970b907e_999074cab6dce6",
+    "asset_bundle_url_b": "https://autopatchcn.bhsr.com/asb/BetaLive/output_12056690_16bfd67c199f_f3c0367d7b051e",
+    "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_12114942_e99cbde25134_e63a6b835f17f9",
+    "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_12103115_ee78155e9867_3626f0948d93e2",
+    "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_12118783_55113408814f_c874267d04c04a"
   },
-  "CNBETAWin3.4.55": {
-    "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_11217430_23c5cfd2cafc_071126dd600bae",
-    "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_11218061_68ee992558e3_fe33df3598d887",
-    "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_11218130_15360461a27a_91a0fd1d2b4db3",
-    "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_0_40d2ce0253_c61ba99f70b885"
+  "CNBETAAndroid3.6.52": {
+    "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_12150127_00d6d096d968_cd76a04beb7ba6",
+    "asset_bundle_url_b": "https://autopatchcn.bhsr.com/asb/BetaLive/output_12150127_00d6d096d968_cd76a04beb7ba6",
+    "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_12178965_e246796e0bb6_05bcce36cd648b",
+    "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_12150614_5279f6d8029a_bdecff99d2d817",
+    "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_12164593_8e3fba5163df_b2b6fc46de4c06"
   },
-  "CNBETAiOS3.4.55": {
-    "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_11217430_23c5cfd2cafc_071126dd600bae",
-    "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_11218061_68ee992558e3_fe33df3598d887",
-    "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_11218130_15360461a27a_91a0fd1d2b4db3",
-    "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_0_40d2ce0253_c61ba99f70b885"
+  "CNBETAAndroid3.6.53": {
+    "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_12267173_87c48b19cccf_e57c755c3b27d6",
+    "asset_bundle_url_b": "https://autopatchcn.bhsr.com/asb/BetaLive/output_12267173_87c48b19cccf_e57c755c3b27d6",
+    "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_12291938_90c393f370b8_ecf686154f9ea4",
+    "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_12295568_47061d21355e_62b79a4851861d",
+    "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_12279762_593428c5dc22_788410d8dabf6a"
   },
-  "OSBETAAndroid3.4.55": {
-    "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_11217430_23c5cfd2cafc_071126dd600bae",
-    "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_11218061_68ee992558e3_fe33df3598d887",
-    "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_11218130_15360461a27a_91a0fd1d2b4db3",
-    "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_0_40d2ce0253_c61ba99f70b885"
+  "CNBETAWin3.6.51": {
+    "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_12066992_f083970b907e_999074cab6dce6",
+    "asset_bundle_url_b": "https://autopatchcn.bhsr.com/asb/BetaLive/output_12056690_16bfd67c199f_f3c0367d7b051e",
+    "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_12114942_e99cbde25134_e63a6b835f17f9",
+    "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_12103115_ee78155e9867_3626f0948d93e2",
+    "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_12118783_55113408814f_c874267d04c04a"
   },
-  "OSBETAWin3.4.55": {
-    "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_11217430_23c5cfd2cafc_071126dd600bae",
-    "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_11218061_68ee992558e3_fe33df3598d887",
-    "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_11218130_15360461a27a_91a0fd1d2b4db3",
-    "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_0_40d2ce0253_c61ba99f70b885"
+  "CNBETAWin3.6.52": {
+    "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_12150127_00d6d096d968_cd76a04beb7ba6",
+    "asset_bundle_url_b": "https://autopatchcn.bhsr.com/asb/BetaLive/output_12150127_00d6d096d968_cd76a04beb7ba6",
+    "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_12178965_e246796e0bb6_05bcce36cd648b",
+    "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_12150614_5279f6d8029a_bdecff99d2d817",
+    "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_12164593_8e3fba5163df_b2b6fc46de4c06"
   },
-  "OSBETAiOS3.4.55": {
-    "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_11217430_23c5cfd2cafc_071126dd600bae",
-    "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_11218061_68ee992558e3_fe33df3598d887",
-    "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_11218130_15360461a27a_91a0fd1d2b4db3",
-    "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_0_40d2ce0253_c61ba99f70b885"
+  "CNBETAWin3.6.53": {
+    "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_12267173_87c48b19cccf_e57c755c3b27d6",
+    "asset_bundle_url_b": "https://autopatchcn.bhsr.com/asb/BetaLive/output_12267173_87c48b19cccf_e57c755c3b27d6",
+    "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_12291938_90c393f370b8_ecf686154f9ea4",
+    "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_12295568_47061d21355e_62b79a4851861d",
+    "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_12279762_593428c5dc22_788410d8dabf6a"
+  },
+  "CNBETAiOS3.6.51": {
+    "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_12066992_f083970b907e_999074cab6dce6",
+    "asset_bundle_url_b": "https://autopatchcn.bhsr.com/asb/BetaLive/output_12056690_16bfd67c199f_f3c0367d7b051e",
+    "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_12114942_e99cbde25134_e63a6b835f17f9",
+    "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_12103115_ee78155e9867_3626f0948d93e2",
+    "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_12118783_55113408814f_c874267d04c04a"
+  },
+  "CNBETAiOS3.6.52": {
+    "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_12150127_00d6d096d968_cd76a04beb7ba6",
+    "asset_bundle_url_b": "https://autopatchcn.bhsr.com/asb/BetaLive/output_12150127_00d6d096d968_cd76a04beb7ba6",
+    "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_12178965_e246796e0bb6_05bcce36cd648b",
+    "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_12150614_5279f6d8029a_bdecff99d2d817",
+    "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_12164593_8e3fba5163df_b2b6fc46de4c06"
+  },
+  "CNBETAiOS3.6.53": {
+    "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_12267173_87c48b19cccf_e57c755c3b27d6",
+    "asset_bundle_url_b": "https://autopatchcn.bhsr.com/asb/BetaLive/output_12267173_87c48b19cccf_e57c755c3b27d6",
+    "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_12291938_90c393f370b8_ecf686154f9ea4",
+    "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_12295568_47061d21355e_62b79a4851861d",
+    "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_12279762_593428c5dc22_788410d8dabf6a"
+  },
+  "OSBETAAndroid3.6.51": {
+    "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_12066992_f083970b907e_999074cab6dce6",
+    "asset_bundle_url_b": "https://autopatchcn.bhsr.com/asb/BetaLive/output_12056690_16bfd67c199f_f3c0367d7b051e",
+    "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_12114942_e99cbde25134_e63a6b835f17f9",
+    "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_12103115_ee78155e9867_3626f0948d93e2",
+    "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_12118783_55113408814f_c874267d04c04a"
+  },
+  "OSBETAAndroid3.6.52": {
+    "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_12150127_00d6d096d968_cd76a04beb7ba6",
+    "asset_bundle_url_b": "https://autopatchcn.bhsr.com/asb/BetaLive/output_12150127_00d6d096d968_cd76a04beb7ba6",
+    "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_12178965_e246796e0bb6_05bcce36cd648b",
+    "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_12150614_5279f6d8029a_bdecff99d2d817",
+    "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_12164593_8e3fba5163df_b2b6fc46de4c06"
+  },
+  "OSBETAAndroid3.6.53": {
+    "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_12267173_87c48b19cccf_e57c755c3b27d6",
+    "asset_bundle_url_b": "https://autopatchcn.bhsr.com/asb/BetaLive/output_12267173_87c48b19cccf_e57c755c3b27d6",
+    "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_12291938_90c393f370b8_ecf686154f9ea4",
+    "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_12295568_47061d21355e_62b79a4851861d",
+    "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_12279762_593428c5dc22_788410d8dabf6a"
+  },
+  "OSBETAWin3.6.51": {
+    "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_12066992_f083970b907e_999074cab6dce6",
+    "asset_bundle_url_b": "https://autopatchcn.bhsr.com/asb/BetaLive/output_12056690_16bfd67c199f_f3c0367d7b051e",
+    "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_12114942_e99cbde25134_e63a6b835f17f9",
+    "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_12103115_ee78155e9867_3626f0948d93e2",
+    "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_12118783_55113408814f_c874267d04c04a"
+  },
+  "OSBETAWin3.6.52": {
+    "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_12150127_00d6d096d968_cd76a04beb7ba6",
+    "asset_bundle_url_b": "https://autopatchcn.bhsr.com/asb/BetaLive/output_12150127_00d6d096d968_cd76a04beb7ba6",
+    "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_12178965_e246796e0bb6_05bcce36cd648b",
+    "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_12150614_5279f6d8029a_bdecff99d2d817",
+    "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_12164593_8e3fba5163df_b2b6fc46de4c06"
+  },
+  "OSBETAWin3.6.53": {
+    "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_12267173_87c48b19cccf_e57c755c3b27d6",
+    "asset_bundle_url_b": "https://autopatchcn.bhsr.com/asb/BetaLive/output_12267173_87c48b19cccf_e57c755c3b27d6",
+    "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_12291938_90c393f370b8_ecf686154f9ea4",
+    "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_12295568_47061d21355e_62b79a4851861d",
+    "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_12279762_593428c5dc22_788410d8dabf6a"
+  },
+  "OSBETAiOS3.6.51": {
+    "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_12066992_f083970b907e_999074cab6dce6",
+    "asset_bundle_url_b": "https://autopatchcn.bhsr.com/asb/BetaLive/output_12056690_16bfd67c199f_f3c0367d7b051e",
+    "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_12114942_e99cbde25134_e63a6b835f17f9",
+    "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_12103115_ee78155e9867_3626f0948d93e2",
+    "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_12118783_55113408814f_c874267d04c04a"
+  },
+  "OSBETAiOS3.6.52": {
+    "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_12150127_00d6d096d968_cd76a04beb7ba6",
+    "asset_bundle_url_b": "https://autopatchcn.bhsr.com/asb/BetaLive/output_12150127_00d6d096d968_cd76a04beb7ba6",
+    "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_12178965_e246796e0bb6_05bcce36cd648b",
+    "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_12150614_5279f6d8029a_bdecff99d2d817",
+    "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_12164593_8e3fba5163df_b2b6fc46de4c06"
+  },
+  "OSBETAiOS3.6.53": {
+    "asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_12267173_87c48b19cccf_e57c755c3b27d6",
+    "asset_bundle_url_b": "https://autopatchcn.bhsr.com/asb/BetaLive/output_12267173_87c48b19cccf_e57c755c3b27d6",
+    "ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_12291938_90c393f370b8_ecf686154f9ea4",
+    "lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_12295568_47061d21355e_62b79a4851861d",
+    "ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_12279762_593428c5dc22_788410d8dabf6a"
   }
 }

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

@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">FireflyGo-3.5.5X</string>
+    <string name="app_name">Firefly Go</string>
 </resources>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Theme.FireflyPsAndorid" parent="android:Theme.Material.Light.NoActionBar" />
+    <style name="Theme.FireflyGoAndroid" parent="android:Theme.Material.Light.NoActionBar" />
 </resources>

app/src/main/res/xml/file_paths.xml

@@ -0,0 +1,3 @@
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+    <external-files-path name="downloads" path="Download/"/>
+</paths>

app/src/test/java/com/example/firefly_go_android/ExampleUnitTest.kt

@@ -1,4 +1,4 @@
-package com.example.fireflypsandorid
+package com.example.firefly_go_android
 
 import org.junit.Test
 

gradle.properties

@@ -14,6 +14,7 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # AndroidX package structure to make it clearer which packages are bundled with the
 # Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
+org.gradle.parallel=true
 android.useAndroidX=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
@@ -21,3 +22,4 @@ kotlin.code.style=official
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
+#org.gradle.configuration-cache=false

gradle/libs.versions.toml

@@ -1,29 +1,46 @@
 [versions]
-agp = "8.9.1"
-kotlin = "2.0.21"
-coreKtx = "1.10.1"
+activityComposeVersion = "1.11.0"
+agp = "8.13.0"
+androidxJunit = "1.3.0"
+animationCore = "1.9.2"
+autoupdater = "1.0.1"
+espressoCoreVersion = "3.7.0"
+foundation = "1.9.2"
+kotlin = "2.2.20"
+coreKtx = "1.17.0"
 junit = "4.13.2"
-junitVersion = "1.1.5"
-espressoCore = "3.5.1"
-lifecycleRuntimeKtx = "2.6.1"
-activityCompose = "1.8.0"
-composeBom = "2024.09.00"
+lifecycleRuntimeKtxVersion = "2.9.4"
+material = "1.9.2"
+material3WindowSizeClass = "1.4.0"
+materialIconsExtended = "1.7.8"
+ui = "1.9.2"
+uiGraphics = "1.9.2"
+uiTestJunit4 = "1.9.2"
+uiTestManifest = "1.9.2"
+uiTooling = "1.9.2"
+uiToolingPreview = "1.9.2"
 
 [libraries]
+androidx-activity-compose-v1101 = { module = "androidx.activity:activity-compose", version.ref = "activityComposeVersion" }
+androidx-animation = { module = "androidx.compose.animation:animation", version.ref = "animationCore" }
+androidx-animation-core = { module = "androidx.compose.animation:animation-core", version.ref = "animationCore" }
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
+androidx-espresso-core-v370 = { module = "androidx.test.espresso:espresso-core", version.ref = "espressoCoreVersion" }
+androidx-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "foundation" }
+androidx-junit-v130 = { module = "androidx.test.ext:junit", version.ref = "androidxJunit" }
+androidx-lifecycle-runtime-ktx-v293 = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtxVersion" }
+androidx-material = { module = "androidx.compose.material:material", version.ref = "material" }
+androidx-material-icons-extended = { module = "androidx.compose.material:material-icons-extended", version.ref = "materialIconsExtended" }
+androidx-material3-window-size-class1 = { module = "androidx.compose.material3:material3-window-size-class", version.ref = "material3WindowSizeClass" }
+autoupdater = { module = "com.github.CSAbhiOnline:AutoUpdater", version.ref = "autoupdater" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
-androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
-androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
-androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" }
-androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
-androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
-androidx-ui = { group = "androidx.compose.ui", name = "ui" }
-androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
-androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
-androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
-androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
-androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
-androidx-material3 = { group = "androidx.compose.material3", name = "material3" }
+material3 = { module = "androidx.compose.material3:material3", version.ref = "material3WindowSizeClass" }
+ui = { module = "androidx.compose.ui:ui", version.ref = "ui" }
+ui-graphics = { module = "androidx.compose.ui:ui-graphics", version.ref = "uiGraphics" }
+ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "uiTestJunit4" }
+ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "uiTestManifest" }
+ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "uiTooling" }
+ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "uiToolingPreview" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Apr 28 17:05:34 ICT 2025
+#Wed Oct 08 15:20:16 ICT 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

library/firefly-go.aar

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:26eaf2a6981aed15c5c7f6edc465505406f05567739054e71f2d3af60f111ef2
-size 73415308

script/README_Note.md

@@ -0,0 +1,2 @@
+# Changelog
+## - FIX: I forgot update new data

script/release.json

@@ -0,0 +1,5 @@
+{
+    "tag": "3.6.4-02",
+    "title": "PreBuild Version 3.6.54 - 02"
+}
+  

settings.gradle.kts

@@ -1,5 +1,8 @@
 pluginManagement {
     repositories {
+        maven {
+            setUrl("https://jitpack.io")
+        }
         google {
             content {
                 includeGroupByRegex("com\\.android.*")
@@ -9,15 +12,20 @@ pluginManagement {
         }
         mavenCentral()
         gradlePluginPortal()
+
     }
 }
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
+        maven {
+            setUrl("https://jitpack.io")
+        }
         google()
         mavenCentral()
     }
+
 }
 
-rootProject.name = "FireflyPsAndorid"
+rootProject.name = "FireflyGoAndroid"
 include(":app")