UPDATE: New res

UPDATE: Extra setting
2025-10-03 22:03:27 +07:00 · 2025-10-03 22:02:57 +07:00 · 2025-10-02 23:37:14 +07:00 · 2025-09-30 12:06:51 +07:00 · 2025-09-30 11:15:49 +07:00 · 2025-09-30 10:30:40 +07:00
46 changed files with 5395 additions and 14337 deletions
@@ -1,61 +0,0 @@
-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"
@@ -16,4 +16,3 @@
 .cxx
 local.properties
 .history/
-.idea/
@@ -1 +1 @@
-FireflyGoAndroid
+FireflyPsAndorid
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="17" />
+    <bytecodeTargetLevel target="21" />
  </component>
 </project>
@@ -1,13 +0,0 @@
-<?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>
@@ -6,6 +6,7 @@
      <GradleProjectSettings>
        <option name="testRunner" value="CHOOSE_PER_TEST" />
        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
        <option name="modules">
          <set>
            <option value="$PROJECT_DIR$" />
@@ -14,6 +15,5 @@
        </option>
      </GradleProjectSettings>
    </option>
-    <option name="parallelModelFetch" value="true" />
  </component>
 </project>
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="MarkdownSettings">
-    <option name="previewPanelProviderInfo">
-      <ProviderInfo name="Compose (experimental)" className="com.intellij.markdown.compose.preview.ComposePanelProvider" />
-    </option>
-  </component>
-</project>
@@ -1,6 +1,6 @@
 <project version="4">
  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
    <output url="file://$PROJECT_DIR$/build/classes" />
  </component>
  <component name="ProjectType">
@@ -5,48 +5,43 @@ plugins {
    alias(libs.plugins.kotlin.android)
    alias(libs.plugins.kotlin.compose)
 }
-kotlin {
-    jvmToolchain(17)
-}

