[컴포즈] NavController 활용한 컴포즈 화면 구성

app/build.gradle.kts

@@ -72,6 +72,7 @@ dependencies {
     implementation(project(":features:base_mvvm_lifecycle"))
     implementation(project(":features:base_mvvm_bottom_sheet"))
     implementation(project(":features:compose_permissions_result"))
+    implementation(project(":features:compose_navigation"))
 
     /**
      * Network
@@ -108,14 +109,6 @@ dependencies {
     implementation(Rx.java)
     implementation(Rx.kotlin)
 
-    /**
-     * Glide
-     */
-    implementation(Glide.base)
-    implementation(Glide.compiler)
-    implementation(Glide.okhttp)
-    kapt(Glide.compiler)
-
     /**
      * Timber
      */

app/src/main/res/values/themes.xml

@@ -10,7 +10,7 @@
         <item name="colorSecondaryVariant">@color/purple_500</item>
         <item name="colorOnSecondary">@color/purple_500</item>
         <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">@color/white</item>
+        <item name="android:statusBarColor" >@color/white</item>
         <!-- Customize your theme here. -->
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>

build.gradle.kts

@@ -12,7 +12,7 @@ buildscript {
         classpath("com.android.tools.build:gradle:8.2.2")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22")
         classpath("org.jetbrains.kotlin:kotlin-serialization:1.8.22")
-        classpath("com.google.dagger:hilt-android-gradle-plugin:2.45")
+        classpath("com.google.dagger:hilt-android-gradle-plugin:2.48")
     }
 }
 

buildSrc/src/main/java/Dependencies.kt

