Optimize 컴포저블 최적화 및 구조 리팩토링

.gitignore

@@ -18,3 +18,4 @@ deploymentTargetDropDown.xml
 /.idea/other.xml
 /.idea/deploymentTargetSelector.xml
 .kotlin/
+*.trace

app/build.gradle.kts

@@ -69,6 +69,25 @@ android {
             excludes += "META-INF/gradle/incremental.annotation.processors"
         }
     }
+
+    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>() {
+        compilerOptions.freeCompilerArgs.addAll(
+            "-P",
+            "plugin:androidx.compose.compiler.plugins.kotlin:metricsDestination=${project.buildDir.absolutePath}/compose_metrics",
+        )
+    }
+    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>() {
+        compilerOptions.freeCompilerArgs.addAll(
+            "-P",
+            "plugin:androidx.compose.compiler.plugins.kotlin:reportsDestination=${project.buildDir.absolutePath}/compose_reports",
+        )
+    }
+    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>() {
+        compilerOptions.freeCompilerArgs.addAll(
+            "-P",
+            "plugin:androidx.compose.compiler.plugins.kotlin:experimentalStrongSkipping=true",
+        )
+    }
 }
 
 
@@ -92,6 +111,7 @@ dependencies {
 
     implementation(libs.app.update.ktx)
     implementation(libs.bootpay) //부트페이
+    implementation(libs.constraintlayout)
     implementation(libs.bundles.kakao.login) // kakao
     implementation(libs.bundles.hilt) // hilt
     kapt(libs.hilt.android.compiler)

app/src/main/java/com/hmoa/app/App.kt

@@ -11,6 +11,5 @@ class App : Application() {
         AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
         super.onCreate()
         KakaoSdk.init(this, BuildConfig.NATIVE_APP_KEY)
-
     }
-}
+}

app/src/main/java/com/hmoa/app/view/MainActivity.kt

@@ -7,6 +7,7 @@ import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.util.Log
+import android.widget.ImageView
 import androidx.activity.compose.setContent
 import androidx.activity.result.ActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
@@ -44,10 +45,10 @@ import com.google.android.play.core.install.model.InstallStatus
 import com.google.android.play.core.install.model.UpdateAvailability
 import com.google.firebase.messaging.FirebaseMessaging
 import com.hmoa.app.BuildConfig
+import com.hmoa.app.R
 import com.hmoa.app.navigation.SetUpNavGraph
 import com.hmoa.app.viewmodel.AppViewModel
 import com.hmoa.core_common.permissions
-import com.hmoa.core_designsystem.BottomScreen
 import com.hmoa.core_designsystem.component.HomeTopBar
 import com.hmoa.core_designsystem.component.MainBottomBar
 import com.hmoa.core_domain.entity.navigation.*
@@ -86,13 +87,6 @@ class MainActivity : AppCompatActivity() {
         MagazineRoute.Magazine.name
     )
 
