UPDATE: Update to 3.6.54

.gitea/workflows/build.yml

@@ -0,0 +1,57 @@
+name: Build
+run-name: ${{ gitea.actor }} build 🚀
+
+on: [push]
+
+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: '21.0.7'
+
+      - 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/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,3 +1,4 @@
+<?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">

app/build.gradle.kts

@@ -1,5 +1,8 @@
 @file:Suppress("UnstableApiUsage")
 
+import com.android.build.api.dsl.Packaging
+
+
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
@@ -11,7 +14,7 @@ android {
     compileSdk = 36
 
     defaultConfig {
-        applicationId = "com.example.firefly_go_android"
+        applicationId = "com.kain344.firefly_go_android"
         minSdk = 24
         //noinspection OldTargetApi
         targetSdk = 35
@@ -21,6 +24,11 @@ android {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
+    fun Packaging.() {
+        jniLibs {
+            useLegacyPackaging = true
+        }
+    }
     buildTypes {
         release {
             isMinifyEnabled = false
@@ -32,16 +40,17 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = "17"
     }
 
     buildFeatures {
         compose = true
+        viewBinding = true
     }
 
     composeOptions {
@@ -49,6 +58,10 @@ android {
     }
     buildToolsVersion = "36.0.0"
     ndkVersion = "27.2.12479018"
+    dependenciesInfo {
+        includeInApk = false
+        includeInBundle = false
+    }
 }
 
 dependencies {
@@ -87,6 +100,6 @@ dependencies {
     debugImplementation(libs.ui.test.manifest)
 
     // Local AAR library
-    implementation(files("../library/firefly-go.aar"))
+    implementation(files("libs/firefly-go.aar"))
 }
 

app/src/main/AndroidManifest.xml

@@ -18,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" />

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

@@ -4,8 +4,8 @@ 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

@@ -16,7 +16,6 @@ import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
@@ -56,12 +55,17 @@ 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,
@@ -98,7 +102,7 @@ class MainActivity : ComponentActivity() {
                 Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
                     Box(modifier = Modifier.fillMaxSize()) {
                         ServerControlScreen(appDataPath, dataDir, appVersion, Modifier.padding(innerPadding))
-                        AutoUpdateDialog(onDismiss = {}, appVersion, true)
+                        AutoUpdateDialog(onDismiss = {}, appVersion, dataDir, true)
                     }
                 }
             }
@@ -126,6 +130,28 @@ fun copyRawToFile(context: Context, targetDir: File, fileName: String, resId: In
     }
 }
 
+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) {
@@ -161,7 +187,7 @@ fun ServerControlScreen(appDataPath: String, dataDir: File, appVersion: AppVersi
         ) {
             // Title
             Text(
-                text = "Firefly Ps for Android",
+                text = "Firefly GO for Android",
                 fontSize = 26.sp,
                 fontWeight = FontWeight.Bold,
                 modifier = Modifier.padding(top = 24.dp),
@@ -248,7 +274,6 @@ fun ServerControlScreen(appDataPath: String, dataDir: File, appVersion: AppVersi
                 horizontalArrangement = Arrangement.spacedBy(32.dp),
                 verticalAlignment = Alignment.CenterVertically
             ) {
-                val context = LocalContext.current
 
                 // Check Update widget
                 Column(
@@ -381,7 +406,9 @@ fun ServerControlScreen(appDataPath: String, dataDir: File, appVersion: AppVersi
     // Auto Update Dialog
     if (showUpdateDialog) {
         AutoUpdateDialog(
-            onDismiss = { showUpdateDialog = false }, appVersion
+            onDismiss = { showUpdateDialog = false },
+            appVersion,
+            dataDir
         )
     }
 }
@@ -394,6 +421,63 @@ fun parseGoLogLine(line: String): String? {
     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(
@@ -444,19 +528,16 @@ fun LogPopup(
                 )
                 Spacer(modifier = Modifier.height(8.dp))
 
-                LazyColumn(
-                    state = listState,
-                    modifier = Modifier.weight(1f)
-                ) {
+                LazyColumn(state = listState, modifier = Modifier.weight(1f)) {
                     items(logs.size) { index ->
                         Text(
-                            text = logs[index],
+                            text = parseAnsi(logs[index]),
                             fontSize = 12.sp,
-                            color = Color.Black,
                             modifier = Modifier.padding(vertical = 2.dp)
                         )
                     }
                 }
+
                 Spacer(modifier = Modifier.height(8.dp))
                 Button(
                     onClick = { onDismiss() },
@@ -475,6 +556,7 @@ fun LogPopup(
 fun AutoUpdateDialog(
     onDismiss: () -> Unit,
     appVersion: AppVersion,
+    dataDir: File,
     isFirstOpen: Boolean = false
 ) {
     val context = LocalContext.current
@@ -522,6 +604,10 @@ fun AutoUpdateDialog(
     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)
         }
     }
@@ -601,7 +687,7 @@ fun AutoUpdateDialog(
                                         autoUpdaterManager.downloadapk(
                                             context,
                                             update!!.apk_url,
-                                            "MyApp_${update!!.latestversion}.apk"
+                                            "FireflyGO_${update!!.latestversion}.apk"
                                         ) { prog -> progress = prog }
                                     }
                                 }

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

@@ -1,5 +1,5 @@
 {
-  "latest_version": "3.6.2-01",
-  "changelog": "UPDATE: Update to 3.6.52",
-  "apk_url": "https://cloud.kain.id.vn/seafhttp/f/7a7d79a5354e4d39976f/?op=view"
+  "latest_version": "3.6.4-01",
+  "changelog": "UPDATE: Update to 3.6.54",
+  "apk_url": "https://git.kain.io.vn/Firefly-Shelter/FireflyGo_Android/releases/download/3.6.4-01/firefly_go_android.apk"
 }

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

@@ -2,20 +2,20 @@
   "leader": 0,
   "lineups": {
     "0": 1413,
-    "1": 1403,
+    "1": 1415,
     "2": 1409,
     "3": 1407
   },
   "position": {
-    "x": -30,
-    "z": -22750,
-    "y": -15000,
-    "rot_y": 234288
+    "x": 218004,
+    "z": 259263,
+    "y": 53915,
+    "rot_y": 79863
   },
   "scene": {
-    "plane_id": 10000,
-    "floor_id": 10000003,
-    "entry_id": 100000352
+    "plane_id": 20423,
+    "floor_id": 20423001,
+    "entry_id": 2042301
   },
   "player_outfit": [
     1001
@@ -145,12 +145,19 @@
   },
   "theory_craft": {
     "hp": {
-      "1": 600000,
-      "2": 10000000
+      "1": [
+        200000,
+        1000000,
+        200000
+      ],
+      "2": [
+        500000,
+        10000000,
+        500000
+      ]
     },
     "cycle_count": 1,
-    "log": false,
-    "mode": false
+    "mode": true
   },
   "profile_data": {
     "cur_chat_bubble_id": 220008,

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>

gradle.properties

@@ -14,12 +14,12 @@ 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
-android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
 # 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=true
+#org.gradle.configuration-cache=false

gradle/libs.versions.toml

@@ -1,24 +1,24 @@
 [versions]
-activityComposeVersion = "1.10.1"
-agp = "8.9.3"
+activityComposeVersion = "1.11.0"
+agp = "8.13.0"
 androidxJunit = "1.3.0"
-animationCore = "1.9.0"
+animationCore = "1.9.2"
 autoupdater = "1.0.1"
 espressoCoreVersion = "3.7.0"
-foundation = "1.9.0"
-kotlin = "2.0.21"
+foundation = "1.9.2"
+kotlin = "2.2.20"
 coreKtx = "1.17.0"
 junit = "4.13.2"
-lifecycleRuntimeKtxVersion = "2.9.3"
-material = "1.9.0"
-material3WindowSizeClass = "1.3.2"
+lifecycleRuntimeKtxVersion = "2.9.4"
+material = "1.9.2"
+material3WindowSizeClass = "1.4.0"
 materialIconsExtended = "1.7.8"
-ui = "1.9.0"
-uiGraphics = "1.9.0"
-uiTestJunit4 = "1.9.0"
-uiTestManifest = "1.9.0"
-uiTooling = "1.9.0"
-uiToolingPreview = "1.9.0"
+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" }

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:5334f2dbde52cf6c2a2a0152a3b2250bc217a19036d3607ce81a9b84ff1c69d0
-size 89535421

script/README_Note.md

@@ -0,0 +1,2 @@
+# Changelog
+## - UPDATE: Update to 3.6.54

script/release.json

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

settings.gradle.kts

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