-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
-    }
-}
 android {
    namespace = "com.example.firefly_go_android"
    compileSdk = 36

    defaultConfig {
-        applicationId = "com.kain344.firefly_go_android"
+        applicationId = "com.example.firefly_go_android"
        minSdk = 24
+        //noinspection OldTargetApi
        targetSdk = 35
-        versionCode = 2
-        versionName = "1.0.1"
+        versionCode = 1
+        versionName = "1.0"

        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-
-
    }

    buildTypes {
        release {
-            isMinifyEnabled = true
-            isShrinkResources = true
+            isMinifyEnabled = false
            proguardFiles(
                getDefaultProguardFile("proguard-android-optimize.txt"),
                "proguard-rules.pro"
            )
-            ndk {
-                abiFilters.addAll(listOf("arm64-v8a"))
-            }
        }
    }

+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
+    kotlinOptions {
+        jvmTarget = "11"
+    }
+
    buildFeatures {
        compose = true
-        viewBinding = true
    }

    composeOptions {
@@ -54,10 +49,6 @@ android {
    }
    buildToolsVersion = "36.0.0"
    ndkVersion = "27.2.12479018"
-    dependenciesInfo {
-        includeInApk = false
-        includeInBundle = false
-    }
 }

 dependencies {
@@ -83,12 +74,6 @@ dependencies {
    // Auto updater library
    implementation(libs.autoupdater)

-    // OkHttp Client
-    implementation("com.squareup.okhttp3:okhttp:4.12.0")
-
-    // Chrome Custom Tabs
-    implementation("androidx.browser:browser:1.8.0")
-
    // Unit Test
    testImplementation(libs.junit)

@@ -102,7 +87,6 @@ dependencies {
    debugImplementation(libs.ui.test.manifest)

    // Local AAR library
-    implementation(files("libs/firefly-go.aar"))
-
-    implementation(libs.slf4j.android)
+    implementation(files("../library/firefly-go.aar"))
 }
+
@@ -2,22 +2,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools">

-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"
-        tools:ignore="ForegroundServicesPolicy" />
-
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
-
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <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.ACCESS_NETWORK_STATE" />
-
-    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"
-        tools:ignore="RequestInstallPackagesPolicy" />
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
    <uses-permission android:name="android.permission.READ_LOGS"/>
-    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"
-        tools:ignore="ScopedStorage" />
-    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />

    <application
        android:allowBackup="true"
@@ -28,35 +18,23 @@
        android:roundIcon="@mipmap/ic_launcher_round"
        android:supportsRtl="true"
        android:requestLegacyExternalStorage="true"
-        android:theme="@style/Theme.FireflyGoAndroid"
+        android:theme="@style/Theme.FireflyPsAndorid"
        tools:targetApi="31">
-
        <activity
            android:name=".MainActivity"
            android:exported="true"
-            android:launchMode="singleTask"
-            android:windowSoftInputMode="adjustResize"
-            android:theme="@style/Theme.FireflyGoAndroid">
+            android:theme="@style/Theme.FireflyPsAndorid">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="firefly-launcher" android:host="auth" android:path="/discord" />
-            </intent-filter>
        </activity>

        <service
            android:name=".GolangServerService"
-            android:foregroundServiceType="specialUse"
-            android:exported="false">
-            <property
-                android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
-                android:value="Running local Golang TCP/UDP Server" />
-        </service>
+            android:foregroundServiceType="dataSync"
+            android:exported="false" />
+

        <provider
            android:name="androidx.core.content.FileProvider"
@@ -1,588 +0,0 @@
-{
-  "leader": 2,
-  "lineups": {
-    "0": 1409,
-    "1": 1407,
-    "2": 1406,
-    "3": 1403
-  },
-  "position": {
-    "x": -4030,
-    "z": -13006,
-    "y": 0,
-    "rot_y": 270000
-  },
-  "scene": {
-    "plane_id": 10000,
-    "floor_id": 10000000,
-    "entry_id": 100000104
-  },
-  "player_outfit": [
-    1003
-  ],
-  "char_path": {
-    "main": 8008,
-    "march_7": 1224
-  },
-  "char_enhanced": {
-    "1004": 1,
-    "1005": 0,
-    "1006": 1,
-    "1102": 1,
-    "1205": 1,
-    "1212": 1,
-    "1217": 1,
-    "1306": 1,
-    "1307": 1,
-    "1310": 1
-  },
-  "challenge": {
-    "challenge_id": 0,
-    "skip_half": 0,
-    "random_seed": 0,
-    "blessings": [],
-    "is_in_challenge": false,
-    "current_stage_id": 0,
-    "path_resonance_id": 0,
-    "maze_buff": 0,
-    "first_lineup": [],
-    "second_lineup": []
-  },
-  "challenge_tierce": {
-    "challenge_id": 0,
-    "current_stage_id": 0,
-    "maze_buff": 0,
-    "path_resonance_id": 0,
-    "is_in_challenge": false,
-    "is_single_stage": false,
-    "challenge_tierce_data": {
-      "20245": {
-        "stage_1": {
-          "blessing": 3031361,
-          "cycle_count": 0,
-          "battle_status": 1,
-          "DeadCount": 0,
-          "score": 40000,
-          "lineup": [
-            1407,
-            1413,
-            1415,
-            1409
-          ]
-        },
-        "stage_2": {
-          "blessing": 3031361,
-          "cycle_count": 0,
-          "battle_status": 1,
-          "DeadCount": 0,
-          "score": 40000,
-          "lineup": [
-            1310,
-            1225,
-            1321,
-            1222
-          ]
-        },
-        "stage_3": {
-          "blessing": 3031362,
-          "cycle_count": 0,
-          "battle_status": 1,
-          "DeadCount": 0,
-          "score": 40000,
-          "lineup": [
-            1506,
-            1502,
-            1501,
-            1217
-          ]
-        }
-      },
-      "30185": {
-        "stage_1": {
-          "blessing": 3111090,
-          "cycle_count": 0,
-          "battle_status": 1,
-          "DeadCount": 0,
-          "score": 3932,
-          "lineup": [
-            1501,
-            1502,
-            1414,
-            1506
-          ]
-        },
-        "stage_2": {
-          "blessing": 3111085,
-          "cycle_count": 0,
-          "battle_status": 1,
-          "DeadCount": 0,
-          "score": 3913,
-          "lineup": [
-            1310,
-            1225,
-            1303,
-            1321
-          ]
-        },
-        "stage_3": {
-          "blessing": 3111071,
-          "cycle_count": 0,
-          "battle_status": 1,
-          "DeadCount": 0,
-          "score": 4000,
-          "lineup": [
-            1415,
-            1413,
-            1407,
-            1409
-          ]
-        }
-      },
-      "5213": {
-        "stage_1": {
-          "blessing": 0,
-          "cycle_count": 0,
-          "battle_status": 1,
-          "DeadCount": 0,
-          "score": 0,
-          "lineup": [
-            1407,
-            1413,
-            1415,
-            1409
-          ]
-        },
-        "stage_2": {
-          "blessing": 0,
-          "cycle_count": 1,
-          "battle_status": 1,
-          "DeadCount": 0,
-          "score": 0,
-          "lineup": [
-            1310,
-            1321,
-            1225,
-            1222
-          ]
-        },
-        "stage_3": {
-          "blessing": 0,
-          "cycle_count": 0,
-          "battle_status": 1,
-          "DeadCount": 0,
-          "score": 0,
-          "lineup": [
-            1506,
-            1502,
-            1501,
-            1414
-          ]
-        }
-      },
-      "5313": {
-        "stage_1": {
-          "blessing": 0,
-          "cycle_count": 0,
-          "battle_status": 3,
-          "DeadCount": 0,
-          "score": 0,
-          "lineup": [
-            1510,
-            8001,
-            1004,
-            1414
-          ]
-        },
-        "stage_2": {
-          "blessing": 0,
-          "cycle_count": 0,
-          "battle_status": 0,
-          "DeadCount": 0,
-          "score": 0,
-          "lineup": [
-            1302
-          ]
-        },
-        "stage_3": {
-          "blessing": 0,
-          "cycle_count": 0,
-          "battle_status": 0,
-          "DeadCount": 0,
-          "score": 0,
-          "lineup": [
-            1321
-          ]
-        }
-      }
-    }
-  },
-  "challenge_peak": {
-    "current_mode": "Knight",
-    "group_id": 8,
-    "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
-            }
-          ]
-        }
-      },
-      "3": {
-        "checkmate_data": {
-          "challenge_id": 304,
-          "blessing": 3033032,
-          "lineup": [
-            1222,
-            1225,
-            1310,
-            1321
-          ],
-          "stage_id": 30503021,
-          "is_hard_mode": false
-        },
-        "knight_data": {
-          "current_challenge_id": 302,
-          "details_data": [
-            {
-              "lineup": [
-                1003
-              ],
-              "stage_id": 30503011,
-              "challenge_id": 301
-            },
-            {
-              "lineup": [
-                1315
-              ],
-              "stage_id": 30503012,
-              "challenge_id": 302
-            },
-            {
-              "lineup": [
-                8001
-              ],
-              "stage_id": 30503013,
-              "challenge_id": 303
-            }
-          ]
-        }
-      },
-      "4": {
-        "checkmate_data": {
-          "challenge_id": 404,
-          "blessing": 3033045,
-          "lineup": [
-            1310
-          ],
-          "stage_id": 30504021,
-          "is_hard_mode": false
-        },
-        "knight_data": {
-          "current_challenge_id": 401,
-          "details_data": [
-            {
-              "lineup": [
-                1302
-              ],
-              "stage_id": 30504011,
-              "challenge_id": 401
-            },
-            {
-              "lineup": [
-                1321
-              ],
-              "stage_id": 30504012,
-              "challenge_id": 402
-            },
-            {
-              "lineup": [
-                1218
-              ],
-              "stage_id": 30504013,
-              "challenge_id": 403
-            }
-          ]
-        }
-      },
-      "5": {
-        "checkmate_data": {
-          "challenge_id": 504,
-          "blessing": 3033050,
-          "lineup": [
-            1415,
-            1413,
-            1407,
-            1409
-          ],
-          "stage_id": 30505021,
-          "is_hard_mode": false
-        },
-        "knight_data": {
-          "current_challenge_id": 501,
-          "details_data": [
-            {
-              "lineup": [
-                1310
-              ],
-              "stage_id": 30505011,
-              "challenge_id": 501
-            },
-            {
-              "lineup": [
-                1407
-              ],
-              "stage_id": 30505012,
-              "challenge_id": 502
-            },
-            {
-              "lineup": [
-                1502
-              ],
-              "stage_id": 30505013,
-              "challenge_id": 503
-            }
-          ]
-        }
-      },
-      "6": {
-        "checkmate_data": {
-          "challenge_id": 604,
-          "blessing": 3033053,
-          "lineup": [
-            1505,
-            1217,
-            1502,
-            8001
-          ],
-          "stage_id": 30506021,
-          "is_hard_mode": false
-        },
-        "knight_data": {
-          "current_challenge_id": 602,
-          "details_data": [
-            {
-              "lineup": [
-                1309
-              ],
-              "stage_id": 30506011,
-              "challenge_id": 601
-            },
-            {
-              "lineup": [
-                1321,
-                1310,
-                1225,
-                1303
-              ],
-              "stage_id": 30506012,
-              "challenge_id": 602
-            },
-            {
-              "lineup": [
-                1415,
-                1413,
-                1409,
-                1407
-              ],
-              "stage_id": 30506013,
-              "challenge_id": 603
-            }
-          ]
-        }
-      },
-      "7": {
-        "checkmate_data": {
-          "challenge_id": 704,
-          "blessing": 3033061,
-          "lineup": [
-            1505,
-            1502,
-            1414,
-            1410
-          ],
-          "stage_id": 30507021,
-          "is_hard_mode": false
-        },
-        "knight_data": {
-          "current_challenge_id": 703,
-          "details_data": [
-            {
-              "lineup": [
-                1414
-              ],
-              "stage_id": 30507011,
-              "challenge_id": 701
-            },
-            {
-              "lineup": [
-                1501
-              ],
-              "stage_id": 30507012,
-              "challenge_id": 702
-            },
-            {
-              "lineup": [
-                1507,
-                1222
-              ],
-              "stage_id": 30507013,
-              "challenge_id": 703
-            }
-          ]
-        }
-      },
-      "8": {
-        "checkmate_data": {
-          "challenge_id": 0,
-          "blessing": 0,
-          "lineup": null,
-          "stage_id": 0,
-          "is_hard_mode": false
-        },
-        "knight_data": {
-          "current_challenge_id": 0,
-          "details_data": null
-        }
-      }
-    }
-  },
-  "theory_craft": {
-    "hp": {
-      "1": [
-        200000,
-        1000000,
-        200000
-      ],
-      "2": [
-        2000000000,
-        2000000000,
-        2000000000
-      ],
-      "3": []
-    },
-    "cycle_count": 1,
-    "stage_id": 30118121,
-    "mode": false,
-    "custom_lineup": []
-  },
-  "profile_data": {
-    "cur_chat_bubble_id": 220009,
-    "cur_phone_theme_id": 221012,
-    "cur_phone_case_id": 254001,
-    "cur_pam_skin_id": 252000,
-    "cur_pet_id": 0,
-    "cur_avatar_player_icon": 202034,
-    "cur_player_personal_card": 253001,
-    "cur_signature": "Firefly GO By Kain",
-    "cur_nickname": "Firefly GO",
-    "cur_display_avatar": [
-      1310,
-      1309,
-      1407,
-      1413,
-      1412
-    ],
-    "cur_is_display_avatar": true
-  },
-  "skin_data": {
-    "1001": 1100101,
-    "1310": 1131001,
-    "1407": 1140701,
-    "1415": 1141501
-  },
-  "extra_setting": {
-    "censorship": false,
-    "cm": false,
-    "first_person": false,
-    "hide_ui": false
-  }
-}
@@ -1,170 +0,0 @@
-{
-  "CNBETAAndroid4.3.51": {
-    "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_15261247_f6e6db2125cf_369da465b36faf",
-    "asset_bundle_url_b": "https://autopatchos.starrails.com/asb/BetaLive/output_15235885_6091fd15561a_83828f542dc1f3",
-    "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_15265964_c2fbb1eb05fc_f2238199ee2b6e",
-    "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_15242148_d40f856defc0_599b68a0adf7bd",
-    "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_15265964_799df4f0ecef_5a94550ba64cff"
-  },
-  "CNBETAAndroid4.3.52": {
-    "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_15305566_fea016d35145_54bbf8ab4009f5",
-    "asset_bundle_url_b": "https://autopatchos.starrails.com/asb/BetaLive/output_15305566_fea016d35145_54bbf8ab4009f5",
-    "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_15318724_a7af31327e74_b3328eb95329b2",
-    "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_15305751_09783637ccc4_d16f9c81138ab3",
-    "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_15265964_799df4f0ecef_5a94550ba64cff"
-  },
-  "CNBETAAndroid4.3.53": {
-    "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_15378434_99bffafdeff7_5d97713dcef07f",
-    "asset_bundle_url_b": "https://autopatchos.starrails.com/asb/BetaLive/output_15378434_99bffafdeff7_5d97713dcef07f",
-    "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_15385668_07011a79dadf_1111728953724e",
-    "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_15378559_7514340ac82f_70dad6c56b8bc7",
-    "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_15384138_4e4be8cf97ac_1e3fcfa0a93bef"
-  },
-  "CNBETAAndroid4.3.54": {
-    "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_15440751_fb99372e1e48_fd11e486274779",
-    "asset_bundle_url_b": "https://autopatchos.starrails.com/asb/BetaLive/output_15440751_fb99372e1e48_fd11e486274779",
-    "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_15497648_6ef97acf9b45_ea8ed0ff303308",
-    "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_15440843_4201511c48d0_34717e44c82e30",
-    "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_0_40d2ce0253_6d871f8bca6eb4"
-  },
-  "CNBETAWin4.3.51": {
-    "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_15261247_f6e6db2125cf_369da465b36faf",
-    "asset_bundle_url_b": "https://autopatchos.starrails.com/asb/BetaLive/output_15235885_6091fd15561a_83828f542dc1f3",
-    "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_15265964_c2fbb1eb05fc_f2238199ee2b6e",
-    "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_15242148_d40f856defc0_599b68a0adf7bd",
-    "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_15265964_799df4f0ecef_5a94550ba64cff"
-  },
-  "CNBETAWin4.3.52": {
-    "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_15305566_fea016d35145_54bbf8ab4009f5",
-    "asset_bundle_url_b": "https://autopatchos.starrails.com/asb/BetaLive/output_15305566_fea016d35145_54bbf8ab4009f5",
-    "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_15318724_a7af31327e74_b3328eb95329b2",
-    "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_15305751_09783637ccc4_d16f9c81138ab3",
-    "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_15265964_799df4f0ecef_5a94550ba64cff"
-  },
-  "CNBETAWin4.3.53": {
-    "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_15378434_99bffafdeff7_5d97713dcef07f",
-    "asset_bundle_url_b": "https://autopatchos.starrails.com/asb/BetaLive/output_15378434_99bffafdeff7_5d97713dcef07f",
-    "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_15385668_07011a79dadf_1111728953724e",
-    "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_15378559_7514340ac82f_70dad6c56b8bc7",
-    "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_15384138_4e4be8cf97ac_1e3fcfa0a93bef"
-  },
-  "CNBETAWin4.3.54": {
-    "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_15440751_fb99372e1e48_fd11e486274779",
-    "asset_bundle_url_b": "https://autopatchos.starrails.com/asb/BetaLive/output_15440751_fb99372e1e48_fd11e486274779",
-    "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_15497648_6ef97acf9b45_ea8ed0ff303308",
-    "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_15440843_4201511c48d0_34717e44c82e30",
-    "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_0_40d2ce0253_6d871f8bca6eb4"
-  },
-  "CNBETAiOS4.3.51": {
-    "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_15261247_f6e6db2125cf_369da465b36faf",
-    "asset_bundle_url_b": "https://autopatchos.starrails.com/asb/BetaLive/output_15235885_6091fd15561a_83828f542dc1f3",
-    "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_15265964_c2fbb1eb05fc_f2238199ee2b6e",
-    "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_15242148_d40f856defc0_599b68a0adf7bd",
-    "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_15265964_799df4f0ecef_5a94550ba64cff"
-  },
-  "CNBETAiOS4.3.52": {
-    "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_15305566_fea016d35145_54bbf8ab4009f5",
-    "asset_bundle_url_b": "https://autopatchos.starrails.com/asb/BetaLive/output_15305566_fea016d35145_54bbf8ab4009f5",
-    "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_15318724_a7af31327e74_b3328eb95329b2",
-    "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_15305751_09783637ccc4_d16f9c81138ab3",
-    "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_15265964_799df4f0ecef_5a94550ba64cff"
-  },
-  "CNBETAiOS4.3.53": {
-    "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_15378434_99bffafdeff7_5d97713dcef07f",
-    "asset_bundle_url_b": "https://autopatchos.starrails.com/asb/BetaLive/output_15378434_99bffafdeff7_5d97713dcef07f",
-    "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_15385668_07011a79dadf_1111728953724e",
-    "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_15378559_7514340ac82f_70dad6c56b8bc7",
-    "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_15384138_4e4be8cf97ac_1e3fcfa0a93bef"
-  },
-  "CNBETAiOS4.3.54": {
-    "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_15440751_fb99372e1e48_fd11e486274779",
-    "asset_bundle_url_b": "https://autopatchos.starrails.com/asb/BetaLive/output_15440751_fb99372e1e48_fd11e486274779",
-    "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_15497648_6ef97acf9b45_ea8ed0ff303308",
-    "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_15440843_4201511c48d0_34717e44c82e30",
-    "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_0_40d2ce0253_6d871f8bca6eb4"
-  },
-  "OSBETAAndroid4.3.51": {
-    "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_15261247_f6e6db2125cf_369da465b36faf",
-    "asset_bundle_url_b": "https://autopatchos.starrails.com/asb/BetaLive/output_15235885_6091fd15561a_83828f542dc1f3",
-    "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_15265964_c2fbb1eb05fc_f2238199ee2b6e",
-    "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_15242148_d40f856defc0_599b68a0adf7bd",
-    "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_15265964_799df4f0ecef_5a94550ba64cff"
-  },
-  "OSBETAAndroid4.3.52": {
-    "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_15305566_fea016d35145_54bbf8ab4009f5",
-    "asset_bundle_url_b": "https://autopatchos.starrails.com/asb/BetaLive/output_15305566_fea016d35145_54bbf8ab4009f5",
-    "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_15318724_a7af31327e74_b3328eb95329b2",
-    "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_15305751_09783637ccc4_d16f9c81138ab3",
-    "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_15265964_799df4f0ecef_5a94550ba64cff"
-  },
-  "OSBETAAndroid4.3.53": {
-    "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_15378434_99bffafdeff7_5d97713dcef07f",
-    "asset_bundle_url_b": "https://autopatchos.starrails.com/asb/BetaLive/output_15378434_99bffafdeff7_5d97713dcef07f",
-    "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_15385668_07011a79dadf_1111728953724e",
-    "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_15378559_7514340ac82f_70dad6c56b8bc7",
-    "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_15384138_4e4be8cf97ac_1e3fcfa0a93bef"
-  },
-  "OSBETAAndroid4.3.54": {
-    "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_15440751_fb99372e1e48_fd11e486274779",
-    "asset_bundle_url_b": "https://autopatchos.starrails.com/asb/BetaLive/output_15440751_fb99372e1e48_fd11e486274779",
-    "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_15497648_6ef97acf9b45_ea8ed0ff303308",
-    "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_15440843_4201511c48d0_34717e44c82e30",
-    "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_0_40d2ce0253_6d871f8bca6eb4"
-  },
-  "OSBETAWin4.3.51": {
-    "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_15261247_f6e6db2125cf_369da465b36faf",
-    "asset_bundle_url_b": "https://autopatchos.starrails.com/asb/BetaLive/output_15235885_6091fd15561a_83828f542dc1f3",
-    "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_15265964_c2fbb1eb05fc_f2238199ee2b6e",
-    "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_15242148_d40f856defc0_599b68a0adf7bd",
-    "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_15265964_799df4f0ecef_5a94550ba64cff"
-  },
-  "OSBETAWin4.3.52": {
-    "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_15305566_fea016d35145_54bbf8ab4009f5",
-    "asset_bundle_url_b": "https://autopatchos.starrails.com/asb/BetaLive/output_15305566_fea016d35145_54bbf8ab4009f5",
-    "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_15318724_a7af31327e74_b3328eb95329b2",
-    "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_15305751_09783637ccc4_d16f9c81138ab3",
-    "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_15265964_799df4f0ecef_5a94550ba64cff"
-  },
-  "OSBETAWin4.3.53": {
-    "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_15378434_99bffafdeff7_5d97713dcef07f",
-    "asset_bundle_url_b": "https://autopatchos.starrails.com/asb/BetaLive/output_15378434_99bffafdeff7_5d97713dcef07f",
-    "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_15385668_07011a79dadf_1111728953724e",
-    "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_15378559_7514340ac82f_70dad6c56b8bc7",
-    "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_15384138_4e4be8cf97ac_1e3fcfa0a93bef"
-  },
-  "OSBETAWin4.3.54": {
-    "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_15440751_fb99372e1e48_fd11e486274779",
-    "asset_bundle_url_b": "https://autopatchos.starrails.com/asb/BetaLive/output_15440751_fb99372e1e48_fd11e486274779",
-    "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_15497648_6ef97acf9b45_ea8ed0ff303308",
-    "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_15440843_4201511c48d0_34717e44c82e30",
-    "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_0_40d2ce0253_6d871f8bca6eb4"
-  },
-  "OSBETAiOS4.3.51": {
-    "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_15261247_f6e6db2125cf_369da465b36faf",
-    "asset_bundle_url_b": "https://autopatchos.starrails.com/asb/BetaLive/output_15235885_6091fd15561a_83828f542dc1f3",
-    "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_15265964_c2fbb1eb05fc_f2238199ee2b6e",
-    "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_15242148_d40f856defc0_599b68a0adf7bd",
-    "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_15265964_799df4f0ecef_5a94550ba64cff"
-  },
-  "OSBETAiOS4.3.52": {
-    "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_15305566_fea016d35145_54bbf8ab4009f5",
-    "asset_bundle_url_b": "https://autopatchos.starrails.com/asb/BetaLive/output_15305566_fea016d35145_54bbf8ab4009f5",
-    "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_15318724_a7af31327e74_b3328eb95329b2",
-    "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_15305751_09783637ccc4_d16f9c81138ab3",
-    "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_15265964_799df4f0ecef_5a94550ba64cff"
-  },
-  "OSBETAiOS4.3.53": {
-    "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_15378434_99bffafdeff7_5d97713dcef07f",
-    "asset_bundle_url_b": "https://autopatchos.starrails.com/asb/BetaLive/output_15378434_99bffafdeff7_5d97713dcef07f",
-    "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_15385668_07011a79dadf_1111728953724e",
-    "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_15378559_7514340ac82f_70dad6c56b8bc7",
-    "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_15384138_4e4be8cf97ac_1e3fcfa0a93bef"
-  },
-  "OSBETAiOS4.3.54": {
-    "asset_bundle_url": "https://autopatchos.starrails.com/asb/BetaLive/output_15440751_fb99372e1e48_fd11e486274779",
-    "asset_bundle_url_b": "https://autopatchos.starrails.com/asb/BetaLive/output_15440751_fb99372e1e48_fd11e486274779",
-    "ex_resource_url": "https://autopatchos.starrails.com/design_data/BetaLive/output_15497648_6ef97acf9b45_ea8ed0ff303308",
-    "lua_url": "https://autopatchos.starrails.com/lua/BetaLive/output_15440843_4201511c48d0_34717e44c82e30",
-    "ifix_url": "https://autopatchos.starrails.com/ifix/BetaLive/output_0_40d2ce0253_6d871f8bca6eb4"
-  }
-}
@@ -1,13 +1,11 @@
 package com.example.firefly_go_android

-import android.annotation.SuppressLint
 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.content.pm.ServiceInfo
-import android.graphics.BitmapFactory
 import android.os.Build
 import android.os.IBinder
 import android.os.PowerManager
