Refactor/lyi 최적화 및 api 호출 오류 수정

app/build.gradle.kts

@@ -21,8 +21,8 @@ android {
         applicationId = "com.hmoa.app"
         minSdk = 26
         targetSdk = 34
-        versionCode = 35
-        versionName = "1.2.0"
+        versionCode = 36
+        versionName = "1.3.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         manifestPlaceholders["REDIRECTION_PATH"] = localProperties["REDIRECTION_PATH"] as String

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

@@ -60,6 +60,7 @@ import com.hmoa.feature_magazine.Navigation.navigateToMagazineHome
 import com.hmoa.feature_userinfo.navigation.navigateToUserInfoGraph
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.launch
 import kr.co.bootpay.android.BootpayAnalytics
 
@@ -185,17 +186,23 @@ class MainActivity : AppCompatActivity() {
 
         lifecycleScope.launch {
             repeatOnLifecycle(Lifecycle.State.CREATED) {
-                viewModel.fcmTokenFlow().collectLatest { fcmToken ->
-                    viewModel.getNotificationEnabled().collectLatest { isEnabled ->
-                        Log.d("POST PERMISSION", "is granted : ${isEnabled}")
+                viewModel.fcmTokenFlow()
+                    .combine(viewModel.getNotificationEnabled()) { fcmToken, isNotificationsEnabled ->
+                        Pair(
+                            fcmToken,
+                            isNotificationsEnabled
+                        )
+                    }.collectLatest {
+                        val fcmToken = it.first
+                        val isNotificationsEnabled = it.second
+                        Log.d("POST PERMISSION", "is granted : ${isNotificationsEnabled}")
                         Log.d("FCM TEST", "fcm token : ${fcmToken}")
                         initializeFirebaseSetting(
                             fcmToken = fcmToken,
                             onSaveFcmToken = { token -> viewModel.saveFcmToken(token) })
                         initializeRoute(
-                            onRouteToLogin = { checkFcmToken(fcmToken, isEnabled) })
+                            onRouteToLogin = { checkFcmToken(fcmToken, isNotificationsEnabled) })
                     }
-                }
             }
         }
 
@@ -292,10 +299,10 @@ class MainActivity : AppCompatActivity() {
         Log.d("FCM TEST", "checkFcmToken의 fcmToken 값: ${fcmToken}")
     }
 
-    private suspend fun handleFcmToken(
-        fcmToken: String, isEnabled: Boolean
+    private fun handleFcmToken(
+        fcmToken: String, isNotificationEnabled: Boolean
     ) {
-        if (isEnabled) {
+        if (isNotificationEnabled) {
             Log.d("FCM TEST", "post fcm token")
             viewModel.postFcmToken(fcmToken)
         } else {

app/src/main/java/com/hmoa/app/viewmodel/AppViewModel.kt

@@ -6,7 +6,8 @@ import com.hmoa.core_domain.repository.FcmRepository
 import com.hmoa.core_domain.repository.LoginRepository
 import com.hmoa.core_model.request.FCMTokenSaveRequestDto
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
@@ -15,15 +16,30 @@ class AppViewModel @Inject constructor(
     private val loginRepository: LoginRepository,
     private val fcmRepository: FcmRepository,
 ) : ViewModel() {
+    val authTokenState = MutableStateFlow<String?>(null)
     suspend fun authTokenFlow(): Flow<String?> = loginRepository.getAuthToken()
     suspend fun rememberedTokenFlow(): Flow<String?> = loginRepository.getRememberedToken()
+    suspend fun fcmTokenFlow(): Flow<String?> =
+        fcmRepository.getLocalFcmToken().shareIn(viewModelScope, SharingStarted.WhileSubscribed())
 
-    suspend fun fcmTokenFlow(): Flow<String?> = fcmRepository.getLocalFcmToken()
+    init {
+        getAuthToken()
+    }
 
     fun delFcmToken() {
         viewModelScope.launch {
-            fcmRepository.deleteLocalFcmToken()
-            fcmRepository.deleteRemoteFcmToken()
+            if (authTokenState.value != null) {
+                fcmRepository.deleteLocalFcmToken()
+                fcmRepository.deleteRemoteFcmToken()
+            }
+        }
+    }
+
+    fun getAuthToken() {
+        viewModelScope.launch(Dispatchers.IO) {
+            loginRepository.getAuthToken().onEmpty { }.collectLatest {
+                authTokenState.update { it }
+            }
         }
     }
 
@@ -36,7 +52,8 @@ class AppViewModel @Inject constructor(
 
     fun saveFcmToken(token: String) = viewModelScope.launch { fcmRepository.saveLocalFcmToken(token) }
     fun checkAlarm(id: Int) = viewModelScope.launch { fcmRepository.checkAlarm(id) }
-    suspend fun getNotificationEnabled(): Flow<Boolean> = fcmRepository.getNotificationEnabled()
+    suspend fun getNotificationEnabled(): Flow<Boolean> =
+        fcmRepository.getNotificationEnabled().shareIn(viewModelScope, SharingStarted.WhileSubscribed())
 
     suspend fun saveNotificationEnabled(isEnabled: Boolean) =
         viewModelScope.launch { fcmRepository.saveNotificationEnabled(isEnabled) }

core-designsystem/src/main/java/com/hmoa/core_designsystem/component/SearchTopBar.kt

@@ -1,5 +1,6 @@
 package com.hmoa.core_designsystem.component
 
+import android.util.Log
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
@@ -36,7 +37,7 @@ fun SearchTopBar(
     onClickSearch: () -> Unit,
     navBack: () -> Unit,
 ) {
-    var searchWord by remember { mutableStateOf("") }
+    var searchWord by remember { mutableStateOf(searchWord) }
     val textFlow = remember { snapshotFlow { searchWord } }
 
     LaunchedEffect(textFlow) {
@@ -51,7 +52,7 @@ fun SearchTopBar(
                     .padding(start = 13.dp),
                 value = searchWord,
                 onValueChange = {
-                    if (it == "") {
+                    if (it.length == 0) {
                         onClearWord()
                     }
                     searchWord = it
@@ -104,7 +105,10 @@ fun SearchTopBar(
                     modifier = Modifier.size(20.dp)
                         .background(color = CustomColor.gray2, shape = CircleShape)
                         .clip(CircleShape),
-                    onClick = onClearWord
+                    onClick = {
+                        onClearWord()
+                        searchWord = ""
+                    }
                 ) {
                     Icon(
                         imageVector = Icons.Filled.Close,

feature-brand/build.gradle.kts

@@ -35,6 +35,18 @@ android {
     buildFeatures {
         compose = true
     }
+    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",
+        )
+    }
 }
 
 dependencies {

feature-brand/src/main/java/com/hmoa/feature_brand/screen/BrandSearchScreen.kt

@@ -3,8 +3,8 @@ package com.hmoa.feature_brand.screen
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
@@ -68,15 +68,14 @@ fun BrandSearchScreen(
 @Composable
 fun BrandSearchContent(
     searchWord: String,
-    consonantBrands: MutableMap<Consonant?, List<BrandDefaultResponseDto>?>?,
-    searchResult: MutableMap<Consonant?, List<BrandDefaultResponseDto>?>?,
+    consonantBrands: Map<Consonant?, List<BrandDefaultResponseDto>?>?,
+    searchResult: Map<Consonant?, List<BrandDefaultResponseDto>?>?,
     onBrandClick: (brandId: Int) -> Unit,
     onBackClick: () -> Unit,
     onChangedWord: (word: String) -> Unit,
     onClearWord: () -> Unit,
     onClickSearch: (word: String) -> Unit
 ) {
-    var scrollState = rememberScrollState()
     Column {
         Row(modifier = Modifier.padding(start = 16.dp)) {
             SearchTopBar(
@@ -93,23 +92,27 @@ fun BrandSearchContent(
         )
         Column(
             modifier = Modifier.fillMaxWidth().padding(horizontal = 12.dp)
-                .padding(top = 16.dp).verticalScroll(scrollState)
+                .padding(top = 16.dp)
         ) {
             if (searchWord == "") {
-                Consonant.entries.forEach { consonant ->
-                    BrandGridView(
-                        brands = consonantBrands?.get(consonant),
-                        onBrandClick = { onBrandClick(it) },
-                        consonant = consonant
-                    )
+                LazyColumn {
+                    items(Consonant.entries.toList()) { consonant ->
+                        BrandGridView(
+                            brands = consonantBrands?.get(consonant),
+                            onBrandClick = { onBrandClick(it) },
+                            consonant = consonant
+                        )
+                    }
                 }
             } else {
-                Consonant.entries.forEach { consonant ->
-                    BrandGridView(
-                        brands = searchResult?.get(consonant),
-                        onBrandClick = { onBrandClick(it) },
-                        consonant = consonant
-                    )
+                LazyColumn {
+                    items(Consonant.entries.toList()) { consonant ->
+                        BrandGridView(
+                            brands = searchResult?.get(consonant),
+                            onBrandClick = { onBrandClick(it) },
+                            consonant = consonant
+                        )
+                    }
                 }
             }
         }

feature-brand/src/main/java/com/hmoa/feature_brand/viewmodel/BrandSearchViewmodel.kt

@@ -4,8 +4,8 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.hmoa.core_common.Result
 import com.hmoa.core_common.asResult
-import com.hmoa.core_domain.repository.SearchRepository
 import com.hmoa.core_domain.entity.data.Consonant
+import com.hmoa.core_domain.repository.SearchRepository
 import com.hmoa.core_model.response.BrandDefaultResponseDto
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.*
@@ -14,7 +14,6 @@ import javax.inject.Inject
 
 @HiltViewModel
 class BrandSearchViewmodel @Inject constructor(private val searchRepository: SearchRepository) : ViewModel() {
-    val PAGE_SIZE = 10
     private var consonantBrandMapState =
         MutableStateFlow<MutableMap<Consonant?, List<BrandDefaultResponseDto>?>?>(null)
     private var searchWordState = MutableStateFlow<String>("")
@@ -38,19 +37,19 @@ class BrandSearchViewmodel @Inject constructor(private val searchRepository: Sea
 
     fun initializeBrands() {
         viewModelScope.launch {
+            val newMap = consonantBrandMapState.value?.toMutableMap() ?: mutableMapOf()
             for (i in 1..19) {
                 flow { emit(searchRepository.getBrandAll(i)) }.asResult().collectLatest {
                     when (it) {
                         is Result.Success -> {
-                            val newMap = consonantBrandMapState.value?.toMutableMap() ?: mutableMapOf()
                             newMap[mapNumberIntoConsonant(i)] = it.data.data
-                            consonantBrandMapState.value = newMap
                         }
 
                         else -> {}
                     }
                 }
             }
+            consonantBrandMapState.value = newMap
         }
     }
 
@@ -65,12 +64,11 @@ class BrandSearchViewmodel @Inject constructor(private val searchRepository: Sea
             flow { emit(searchRepository.getBrand(word)) }.asResult().collectLatest {
                 when (it) {
                     is Result.Success -> {
+                        val newMap = searchResultState.value?.toMutableMap() ?: mutableMapOf()
                         it.data.data?.forEach {
-                            val newMap = searchResultState.value?.toMutableMap()
-                                ?: mutableMapOf()
                             newMap[mapNumberIntoConsonant(it.consonant)] = it.brandList
-                            searchResultState.value = newMap
                         }
+                        searchResultState.value = newMap
                     }
 
                     is Result.Error -> {
@@ -121,4 +119,4 @@ class BrandSearchViewmodel @Inject constructor(private val searchRepository: Sea
         data object Error : BrandSearchUiState
     }
 
-}
+}