Android: Optimised the adaptation method for multiple screen sizes to…

Android/build.gradle.kts

@@ -1,16 +1,16 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id("com.android.application") version "8.12.0-alpha03" apply false
-    id("org.jetbrains.kotlin.android") version "2.1.20" apply false
-    id("com.google.gms.google-services") version "4.4.2" apply false
-    id("org.jetbrains.kotlin.plugin.compose") version "2.1.20" apply false
-    id("com.google.devtools.ksp") version "2.1.20-1.0.32" apply false
+    id("com.android.application") version "9.1.0-alpha01" apply false
+    id("org.jetbrains.kotlin.android") version "2.3.0" apply false
+    id("org.jetbrains.kotlin.plugin.compose") version "2.3.0" apply false
+    id("com.google.gms.google-services") version "4.4.4" apply false
+    id("com.google.devtools.ksp") version "2.3.4" apply false
 }
 buildscript {
     repositories {
         google()  // Google's Maven repository
     }
     dependencies {
-        classpath("com.google.gms:google-services:4.4.2")
+        classpath(libs.google.services)
     }
 }

Android/gradle.properties

@@ -10,5 +10,19 @@ kotlin.code.style=official
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
-org.gradle.configuration-cache=true
-android.suppressUnsupportedCompileSdk=34
+# org.gradle.configuration-cache=true
+android.suppressUnsupportedCompileSdk=34
+# KSP classpath snapshot configuration
+ksp.use.kotlin.incremental=false
+ksp.use.kotlin.incremental.java=false
+ksp.use.kotlin.incremental.kapt=false
+android.defaults.buildfeatures.resvalues=true
+android.sdk.defaultTargetSdkToCompileSdkIfUnset=false
+android.enableAppCompileTimeRClass=false
+android.usesSdkInManifest.disallowed=false
+android.uniquePackageNames=false
+android.dependency.useConstraints=true
+android.r8.strictFullModeForKeepRules=false
+android.r8.optimizedResourceShrinking=false
+android.builtInKotlin=false
+android.newDsl=false

Android/gradle/libs.versions.toml