@@ -16,9 +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
-import androidx.core.content.edit

 class GolangServerService : Service() {

@@ -36,10 +32,9 @@ class GolangServerService : Service() {
        createNotificationChannel()
    }

-    @SuppressLint("WakelockTimeout")
    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
        if (isRunning) {
-            Log.d(TAG, "Server is already running")
+            Log.d(TAG, "❗ Server is already running")
            return START_STICKY
        }
        isRunning = true
@@ -52,79 +47,49 @@ 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("Server is running...")
-            .setColor(ContextCompat.getColor(this, R.color.teal_700))
-            .setOngoing(true)
-            .setOnlyAlertOnce(true)
+            .setContentText("FireflyGO is running...")
+            .setSmallIcon(R.drawable.ic_launcher_foreground)
            .setContentIntent(pendingIntent)
-            .setPriority(NotificationCompat.PRIORITY_DEFAULT)
-            .setShowWhen(false)
-            .setCategory(NotificationCompat.CATEGORY_SERVICE)
            .build()

-        if (Build.VERSION.SDK_INT >= 34) {
-            startForeground(
-                NOTIFICATION_ID,
-                notification,
-                ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE
-            )
-        } else if (Build.VERSION.SDK_INT >= 29) {
-            startForeground(
-                NOTIFICATION_ID,
-                notification,
-                ServiceInfo.FOREGROUND_SERVICE_TYPE_MANIFEST
-            )
-        } else {
-            startForeground(NOTIFICATION_ID, notification)
-        }
+        startForeground(NOTIFICATION_ID, notification)

-        // Khởi tạo WakeLock và WifiLock
        try {
            val powerManager = getSystemService(POWER_SERVICE) as PowerManager
            wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "GolangServer::WakeLock")
            wakeLock?.acquire()
-            Log.d(TAG, "WakeLock acquired")
+            Log.d(TAG, "✅ WakeLock acquired")
        } catch (e: Exception) {
-            Log.e(TAG, "Lock failed", e)
+            Log.e(TAG, "❌ WakeLock failed", e)
        }

        Thread {
            try {
-                val sharedPrefs = getSharedPreferences("AppPrefs", MODE_PRIVATE)
-                var appDataPath = intent?.getStringExtra("appDataPath")
-
-                if (appDataPath != null) {
-                    sharedPrefs.edit { putString("saved_app_data_path", appDataPath) }
-                } else {
-                    appDataPath = sharedPrefs.getString("saved_app_data_path", null)
-                }
-
+                val appDataPath = intent?.getStringExtra("appDataPath")
                if (appDataPath != null) {
                    Libandroid.setPathDataLocal(appDataPath)
-                    Log.d(TAG, "Set path data: $appDataPath")
+                    Log.d(TAG, "✅ Set path data: $appDataPath")
                } else {
                    isRunning = false
-                    Log.e(TAG, "appDataPath not received and not found in SharedPreferences")
+                    Log.e(TAG, "❌ appDataPath not received in intent")
                    stopSelf()
                    return@Thread
                }

                Libandroid.setServerRunning(true)
                isRunning = true
-                Log.d(TAG, "Server started")
+                Log.d(TAG, "✅ Server started")
            } catch (e: Exception) {
                isRunning = false
-                Log.e(TAG, "Error starting server", e)
+                Log.e(TAG, "❌ Error starting server", e)
                stopSelf()
            }
        }.start()

+
        return START_STICKY
    }

@@ -132,6 +97,7 @@ class GolangServerService : Service() {
        super.onDestroy()
        Log.d(TAG, "onDestroy called")

+        // 1. Tắt server
        try {
            val result = Libandroid.setServerRunning(false)
            isRunning = false
@@ -140,16 +106,16 @@ class GolangServerService : Service() {
            Log.e(TAG, "Error shutting down server", e)
        }

-        // Nhả các khóa tài nguyên
+        // 2. Giải phóng WakeLock nếu còn giữ
        try {
            wakeLock?.let {
                if (it.isHeld) {
                    it.release()
-                    Log.d(TAG, "WakeLock released")
+                    Log.d(TAG, "✅ WakeLock released")
                }
            }
        } catch (e: Exception) {
-            Log.e(TAG, "Failed to release Locks", e)
+            Log.e(TAG, "❌ Failed to release WakeLock", e)
        }
        isRunning = false
    }
@@ -166,9 +132,9 @@ class GolangServerService : Service() {
                description = "Channel for running Golang backend in foreground"
            }

-            val manager = getSystemService(NOTIFICATION_SERVICE) as NotificationManager
+            val manager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
            manager.createNotificationChannel(channel)
-            Log.d(TAG, "Notification channel created")
+            Log.d(TAG, "✅ Notification channel created")
        }
    }
 }