@@ -6,7 +6,7 @@ object Apps {
 object Versions {
     const val retrofit = "2.9.0"
     const val lifecycle = "2.6.1"
-    const val hilt = "2.45"
+    const val hilt = "2.48"
 }
 
 object AndroidX {
@@ -59,10 +59,21 @@ object Retrofit {
 }
 
 object Glide {
-    const val base = "com.github.bumptech.glide:glide:4.16.0"
-    const val okhttp = "com.github.bumptech.glide:okhttp3-integration:4.16.0"
-    const val compiler = "com.github.bumptech.glide:ksp:4.16.0"
+    const val base = "com.github.bumptech.glide:glide:4.13.2"
+    const val okhttp = "com.github.bumptech.glide:okhttp3-integration:4.13.2"
+    const val compiler = "com.github.bumptech.glide:compiler:4.13.2"
+    const val annotations = "com.github.bumptech.glide:annotations:4.13.2"
     const val compose = "com.github.bumptech.glide:compose:1.0.0-beta01"
+//    const val base = "com.github.bumptech.glide:glide:4.16.0"
+//    const val okhttp = "com.github.bumptech.glide:okhttp3-integration:4.16.0"
+//    const val compiler = "com.github.bumptech.glide:ksp:4.16.0"
+//    const val annotations = "com.github.bumptech.glide:annotations:4.16.0"
+//    const val compose = "com.github.bumptech.glide:compose:1.0.0-beta01"
+//    const val base = "com.github.bumptech.glide:glide:5.0.0-rc01"
+//    const val okhttp = "com.github.bumptech.glide:okhttp3-integration:5.0.0-rc01"
+//    const val compiler = "com.github.bumptech.glide:ksp:5.0.0-rc01"
+//    const val annotations = "com.github.bumptech.glide:annotations:5.0.0-rc01"
+//    const val compose = "com.github.bumptech.glide:compose:1.0.0-beta01"
 }
 
 object KotlinX {
@@ -90,6 +101,8 @@ object Compose {
     const val viewModel = "androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1"
     const val constraint = "androidx.constraintlayout:constraintlayout-compose:1.0.1"
     const val runtime = "androidx.compose.runtime:runtime"
+    const val navigation = "androidx.navigation:navigation-compose:2.7.7"
+    const val navigationViewModel = "androidx.hilt:hilt-navigation-compose:1.0.0"
 }
 
 object UnitTest {

core/build.gradle.kts

@@ -53,6 +53,8 @@ dependencies {
     implementation(Glide.base)
     implementation(Glide.compiler)
     implementation(Glide.okhttp)
+    implementation(Glide.annotations)
+    implementation(Glide.compose)
     kapt(Glide.compiler)
 
     /**
@@ -106,6 +108,7 @@ dependencies {
     implementation(Compose.preview)
     implementation(Compose.ui)
     implementation(Compose.runtime)
+    implementation(Compose.navigation)
 
     /**
      * Unit Test

core/src/main/java/com/hmju/core/compose/Extensions.kt

@@ -1,12 +1,20 @@
 package com.hmju.core.compose
 
+import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusManager
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.SavedStateHandle
+import androidx.navigation.NavController
+import androidx.navigation.NavHostController
 import com.hmju.core.compose.ComposeLifecycleState.Companion.from
 
 
@@ -35,3 +43,45 @@ fun rememberLifecycleUpdatedState(
     }
     return currentState
 }
+
+/**
+ * 다른데 터치할때 키보드 내리기 위한 유틸 함수
+ * @param focusManager LocalFocusManager
+ */
+fun Modifier.addFocusCleaner(
+    focusManager: FocusManager,
+    doOnClear: () -> Unit = {}
+): Modifier {
+    return this.pointerInput(Unit) {
+        detectTapGestures(onTap = {
+            doOnClear()
+            focusManager.clearFocus()
+        })
+    }
+}
+
+fun NavHostController.backPressed() {
+    if (!popBackStack()) {
+        val activity = this.context as? FragmentActivity
+        activity?.finish()
+    }
+}
+
+inline fun <reified T> NavController.getBundleData(key: String): T? {
+    val savedStateHandle = currentBackStackEntry?.savedStateHandle ?: return null
+    return savedStateHandle.get<T>(key)
+}
+
+inline fun NavController.putBundle(
+    predicate: SavedStateHandle.() -> Unit
+) {
+    val savedStateHandle = currentBackStackEntry?.savedStateHandle ?: return
+    predicate.invoke(savedStateHandle)
+}
+
+inline fun NavController.prevPutBundle(
+    predicate: SavedStateHandle.() -> Unit
+) {
+    val savedStateHandle = previousBackStackEntry?.savedStateHandle ?: return
+    predicate.invoke(savedStateHandle)
+}

core/src/main/java/com/hmju/core/compose/MutableStateAdapter.kt

@@ -0,0 +1,37 @@
+package com.hmju.core.compose
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.State
+import androidx.compose.runtime.collectAsState
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlin.coroutines.CoroutineContext
+import kotlin.coroutines.EmptyCoroutineContext
+
+/**
+ * Description :
+ *
+ * Created by juhongmin on 4/7/24
+ */
+class MutableStateAdapter<T>(
+    private val state: State<T>,
+    private val mutate: (T) -> Unit
+) : MutableState<T> {
+
+    override var value: T
+        get() = state.value
+        set(value) {
+            mutate(value)
+        }
+
+    override fun component1(): T = value
+    override fun component2(): (T) -> Unit = { value = it }
+}
+
+@Composable
+fun <T> MutableStateFlow<T>.collectAsMutableState(
+    context: CoroutineContext = EmptyCoroutineContext
+): MutableState<T> = MutableStateAdapter(
+    state = collectAsState(context),
+    mutate = { value = it }
+)

core/src/main/java/com/hmju/core/compose/MutableStateFlowList.kt

@@ -0,0 +1,37 @@
+package com.hmju.core.compose
+
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+
+/**
+ * Description : Compose + Flow 전용 List 형태의 Flow
+ *
+ * Created by juhongmin on 5/6/24
+ */
+class MutableStateFlowList<T> {
+
+    private val _list = mutableListOf<T>()
+    private val _stateFlow = MutableStateFlow<List<T>>(emptyList())
+
+    val stateFlow = _stateFlow.asStateFlow()
+
+    fun add(item: T) {
+        _list.add(item)
+        notifyObserver()
+    }
+
+    fun addAll(items: List<T>?) {
+        if (items == null) return
+        _list.addAll(items)
+        notifyObserver()
+    }
+
+    fun remove(item: T) {
+        _list.remove(item)
+        notifyObserver()
+    }
+
+    private fun notifyObserver() {
+        _stateFlow.value = _list.toList()
+    }
+}

core/src/main/java/com/hmju/core/compose/TilColor.kt

@@ -22,7 +22,8 @@ class TilColor internal constructor(
     val gray3: Color,
     val gray3Light: Color,
     val gray4: Color,
-    val gray5: Color
+    val gray5: Color,
+    val defBgColor: Color
 ) {
     constructor() : this(
         white = Color(255, 255, 255),
@@ -36,6 +37,7 @@ class TilColor internal constructor(
         gray3 = Color(204, 204, 204),
         gray3Light = Color(229, 229, 229),
         gray4 = Color(240, 240, 240),
-        gray5 = Color(247, 247, 247)
+        gray5 = Color(247, 247, 247),
+        defBgColor = Color(245,243,244)
     )
 }