@@ -0,0 +1,94 @@
+[versions]
+accompanist = "0.36.0"
+activity = "1.12.2"
+androidxComposeUi = "ui-test-junit4"
+androidxComposeUiX2 = "ui-test-manifest"
+animation = "1.10.0"
+coilCompose = "3.3.0"
+compose = "1.5.6"
+composeBom = "2025.12.01"
+composeUi = "ui-tooling"
+coreKtx = "1.17.0"
+coreSplashscreen = "1.2.0"
+espressoCore = "3.7.0"
+firebaseAnalytics = "23.0.0"
+firebaseAuthKtx = "23.2.1"
+firebaseFirestore = "26.0.2"
+firebaseMessagingKtx = "24.1.2"
+firebaseUiAuth = "10.0.0-beta01"
+generativeai = "0.9.0"
+googleServices = "4.4.4"
+horologist = "0.7.15"
+junit = "1.3.0"
+junitJupiterApi = "6.0.1"
+lifecycle = "2.10.0"
+material = "1.14.0-alpha08"
+material3 = "1.4.0"
+materialIconsExtended = "1.7.8"
+navigationCompose = "2.9.6"
+playServicesAds = "24.9.0"
+playServicesAuth = "21.4.0"
+playServicesWearable = "19.0.0"
+room = "2.8.4"
+runtimeLivedata = "1.10.0"
+tiles = "1.5.0"
+ui = "1.10.0"
+volley = "1.2.1"
+watchfaceComplicationsDataSourceKtx = "1.3.0-beta01"
+
+[libraries]
+accompanist-pager = { group = "com.google.accompanist", name = "accompanist-pager", version.ref = "accompanist" }
+accompanist-pager-indicators = { group = "com.google.accompanist", name = "accompanist-pager-indicators", version.ref = "accompanist" }
+accompanist-swiperefresh = { group = "com.google.accompanist", name = "accompanist-swiperefresh", version.ref = "accompanist" }
+activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activity" }
+activity-ktx = { group = "androidx.activity", name = "activity-ktx", version.ref = "activity" }
+animation = { group = "androidx.compose.animation", name = "animation", version.ref = "animation" }
+coil-compose = { group = "io.coil-kt.coil3", name = "coil-compose", version.ref = "coilCompose" }
+compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
+compose-foundation = { group = "androidx.wear.compose", name = "compose-foundation", version.ref = "compose" }
+compose-material = { group = "androidx.wear.compose", name = "compose-material", version.ref = "compose" }
+core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
+core-splashscreen = { group = "androidx.core", name = "core-splashscreen", version.ref = "coreSplashscreen" }
+espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
+firebase-analytics = { group = "com.google.firebase", name = "firebase-analytics", version.ref = "firebaseAnalytics" }
+firebase-auth-ktx = { group = "com.google.firebase", name = "firebase-auth-ktx", version.ref = "firebaseAuthKtx" }
+firebase-firestore = { group = "com.google.firebase", name = "firebase-firestore", version.ref = "firebaseFirestore" }
+firebase-messaging-ktx = { group = "com.google.firebase", name = "firebase-messaging-ktx", version.ref = "firebaseMessagingKtx" }
+firebase-ui-auth = { group = "com.firebaseui", name = "firebase-ui-auth", version.ref = "firebaseUiAuth" }
+generativeai = { group = "com.google.ai.client.generativeai", name = "generativeai", version.ref = "generativeai" }
+google-services = { group = "com.google.gms", name = "google-services", version.ref = "googleServices" }
+horologist-compose-tools = { group = "com.google.android.horologist", name = "horologist-compose-tools", version.ref = "horologist" }
+horologist-tiles = { group = "com.google.android.horologist", name = "horologist-tiles", version.ref = "horologist" }
+junit = { group = "androidx.test.ext", name = "junit", version.ref = "junit" }
+junit-jupiter-api = { group = "org.junit.jupiter", name = "junit-jupiter-api", version.ref = "junitJupiterApi" }
+lifecycle-process = { group = "androidx.lifecycle", name = "lifecycle-process", version.ref = "lifecycle" }
+lifecycle-runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "lifecycle" }
+lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycle" }
+lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "lifecycle" }
+material = { group = "com.google.android.material", name = "material", version.ref = "material" }
+material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended", version.ref = "materialIconsExtended" }
+material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "material3" }
+material3-window-size-class1 = { group = "androidx.compose.material3", name = "material3-window-size-class", version.ref = "material3" }
+navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigationCompose" }
+play-services-ads = { group = "com.google.android.gms", name = "play-services-ads", version.ref = "playServicesAds" }
+play-services-auth = { group = "com.google.android.gms", name = "play-services-auth", version.ref = "playServicesAuth" }
+play-services-wearable = { group = "com.google.android.gms", name = "play-services-wearable", version.ref = "playServicesWearable" }
+room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" }
+room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" }
+room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" }
+runtime-livedata = { group = "androidx.compose.runtime", name = "runtime-livedata", version.ref = "runtimeLivedata" }
+tiles = { group = "androidx.wear.tiles", name = "tiles", version.ref = "tiles" }
+tiles-material = { group = "androidx.wear.tiles", name = "tiles-material", version.ref = "tiles" }
+ui = { group = "androidx.compose.ui", name = "ui", version.ref = "ui" }
+ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics", version.ref = "ui" }
+ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4", version.ref = "ui" }
+ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest", version.ref = "ui" }
+ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "ui" }
+ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview", version.ref = "ui" }
+volley = { group = "com.android.volley", name = "volley", version.ref = "volley" }
+watchface-complications-data-source-ktx = { group = "androidx.wear.watchface", name = "watchface-complications-data-source-ktx", version.ref = "watchfaceComplicationsDataSourceKtx" }
+
+[plugins]
+androidx-compose-ui = { id = "androidx.compose.ui", version.ref = "composeUi" }
+androidx-compose-uiX2 = { id = "androidx.compose.ui", version.ref = "androidxComposeUiX2" }
+compose-ui = { id = "androidx.compose.ui", version.ref = "androidxComposeUi" }

Android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sat Apr 13 22:27:27 CST 2024
+#Sun Sep 21 11:37:00 CST 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-9.2.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

Android/mobile/build.gradle.kts

