From 0a44f56c2f44a9fedde6eeb25ca8e133c51cc5f8 Mon Sep 17 00:00:00 2001
From: AzenKain <doduykhanh344@gmail.com>
Date: Sat, 18 Oct 2025 09:13:43 +0700
Subject: [PATCH] Re-optima apk

---
 .idea/gradle.xml                              |  1 +
 app/build.gradle.kts                          |  7 +-
 app/libs/firefly-go.aar                       |  4 +-
 .../firefly_go_android/MainActivity.kt        | 82 ++++++++++---------
 app/src/main/res/raw/app_version_json.json    |  6 +-
 gradle.properties                             |  1 +
 gradle/libs.versions.toml                     | 20 +++--
 script/README_Note.md                         |  2 +-
 script/release.json                           |  4 +-
 9 files changed, 71 insertions(+), 56 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 639c779..1580500 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -15,5 +15,6 @@
         </option>
       </GradleProjectSettings>
     </option>
+    <option name="parallelModelFetch" value="true" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index e938705..2b7181e 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -22,6 +22,8 @@ android {
         versionName = "1.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+
+
     }
 
     buildTypes {
@@ -32,6 +34,9 @@ android {
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
+            ndk {
+                abiFilters.addAll(listOf("arm64-v8a"))
+            }
         }
     }
 
@@ -89,6 +94,6 @@ dependencies {
     // Local AAR library
     implementation(files("libs/firefly-go.aar"))
 
-    implementation("org.slf4j:slf4j-android:1.7.36")
+    implementation(libs.slf4j.android)
 }
 
