UPDATE: Fix bug, update libs

app/build.gradle.kts

@@ -1,3 +1,5 @@
+@file:Suppress("UnstableApiUsage")
+
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
@@ -5,12 +7,13 @@ plugins {
 }
 
 android {
-    namespace = "com.example.fireflypsandorid"
+    namespace = "com.example.firefly_go_android"
-    compileSdk = 35
+    compileSdk = 36
 
     defaultConfig {
-        applicationId = "com.example.fireflypsandorid"
+        applicationId = "com.example.firefly_go_android"
         minSdk = 24
+        //noinspection OldTargetApi
         targetSdk = 35
         versionCode = 1
         versionName = "1.0"
@@ -44,42 +47,44 @@ android {
     composeOptions {
         kotlinCompilerExtensionVersion = "1.5.0"
     }
+    buildToolsVersion = "36.0.0"
+    ndkVersion = "27.2.12479018"
 }
 
 dependencies {
-    implementation("androidx.core:core-ktx:1.13.0")
+    implementation(libs.androidx.core.ktx)
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.9.3")
+    implementation(libs.androidx.lifecycle.runtime.ktx.v293)
-    implementation("androidx.activity:activity-compose:1.10.1")
+    implementation(libs.androidx.activity.compose.v1101)
     // Compose UI
-    implementation("androidx.compose.ui:ui:1.9.0")
+    implementation(libs.ui)
-    implementation("androidx.compose.ui:ui-graphics:1.9.0")
+    implementation(libs.ui.graphics)
-    implementation("androidx.compose.ui:ui-tooling-preview:1.9.0")
+    implementation(libs.ui.tooling.preview)
 
     // Foundation & Animation
-    implementation("androidx.compose.foundation:foundation:1.9.0")
+    implementation(libs.androidx.foundation)
-    implementation("androidx.compose.animation:animation:1.9.0")
+    implementation(libs.androidx.animation)
-    implementation("androidx.compose.animation:animation-core:1.9.0")
+    implementation(libs.androidx.animation.core)
 
     // Material & Material3
-    implementation("androidx.compose.material:material:1.9.0")
+    implementation(libs.androidx.material)
-    implementation("androidx.compose.material:material-icons-extended:1.7.8")
+    implementation(libs.androidx.material.icons.extended)
-    implementation("androidx.compose.material3:material3:1.3.2")
+    implementation(libs.material3)
-    implementation("androidx.compose.material3:material3-window-size-class:1.3.2")
+    implementation(libs.androidx.material3.window.size.class1)
 
     // Auto updater library
-    implementation("com.github.CSAbhiOnline:AutoUpdater:1.0.1")
+    implementation(libs.autoupdater)
 
     // Unit Test
     testImplementation(libs.junit)
 
     // Android Instrumentation Test
-    androidTestImplementation("androidx.test.ext:junit:1.3.0")
+    androidTestImplementation(libs.androidx.junit.v130)
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.7.0")
+    androidTestImplementation(libs.androidx.espresso.core.v370)
-    androidTestImplementation("androidx.compose.ui:ui-test-junit4:1.9.0")
+    androidTestImplementation(libs.ui.test.junit4)
 
     // Debug
-    debugImplementation("androidx.compose.ui:ui-tooling:1.9.0")
+    debugImplementation(libs.ui.tooling)
-    debugImplementation("androidx.compose.ui:ui-test-manifest:1.9.0")
+    debugImplementation(libs.ui.test.manifest)
 
     // Local AAR library
     implementation(files("../library/firefly-go.aar"))

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

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

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

@@ -1,4 +1,4 @@
-package com.example.fireflypsandorid
+package com.example.firefly_go_android
 
 import android.app.NotificationChannel
 import android.app.NotificationManager

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

@@ -1,4 +1,4 @@
-package com.example.fireflypsandorid
+package com.example.firefly_go_android
 
 import AutoUpdaterManager
 import android.annotation.SuppressLint
@@ -24,7 +24,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.example.autoupdater.UpdateFeatures
-import com.example.fireflypsandorid.ui.theme.FireflyPsAndoridTheme
+import com.example.firefly_go_android.ui.theme.FireflyPsAndoridTheme
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -34,7 +34,6 @@ import androidx.compose.animation.core.*
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.icons.Icons

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

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

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

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

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

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

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

@@ -1,5 +1,5 @@
 {
-  "latest_version": "3.5.4-01",
+  "latest_version": "3.5.4-02",
-  "changelog": "UPDATE: Update for v4",
+  "changelog": "UPDATE: Fix bug, update libs",
-  "apk_url": "https://git.kain.io.vn/Firefly-Shelter/FireflyGo_Andoid/releases/download/3.5.4-01/firefly_go_android.apk"
+  "apk_url": "https://git.kain.io.vn/Firefly-Shelter/FireflyGo_Andoid/releases/download/3.5.4-02/firefly_go_android.apk"
 }

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

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

gradle/libs.versions.toml

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

library/firefly-go.aar

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fbc29acc100bafe70ed46d921495ce98d93735d4c62d7af2fd78bc0f4d67651b
+oid sha256:78fd3d4938199813bbdf5b54d427e2e497c618cb228b230a3eaf26506e78b55d
-size 86920442
+size 86920440