@@ -1,128 +0,0 @@
-package com.example.firefly_go_android.network
-
-import android.content.Context
-import android.util.Log
-import okhttp3.*
-import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.RequestBody.Companion.toRequestBody
-import org.json.JSONObject
-import java.io.IOException
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-
-class AuthManager(private val context: Context) {
-    private val sharedPrefs = context.getSharedPreferences("auth_prefs", Context.MODE_PRIVATE)
-    private val client = OkHttpClient()
-
-    companion object {
-        private const val BASE_URL = "https://api.punklorde.org"
-        private const val TOKEN_KEY = "access_token"
-        private const val EMAIL_KEY = "user_email"
-        private const val IS_PLAYER_KEY = "is_player"
-    }
-
-    var accessToken: String?
-        get() = sharedPrefs.getString(TOKEN_KEY, null)
-        set(value) = sharedPrefs.edit().putString(TOKEN_KEY, value).apply()
-
-    var userEmail: String?
-        get() = sharedPrefs.getString(EMAIL_KEY, null)
-        set(value) = sharedPrefs.edit().putString(EMAIL_KEY, value).apply()
-
-    var isPlayer: Boolean
-        get() = sharedPrefs.getBoolean(IS_PLAYER_KEY, false)
-        set(value) = sharedPrefs.edit().putBoolean(IS_PLAYER_KEY, value).apply()
-
-    val isLoggedIn: Boolean
-        get() = accessToken != null
-
-    suspend fun login(email: String, password: String): Result<Boolean> = withContext(Dispatchers.IO) {
-        val json = JSONObject().apply {
-            put("email", email)
-            put("password", password)
-        }
-        val body = json.toString().toRequestBody("application/json; charset=utf-8".toMediaType())
-        val request = Request.Builder()
-            .url("$BASE_URL/auth/signin")
-            .post(body)
-            .build()
-
-        try {
-            client.newCall(request).execute().use { response ->
-                val bodyStr = response.body?.string() ?: ""
-                if (!response.isSuccessful) {
-                    val errMsg = try {
-                        JSONObject(bodyStr).getString("message")
-                    } catch (e: Exception) {
-                        "Login failed: ${response.code}"
-                    }
-                    return@withContext Result.failure(Exception(errMsg))
-                }
-
-                val jsonResponse = JSONObject(bodyStr)
-                if (!jsonResponse.getBoolean("status")) {
-                    return@withContext Result.failure(Exception(jsonResponse.optString("message", "Login failed")))
-                }
-
-                val data = jsonResponse.getJSONObject("data")
-                val token = data.getString("access_token")
-                accessToken = token
-                userEmail = email
-
-                // Fetch user profile to verify role
-                return@withContext fetchProfileAndVerifyRole(token)
-            }
-        } catch (e: Exception) {
-            return@withContext Result.failure(e)
-        }
-    }
-
-    suspend fun fetchProfileAndVerifyRole(token: String): Result<Boolean> = withContext(Dispatchers.IO) {
-        val request = Request.Builder()
-            .url("$BASE_URL/users/current")
-            .header("Authorization", "Bearer $token")
-            .get()
-            .build()
-
-        try {
-            client.newCall(request).execute().use { response ->
-                val bodyStr = response.body?.string() ?: ""
-                if (!response.isSuccessful) {
-                    // Token might have expired, clear local credentials
-                    if (response.code == 401) {
-                        logout()
-                    }
-                    return@withContext Result.failure(Exception("Failed to fetch profile: ${response.code}"))
-                }
-
-                val jsonResponse = JSONObject(bodyStr)
-                if (!jsonResponse.getBoolean("status")) {
-                    return@withContext Result.failure(Exception(jsonResponse.optString("message", "Failed to fetch profile")))
-                }
-
-                val data = jsonResponse.getJSONObject("data")
-                val rolesArray = data.getJSONArray("roles")
-                var hasPlayerRole = false
-                for (i in 0 until rolesArray.length()) {
-                    val roleObj = rolesArray.getJSONObject(i)
-                    val roleName = roleObj.getString("name").uppercase()
-                    if (roleName == "PLAYER" || roleName == "ADMIN" || roleName == "MOD") {
-                        hasPlayerRole = true
-                        break
-                    }
-                }
-
-                isPlayer = hasPlayerRole
-                return@withContext Result.success(hasPlayerRole)
-            }
-        } catch (e: Exception) {
-            return@withContext Result.failure(e)
-        }
-    }
-
-    fun logout() {
-        accessToken = null
-        userEmail = null
-        isPlayer = false
-    }
-}
@@ -1,376 +0,0 @@
-package com.example.firefly_go_android
-
-import AutoUpdaterManager
-import android.content.Context
-import androidx.compose.animation.animateContentSize
-import androidx.compose.animation.core.FastOutSlowInEasing
-import androidx.compose.animation.core.Spring
-import androidx.compose.animation.core.animateFloatAsState
-import androidx.compose.animation.core.spring
-import androidx.compose.animation.core.tween
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-import androidx.compose.foundation.BorderStroke
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.rounded.*
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.draw.scale
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.compose.ui.window.Dialog
-import androidx.compose.ui.window.DialogProperties
-import androidx.compose.ui.res.stringResource
-import com.example.firefly_go_android.R
-import com.example.autoupdater.UpdateFeatures
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import java.io.File
-
-@Composable
-fun AutoUpdateDialog(
-    onDismiss: () -> Unit,
-    appVersion: AppVersion,
-    dataDir: File,
-    isFirstOpen: Boolean = false
-) {
-    val context = LocalContext.current
-    val autoUpdaterManager = AutoUpdaterManager(context)
-    var update by remember { mutableStateOf<UpdateFeatures?>(null) }
-    var progress by remember { mutableStateOf(0) }
-    var showDialog by remember { mutableStateOf(false) }
-    var isDownloading by remember { mutableStateOf(false) }
-    var downloadComplete by remember { mutableStateOf(false) }
-    val coroutineScope = rememberCoroutineScope()
-
-    val progressAnimation by animateFloatAsState(
-        targetValue = progress / 100f,
-        animationSpec = tween(300, easing = FastOutSlowInEasing),
-        label = "progress"
-    )
-
-    val scaleAnimation by animateFloatAsState(
-        targetValue = if (showDialog) 1f else 0.8f,
-        animationSpec = spring(dampingRatio = Spring.DampingRatioMediumBouncy),
-        label = "scale"
-    )
-
-    // Check for update
-    LaunchedEffect(Unit) {
-        val result = withContext(Dispatchers.IO) {
-            autoUpdaterManager.checkForUpdate(
-                JSONfileURL = "https://git.kain.io.vn/Firefly-Shelter/FireflyGo_Andoid/raw/branch/master/app/src/main/res/raw/app_version_json.json"
-            )
-        }
-
-        val hasUpdate = result != null && appVersion.latestVersion != result.latestversion
-
-        update = if (hasUpdate) result else null
-
-        showDialog = if (isFirstOpen) {
-            hasUpdate
-        } else {
-            result != null
-        }
-    }
-
-
-    // Download progress
-    LaunchedEffect(progress) {
-        if (progress >= 100 && isDownloading) {
-            downloadComplete = true
-        }
-    }
-
-    if (showDialog) {
-        Dialog(
-            onDismissRequest = {
-                if (!isDownloading) showDialog = false
-                onDismiss()
-            },
-            properties = DialogProperties(
-                dismissOnBackPress = !isDownloading,
-                dismissOnClickOutside = !isDownloading,
-                usePlatformDefaultWidth = false
-            )
-        ) {
-            Box(
-                modifier = Modifier
-                    .fillMaxWidth(0.9f)
-                    .scale(scaleAnimation)
-                    .animateContentSize()
-                    .background(Color.Black.copy(alpha = 0.85f), RoundedCornerShape(24.dp))
-                    .border(1.5.dp, Color.White.copy(alpha = 0.2f), RoundedCornerShape(24.dp))
-            ) {
-                Column(
-                    modifier = Modifier.padding(24.dp),
-                    horizontalAlignment = Alignment.CenterHorizontally
-                ) {
-                    Box(
-                        modifier = Modifier
-                            .size(72.dp)
-                            .background(
-                                Color.White.copy(alpha = 0.1f),
-                                CircleShape
-                            ),
-                        contentAlignment = Alignment.Center
-                    ) {
-                        Icon(
-                            imageVector = if (update != null) Icons.Rounded.SystemUpdate
-                            else Icons.Rounded.CheckCircle,
-                            contentDescription = null,
-                            modifier = Modifier.size(36.dp),
-                            tint = if (update != null) Color(0xFF2196F3) else Color(0xFF4CAF50)
-                        )
-                    }
-
-                    Spacer(modifier = Modifier.height(16.dp))
-
-                    Text(
-                        text = if (update != null) stringResource(id = R.string.update_available) else stringResource(id = R.string.no_update_available),
-                        style = MaterialTheme.typography.headlineSmall,
-                        fontWeight = FontWeight.Bold,
-                        color = Color.White,
-                        textAlign = TextAlign.Center
-                    )
-
-                    Spacer(modifier = Modifier.height(12.dp))
-
-                    if (update != null) {
-                        VersionInfoSection(update!!)
-                        ChangelogSection(update!!)
-                        DownloadProgressSection(
-                            isDownloading = isDownloading,
-                            downloadComplete = downloadComplete,
-                            progress = progressAnimation
-                        )
-                        ActionButtons(
-                            isDownloading = isDownloading,
-                            downloadComplete = downloadComplete,
-                            onDownloadClick = {
-                                isDownloading = true
-                                coroutineScope.launch {
-                                    withContext(Dispatchers.IO) {
-                                        autoUpdaterManager.downloadapk(
-                                            context,
-                                            update!!.apk_url,
-                                            "FireflyGO_${update!!.latestversion}.apk"
-                                        ) { prog -> progress = prog }
-                                    }
-                                }
-                            },
-                            onDismiss = { showDialog = false; onDismiss() }
-                        )
-                    } else {
-
-                        Column(
-                            horizontalAlignment = Alignment.CenterHorizontally,
-                            modifier = Modifier.fillMaxWidth()
-                        ) {
-                            Text(
-                                text = stringResource(id = R.string.app_up_to_date),
-                                style = MaterialTheme.typography.bodyMedium,
-                                color = Color.White.copy(alpha = 0.7f),
-                                textAlign = TextAlign.Center
-                            )
-
-                            Spacer(modifier = Modifier.height(24.dp))
-
-
-                            Button(
-                                onClick = { showDialog = false; onDismiss() },
-                                modifier = Modifier.wrapContentWidth(),
-                                shape = RoundedCornerShape(12.dp),
-                                colors = ButtonDefaults.buttonColors(
-                                    containerColor = Color(0xCC0D47A1),
-                                    contentColor = Color.White
-                                ),
-                                contentPadding = PaddingValues(horizontal = 32.dp, vertical = 12.dp)
-                            ) {
-                                Text(
-                                    text = stringResource(id = R.string.ok),
-                                    style = MaterialTheme.typography.labelMedium
-                                )
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-@Composable
-fun VersionInfoSection(update: UpdateFeatures) {
-    Card(
-        modifier = Modifier.fillMaxWidth(),
-        colors = CardDefaults.cardColors(
-            containerColor = Color.White.copy(alpha = 0.08f)
-        ),
-        shape = RoundedCornerShape(12.dp)
-    ) {
-        Column(modifier = Modifier.padding(16.dp)) {
-            Row(
-                modifier = Modifier.fillMaxWidth(),
-                horizontalArrangement = Arrangement.SpaceBetween,
-                verticalAlignment = Alignment.CenterVertically
-            ) {
-                Text(
-                    text = stringResource(id = R.string.latest_version),
-                    style = MaterialTheme.typography.labelMedium,
-                    color = Color.White.copy(alpha = 0.7f)
-                )
-                Surface(
-                    shape = RoundedCornerShape(8.dp),
-                    color = Color(0xCC0D47A1)
-                ) {
-                    Text(
-                        text = "v${update.latestversion}",
-                        modifier = Modifier.padding(horizontal = 8.dp, vertical = 4.dp),
-                        style = MaterialTheme.typography.labelSmall,
-                        color = Color.White,
-                        fontWeight = FontWeight.Medium
-                    )
-                }
-            }
-        }
-    }
-    Spacer(modifier = Modifier.height(12.dp))
-}
-
-@Composable
-fun ChangelogSection(update: UpdateFeatures) {
-    Column(modifier = Modifier.fillMaxWidth()) {
-        Row(verticalAlignment = Alignment.CenterVertically) {
-            Icon(
-                imageVector = Icons.Rounded.AutoAwesome,
-                contentDescription = null,
-                modifier = Modifier.size(16.dp),
-                tint = Color(0xFF4CAF50)
-            )
-            Spacer(modifier = Modifier.width(8.dp))
-            Text(
-                text = stringResource(id = R.string.whats_new),
-                style = MaterialTheme.typography.titleSmall,
-                fontWeight = FontWeight.Medium,
-                color = Color.White
-            )
-        }
-        Spacer(modifier = Modifier.height(8.dp))
-        Text(
-            text = update.changelog,
-            style = MaterialTheme.typography.bodyMedium,
-            color = Color.White.copy(alpha = 0.8f),
-            lineHeight = 20.sp
-        )
-    }
-}
-
-@Composable
-fun DownloadProgressSection(
-    isDownloading: Boolean,
-    downloadComplete: Boolean,
-    progress: Float
-) {
-    if (!isDownloading && !downloadComplete) return
-    Spacer(modifier = Modifier.height(16.dp))
-    Column(modifier = Modifier.fillMaxWidth()) {
-        Row(
-            modifier = Modifier.fillMaxWidth(),
-            horizontalArrangement = Arrangement.SpaceBetween,
-            verticalAlignment = Alignment.CenterVertically
-        ) {
-            Text(
-                text = if (downloadComplete) stringResource(id = R.string.installation_ready) else stringResource(id = R.string.downloading),
-                style = MaterialTheme.typography.labelMedium,
-                color = Color.White,
-                fontWeight = FontWeight.Medium
-            )
-            Text(
-                text = "${(progress * 100).toInt()}%",
-                style = MaterialTheme.typography.labelMedium,
-                color = Color.White.copy(alpha = 0.8f)
-            )
-        }
-        Spacer(modifier = Modifier.height(8.dp))
-        LinearProgressIndicator(
-            progress = { progress },
-            modifier = Modifier
-                .fillMaxWidth()
-                .height(8.dp)
-                .clip(RoundedCornerShape(4.dp)),
-            color = if (downloadComplete) Color(0xFF4CAF50) else Color(0xFF2196F3),
-            trackColor = Color.White.copy(alpha = 0.15f),
-        )
-    }
-}
-
-@Composable
-fun ActionButtons(
-    isDownloading: Boolean,
-    downloadComplete: Boolean,
-    onDownloadClick: () -> Unit,
-    onDismiss: () -> Unit
-) {
-    Spacer(modifier = Modifier.height(24.dp))
-    Row(
-        modifier = Modifier.fillMaxWidth(),
-        horizontalArrangement = if (!isDownloading && !downloadComplete) Arrangement.spacedBy(12.dp) else Arrangement.Center
-    ) {
-        if (!downloadComplete) {
-            OutlinedButton(
-                onClick = onDismiss,
-                modifier = Modifier.weight(1f),
-                enabled = !isDownloading,
-                shape = RoundedCornerShape(12.dp),
-                colors = ButtonDefaults.outlinedButtonColors(contentColor = Color.White),
-                border = BorderStroke(1.dp, Color.White.copy(alpha = 0.3f))
-            ) {
-                Text(text = stringResource(id = R.string.later), style = MaterialTheme.typography.labelLarge)
-            }
-        }
-
-        Button(
-            onClick = onDownloadClick,
-            modifier = if (downloadComplete) Modifier.widthIn(min = 160.dp) else Modifier.weight(1f),
-            enabled = !isDownloading || downloadComplete,
-            shape = RoundedCornerShape(12.dp),
-            colors = ButtonDefaults.buttonColors(
-                containerColor = if (downloadComplete) Color(0xFF4CAF50) else Color(0xCC0D47A1)
-            )
-        ) {
-            Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.Center) {
-                when {
-                    downloadComplete -> {
-                        Icon(Icons.Rounded.InstallMobile, contentDescription = null, modifier = Modifier.size(18.dp), tint = Color.White)
-                        Spacer(modifier = Modifier.width(8.dp))
-                        Text(stringResource(id = R.string.install_now), style = MaterialTheme.typography.labelLarge, fontWeight = FontWeight.Medium, color = Color.White)
-                    }
-                    isDownloading -> {
-                        CircularProgressIndicator(modifier = Modifier.size(24.dp), color = Color.White)
-                    }
-                    else -> {
-                        Icon(
-                            imageVector = Icons.Rounded.Download,
-                            contentDescription = "Download",
-                            modifier = Modifier.size(24.dp),
-                            tint = Color.White
-                        )
-                    }
-                }
-            }
-        }
-    }
-}
@@ -1,254 +0,0 @@
-package com.example.firefly_go_android
-
-import android.util.Log
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.ui.window.DialogProperties
-import androidx.compose.ui.res.stringResource
-import com.example.firefly_go_android.R
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.text.AnnotatedString
-import androidx.compose.ui.text.SpanStyle
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.buildAnnotatedString
-import androidx.compose.ui.text.font.FontFamily
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.withStyle
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.compose.ui.window.Dialog
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.shape.CircleShape
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.withContext
-import java.io.BufferedReader
-import java.io.InputStreamReader
-
-data class LogEntry(val id: Long, val text: String)
-
-@Composable
-fun LogPopup(
-    onDismiss: () -> Unit
-) {
-    val logs = remember { mutableStateListOf<LogEntry>() }
-    var nextLogId by remember { mutableLongStateOf(0L) }
-    var autoScroll by remember { mutableStateOf(true) }
-    val listState = rememberLazyListState()
-
-    LaunchedEffect(Unit) {
-        withContext(Dispatchers.IO) {
-            var process: Process? = null
-            var reader: BufferedReader? = null
-            try {
-                process = Runtime.getRuntime().exec("logcat -T 300 -s GoLog")
-                reader = BufferedReader(InputStreamReader(process.inputStream))
-
-                // Safely destroy the logcat process and close the stream when the coroutine is cancelled
-                coroutineContext[Job]?.invokeOnCompletion {
-                    try {
-                        process?.destroy()
-                        reader?.close()
-                    } catch (e: Exception) {
-                        // ignore
-                    }
-                }
-
-                var line: String?
-                while (reader.readLine().also { line = it } != null) {
-                    val clean = parseGoLogLine(line!!)
-                    if (!clean.isNullOrBlank()) {
-                        withContext(Dispatchers.Main) {
-                            logs.add(LogEntry(nextLogId++, clean))
-                            if (logs.size > 500) {
-                                logs.removeAt(0)
-                            }
-                        }
-                    }
-                }
-            } catch (e: Exception) {
-                withContext(Dispatchers.Main) {
-                    logs.add(LogEntry(nextLogId++, "Error reading logcat: ${e.message}"))
-                }
-            } finally {
-                try {
-                    process?.destroy()
-                    reader?.close()
-                } catch (e: Exception) {
-                    // ignore
-                }
-                Log.i("LogPopup", "Logcat process destroyed and stream closed successfully")
-            }
-        }
-    }
-
-    LaunchedEffect(logs.size) {
-        if (autoScroll && logs.isNotEmpty()) {
-            listState.scrollToItem(logs.size - 1)
-        }
-    }
-
-    val defaultTextColor = Color.White.copy(alpha = 0.9f)
-
-    Dialog(
-        onDismissRequest = { onDismiss() },
-        properties = DialogProperties(usePlatformDefaultWidth = false)
-    ) {
-        Box(
-            modifier = Modifier
-                .fillMaxWidth(0.9f)
-                .fillMaxHeight(0.7f)
-                .background(Color.Black.copy(alpha = 0.8f), RoundedCornerShape(16.dp))
-                .border(1.5.dp, Color.White.copy(alpha = 0.2f), RoundedCornerShape(16.dp))
-        ) {
-            Column(modifier = Modifier.padding(16.dp)) {
-                Row(
-                    modifier = Modifier.fillMaxWidth(),
-                    horizontalArrangement = Arrangement.SpaceBetween,
-                    verticalAlignment = Alignment.CenterVertically
-                ) {
-                    Text(
-                        text = stringResource(id = R.string.golog_output),
-                        style = MaterialTheme.typography.titleMedium,
-                        fontWeight = FontWeight.Bold,
-                        color = Color.White
-                    )
-
-                    // Auto-Scroll Toggle Button
-                    val activeColor = Color(0xFF4CAF50)
-                    val inactiveColor = Color.White.copy(alpha = 0.4f)
-                    Row(
-                        verticalAlignment = Alignment.CenterVertically,
-                        modifier = Modifier
-                            .clickable { autoScroll = !autoScroll }
-                            .padding(4.dp)
-                    ) {
-                        Box(
-                            modifier = Modifier
-                                .size(8.dp)
-                                .background(if (autoScroll) activeColor else inactiveColor, CircleShape)
-                        )
-                        Spacer(modifier = Modifier.width(6.dp))
-                        Text(
-                            text = stringResource(id = R.string.auto_scroll),
-                            fontSize = 11.sp,
-                            color = if (autoScroll) Color.White else Color.White.copy(alpha = 0.5f),
-                            fontWeight = FontWeight.Medium
-                        )
-                    }
-                }
-
-                Spacer(modifier = Modifier.height(8.dp))
-
-                LazyColumn(state = listState, modifier = Modifier.weight(1f)) {
-                    items(
-                        items = logs,
-                        key = { log -> log.id }
-                    ) { log ->
-                        Text(
-                            text = parseAnsi(log.text, defaultTextColor),
-                            fontSize = 12.sp,
-                            fontFamily = FontFamily.Monospace,
-                            lineHeight = 14.sp,
-                            modifier = Modifier.padding(vertical = 2.dp)
-                        )
-                    }
-                }
-
-                Spacer(modifier = Modifier.height(8.dp))
-                Row(
-                    modifier = Modifier.fillMaxWidth(),
-                    horizontalArrangement = Arrangement.SpaceBetween,
-                    verticalAlignment = Alignment.CenterVertically
-                ) {
-                    TextButton(
-                        onClick = {
-                            logs.clear()
-                            try {
-                                Runtime.getRuntime().exec("logcat -c")
-                            } catch (e: Exception) {
-                                // ignore
-                            }
-                        }
-                    ) {
-                        Text(stringResource(id = R.string.clear), color = Color(0xFFE53935), fontWeight = FontWeight.SemiBold)
-                    }
-
-                    TextButton(
-                        onClick = { onDismiss() }
-                    ) {
-                        Text(stringResource(id = R.string.close), color = Color.White)
-                    }
-                }
-            }
-        }
-    }
-}
-
-fun parseGoLogLine(line: String): String? {
-    val regex = Regex(""".*GoLog\s*:?\s*(.*)""")
-    val match = regex.find(line)
-    val content = match?.groupValues?.getOrNull(1)?.trim()
-
-    return if (content.isNullOrBlank()) null else content
-}
-
-fun parseAnsi(text: String, defaultColor: Color): AnnotatedString {
-    val regex = Regex("\u001B\\[(\\d+)(;\\d+)*m")
-    val builder = buildAnnotatedString {
-        var lastIndex = 0
-        var currentColor = defaultColor
-
-        for (match in regex.findAll(text)) {
-            val start = match.range.first
-
-            val before = text.substring(lastIndex, start)
-            if (before.isNotEmpty()) {
-                withStyle(SpanStyle(color = currentColor)) {
-                    append(before)
-                }
-            }
-
-            val code = try {
-                match.groupValues[1].toInt()
-            } catch (e: NumberFormatException) {
-                0
-            }
-
-            currentColor = when (code) {
-                0 -> defaultColor
-                30 -> Color.Black
-                31 -> Color.Red
-                32 -> Color(0xFF00C853) // Green
-                33 -> Color(0xFFFFD600) // Yellow
-                34 -> Color(0xFF2962FF) // Blue
-                35 -> Color(0xFFD500F9) // Magenta
-                36 -> Color(0xFF00B8D4) // Cyan
-                37 -> Color.White
-                else -> currentColor
-            }
-
-            lastIndex = match.range.last + 1
-        }
-
-        if (lastIndex < text.length) {
-            val remain = text.substring(lastIndex)
-            if (remain.isNotEmpty()) {
-                withStyle(SpanStyle(color = currentColor)) {
-                    append(remain)
-                }
-            }
-        }
-    }
-
-    return builder
-}
@@ -1,328 +0,0 @@
-package com.example.firefly_go_android
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Visibility
-import androidx.compose.material.icons.filled.VisibilityOff
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.input.KeyboardType
-import androidx.compose.ui.text.input.PasswordVisualTransformation
-import androidx.compose.ui.text.input.VisualTransformation
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.compose.ui.window.Dialog
-import androidx.compose.ui.window.DialogProperties
-import android.content.Intent
-import android.net.Uri
-import androidx.browser.customtabs.CustomTabsIntent
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalSoftwareKeyboardController
-import androidx.compose.ui.focus.FocusRequester
-import androidx.compose.ui.focus.focusRequester
-import androidx.compose.foundation.BorderStroke
-import androidx.compose.ui.res.stringResource
-import com.example.firefly_go_android.network.AuthManager
-import kotlinx.coroutines.launch
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun LoginDialog(
-    authManager: AuthManager,
-    onDismiss: () -> Unit,
-    onLoginSuccess: () -> Unit
-) {
-    val coroutineScope = rememberCoroutineScope()
-    var email by remember { mutableStateOf("") }
-    var password by remember { mutableStateOf("") }
-    var passwordVisible by remember { mutableStateOf(false) }
-    var isLoading by remember { mutableStateOf(false) }
-    var errorMessage by remember { mutableStateOf<String?>(null) }
-
-    val focusRequester = remember { FocusRequester() }
-    val keyboardController = LocalSoftwareKeyboardController.current
-
-    LaunchedEffect(Unit) {
-        kotlinx.coroutines.delay(250)
-        try {
-            focusRequester.requestFocus()
-            keyboardController?.show()
-        } catch (e: Exception) {
-            // ignore
-        }
-    }
-
-    Dialog(
-        onDismissRequest = { if (!isLoading) { keyboardController?.hide(); onDismiss() } },
-        properties = DialogProperties(
-            usePlatformDefaultWidth = false
-        )
-    ) {
-        Box(
-            modifier = Modifier
-                .fillMaxWidth(0.9f)
-                .background(Color.Black.copy(alpha = 0.85f), RoundedCornerShape(20.dp))
-                .border(1.5.dp, Color.White.copy(alpha = 0.2f), RoundedCornerShape(20.dp))
-                .padding(24.dp)
-        ) {
-            if (authManager.isLoggedIn) {
-                // Profile & Logout view
-                Column(
-                    horizontalAlignment = Alignment.CenterHorizontally,
-                    modifier = Modifier.fillMaxWidth()
-                ) {
-                    Text(
-                        text = stringResource(id = R.string.account_profile),
-                        fontSize = 20.sp,
-                        fontWeight = FontWeight.Bold,
-                        color = Color.White
-                    )
-                    Spacer(modifier = Modifier.height(16.dp))
-
-                    Text(
-                        text = stringResource(id = R.string.logged_in_as),
-                        fontSize = 12.sp,
-                        color = Color.White.copy(alpha = 0.6f)
-                    )
-                    Text(
-                        text = authManager.userEmail ?: "Unknown User",
-                        fontSize = 16.sp,
-                        fontWeight = FontWeight.Medium,
-                        color = Color.White
-                    )
-                    Spacer(modifier = Modifier.height(12.dp))
-
-                    Text(
-                        text = stringResource(id = R.string.auto_update_status),
-                        fontSize = 12.sp,
-                        color = Color.White.copy(alpha = 0.6f)
-                    )
-                    val statusText = if (authManager.isPlayer) stringResource(id = R.string.unlocked_player) else stringResource(id = R.string.locked_no_permission)
-                    val statusColor = if (authManager.isPlayer) Color(0xFF4CAF50) else Color(0xFFE53935)
-                    Text(
-                        text = statusText,
-                        fontSize = 15.sp,
-                        fontWeight = FontWeight.SemiBold,
-                        color = statusColor
-                    )
-
-                    Spacer(modifier = Modifier.height(28.dp))
-
-                    Row(
-                        modifier = Modifier.fillMaxWidth(),
-                        horizontalArrangement = Arrangement.spacedBy(12.dp)
-                    ) {
-                        OutlinedButton(
-                            onClick = { keyboardController?.hide(); onDismiss() },
-                            modifier = Modifier.weight(1f),
-                            shape = RoundedCornerShape(12.dp),
-                            colors = ButtonDefaults.outlinedButtonColors(contentColor = Color.White),
-                            border = BorderStroke(1.dp, Color.White.copy(alpha = 0.3f))
-                        ) {
-                            Text(stringResource(id = R.string.back))
-                        }
-
-                        Button(
-                            onClick = {
-                                keyboardController?.hide()
-                                authManager.logout()
-                                onLoginSuccess() // triggers UI refresh
-                                onDismiss()
-                            },
-                            modifier = Modifier.weight(1f),
-                            shape = RoundedCornerShape(12.dp),
-                            colors = ButtonDefaults.buttonColors(containerColor = Color(0xFFD32F2F))
-                        ) {
-                            Text(stringResource(id = R.string.logout), color = Color.White)
-                        }
-                    }
-                }
-            } else {
-                // Sign In view
-                Column(
-                    horizontalAlignment = Alignment.CenterHorizontally,
-                    modifier = Modifier.fillMaxWidth()
-                ) {
-                    Text(
-                        text = stringResource(id = R.string.sign_in),
-                        fontSize = 22.sp,
-                        fontWeight = FontWeight.Bold,
-                        color = Color.White
-                    )
-                    Spacer(modifier = Modifier.height(16.dp))
-
-                    val pleaseEnterBothText = stringResource(id = R.string.please_enter_both)
-
-                    TextField(
-                        value = email,
-                        onValueChange = { email = it; errorMessage = null },
-                        placeholder = { Text(stringResource(id = R.string.email), color = Color.White.copy(alpha = 0.4f)) },
-                        colors = TextFieldDefaults.colors(
-                            focusedTextColor = Color.White,
-                            unfocusedTextColor = Color.White,
-                            focusedContainerColor = Color.White.copy(alpha = 0.08f),
-                            unfocusedContainerColor = Color.White.copy(alpha = 0.04f),
-                            focusedIndicatorColor = Color.Transparent,
-                            unfocusedIndicatorColor = Color.Transparent,
-                            cursorColor = Color.White
-                        ),
-                        shape = RoundedCornerShape(12.dp),
-                        singleLine = true,
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .border(1.dp, Color.White.copy(alpha = 0.15f), RoundedCornerShape(12.dp))
-                            .focusRequester(focusRequester),
-                        keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Email)
-                    )
-
-                    Spacer(modifier = Modifier.height(12.dp))
-
-                    TextField(
-                        value = password,
-                        onValueChange = { password = it; errorMessage = null },
-                        placeholder = { Text(stringResource(id = R.string.password), color = Color.White.copy(alpha = 0.4f)) },
-                        visualTransformation = if (passwordVisible) VisualTransformation.None else PasswordVisualTransformation(),
-                        trailingIcon = {
-                            val image = if (passwordVisible) Icons.Filled.Visibility else Icons.Filled.VisibilityOff
-                            IconButton(onClick = { passwordVisible = !passwordVisible }) {
-                                Icon(imageVector = image, contentDescription = "Toggle password visibility", tint = Color.White.copy(alpha = 0.5f))
-                            }
-                        },
-                        colors = TextFieldDefaults.colors(
-                            focusedTextColor = Color.White,
-                            unfocusedTextColor = Color.White,
-                            focusedContainerColor = Color.White.copy(alpha = 0.08f),
-                            unfocusedContainerColor = Color.White.copy(alpha = 0.04f),
-                            focusedIndicatorColor = Color.Transparent,
-                            unfocusedIndicatorColor = Color.Transparent,
-                            cursorColor = Color.White
-                        ),
-                        shape = RoundedCornerShape(12.dp),
-                        singleLine = true,
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .border(1.dp, Color.White.copy(alpha = 0.15f), RoundedCornerShape(12.dp)),
-                        keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password)
-                    )
-
-                    if (errorMessage != null) {
-                        Spacer(modifier = Modifier.height(8.dp))
-                        Text(
-                            text = errorMessage!!,
-                            color = Color(0xFFE53935),
-                            fontSize = 13.sp,
-                            fontWeight = FontWeight.Medium,
-                            modifier = Modifier.align(Alignment.Start)
-                        )
-                    }
-
-                    Spacer(modifier = Modifier.height(24.dp))
-
-                    Row(
-                        modifier = Modifier.fillMaxWidth(),
-                        horizontalArrangement = Arrangement.spacedBy(12.dp)
-                    ) {
-                        OutlinedButton(
-                            onClick = { keyboardController?.hide(); onDismiss() },
-                            modifier = Modifier.weight(1f),
-                            enabled = !isLoading,
-                            shape = RoundedCornerShape(12.dp),
-                            colors = ButtonDefaults.outlinedButtonColors(contentColor = Color.White),
-                            border = BorderStroke(1.dp, Color.White.copy(alpha = 0.3f))
-                        ) {
-                            Text(stringResource(id = R.string.cancel))
-                        }
-
-                        Button(
-                            onClick = {
-                                if (email.isBlank() || password.isBlank()) {
-                                    errorMessage = pleaseEnterBothText
-                                    return@Button
-                                }
-                                keyboardController?.hide()
-                                isLoading = true
-                                coroutineScope.launch {
-                                    val result = authManager.login(email, password)
-                                    isLoading = false
-                                    if (result.isSuccess) {
-                                        onLoginSuccess()
-                                        onDismiss()
-                                    } else {
-                                        errorMessage = result.exceptionOrNull()?.message ?: "Login failed"
-                                    }
-                                }
-                            },
-                            modifier = Modifier.weight(1f),
-                            enabled = !isLoading,
-                            shape = RoundedCornerShape(12.dp),
-                            colors = ButtonDefaults.buttonColors(containerColor = Color(0xCC0D47A1))
-                        ) {
-                            if (isLoading) {
-                                CircularProgressIndicator(modifier = Modifier.size(20.dp), color = Color.White, strokeWidth = 2.dp)
-                            } else {
-                                Text(stringResource(id = R.string.login), color = Color.White)
-                            }
-                        }
-                    }
-
-                    Spacer(modifier = Modifier.height(16.dp))
-
-                    // Divider "or"
-                    Row(
-                        verticalAlignment = Alignment.CenterVertically,
-                        modifier = Modifier.fillMaxWidth()
-                    ) {
-                        HorizontalDivider(
-                            modifier = Modifier.weight(1f),
-                            color = Color.White.copy(alpha = 0.2f)
-                        )
-                        Text(
-                            text = stringResource(id = R.string.or),
-                            fontSize = 11.sp,
-                            color = Color.White.copy(alpha = 0.5f),
-                            modifier = Modifier.padding(horizontal = 8.dp)
-                        )
-                        HorizontalDivider(
-                            modifier = Modifier.weight(1f),
-                            color = Color.White.copy(alpha = 0.2f)
-                        )
-                    }
-
-                    Spacer(modifier = Modifier.height(16.dp))
-
-                    val context = LocalContext.current
-                    Button(
-                        onClick = {
-                            keyboardController?.hide()
-                            val url = "https://api.punklorde.org/auth/discord/login?redirect=https://area999.punklorde.org/auth/launcher/discord&origin=firefly-launcher&is_return_token=true"
-                            try {
-                                val customTabsIntent = CustomTabsIntent.Builder()
-                                    .setShowTitle(true)
-                                    .build()
-                                customTabsIntent.launchUrl(context, Uri.parse(url))
-                            } catch (e: Exception) {
-                                // Fallback to system browser
-                                val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
-                                context.startActivity(intent)
-                            }
-                        },
-                        modifier = Modifier.fillMaxWidth().height(48.dp),
-                        enabled = !isLoading,
-                        shape = RoundedCornerShape(12.dp),
-                        colors = ButtonDefaults.buttonColors(containerColor = Color(0xCC5865F2))
-                    ) {
-                        Text(stringResource(id = R.string.login_with_discord), color = Color.White, fontWeight = FontWeight.Medium)
-                    }
-                }
-            }
-        }
-    }
-}
@@ -1,87 +0,0 @@
-package com.example.firefly_go_android.ui
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Warning
-import androidx.compose.material3.*
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.compose.ui.window.Dialog
-import androidx.compose.ui.window.DialogProperties
-import com.example.firefly_go_android.R
-
-@Composable
-fun ScamWarningDialog(
-    onDismiss: () -> Unit
-) {
-    Dialog(
-        onDismissRequest = onDismiss,
-        properties = DialogProperties(
-            dismissOnBackPress = false,
-            dismissOnClickOutside = false,
-            usePlatformDefaultWidth = false
-        )
-    ) {
-        Box(
-            modifier = Modifier
-                .fillMaxWidth(0.9f)
-                .background(Color.Black.copy(alpha = 0.85f), RoundedCornerShape(20.dp))
-                .border(1.5.dp, Color.White.copy(alpha = 0.2f), RoundedCornerShape(20.dp))
-                .padding(24.dp)
-        ) {
-            Column(
-                horizontalAlignment = Alignment.CenterHorizontally,
-                modifier = Modifier.fillMaxWidth()
-            ) {
-                Icon(
-                    imageVector = Icons.Default.Warning,
-                    contentDescription = "Warning",
-                    tint = Color(0xFFFFB300),
-                    modifier = Modifier.size(48.dp)
-                )
-                Spacer(modifier = Modifier.height(16.dp))
-
-                Text(
-                    text = stringResource(id = R.string.scam_warning_title),
-                    fontSize = 20.sp,
-                    fontWeight = FontWeight.Bold,
-                    color = Color.White
-                )
-                Spacer(modifier = Modifier.height(12.dp))
-
-                Text(
-                    text = stringResource(id = R.string.scam_warning_text),
-                    fontSize = 14.sp,
-                    color = Color.White.copy(alpha = 0.85f),
-                    textAlign = TextAlign.Center,
-                    lineHeight = 20.sp
-                )
-
-                Spacer(modifier = Modifier.height(28.dp))
-
-                Button(
-                    onClick = onDismiss,
-                    modifier = Modifier.fillMaxWidth().height(48.dp),
-                    shape = RoundedCornerShape(12.dp),
-                    colors = ButtonDefaults.buttonColors(containerColor = Color(0xFF0D47A1))
-                ) {
-                    Text(
-                        text = stringResource(id = R.string.i_understand),
-                        color = Color.White,
-                        fontWeight = FontWeight.SemiBold
-                    )
-                }
-            }
-        }
-    }
-}
@@ -1,429 +0,0 @@
-package com.example.firefly_go_android
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.content.Intent
-import android.widget.Toast
-import androidx.compose.animation.animateColorAsState
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.*
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.Shadow
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.core.content.ContextCompat
-import com.example.firefly_go_android.network.AuthManager
-import java.io.File
-import androidx.compose.ui.window.Dialog
-import androidx.compose.ui.window.DialogProperties
-import androidx.compose.foundation.BorderStroke
-
-@SuppressLint("ImplicitSamInstance")
-@Composable
-fun ServerControlScreen(
-    appDataPath: String,
-    dataDir: File,
-    appVersion: AppVersion,
-    authManager: AuthManager,
-    modifier: Modifier = Modifier
-) {
-    val context = LocalContext.current
-    val isRunning = GolangServerService.isRunning
-
-    var showResetDialog by remember { mutableStateOf(false) }
-    var showUpdateDialog by remember { mutableStateOf(false) }
-    var showLoginDialog by remember { mutableStateOf(false) }
-    var showLogs by remember { mutableStateOf(false) }
-    var refreshTrigger by remember { mutableIntStateOf(0) } // Used to trigger UI refresh on login/logout
-
-    Box(
-        modifier = modifier.fillMaxSize()
-    ) {
-        // Background image
-        Image(
-            painter = painterResource(id = R.drawable.background),
-            contentDescription = "Background",
-            contentScale = ContentScale.Crop,
-            modifier = Modifier.fillMaxSize()
-        )
-
-        Box(
-            modifier = Modifier
-                .fillMaxSize()
-                .background(Color.Black.copy(alpha = 0.3f))
-        )
-
-        Column(
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(horizontal = 24.dp, vertical = 16.dp),
-            horizontalAlignment = Alignment.CenterHorizontally
-        ) {
-            // Header Row (Branding and Account Status Chip)
-            Row(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(top = 16.dp),
-                horizontalArrangement = Arrangement.SpaceBetween,
-                verticalAlignment = Alignment.CenterVertically
-            ) {
-                // Brand Title
-                Column {
-                    Text(
-                        text = stringResource(id = R.string.app_name),
-                        fontSize = 24.sp,
-                        fontWeight = FontWeight.Bold,
-                        color = Color.White,
-                        style = TextStyle(
-                            shadow = Shadow(
-                                color = Color.Black,
-                                offset = Offset(2f, 2f),
-                                blurRadius = 4f
-                            )
-                        )
-                    )
-                    Text(
-                        text = stringResource(id = R.string.android_edition),
-                        fontSize = 12.sp,
-                        fontWeight = FontWeight.Medium,
-                        color = Color.White.copy(alpha = 0.7f),
-                        style = TextStyle(
-                            shadow = Shadow(
-                                color = Color.Black,
-                                offset = Offset(1f, 1f),
-                                blurRadius = 2f
-                            )
-                        )
-                    )
-                }
-
-                // Brand Logo / Icon (instead of Login Chip since login is disabled)
-                Box(
-                    contentAlignment = Alignment.Center,
-                    modifier = Modifier
-                        .size(42.dp)
-                        .background(Color.White.copy(alpha = 0.08f), CircleShape)
-                        .border(1.dp, Color.White.copy(alpha = 0.15f), CircleShape)
-                ) {
-                    Icon(
-                        imageVector = Icons.Default.Android,
-                        contentDescription = "Logo",
-                        tint = Color.White,
-                        modifier = Modifier.size(28.dp)
-                    )
-                }
-            }
-
-            Spacer(modifier = Modifier.height(28.dp))
-
-            // Server status capsule
-            val statusColor = if (isRunning) Color(0xFF4CAF50) else Color(0xFF9E9E9E)
-            val statusText = if (isRunning) stringResource(id = R.string.server_running) else stringResource(id = R.string.server_stopped)
-
-            Box(
-                modifier = Modifier
-                    .background(Color.Black.copy(alpha = 0.4f), RoundedCornerShape(20.dp))
-                    .border(1.dp, Color.White.copy(alpha = 0.15f), RoundedCornerShape(20.dp))
-                    .padding(horizontal = 20.dp, vertical = 8.dp)
-            ) {
-                Row(
-                    verticalAlignment = Alignment.CenterVertically,
-                    horizontalArrangement = Arrangement.Center
-                ) {
-                    Box(
-                        modifier = Modifier
-                            .size(10.dp)
-                            .background(statusColor, CircleShape)
-                    )
-                    Spacer(modifier = Modifier.width(10.dp))
-                    Text(
-                        text = statusText,
-                        fontSize = 18.sp,
-                        color = Color.White,
-                        fontWeight = FontWeight.Medium
-                    )
-                }
-            }
-
-            Spacer(modifier = Modifier.weight(1.8f).heightIn(min = 24.dp))
-            // Toggle button
-            val buttonColor by animateColorAsState(
-                targetValue = if (isRunning) Color(0xCCB71C1C) else Color(0xCC0D47A1),
-                label = "buttonColor"
-            )
-            Box(
-                contentAlignment = Alignment.Center,
-                modifier = Modifier
-                    .fillMaxWidth(0.75f)
-                    .height(54.dp)
-                    .bounceClick {
-                        try {
-                            if (!isRunning) {
-                                val intent = Intent(context, GolangServerService::class.java)
-                                intent.putExtra("appDataPath", appDataPath)
-                                ContextCompat.startForegroundService(context, intent)
-                            } else {
-                                context.stopService(Intent(context, GolangServerService::class.java))
-                            }
-                        } catch (e: Exception) {
-                            Toast.makeText(context, "Error: ${e.message}", Toast.LENGTH_SHORT).show()
-                        }
-                    }
-                    .background(buttonColor, RoundedCornerShape(14.dp))
-                    .border(1.dp, Color.White.copy(alpha = 0.25f), RoundedCornerShape(14.dp))
-            ) {
-                Row(
-                    verticalAlignment = Alignment.CenterVertically,
-                    horizontalArrangement = Arrangement.Center
-                ) {
-                    Icon(
-                        imageVector = if (isRunning) Icons.Default.Stop else Icons.Default.PlayArrow,
-                        contentDescription = null,
-                        tint = Color.White,
-                        modifier = Modifier.size(24.dp)
-                    )
-                    Spacer(modifier = Modifier.width(8.dp))
-                    Text(
-                        text = if (isRunning) stringResource(id = R.string.stop_server) else stringResource(id = R.string.start_server),
-                        fontSize = 18.sp,
-                        color = Color.White,
-                        fontWeight = FontWeight.SemiBold
-                    )
-                }
-            }
-
-            Spacer(modifier = Modifier.height(20.dp))
-
-            // Widget icons row
-            Row(
-                modifier = Modifier.fillMaxWidth(),
-                horizontalArrangement = Arrangement.spacedBy(16.dp),
-                verticalAlignment = Alignment.CenterVertically
-            ) {
-                // Check Update widget (Now shown for all users since login is disabled)
-                if (true) {
-                    Column(
-                        horizontalAlignment = Alignment.CenterHorizontally,
-                        verticalArrangement = Arrangement.Center,
-                        modifier = Modifier
-                            .weight(1f)
-                            .height(96.dp)
-                            .bounceClick { showUpdateDialog = true }
-                            .background(
-                                Color.White.copy(alpha = 0.15f),
-                                RoundedCornerShape(16.dp)
-                            )
-                            .border(
-                                1.dp,
-                                Color.White.copy(alpha = 0.2f),
-                                RoundedCornerShape(16.dp)
-                            )
-                            .padding(horizontal = 8.dp)
-                    ) {
-                        Icon(
-                            imageVector = Icons.Default.CloudDownload,
-                            contentDescription = "Check Update",
-                            tint = Color.White.copy(alpha = 0.85f),
-                            modifier = Modifier.size(28.dp)
-                        )
-                        Spacer(modifier = Modifier.height(6.dp))
-                        Text(
-                            text = stringResource(id = R.string.update),
-                            fontSize = 12.sp,
-                            color = Color.White,
-                            textAlign = TextAlign.Center,
-                            fontWeight = FontWeight.Medium,
-                            maxLines = 2
-                        )
-                    }
-                }
-
-                // Reset Data widget
-                Column(
-                    horizontalAlignment = Alignment.CenterHorizontally,
-                    verticalArrangement = Arrangement.Center,
-                    modifier = Modifier
-                        .weight(1f)
-                        .height(96.dp)
-                        .bounceClick { showResetDialog = true }
-                        .background(
-                            Color.White.copy(alpha = 0.15f),
-                            RoundedCornerShape(16.dp)
-                        )
-                        .border(
-                            1.dp,
-                            Color.White.copy(alpha = 0.2f),
-                            RoundedCornerShape(16.dp)
-                        )
-                        .padding(horizontal = 8.dp)
-                ) {
-                    Icon(
-                        imageVector = Icons.Default.RestartAlt,
-                        contentDescription = "Reset Data",
-                        tint = Color.White.copy(alpha = 0.85f),
-                        modifier = Modifier.size(28.dp)
-                    )
-                    Spacer(modifier = Modifier.height(6.dp))
-                    Text(
-                        text = stringResource(id = R.string.reset),
-                        fontSize = 12.sp,
-                        color = Color.White,
-                        textAlign = TextAlign.Center,
-                        fontWeight = FontWeight.Medium,
-                        maxLines = 2
-                    )
-                }
-
-                // Logcat (Lynx) widget
-                Column(
-                    horizontalAlignment = Alignment.CenterHorizontally,
-                    verticalArrangement = Arrangement.Center,
-                    modifier = Modifier
-                        .weight(1f)
-                        .height(96.dp)
-                        .bounceClick { showLogs = true }
-                        .background(
-                            Color.White.copy(alpha = 0.15f),
-                            RoundedCornerShape(16.dp)
-                        )
-                        .border(
-                            1.dp,
-                            Color.White.copy(alpha = 0.2f),
-                            RoundedCornerShape(16.dp)
-                        )
-                        .padding(horizontal = 8.dp)
-                ) {
-                    Icon(
-                        imageVector = Icons.Default.BugReport,
-                        contentDescription = "Open Logcat",
-                        tint = Color.White.copy(alpha = 0.85f),
-                        modifier = Modifier.size(28.dp)
-                    )
-                    Spacer(modifier = Modifier.height(6.dp))
-                    Text(
-                        text = stringResource(id = R.string.logs),
-                        fontSize = 12.sp,
-                        color = Color.White,
-                        textAlign = TextAlign.Center,
-                        fontWeight = FontWeight.Medium,
-                        maxLines = 2
-                    )
-                }
-            }
-
-            Spacer(modifier = Modifier.weight(0.4f).heightIn(min = 16.dp))
-        }
-    }
-
-    if (showLogs) {
-        LogPopup(onDismiss = { showLogs = false })
-    }
-
-    if (showLoginDialog) {
-        LoginDialog(
-            authManager = authManager,
-            onDismiss = { showLoginDialog = false },
-            onLoginSuccess = {
-                refreshTrigger++ // Force UI update
-            }
-        )
-    }
-
-    // Reset Data Confirmation Dialog
-    if (showResetDialog) {
-        Dialog(
-            onDismissRequest = { showResetDialog = false },
-            properties = DialogProperties(usePlatformDefaultWidth = false)
-        ) {
-            Box(
-                modifier = Modifier
-                    .fillMaxWidth(0.9f)
-                    .background(Color.Black.copy(alpha = 0.85f), RoundedCornerShape(20.dp))
-                    .border(1.5.dp, Color.White.copy(alpha = 0.2f), RoundedCornerShape(20.dp))
-                    .padding(24.dp)
-            ) {
-                Column(
-                    horizontalAlignment = Alignment.CenterHorizontally,
-                    modifier = Modifier.fillMaxWidth()
-                ) {
-                    Text(
-                        text = stringResource(id = R.string.reset_data_title),
-                        fontSize = 20.sp,
-                        fontWeight = FontWeight.Bold,
-                        color = Color.White
-                    )
-                    Spacer(modifier = Modifier.height(16.dp))
-
-                    Text(
-                        text = stringResource(id = R.string.reset_data_confirm),
-                        fontSize = 14.sp,
-                        color = Color.White.copy(alpha = 0.8f),
-                        textAlign = TextAlign.Center
-                    )
-
-                    Spacer(modifier = Modifier.height(28.dp))
-
-                    Row(
-                        modifier = Modifier.fillMaxWidth(),
-                        horizontalArrangement = Arrangement.spacedBy(12.dp)
-                    ) {
-                        OutlinedButton(
-                            onClick = { showResetDialog = false },
-                            modifier = Modifier.weight(1f),
-                            shape = RoundedCornerShape(12.dp),
-                            colors = ButtonDefaults.outlinedButtonColors(contentColor = Color.White),
-                            border = BorderStroke(1.dp, Color.White.copy(alpha = 0.3f))
-                        ) {
-                            Text(stringResource(id = R.string.no))
-                        }
-
-                        Button(
-                            onClick = {
-                                showResetDialog = false
-                                try {
-                                    copyRawToFile(context, dataDir, true)
-                                    Toast.makeText(context, "Data has been reset successfully", Toast.LENGTH_SHORT).show()
-                                } catch (e: Exception) {
-                                    Toast.makeText(context, "Reset failed: ${e.message}", Toast.LENGTH_SHORT).show()
-                                }
-                            },
-                            modifier = Modifier.weight(1f),
-                            shape = RoundedCornerShape(12.dp),
-                            colors = ButtonDefaults.buttonColors(containerColor = Color(0xFFD32F2F))
-                        ) {
-                            Text(stringResource(id = R.string.yes), color = Color.White)
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    // Auto Update Dialog
-    if (showUpdateDialog) {
-        AutoUpdateDialog(
-            onDismiss = { showUpdateDialog = false },
-            appVersion,
-            dataDir
-        )
-    }
-}
@@ -0,0 +1,5 @@
+{
+  "latest_version": "3.6.2-04",
+  "changelog": "UPDATE: New res",
+  "apk_url": "https://git.kain.io.vn/Firefly-Shelter/FireflyGo_Android/releases/download/3.6.2-04/firefly_go_android.apk"
+}
@@ -0,0 +1,184 @@
+{
+  "leader": 0,
+  "lineups": {
+    "0": 1413,
+    "1": 1415,
+    "2": 1409,
+    "3": 1407
+  },
+  "position": {
+    "x": 218004,
+    "z": 259263,
+    "y": 53915,
+    "rot_y": 79863
+  },
+  "scene": {
+    "plane_id": 20423,
+    "floor_id": 20423001,
+    "entry_id": 2042301
+  },
+  "player_outfit": [
+    1001
+  ],
+  "char_path": {
+    "main": 8008,
+    "march_7": 1224
+  },
+  "char_enhanced": {
+    "1005": 1,
+    "1006": 1,
+    "1205": 1,
+    "1212": 1
+  },
+  "challenge": {
+    "challenge_id": 0,
+    "skip_half": 0,
+    "blessings": [],
+    "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": [
+        200000,
+        1000000,
+        200000
+      ],
+      "2": [
+        500000,
+        10000000,
+        500000
+      ]
+    },
+    "cycle_count": 1,
+    "mode": true
+  },
+  "profile_data": {
+    "cur_chat_bubble_id": 220008,
+    "cur_phone_theme_id": 221012,
+    "cur_phone_case_id": 254001,
+    "cur_pam_skin_id": 252000,
+    "cur_pet_id": 1003,
+    "cur_avatar_player_icon": 202034,
+    "cur_player_personal_card": 253001,
+    "cur_signature": "Firefly GO By Kain",
+    "cur_display_avatar": [
+      1310,
+      1309,
+      1407,
+      1413,
+      1412
+    ],
+    "cur_is_display_avatar": true
+  },
+  "skin_data": {
+    "1001": 1100101,
+    "1310": 1131001
+  }
+}
@@ -0,0 +1,44 @@
+{
+  "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.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.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.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.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.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"
+  }
+}
@@ -1,57 +0,0 @@
-<resources>
-    <string name="app_name">Firefly Go</string>
-    <string name="android_edition">Android版</string>
-    <string name="sign_in">サインイン</string>
-    <string name="server_running">サーバー稼働中</string>
-    <string name="server_stopped">サーバー停止</string>
-    <string name="start_server">サーバー起動</string>
-    <string name="stop_server">サーバー停止</string>
-    <string name="update">アップデート</string>
-    <string name="reset">リセット</string>
-    <string name="logs">ログ</string>
-    <string name="reset_data_title">データリセット</string>
-    <string name="reset_data_confirm">すべてのデータをリセットしますか？この操作は取り消せません。</string>
-    <string name="no">いいえ</string>
-    <string name="yes">はい</string>
-    
-    <!-- Scam Warning -->
-    <string name="scam_warning_title">セキュリティ警告</string>
-    <string name="scam_warning_text">これはオープンソースプロジェクトです。もし誰かからこのアプリを購入した場合、あなたは詐欺に遭っています。</string>
-    <string name="i_understand">了解しました</string>
-
-    <!-- LoginDialog -->
-    <string name="account_profile">アカウントプロフィール</string>
-    <string name="logged_in_as">ログイン中:</string>
-    <string name="auto_update_status">自動更新ステータス:</string>
-    <string name="unlocked_player">ロック解除 (PLAYER)</string>
-    <string name="locked_no_permission">ロック中 (権限なし)</string>
-    <string name="back">戻る</string>
-    <string name="logout">ログアウト</string>
-    <string name="email">メールアドレス</string>
-    <string name="password">パスワード</string>
-    <string name="cancel">キャンセル</string>
-    <string name="login">ログイン</string>
-    <string name="or">または</string>
-    <string name="login_with_discord">Discordでログイン</string>
-    <string name="please_enter_both">メールアドレスとパスワードを入力してください</string>
-    <string name="login_failed">ログイン失敗</string>
-    <string name="failed_to_fetch_profile">プロフィールの取得に失敗しました</string>
-
-    <!-- AutoUpdateDialog -->
-    <string name="update_available">アップデートがあります</string>
-    <string name="no_update_available">アップデートはありません</string>
-    <string name="app_up_to_date">アプリは最新状態です</string>
-    <string name="ok">確定</string>
-    <string name="latest_version">最新バージョン</string>
-    <string name="whats_new">更新内容</string>
-    <string name="downloading">ダウンロード中...</string>
-    <string name="installation_ready">インストールの準備完了</string>
-    <string name="later">後で</string>
-    <string name="install_now">今すぐインストール</string>
-
-    <!-- LogPopup -->
-    <string name="golog_output">GoLog出力</string>
-    <string name="auto_scroll">自動スクロール</string>
-    <string name="clear">消去</string>
-    <string name="close">閉じる</string>
-</resources>
@@ -1,57 +0,0 @@
-<resources>
-    <string name="app_name">Firefly Go</string>
-    <string name="android_edition">안드로이드 버전</string>
-    <string name="sign_in">로그인</string>
-    <string name="server_running">서버 실행 중</string>
-    <string name="server_stopped">서버 정지됨</string>
-    <string name="start_server">서버 시작</string>
-    <string name="stop_server">서버 정지</string>
-    <string name="update">업데이트</string>
-    <string name="reset">초기화</string>
-    <string name="logs">로그</string>
-    <string name="reset_data_title">데이터 초기화</string>
-    <string name="reset_data_confirm">모든 데이터를 초기화하시겠습니까? 이 작업은 취소할 수 없습니다.</string>
-    <string name="no">아니오</string>
-    <string name="yes">예</string>
-    
-    <!-- Scam Warning -->
-    <string name="scam_warning_title">보안 경고</string>
-    <string name="scam_warning_text">이것은 오픈 소스 프로젝트입니다. 누군가로부터 이 앱을 구매하셨다면, 귀하는 사기를 당한 것입니다.</string>
-    <string name="i_understand">확인했습니다</string>
-
-    <!-- LoginDialog -->
-    <string name="account_profile">계정 프로필</string>
-    <string name="logged_in_as">로그인 계정:</string>
-    <string name="auto_update_status">자동 업데이트 상태:</string>
-    <string name="unlocked_player">잠금 해제 (PLAYER)</string>
-    <string name="locked_no_permission">잠김 (권한 없음)</string>
-    <string name="back">뒤로</string>
-    <string name="logout">로그아웃</string>
-    <string name="email">이메일</string>
-    <string name="password">비밀번호</string>
-    <string name="cancel">취소</string>
-    <string name="login">로그인</string>
-    <string name="or">또는</string>
-    <string name="login_with_discord">Discord로 로그인</string>
-    <string name="please_enter_both">이메일과 비밀번호를 모두 입력하세요</string>
-    <string name="login_failed">로그인 실패</string>
-    <string name="failed_to_fetch_profile">프로필을 불러오지 못했습니다</string>
-
-    <!-- AutoUpdateDialog -->
-    <string name="update_available">업데이트 가능</string>
-    <string name="no_update_available">업데이트 없음</string>
-    <string name="app_up_to_date">앱이 최신 상태입니다</string>
-    <string name="ok">확인</string>
-    <string name="latest_version">최신 버전</string>
-    <string name="whats_new">업데이트 내역</string>
-    <string name="downloading">다운로드 중...</string>
-    <string name="installation_ready">설치 준비 완료</string>
-    <string name="later">나중에</string>
-    <string name="install_now">지금 설치</string>
-
-    <!-- LogPopup -->
-    <string name="golog_output">GoLog 출력</string>
-    <string name="auto_scroll">자동 스크롤</string>
-    <string name="clear">지우기</string>
-    <string name="close">닫기</string>
-</resources>
@@ -1,57 +0,0 @@
-<resources>
-    <string name="app_name">Firefly Go</string>
-    <string name="android_edition">Phiên bản Android</string>
-    <string name="sign_in">Đăng nhập</string>
-    <string name="server_running">Máy chủ đang chạy</string>
-    <string name="server_stopped">Máy chủ đã dừng</string>
-    <string name="start_server">Khởi động máy chủ</string>
-    <string name="stop_server">Dừng máy chủ</string>
-    <string name="update">Cập nhật</string>
-    <string name="reset">Đặt lại</string>
-    <string name="logs">Nhật ký</string>
-    <string name="reset_data_title">Đặt lại dữ liệu</string>
-    <string name="reset_data_confirm">Bạn có muốn đặt lại tất cả dữ liệu? Hành động này không thể hoàn tác.</string>
-    <string name="no">Không</string>
-    <string name="yes">Có</string>
-    
-    <!-- Scam Warning -->
-    <string name="scam_warning_title">Cảnh báo bảo mật</string>
-    <string name="scam_warning_text">Đây là dự án mã nguồn mở. Nếu bạn mua ứng dụng này từ bất kỳ ai, bạn đã bị lừa đảo (scam).</string>
-    <string name="i_understand">Tôi đã hiểu</string>
-
-    <!-- LoginDialog -->
-    <string name="account_profile">Thông tin tài khoản</string>
-    <string name="logged_in_as">Đăng nhập bằng:</string>
-    <string name="auto_update_status">Trạng thái tự cập nhật:</string>
-    <string name="unlocked_player">Đã mở khóa (PLAYER)</string>
-    <string name="locked_no_permission">Bị khóa (Không có quyền)</string>
-    <string name="back">Quay lại</string>
-    <string name="logout">Đăng xuất</string>
-    <string name="email">Email</string>
-    <string name="password">Mật khẩu</string>
-    <string name="cancel">Hủy</string>
-    <string name="login">Đăng nhập</string>
-    <string name="or">HOẶC</string>
-    <string name="login_with_discord">Đăng nhập bằng Discord</string>
-    <string name="please_enter_both">Vui lòng nhập cả Email và Mật khẩu</string>
-    <string name="login_failed">Đăng nhập thất bại</string>
-    <string name="failed_to_fetch_profile">Không thể tải thông tin cá nhân</string>
-
-    <!-- AutoUpdateDialog -->
-    <string name="update_available">Có bản cập nhật mới</string>
-    <string name="no_update_available">Không có bản cập nhật</string>
-    <string name="app_up_to_date">Ứng dụng đã được cập nhật mới nhất</string>
-    <string name="ok">Đồng ý</string>
-    <string name="latest_version">Phiên bản mới nhất</string>
-    <string name="whats_new">Có gì mới</string>
-    <string name="downloading">Đang tải xuống...</string>
-    <string name="installation_ready">Sẵn sàng cài đặt</string>
-    <string name="later">Để sau</string>
-    <string name="install_now">Cài đặt ngay</string>
-
-    <!-- LogPopup -->
-    <string name="golog_output">Nhật ký GoLog</string>
-    <string name="auto_scroll">Tự động cuộn</string>
-    <string name="clear">Xóa</string>
-    <string name="close">Đóng</string>
-</resources>
@@ -1,57 +0,0 @@
-<resources>
-    <string name="app_name">Firefly Go</string>
-    <string name="android_edition">安卓版</string>
-    <string name="sign_in">登录</string>
-    <string name="server_running">服务器正在运行</string>
-    <string name="server_stopped">服务器已停止</string>
-    <string name="start_server">启动服务器</string>
-    <string name="stop_server">停止服务器</string>
-    <string name="update">更新</string>
-    <string name="reset">重置</string>
-    <string name="logs">日志</string>
-    <string name="reset_data_title">重置数据</string>
-    <string name="reset_data_confirm">您确定要重置所有数据吗？此操作无法撤销。</string>
-    <string name="no">取消</string>
-    <string name="yes">确定</string>
-    
-    <!-- Scam Warning -->
-    <string name="scam_warning_title">安全警告</string>
-    <string name="scam_warning_text">这是一个开源项目。如果您是从别人那里购买的这个应用，您就被骗了（欺诈）。</string>
-    <string name="i_understand">我已知晓</string>
-
-    <!-- LoginDialog -->
-    <string name="account_profile">账户信息</string>
-    <string name="logged_in_as">已登录为:</string>
-    <string name="auto_update_status">自动更新状态:</string>
-    <string name="unlocked_player">已解锁 (PLAYER)</string>
-    <string name="locked_no_permission">已锁定 (无权限)</string>
-    <string name="back">返回</string>
-    <string name="logout">退出登录</string>
-    <string name="email">邮箱</string>
-    <string name="password">密码</string>
-    <string name="cancel">取消</string>
-    <string name="login">登录</string>
-    <string name="or">或</string>
-    <string name="login_with_discord">使用 Discord 登录</string>
-    <string name="please_enter_both">请输入邮箱和密码</string>
-    <string name="login_failed">登录失败</string>
-    <string name="failed_to_fetch_profile">获取个人资料失败</string>
-
-    <!-- AutoUpdateDialog -->
-    <string name="update_available">有可用更新</string>
-    <string name="no_update_available">没有可用更新</string>
-    <string name="app_up_to_date">您的应用已是最新版本</string>
-    <string name="ok">确定</string>
-    <string name="latest_version">最新版本</string>
-    <string name="whats_new">更新日志</string>
-    <string name="downloading">正在下载...</string>
-    <string name="installation_ready">准备安装</string>
-    <string name="later">稍后</string>
-    <string name="install_now">立即安装</string>
-
-    <!-- LogPopup -->
-    <string name="golog_output">GoLog 输出</string>
-    <string name="auto_scroll">自动滚动</string>
-    <string name="clear">清除</string>
-    <string name="close">关闭</string>
-</resources>
@@ -1,57 +1,3 @@
 <resources>
    <string name="app_name">Firefly Go</string>
-    <string name="android_edition">Android Edition</string>
-    <string name="sign_in">Sign In</string>
-    <string name="server_running">Server is running</string>
-    <string name="server_stopped">Server is stopped</string>
-    <string name="start_server">Start Server</string>
-    <string name="stop_server">Stop Server</string>
-    <string name="update">Update</string>
-    <string name="reset">Reset</string>
-    <string name="logs">Logs</string>
-    <string name="reset_data_title">Reset Data</string>
-    <string name="reset_data_confirm">Do you want to reset all data? This action cannot be rolled back.</string>
-    <string name="no">No</string>
-    <string name="yes">Yes</string>
-    
-    <!-- Scam Warning -->
-    <string name="scam_warning_title">Security Warning</string>
-    <string name="scam_warning_text">This is an open-source project. If you bought this application from someone, you have been scammed (fraud).</string>
-    <string name="i_understand">I Understand</string>
-
-    <!-- LoginDialog -->
-    <string name="account_profile">Account Profile</string>
-    <string name="logged_in_as">Logged in as:</string>
-    <string name="auto_update_status">Auto-Update Status:</string>
-    <string name="unlocked_player">Unlocked (PLAYER)</string>
-    <string name="locked_no_permission">Locked (No permission)</string>
-    <string name="back">Back</string>
-    <string name="logout">Logout</string>
-    <string name="email">Email</string>
-    <string name="password">Password</string>
-    <string name="cancel">Cancel</string>
-    <string name="login">Login</string>
-    <string name="or">OR</string>
-    <string name="login_with_discord">Login with Discord</string>
-    <string name="please_enter_both">Please enter both Email and Password</string>
-    <string name="login_failed">Login failed</string>
-    <string name="failed_to_fetch_profile">Failed to fetch profile</string>
-
-    <!-- AutoUpdateDialog -->
-    <string name="update_available">Update Available</string>
-    <string name="no_update_available">No Update Available</string>
-    <string name="app_up_to_date">Your app is up to date</string>
-    <string name="ok">OK</string>
-    <string name="latest_version">Latest Version</string>
-    <string name="whats_new">What\'s New</string>
-    <string name="downloading">Downloading...</string>
-    <string name="installation_ready">Installation Ready</string>
-    <string name="later">Later</string>
-    <string name="install_now">Install Now</string>
-
-    <!-- LogPopup -->
-    <string name="golog_output">GoLog Output</string>
-    <string name="auto_scroll">Auto-Scroll</string>
-    <string name="clear">Clear</string>
-    <string name="close">Close</string>
 </resources>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>

-    <style name="Theme.FireflyGoAndroid" parent="android:Theme.Material.Light.NoActionBar" />
+    <style name="Theme.FireflyPsAndorid" parent="android:Theme.Material.Light.NoActionBar" />
 </resources>
@@ -14,14 +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=false
 # 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=false
-android.r8.optimizedResourceShrinking=true
-org.gradle.java.installations.auto-download=true
+org.gradle.configuration-cache=true
@@ -1,13 +0,0 @@
-#This file is generated by updateDaemonJvm
-toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/536afcd1dff540251f85e5d2c80458cf/redirect
-toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/398ffe3949748bfb1d5636f023d228fd/redirect
-toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/536afcd1dff540251f85e5d2c80458cf/redirect
-toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/398ffe3949748bfb1d5636f023d228fd/redirect
-toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e99bae143b75f9a10ead10248f02055e/redirect
-toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/658299a896470fbb3103ba3a430ee227/redirect
-toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/536afcd1dff540251f85e5d2c80458cf/redirect
-toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/398ffe3949748bfb1d5636f023d228fd/redirect
-toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/248ffb1098f61659502d0c09aa348294/redirect
-toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/932015f6361ccaead0c6d9b8717ed96e/redirect
-toolchainVendor=JETBRAINS
-toolchainVersion=21
@@ -1,25 +1,24 @@
 [versions]
-activityComposeVersion = "1.11.0"
-agp = "8.13.0"
+activityComposeVersion = "1.10.1"
+agp = "8.9.3"
 androidxJunit = "1.3.0"
-animationCore = "1.9.3"
+animationCore = "1.9.0"
 autoupdater = "1.0.1"
 espressoCoreVersion = "3.7.0"
-foundation = "1.9.3"
-kotlin = "2.2.20"
+foundation = "1.9.0"
+kotlin = "2.0.21"
 coreKtx = "1.17.0"
 junit = "4.13.2"
-lifecycleRuntimeKtxVersion = "2.9.4"
-material = "1.9.3"
-material3WindowSizeClass = "1.4.0"
+lifecycleRuntimeKtxVersion = "2.9.3"
+material = "1.9.0"
+material3WindowSizeClass = "1.3.2"
 materialIconsExtended = "1.7.8"
-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"
+ui = "1.9.0"
+uiGraphics = "1.9.0"
+uiTestJunit4 = "1.9.0"
+uiTestManifest = "1.9.0"
+uiTooling = "1.9.0"
+uiToolingPreview = "1.9.0"

 [libraries]
 androidx-activity-compose-v1101 = { module = "androidx.activity:activity-compose", version.ref = "activityComposeVersion" }
@@ -36,7 +35,6 @@ 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" }
@@ -1,6 +1,6 @@
-#Wed Oct 08 15:20:16 ICT 2025
+#Mon Apr 28 17:05:34 ICT 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
@rem
@rem Copyright 2015 the original author or authors.
@rem
@@ -88,94 +87,3 @@ exit /b 1
 if "%OS%"=="Windows_NT" endlocal

 :omega
-=======
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
->>>>>>> 2459650 (feat: v4)
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:87408dc51a2862b36217129b2a675518705b4b69bbf33b8a6c876b0bdefb91b9
+size 89628224
@@ -0,0 +1,2 @@
+.env
+*.exe
@@ -1,8 +1,2 @@
-<<<<<<< HEAD
 # Changelog
-
-=======
-# Changelog
-
->>>>>>> 2459650 (feat: v4)
-## - UPDATE: Support 4.3.5X
+## - UPDATE: New res
@@ -0,0 +1,5 @@
+module release
+
+go 1.25.0
+
+require github.com/joho/godotenv v1.5.1
@@ -0,0 +1,2 @@
+github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
+github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
@@ -0,0 +1,154 @@
+package main
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"io"
+	"mime/multipart"
+	"net/http"
+	"os"
+	"path/filepath"
+		"github.com/joho/godotenv"
+)
+
+const (
+	repoOwner = "Firefly-Shelter"
+	repoName  = "FireflyGo_Android"
+	giteaURL  = "https://git.kain.io.vn"
+)
+
+type ReleaseInput struct {
+	TagName    string `json:"tag_name"`
+	Name       string `json:"name"`
+	Body       string `json:"body"`
+	Draft      bool   `json:"draft"`
+	Prerelease bool   `json:"prerelease"`
+}
+
+type ReleaseResponse struct {
+	ID      int    `json:"id"`
+	HTMLURL string `json:"html_url"`
+	URL     string `json:"url"`
+}
+
+func readFile(path string) string {
+	data, err := os.ReadFile(path)
+	if err != nil {
+		panic(fmt.Sprintf("Failed to read %s: %v", path, err))
+	}
+	return string(data)
+}
+
+func main() {
+    err := godotenv.Load("script/.env")
+	if err != nil {
+		fmt.Println("Error loading .env file")
+	}
+
+	token := os.Getenv("TOKEN")
+	if token == "" {
+		fmt.Println("TOKEN not found in .env")
+	}
+
+
+	releaseJSON := readFile("script/release.json")
+	var meta map[string]string
+	if err := json.Unmarshal([]byte(releaseJSON), &meta); err != nil {
+		panic("Invalid release.json")
+	}
+	tag := meta["tag"]
+	title := meta["title"]
+	body := readFile("script/README_Note.md")
+
+	// Step 1: Create release
+	releaseInput := ReleaseInput{
+		TagName:    tag,
+		Name:       title,
+		Body:       body,
+		Draft:      false,
+		Prerelease: false,
+	}
+	payload, _ := json.Marshal(releaseInput)
+
+	req, _ := http.NewRequest("POST",
+		fmt.Sprintf("%s/api/v1/repos/%s/%s/releases", giteaURL, repoOwner, repoName),
+		bytes.NewReader(payload),
+	)
+	req.Header.Set("Authorization", "token "+token)
+	req.Header.Set("Content-Type", "application/json")
+
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		panic(err)
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusCreated {
+		bodyBytes, _ := io.ReadAll(resp.Body)
+		panic(fmt.Sprintf("Failed to create release: %s", bodyBytes))
+	}
+
+	var releaseResp ReleaseResponse
+	if err := json.NewDecoder(resp.Body).Decode(&releaseResp); err != nil {
+		panic("Failed to decode release response")
+	}
+
+	fmt.Printf("Release created:\n- ID: %d\n- HTML: %s\n", releaseResp.ID, releaseResp.HTMLURL)
+
+	uploadURL := releaseResp.URL
+	if uploadURL == "" {
+		panic("url missing in release response")
+	}
+
+	files, err := os.ReadDir("app/release")
+	if err != nil {
+		panic("Cannot read prebuild folder")
+	}
+
+	for _, file := range files {
+		if filepath.Ext(file.Name()) != ".apk" {
+			continue
+		}
+		uploadPath := filepath.Join("app/release", file.Name())
+		fmt.Println("Uploading:", uploadPath)
+
+		buf := new(bytes.Buffer)
+		writer := multipart.NewWriter(buf)
+		part, err := writer.CreateFormFile("attachment", filepath.Base(uploadPath))
+		if err != nil {
+			fmt.Printf("Failed to create form: %v\n", err)
+			continue
+		}
+
+		src, err := os.Open(uploadPath)
+		if err != nil {
+			fmt.Printf("Cannot open file %s: %v\n", file.Name(), err)
+			continue
+		}
+		io.Copy(part, src)
+		src.Close()
+		writer.Close()
+
+		req, err := http.NewRequest("POST", uploadURL+"/assets", buf)
+		if err != nil {
+			fmt.Printf("NewRequest error: %v\n", err)
+			continue
+		}
+		req.Header.Set("Authorization", "token "+token)
+		req.Header.Set("Content-Type", writer.FormDataContentType())
+
+		resp, err := http.DefaultClient.Do(req)
+		if err != nil {
+			fmt.Printf("Upload failed: %v\n", err)
+			continue
+		}
+		if resp.StatusCode != http.StatusCreated {
+			bodyBytes, _ := io.ReadAll(resp.Body)
+			fmt.Printf("Upload failed: %s\n", bodyBytes)
+		} else {
+			fmt.Println("Uploaded:", file.Name())
+		}
+		resp.Body.Close()
+	}
+}
@@ -1,4 +1,5 @@
 {
-    "tag": "4.3.4-02",
-    "title": "PreBuild Version 4.3.54 - 02"
+    "tag": "3.6.2-04",
+    "title": "PreBuild Version 3.6.52 - 04"
 }
+  
@@ -1,8 +1,5 @@
 pluginManagement {
    repositories {
-        maven {
-            setUrl("https://jitpack.io")
-        }
        google {
            content {
                includeGroupByRegex("com\\.android.*")
@@ -12,23 +9,18 @@ pluginManagement {
        }
        mavenCentral()
        gradlePluginPortal()
-
    }
 }
-plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.10.0"
-}
 dependencyResolutionManagement {
    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
    repositories {
-        maven {
-            setUrl("https://jitpack.io")
-        }
        google()
        mavenCentral()
+        maven{
+            url=uri("https://jitpack.io")
+        }
    }
-
 }

-rootProject.name = "FireflyGoAndroid"
+rootProject.name = "FireflyPsAndorid"
 include(":app")
Author	SHA1	Message	Date
Kain344	dafb6aba1b	UPDATE: New res	2025-10-03 22:03:27 +07:00
Kain344	3e967d7bed	UPDATE: New res	2025-10-03 22:02:57 +07:00
Kain344	c75207f8e1	UPDATE: Extra setting	2025-10-02 23:37:14 +07:00
Kain344	3871dc8677	FIX: Fix env	2025-09-30 12:06:51 +07:00
Kain344	72dc9b238f	UPDATE: Update new link	2025-09-30 11:15:49 +07:00
Kain344	edf158028e	UPDATE: apk link	2025-09-30 10:30:40 +07:00
Kain344	e21b59b9b1	UPDATE: Update to 3.6.52	2025-09-30 10:10:06 +07:00
Kain344	4c10a53229	UPDATE: Fix bug, update libs	2025-09-02 20:00:36 +07:00
Kain344	e61bb39fc5	UPDATE: Update for v4	2025-09-02 14:18:06 +07:00
Kain344	8f86f3ea61	UPDATE: Add self update, reset data, logs	2025-08-25 09:56:01 +07:00
Kain344	d57f7c024b	UPDATE: Add self update, reset data, logs	2025-08-25 09:54:12 +07:00
Kain344	aec3601f2a	UPDATE: Add self update, reset data, logs	2025-08-25 09:52:03 +07:00
Kain344	b54d8bd0c5	FIX: add asset bundle url b	2025-08-19 16:32:14 +07:00
Kain344	89a772152b	FIX: add new resdata	2025-08-19 12:23:08 +07:00
Kain344	ed411fc284	UPDATE: update for 3.5.1	2025-08-19 11:18:08 +07:00
Kain344	b7b0457685	FIX: app runing state bug	2025-08-06 19:09:41 +07:00
Kain344	bdd458a64f	UPDATE: Add wakelock	2025-08-06 18:32:18 +07:00
Kain344	93d86df411	update for v5	2025-07-25 12:53:42 +07:00
Kain344	a0cef76ae6	update for v4	2025-07-22 14:22:23 +07:00
Kain344	b40252d958	fix env	2025-07-15 21:59:45 +07:00
Kain344	01b311fb24	update for v3	2025-07-15 21:35:35 +07:00
Kain344	d21a84ee47	update for 3.4.5x	2025-07-08 15:04:02 +07:00
Kain344	ad357dc8dd	update to v4	2025-06-10 12:33:33 +07:00
Kain344	6b5634de48	add embed setting, and fix toughtness error	2025-05-30 14:34:41 +07:00
Kain344	f7e435972c	update for v2	2025-05-27 10:42:09 +07:00
Kain344	6fc0887111	update lib, fix bug when display relic	2025-05-07 15:38:06 +07:00
Kain344	533ba337d4	update for v5 and fix bug skip node	2025-05-03 12:38:21 +07:00
Kain344	b992bd9784	Track .aar with Git LFS	2025-04-29 17:24:11 +07:00