@@ -38,19 +38,12 @@ android {
             isShrinkResources = false
         }
     }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-    kotlinOptions {
-        jvmTarget = "17"
-    }
     buildFeatures {
         compose = true
         buildConfig = true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.0"
+        kotlinCompilerExtensionVersion = "1.5.15"
     }
     packaging {
         resources {
@@ -59,67 +52,60 @@ android {
     }
 }
 
-dependencies {
-
-    val activity = "1.11.0-rc01"
-    val composeBom = "2025.04.01"
-    val ui = "1.9.0-alpha01"
-    val material = "1.4.0-alpha13"
-    val accompanist = "0.36.0"
-    val lifecycle = "2.9.0-rc01"
-    val room = "2.7.1"
-
-    implementation("androidx.core:core-ktx:1.16.0")
-    implementation("io.coil-kt:coil-compose:2.7.0")
-    implementation("com.android.volley:volley:1.2.1")
-    implementation("com.google.ai.client.generativeai:generativeai:0.9.0")
-    implementation("androidx.compose.material:material-icons-extended:1.7.8")
-    implementation("com.google.android.material:material:1.13.0-alpha13")
-    implementation("androidx.navigation:navigation-compose:2.9.0-rc01")
-
-    implementation(platform("com.google.firebase:firebase-bom:33.13.0"))
-    implementation("com.google.firebase:firebase-auth-ktx:23.2.0")
-    implementation("com.google.android.gms:play-services-auth:21.3.0")
-    implementation("com.firebaseui:firebase-ui-auth:9.0.0")
-    implementation("com.google.firebase:firebase-firestore:25.1.4")
-    implementation("com.google.firebase:firebase-messaging-ktx:24.1.1")
-    implementation("com.google.android.gms:play-services-ads:24.2.0")
-    implementation("com.google.firebase:firebase-analytics:22.4.0")
-
-    implementation("androidx.activity:activity-ktx:${activity}")
-    implementation("androidx.activity:activity-compose:${activity}")
-
-    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle")
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle")
-    implementation("androidx.lifecycle:lifecycle-runtime-compose:$lifecycle")
-    implementation("androidx.lifecycle:lifecycle-process:$lifecycle")
-
-    implementation("androidx.compose.ui:ui:$ui")
-    implementation("androidx.compose.animation:animation:$ui")
-    implementation("androidx.compose.ui:ui-graphics:$ui")
-    implementation("androidx.compose.ui:ui-tooling-preview:$ui")
-    implementation("androidx.compose.runtime:runtime-livedata:$ui")
-
-    implementation("androidx.room:room-runtime:$room")
-    implementation("androidx.room:room-ktx:$room")
-    ksp("androidx.room:room-compiler:$room")
-
-    implementation("androidx.compose.material3:material3:$material")
-    implementation("androidx.compose.material3:material3-window-size-class:$material")
-
-    implementation("com.google.accompanist:accompanist-swiperefresh:$accompanist")
-    implementation("com.google.accompanist:accompanist-pager:$accompanist")
-    implementation("com.google.accompanist:accompanist-pager-indicators:${accompanist}")
-
-    implementation(platform("androidx.compose:compose-bom:$composeBom"))
-
-    androidTestImplementation("androidx.compose.ui:ui-test-junit4:$ui")
-    androidTestImplementation(platform("androidx.compose:compose-bom:$composeBom"))
-    androidTestImplementation("androidx.test.ext:junit:1.2.0-alpha03")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.6.0-alpha03")
+kotlin {
+    jvmToolchain(17)
+}
 
-    debugImplementation("androidx.compose.ui:ui-tooling:$ui")
-    debugImplementation("androidx.compose.ui:ui-test-manifest:$ui")
+dependencies {
 
-    testImplementation("junit:junit:4.13.2")
+    implementation(libs.core.ktx)
+    implementation(libs.coil.compose)
+    implementation(libs.volley)
+    implementation(libs.generativeai)
+    implementation(libs.material.icons.extended)
+    implementation(libs.material)
+    implementation(libs.navigation.compose)
+
+    implementation(libs.firebase.auth.ktx)
+    implementation(libs.firebase.firestore)
+    implementation(libs.firebase.messaging.ktx)
+    implementation(libs.firebase.analytics)
+    implementation(libs.play.services.auth)
+    implementation(libs.firebase.ui.auth)
+    implementation(libs.play.services.ads)
+
+    implementation(libs.activity.ktx)
+    implementation(libs.activity.compose)
+
+    implementation(libs.lifecycle.viewmodel.compose)
+    implementation(libs.lifecycle.runtime.ktx)
+    implementation(libs.lifecycle.runtime.compose)
+    implementation(libs.lifecycle.process)
+
+    implementation(libs.room.runtime)
+    implementation(libs.room.ktx)
+    ksp(libs.room.compiler)
+
+    implementation(libs.accompanist.swiperefresh)
+    implementation(libs.accompanist.pager)
+    implementation(libs.accompanist.pager.indicators)
+
+    implementation(platform(libs.compose.bom))
+    implementation(libs.ui)
+    implementation(libs.animation)
+    implementation(libs.ui.graphics)
+    implementation(libs.ui.tooling.preview)
+    implementation(libs.runtime.livedata)
+    implementation(libs.material3)
+    implementation(libs.material3.window.size.class1)
+
+    androidTestImplementation(libs.ui.test.junit4)
+    androidTestImplementation(platform(libs.compose.bom))
+    androidTestImplementation(libs.junit)
+    androidTestImplementation(libs.espresso.core)
+
+    debugImplementation(libs.ui.tooling)
+    debugImplementation(libs.ui.test.manifest)
+
+    testImplementation(libs.junit.jupiter.api)
 }