diff --git a/app/libs/firefly-go.aar b/app/libs/firefly-go.aar
index eb4547a..8c1726a 100644
--- a/app/libs/firefly-go.aar
+++ b/app/libs/firefly-go.aar
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0d27c1c866cd38bb59ab1df254a11da6cd47bc26e8fe6d4f041e64b036dc8196
-size 89612502
+oid sha256:0f0a361683f895acb860bab3e903c490f0ef9a3c90fed2ae71201669ae87e1c9
+size 44968493
diff --git a/app/src/main/java/com/example/firefly_go_android/MainActivity.kt b/app/src/main/java/com/example/firefly_go_android/MainActivity.kt
index a85d2cc..d974fda 100644
--- a/app/src/main/java/com/example/firefly_go_android/MainActivity.kt
+++ b/app/src/main/java/com/example/firefly_go_android/MainActivity.kt
@@ -66,6 +66,7 @@ import androidx.compose.ui.window.DialogProperties
 import kotlinx.coroutines.delay
 import org.json.JSONObject
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.font.FontFamily
 
 data class AppVersion(
     val latestVersion: String,
@@ -421,64 +422,60 @@ fun parseGoLogLine(line: String): String? {
     return if (content.isNullOrBlank()) null else content
 }
 
-fun parseAnsi(text: String): AnnotatedString {
+
+fun parseAnsi(text: String, defaultColor: Color): AnnotatedString {
     val regex = Regex("\u001B\\[(\\d+)(;\\d+)*m")
     val builder = buildAnnotatedString {
         var lastIndex = 0
-        var currentColor = Color.Black
+        var currentColor = defaultColor
 
         for (match in regex.findAll(text)) {
             val start = match.range.first
+
+            // 1. Thêm phần text TRƯỚC mã ANSI với màu HIỆN TẠI
             val before = text.substring(lastIndex, start)
-            withStyle(SpanStyle(color = currentColor)) {
-                append(before)
+            if (before.isNotEmpty()) {
+                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)
-                }
+            // 2. Lấy mã code (ví dụ 31, 36, hoặc 0)
+            val code = try {
+                match.groupValues[1].toInt()
+            } catch (e: NumberFormatException) {
+                0
+            }
 
-                37 -> {
-                    Color.White
-                }
-                else -> {
-                    Color.Black
-                }
+            currentColor = when (code) {
+                0 -> defaultColor
+                30 -> Color.Black
+                31 -> Color.Red
+                32 -> Color(0xFF00C853) // Green
+                33 -> Color(0xFFFFD600) // Yellow
+                34 -> Color(0xFF2962FF) // Blue
+                35 -> Color(0xFFD500F9) // Magenta
+                36 -> Color(0xFF00B8D4) // Cyan
+                37 -> Color.White
+                else -> currentColor
             }
 
             lastIndex = match.range.last + 1
         }
 
-        val remain = text.substring(lastIndex)
-        withStyle(SpanStyle(color = currentColor)) {
-            append(remain)
+        if (lastIndex < text.length) {
+            val remain = text.substring(lastIndex)
+            if (remain.isNotEmpty()) {
+                withStyle(SpanStyle(color = currentColor)) {
+                    append(remain)
+                }
+            }
         }
     }
 
     return builder
 }
 
-
 @Composable
 fun LogPopup(
     onDismiss: () -> Unit
@@ -512,6 +509,8 @@ fun LogPopup(
         }
     }
 
+    val defaultTextColor = LocalContentColor.current
+
     Dialog(onDismissRequest = { onDismiss() }) {
         Surface(
             shape = RoundedCornerShape(12.dp),
@@ -531,8 +530,15 @@ fun LogPopup(
                 LazyColumn(state = listState, modifier = Modifier.weight(1f)) {
                     items(logs.size) { index ->
                         Text(
-                            text = parseAnsi(logs[index]),
+                            text = parseAnsi(logs[index], defaultTextColor),
                             fontSize = 12.sp,
+
+                            // 2. DÙNG FONT MONOSPACE
+                            fontFamily = FontFamily.Monospace,
+
+                            // 3. (Tuỳ chọn) Giảm chiều cao dòng để logo liền mạch
+                            lineHeight = 14.sp,
+
                             modifier = Modifier.padding(vertical = 2.dp)
                         )
                     }
diff --git a/app/src/main/res/raw/app_version_json.json b/app/src/main/res/raw/app_version_json.json
index ac488b3..90c08f0 100644
--- a/app/src/main/res/raw/app_version_json.json
+++ b/app/src/main/res/raw/app_version_json.json
@@ -1,5 +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"
+  "latest_version": "3.6.4-03",
+  "changelog": "UPDATE: Re-optima",
+  "apk_url": "https://git.kain.io.vn/Firefly-Shelter/FireflyGo_Android/releases/download/3.6.4-03/firefly_go_android.apk"
 }
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 942f4fe..d94d770 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -23,3 +23,4 @@ kotlin.code.style=official
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
 #org.gradle.configuration-cache=false
+android.r8.optimizedResourceShrinking=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6b93275..b102cac 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,23 +2,24 @@
 activityComposeVersion = "1.11.0"
 agp = "8.13.0"
 androidxJunit = "1.3.0"
-animationCore = "1.9.2"
+animationCore = "1.9.3"
 autoupdater = "1.0.1"
 espressoCoreVersion = "3.7.0"
-foundation = "1.9.2"
+foundation = "1.9.3"
 kotlin = "2.2.20"
 coreKtx = "1.17.0"
 junit = "4.13.2"
 lifecycleRuntimeKtxVersion = "2.9.4"
-material = "1.9.2"
+material = "1.9.3"
 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"
+slf4jAndroidVersion = "1.7.36"
+ui = "1.9.3"
+uiGraphics = "1.9.3"
+uiTestJunit4 = "1.9.3"
+uiTestManifest = "1.9.3"
+uiTooling = "1.9.3"
+uiToolingPreview = "1.9.3"
 
 [libraries]
 androidx-activity-compose-v1101 = { module = "androidx.activity:activity-compose", version.ref = "activityComposeVersion" }
@@ -35,6 +36,7 @@ androidx-material3-window-size-class1 = { module = "androidx.compose.material3:m
 autoupdater = { module = "com.github.CSAbhiOnline:AutoUpdater", version.ref = "autoupdater" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
 material3 = { module = "androidx.compose.material3:material3", version.ref = "material3WindowSizeClass" }
+slf4j-android = { module = "org.slf4j:slf4j-android", version.ref = "slf4jAndroidVersion" }
 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" }
diff --git a/script/README_Note.md b/script/README_Note.md
index 7a91ad3..5e12187 100644
--- a/script/README_Note.md
+++ b/script/README_Note.md
@@ -1,2 +1,2 @@
 # Changelog
-## - FIX: I forgot update new data
\ No newline at end of file
+## - UPDATE: Re-Optima apk
\ No newline at end of file
diff --git a/script/release.json b/script/release.json
index 6cde68c..beddc02 100644
--- a/script/release.json
+++ b/script/release.json
@@ -1,5 +1,5 @@
 {
-    "tag": "3.6.4-02",
-    "title": "PreBuild Version 3.6.54 - 02"
+    "tag": "3.6.4-03",
+    "title": "PreBuild Version 3.6.54 - 03"
 }
   
\ No newline at end of file