Migration to Compose 2024.09.02 (#316)

Author: ShiftHackZ

build-logic/convention/src/main/kotlin/com/shifthackz/aisdv1/buildlogic/Compose.kt

@@ -37,7 +37,6 @@ internal fun Project.configureCompose(
             add("implementation", libs.findLibrary("androidx.paging.compose").get())
             add("implementation", libs.findLibrary("androidx.lifecycle.viewmodel").get())
             add("implementation", libs.findLibrary("androidx.lifecycle.compose").get())
-            add("implementation", libs.findLibrary("google.accompanist.systemuicontroller").get())
             add("implementation", libs.findLibrary("rx.java").get())
             add("implementation", libs.findLibrary("shifthackz.mvi").get())
             add("implementation", libs.findLibrary("kotlinx.serialization.json").get())

core/ui/src/main/java/com/shifthackz/aisdv1/core/ui/MviComponent.kt

@@ -96,7 +96,7 @@ class PreferenceManagerImpl(
 
     override var monitorConnectivity: Boolean
         get() = if (!source.featureTags.contains(FeatureTag.OwnServer)) false
-        else preferences.getBoolean(KEY_MONITOR_CONNECTIVITY, true)
+        else preferences.getBoolean(KEY_MONITOR_CONNECTIVITY, false)
         set(value) = preferences.edit()
             .putBoolean(KEY_MONITOR_CONNECTIVITY, value)
             .apply()
@@ -321,7 +321,7 @@ class PreferenceManagerImpl(
         const val KEY_MEDIA_PIPE_CUSTOM_MODEL_PATH = "key_mediapipe_custom_model_path"
         const val KEY_ALLOW_LOCAL_DIFFUSION_CANCEL = "key_allow_local_diffusion_cancel"
         const val KEY_LOCAL_DIFFUSION_SCHEDULER_THREAD = "key_local_diffusion_scheduler_thread"
-        const val KEY_MONITOR_CONNECTIVITY = "key_monitor_connectivity"
+        const val KEY_MONITOR_CONNECTIVITY = "key_monitor_connection"
         const val KEY_AI_AUTO_SAVE = "key_ai_auto_save"
         const val KEY_SAVE_TO_MEDIA_STORE = "key_save_to_media_store"
         const val KEY_FORM_ALWAYS_SHOW_ADVANCED_OPTIONS = "key_always_show_advanced_options"

data/src/main/java/com/shifthackz/aisdv1/data/preference/PreferenceManagerImpl.kt

@@ -9,15 +9,14 @@ kotlin = "2.0.20"
 ksp = "2.0.20-1.0.25"
 appcompat = "1.7.0"
 composeCompiler = "1.5.7"
-composeBom = "2024.08.00"
+composeBom = "2024.09.02"
 composeActivity = "1.9.2"
 composeJunit = "1.7.2"
 lifecycleViewModel = "2.8.6"
 navigation = "2.8.1"
 paging = "3.1.1"
 pagingCompose = "1.0.0-alpha18"
 gson = "2.11.0"
-accompanistSystemUi = "0.36.0"
 retrofit = "2.11.0"
 okhttp = "5.0.0-alpha.14"
 koin = "4.0.0"
@@ -79,7 +78,6 @@ androidx-room-rx = { group = "androidx.room", name = "room-rxjava3", version.ref
 androidx-work-runtime = { group = "androidx.work", name = "work-runtime", version.ref = "workManager" }
 google-gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" }
 google-material = { group = "com.google.android.material", name = "material", version.ref = "material" }
-google-accompanist-systemuicontroller = { group = "com.google.accompanist", name = "accompanist-systemuicontroller", version.ref = "accompanistSystemUi" }
 google-mediapipe-image-generator = { group = "com.google.mediapipe", name = "tasks-vision-image-generator", version.ref = "mediaPipeGenerator" }
 retrofit-core = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" }
 retrofit-converter-gson = { group = "com.squareup.retrofit2", name = "converter-gson", version.ref = "retrofit" }

gradle/libs.versions.toml

@@ -19,7 +19,7 @@ android {
 }
 
 dependencies {
-    api(project(":core:ui"))
+    implementation(project(":core:ui"))
     implementation(project(":core:common"))
     implementation(project(":core:imageprocessing"))
     implementation(project(":core:localization"))

presentation/build.gradle.kts

@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.view.View
 import androidx.activity.compose.BackHandler
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.material3.DrawerValue
@@ -22,14 +23,14 @@ import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 import com.shifthackz.aisdv1.core.common.log.debugLog
-import com.shifthackz.aisdv1.core.ui.MviComponent
 import com.shifthackz.aisdv1.presentation.extensions.navigatePopUpToCurrent
 import com.shifthackz.aisdv1.presentation.navigation.NavigationEffect
 import com.shifthackz.aisdv1.presentation.navigation.NavigationRoute
 import com.shifthackz.aisdv1.presentation.navigation.graph.mainNavGraph
 import com.shifthackz.aisdv1.presentation.screen.drawer.DrawerScreen
 import com.shifthackz.aisdv1.presentation.theme.global.AiSdAppTheme
 import com.shifthackz.aisdv1.presentation.utils.PermissionUtil
+import com.shifthackz.android.core.mvi.MviComponent
 import kotlinx.coroutines.launch
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
@@ -54,6 +55,7 @@ class AiStableDiffusionActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         val splashScreen = installSplashScreen()
+        enableEdgeToEdge()
         super.onCreate(savedInstanceState)
         actionBar?.hide()
         splashScreen.setKeepOnScreenCondition { viewModel.state.value.isShowSplash }
@@ -125,9 +127,8 @@ class AiStableDiffusionActivity : AppCompatActivity() {
                                 homeRouteEntry = effect.navRoute
                             }
                         }
-                    },
-                    applySystemUiColors = false,
-                ) { state, _ ->
+                    }
+                ) { state ->
                     DrawerScreen(
                         drawerState = drawerState,
                         backStackEntry = backStackEntry,

presentation/src/main/java/com/shifthackz/aisdv1/presentation/activity/AiStableDiffusionActivity.kt

@@ -4,6 +4,7 @@ package com.shifthackz.aisdv1.presentation.modal
 
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -120,6 +121,7 @@ fun ModalRenderer(
         is Modal.Image.Batch -> ModalBottomSheet(
             onDismissRequest = dismiss,
             shape = RectangleShape,
+            containerColor = MaterialTheme.colorScheme.background,
         ) {
             GenerationImageBatchResultModal(
                 screenModal.results,
@@ -136,6 +138,7 @@ fun ModalRenderer(
         is Modal.PromptBottomSheet -> ModalBottomSheet(
             onDismissRequest = dismiss,
             shape = RectangleShape,
+            containerColor = MaterialTheme.colorScheme.background,
         ) {
             InputHistoryScreen(
                 onGenerationSelected = { ai ->
@@ -266,6 +269,7 @@ fun ModalRenderer(
         Modal.Language -> ModalBottomSheet(
             onDismissRequest = dismiss,
             shape = RectangleShape,
+            containerColor = MaterialTheme.colorScheme.background,
         ) {
             LanguageBottomSheet(onDismissRequest = dismiss)
         }
@@ -333,6 +337,7 @@ fun ModalRenderer(
         is Modal.GalleryGrid -> ModalBottomSheet(
             onDismissRequest = dismiss,
             shape = RectangleShape,
+            containerColor = MaterialTheme.colorScheme.background,
         ) {
             GridBottomSheet(
                 currentGrid = screenModal.grid,
@@ -346,6 +351,7 @@ fun ModalRenderer(
         is Modal.LDScheduler -> ModalBottomSheet(
             onDismissRequest = dismiss,
             shape = RectangleShape,
+            containerColor = MaterialTheme.colorScheme.background,
         ) {
             LDSchedulerBottomSheet(
                 currentScheduler = screenModal.scheduler,

presentation/src/main/java/com/shifthackz/aisdv1/presentation/modal/ModalRenderer.kt

@@ -19,7 +19,6 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Check
-import androidx.compose.material3.AlertDialogDefaults
 import androidx.compose.material3.Button
 import androidx.compose.material3.Icon
 import androidx.compose.material3.LocalContentColor
@@ -46,7 +45,7 @@ import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import com.shifthackz.aisdv1.core.extensions.shimmer
-import com.shifthackz.aisdv1.core.ui.MviComponent
+import com.shifthackz.android.core.mvi.MviComponent
 import com.shifthackz.aisdv1.domain.entity.ServerSource
 import com.shifthackz.aisdv1.presentation.modal.extras.ExtrasEffect
 import com.shifthackz.aisdv1.presentation.model.ErrorState
@@ -102,7 +101,7 @@ private fun ScreenContent(
         Surface(
             modifier = modifier.fillMaxHeight(0.7f),
             shape = RoundedCornerShape(16.dp),
-            color = AlertDialogDefaults.containerColor,
+            color = MaterialTheme.colorScheme.background,
         ) {
             Scaffold(
                 bottomBar = {

presentation/src/main/java/com/shifthackz/aisdv1/presentation/modal/embedding/EmbeddingScreen.kt

@@ -22,7 +22,6 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Check
 import androidx.compose.material.icons.filled.DataExploration
-import androidx.compose.material3.AlertDialogDefaults
 import androidx.compose.material3.Button
 import androidx.compose.material3.Icon
 import androidx.compose.material3.LocalContentColor
@@ -43,7 +42,7 @@ import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import com.shifthackz.aisdv1.core.extensions.shimmer
-import com.shifthackz.aisdv1.core.ui.MviComponent
+import com.shifthackz.android.core.mvi.MviComponent
 import com.shifthackz.aisdv1.domain.entity.ServerSource
 import com.shifthackz.aisdv1.presentation.model.ErrorState
 import com.shifthackz.aisdv1.presentation.model.ExtraType
@@ -99,7 +98,7 @@ private fun ScreenContent(
         Surface(
             modifier = modifier.fillMaxHeight(0.7f),
             shape = RoundedCornerShape(16.dp),
-            color = AlertDialogDefaults.containerColor,
+            color = MaterialTheme.colorScheme.background,
         ) {
             Scaffold(
                 bottomBar = {

presentation/src/main/java/com/shifthackz/aisdv1/presentation/modal/extras/ExtrasScreen.kt

@@ -39,7 +39,7 @@ import androidx.compose.ui.unit.dp
 import androidx.paging.PagingData
 import androidx.paging.compose.collectAsLazyPagingItems
 import androidx.paging.compose.items
-import com.shifthackz.aisdv1.core.ui.MviComponent
+import com.shifthackz.android.core.mvi.MviComponent
 import com.shifthackz.aisdv1.domain.entity.AiGenerationResult
 import kotlinx.coroutines.flow.Flow
 import org.koin.androidx.compose.koinViewModel
@@ -50,7 +50,7 @@ fun InputHistoryScreen(
     onGenerationSelected: (AiGenerationResult) -> Unit = {},
 ) {
     val viewModel = koinViewModel<InputHistoryViewModel>()
-    MviComponent(viewModel = viewModel, applySystemUiColors = false) { _, _ ->
+    MviComponent(viewModel = viewModel) { _, _ ->
         ScreenContent(
             modifier = Modifier.fillMaxSize(),
             pagingFlow = viewModel.pagingFlow,
@@ -107,7 +107,7 @@ private fun InputHistoryItem(
         modifier = modifier
             .fillMaxWidth()
             .clip(RoundedCornerShape(16.dp))
-            .background(color = MaterialTheme.colorScheme.background)
+            .background(color = MaterialTheme.colorScheme.surface)
             .defaultMinSize(minHeight = 50.dp)
             .clickable { onClick(item) },
     ) {