-    private val needTopBarScreens = HomeRoute.Home.name
-    private val bottomNav = listOf(
-        BottomScreen.Home.name,
-        BottomScreen.HPedia.name,
-        BottomScreen.Magazine.name,
-        BottomScreen.MyPage.name
-    )
     private lateinit var appUpdateManager: AppUpdateManager
     private val activityResultLauncher =
         registerForActivityResult(ActivityResultContracts.StartIntentSenderForResult()) { result: ActivityResult ->
@@ -102,7 +96,7 @@ class MainActivity : AppCompatActivity() {
     // Displays the snackbar notification and call to action.
     fun popupSnackbarForCompleteUpdate() {
         Snackbar.make(
-            findViewById(com.hmoa.core_designsystem.R.drawable.ic_fab),
+            findViewById<ImageView>(R.id.snackbar),
             "새로운 업데이트 다운로드가 완료되었습니다.",
             Snackbar.LENGTH_INDEFINITE
         ).apply {
@@ -180,7 +174,6 @@ class MainActivity : AppCompatActivity() {
 
         appUpdateManager = AppUpdateManagerFactory.create(this)
         checkImmediateUpdateAvailability()
-
         requestNotificationPermission()
         BootpayAnalytics.init(this, BuildConfig.BOOTPAY_APPLICATION_ID)
 

app/src/main/res/layout/update_image_view.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/view"
+        tools:context=".view.MainActivity">
+
+    <Button
+            android:text="업데이트 완료됨"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content" android:id="@+id/snackbar"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent" android:layout_marginEnd="16dp"
+            android:layout_marginStart="16dp" android:backgroundTint="@color/material_dynamic_neutral40"
+            android:textColor="@color/white" android:textAlignment="viewStart" android:enabled="false"/>
+</androidx.constraintlayout.widget.ConstraintLayout>

core-common/build.gradle.kts

@@ -33,7 +33,8 @@ dependencies {
     implementation(project(":core-model"))
 
     implementation(libs.bundles.basic)
+    implementation(libs.lifecycle.viewmodel.ktx)
     androidTestImplementation("androidx.test.ext:junit:1.1.5")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
     testImplementation("junit:junit:4.13.2")
-}
+}

core-common/src/main/java/com/hmoa/core_common/ui/BaseViewModel.kt

@@ -0,0 +1,59 @@
+package com.hmoa.core_common.ui
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.hmoa.core_common.ui.contract.UiEffect
+import com.hmoa.core_common.ui.contract.UiEvent
+import com.hmoa.core_common.ui.contract.UiState
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.launch
+
+abstract class BaseViewModel<Event : UiEvent, State : UiState, Effect : UiEffect> : ViewModel() {
+
+    private val initialState: State by lazy { createInitialState() }
+    abstract fun createInitialState(): State
+
+    val currentState: State
+        get() = uiState.value
+
+    private val _uiState: MutableStateFlow<State> = MutableStateFlow(initialState)
+    val uiState = _uiState.asStateFlow()
+
+    private val _event: MutableSharedFlow<Event> = MutableSharedFlow()
+    val event = _event.asSharedFlow()
+
+    private val _effects: Channel<Effect> = Channel()
+    val effects = _effects.receiveAsFlow()
+
+    init {
+        subscribeEvents()
+    }
+
+    protected fun subscribeEvents() {
+        viewModelScope.launch {
+            event.collect {
+                handleEvent(it)
+            }
+        }
+    }
+
+    abstract fun handleEvent(event: Event)
+
+    protected fun setEvent(event: Event) {
+        val newEvent = event
+        viewModelScope.launch { _event.emit(newEvent) }
+    }
+
+    protected fun setState(reduce: State.() -> State) {
+        _uiState.update { it.reduce() }
+    }
+
+    protected fun setEffect(vararg builder: Effect) {
+        viewModelScope.launch {
+            for (effectValue in builder) {
+                _effects.send(effectValue)
+            }
+        }
+    }
+}

core-common/src/main/java/com/hmoa/core_common/ui/contract/UiContract.kt

@@ -0,0 +1,5 @@
+package com.hmoa.core_common.ui.contract
+
+interface UiState
+interface UiEvent
+interface UiEffect

core-database/src/main/java/com/hmoa/core_database/TokenManagerImpl.kt

@@ -10,11 +10,13 @@ import androidx.datastore.preferences.core.emptyPreferences
 import androidx.datastore.preferences.core.stringPreferencesKey
 import androidx.datastore.preferences.preferencesDataStore
 import dagger.hilt.android.qualifiers.ApplicationContext
-import kotlinx.coroutines.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.runBlocking
 import javax.inject.Inject
 
 val Context.datastore: DataStore<Preferences> by preferencesDataStore(
@@ -38,15 +40,8 @@ class TokenManagerImpl @Inject constructor(@ApplicationContext context: Context)
     }
 
     override fun getAuthTokenForHeader(): String {
-        val token = runBlocking {
-            try {
-                withTimeout(2000L) {
-                    getAuthToken().filterNotNull().first()
-                }
-            } catch (e: TimeoutCancellationException) {
-                Log.d("TokenManagerImpl", "getAuthTokenForHeader: Timeout occurred, returning null.")
-                null
-            }
+        val token: String? = runBlocking {
+            getAuthToken().first()
         }
         if (token != null) {
             Log.d("TokenManagerImpl", "getAuthTokenForHeader: AuthToken(accessToken):${token}")
@@ -147,4 +142,4 @@ class TokenManagerImpl @Inject constructor(@ApplicationContext context: Context)
             preferences.remove(FCM_TOKEN_KEY)
         }
     }
-}
+}