[FIX/#300,#302] Domain 레이어 Paging3 제거 & FlowWithLifecycle 적용

app/src/main/java/com/el/yello/di/RepositoryModule.kt

@@ -1,7 +1,6 @@
 package com.el.yello.di
 
 import com.example.data.repository.AuthRepositoryImpl
-import com.example.data.repository.LookRepositoryImpl
 import com.example.data.repository.OnboardingRepositoryImpl
 import com.example.data.repository.PayRepositoryImpl
 import com.example.data.repository.ProfileRepositoryImpl
@@ -10,7 +9,6 @@ import com.example.data.repository.SearchRepositoryImpl
 import com.example.data.repository.VoteRepositoryImpl
 import com.example.data.repository.YelloRepositoryImpl
 import com.example.domain.repository.AuthRepository
-import com.example.domain.repository.LookRepository
 import com.example.domain.repository.OnboardingRepository
 import com.example.domain.repository.PayRepository
 import com.example.domain.repository.ProfileRepository
@@ -67,9 +65,4 @@ object RepositoryModule {
     fun providePayRepository(payRepositoryImpl: PayRepositoryImpl): PayRepository =
         payRepositoryImpl
 
-    @Provides
-    @Singleton
-    fun provideLookRepository(lookRepositoryImpl: LookRepositoryImpl): LookRepository =
-        lookRepositoryImpl
-
 }

app/src/main/java/com/el/yello/presentation/auth/SignInActivity.kt

@@ -3,6 +3,8 @@ package com.el.yello.presentation.auth
 import android.content.Intent
 import android.os.Bundle
 import androidx.activity.viewModels
+import androidx.lifecycle.flowWithLifecycle
+import androidx.lifecycle.lifecycleScope
 import com.el.yello.R
 import com.el.yello.databinding.ActivitySignInBinding
 import com.el.yello.presentation.auth.SignInViewModel.Companion.FRIEND_LIST
@@ -17,6 +19,8 @@ import com.example.ui.context.toast
 import com.example.ui.view.UiState
 import com.example.ui.view.setOnSingleClickListener
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 
 @AndroidEntryPoint
 class SignInActivity : BindingActivity<ActivitySignInBinding>(R.layout.activity_sign_in) {
@@ -52,21 +56,21 @@ class SignInActivity : BindingActivity<ActivitySignInBinding>(R.layout.activity_
     }
 
     private fun observeDeviceTokenError() {
-        viewModel.getDeviceTokenError.observe(this) {
+        viewModel.getDeviceTokenError.flowWithLifecycle(lifecycle).onEach {
             toast(getString(R.string.sign_in_error_connection))
-        }
+        }.launchIn(lifecycleScope)
     }
 
     // 카카오통 앱 로그인에 실패한 경우 웹 로그인 시도
     private fun observeAppLoginError() {
-        viewModel.isAppLoginAvailable.observe(this) { available ->
+        viewModel.isAppLoginAvailable.flowWithLifecycle(lifecycle).onEach { available ->
             if (!available) viewModel.startKakaoLogIn(this)
-        }
+        }.launchIn(lifecycleScope)
     }
 
     // 서비스 토큰 교체 서버 통신 결과에 따라서 분기 처리 진행
     private fun observeChangeTokenState() {
-        viewModel.postChangeTokenState.observe(this) { state ->
+        viewModel.postChangeTokenState.flowWithLifecycle(lifecycle).onEach { state ->
             when (state) {
                 is UiState.Success -> {
                     // 200(가입된 아이디): 온보딩 뷰 생략하고 바로 메인 화면으로 이동 위해 유저 정보 받기
@@ -83,16 +87,16 @@ class SignInActivity : BindingActivity<ActivitySignInBinding>(R.layout.activity_
                     }
                 }
 
-                is UiState.Loading -> {}
+                is UiState.Loading -> return@onEach
 
-                is UiState.Empty -> {}
+                is UiState.Empty -> return@onEach
             }
-        }
+        }.launchIn(lifecycleScope)
     }
 
     // Failure -> 카카오에 등록된 유저 정보 받아온 후 친구목록 동의 화면으로 이동
     private fun observeKakaoUserInfoState() {
-        viewModel.getKakaoInfoState.observe(this) { state ->
+        viewModel.getKakaoInfoState.flowWithLifecycle(lifecycle).onEach { state ->
             when (state) {
                 is UiState.Success -> {
                     userKakaoId = state.data?.id ?: 0
@@ -107,15 +111,15 @@ class SignInActivity : BindingActivity<ActivitySignInBinding>(R.layout.activity_
                     yelloSnackbar(binding.root, getString(R.string.msg_error))
                 }
 
-                is UiState.Empty -> {}
+                is UiState.Empty -> return@onEach
 
-                is UiState.Loading -> {}
+                is UiState.Loading -> return@onEach
             }
-        }
+        }.launchIn(lifecycleScope)
     }
 
     private fun observeFriendsListValidState() {
-        viewModel.getKakaoValidState.observe(this) { state ->
+        viewModel.getKakaoValidState.flowWithLifecycle(lifecycle).onEach { state ->
             when (state) {
                 is UiState.Success -> {
                     val friendScope = state.data.find { it.id == FRIEND_LIST }
@@ -129,15 +133,17 @@ class SignInActivity : BindingActivity<ActivitySignInBinding>(R.layout.activity_
                 is UiState.Failure -> {
                     yelloSnackbar(binding.root, getString(R.string.msg_error))
                 }
-                is UiState.Empty -> {}
-                is UiState.Loading -> {}
+
+                is UiState.Empty -> return@onEach
+
+                is UiState.Loading -> return@onEach
             }
-        }
+        }.launchIn(lifecycleScope)
     }
 
     // Success -> 서버에 등록된 유저 정보가 있는지 확인 후 메인 액티비티로 이동
     private fun observeUserDataState() {
-        viewModel.getUserProfileState.observe(this) { state ->
+        viewModel.getUserProfileState.flowWithLifecycle(lifecycle).onEach { state ->
             when (state) {
                 is UiState.Success -> {
                     if (viewModel.getIsFirstLoginData()) {
@@ -159,11 +165,19 @@ class SignInActivity : BindingActivity<ActivitySignInBinding>(R.layout.activity_
                     yelloSnackbar(binding.root, getString(R.string.msg_error))
                 }
 
-                is UiState.Loading -> {}
+                is UiState.Loading -> return@onEach
             }
         }
     }
 
+    private fun startMainActivity() {
+        Intent(this, MainActivity::class.java).apply {
+            addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
+            startActivity(this)
+        }
+        finish()
+    }
+
     private fun startSocialSyncActivity() {
         Intent(this, SocialSyncActivity::class.java).apply {
             addPutExtra()
@@ -191,14 +205,6 @@ class SignInActivity : BindingActivity<ActivitySignInBinding>(R.layout.activity_
         addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
     }
 
-    private fun startMainActivity() {
-        Intent(this, MainActivity::class.java).apply {
-            addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
-            startActivity(this)
-        }
-        finish()
-    }
-
     companion object {
         const val EXTRA_KAKAO_ID = "KAKAO_ID"
         const val EXTRA_EMAIL = "KAKAO_EMAIL"

app/src/main/java/com/el/yello/presentation/auth/SignInViewModel.kt

@@ -1,14 +1,12 @@
 package com.el.yello.presentation.auth
 
 import android.content.Context
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.el.yello.presentation.auth.SignInActivity.Companion.CODE_NOT_SIGNED_IN
 import com.el.yello.presentation.auth.SignInActivity.Companion.CODE_NO_UUID
-import com.example.domain.entity.AuthTokenRequestModel
 import com.example.domain.entity.AuthTokenModel
+import com.example.domain.entity.AuthTokenRequestModel
 import com.example.domain.repository.AuthRepository
 import com.example.domain.repository.OnboardingRepository
 import com.example.domain.repository.ProfileRepository
@@ -21,6 +19,8 @@ import com.kakao.sdk.user.UserApiClient
 import com.kakao.sdk.user.model.Scope
 import com.kakao.sdk.user.model.User
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
 import retrofit2.HttpException
 import javax.inject.Inject
@@ -32,27 +32,27 @@ class SignInViewModel @Inject constructor(
     private val profileRepository: ProfileRepository
 ) : ViewModel() {
 
-    private val _postChangeTokenState = MutableLiveData<UiState<AuthTokenModel?>>()
-    val postChangeTokenState: LiveData<UiState<AuthTokenModel?>> = _postChangeTokenState
+    private val _postChangeTokenState = MutableStateFlow<UiState<AuthTokenModel?>>(UiState.Empty)
+    val postChangeTokenState: StateFlow<UiState<AuthTokenModel?>> = _postChangeTokenState
 
-    private val _getUserProfileState = MutableLiveData<UiState<Unit>>()
-    val getUserProfileState: LiveData<UiState<Unit>> = _getUserProfileState
+    private val _getUserProfileState = MutableStateFlow<UiState<Unit>>(UiState.Loading)
+    val getUserProfileState: StateFlow<UiState<Unit>> = _getUserProfileState
 
-    private val _getKakaoInfoState = MutableLiveData<UiState<User?>>()
-    val getKakaoInfoState: LiveData<UiState<User?>> = _getKakaoInfoState
+    private val _getKakaoInfoState = MutableStateFlow<UiState<User?>>(UiState.Empty)
+    val getKakaoInfoState: StateFlow<UiState<User?>> = _getKakaoInfoState
 
-    private val _getKakaoValidState = MutableLiveData<UiState<List<Scope>>>()
-    val getKakaoValidState: LiveData<UiState<List<Scope>>> = _getKakaoValidState
+    private val _getKakaoValidState = MutableStateFlow<UiState<List<Scope>>>(UiState.Empty)
+    val getKakaoValidState: StateFlow<UiState<List<Scope>>> = _getKakaoValidState
 
     private val serviceTermsList = listOf(THUMBNAIL, EMAIL, FRIEND_LIST, NAME, GENDER)
 
     private var deviceToken = String()
 
-    private val _getDeviceTokenError = MutableLiveData<String>()
-    val getDeviceTokenError: LiveData<String> = _getDeviceTokenError
+    private val _getDeviceTokenError = MutableStateFlow("")
+    val getDeviceTokenError: StateFlow<String> = _getDeviceTokenError
 
-    private val _isAppLoginAvailable = MutableLiveData<Boolean>()
-    val isAppLoginAvailable: LiveData<Boolean> = _isAppLoginAvailable
+    private val _isAppLoginAvailable = MutableStateFlow(true)
+    val isAppLoginAvailable: StateFlow<Boolean> = _isAppLoginAvailable
 
     var isResigned = false
         private set
@@ -85,7 +85,7 @@ class SignInViewModel @Inject constructor(
     }
 
     fun startKakaoLogIn(context: Context) {
-        if (UserApiClient.instance.isKakaoTalkLoginAvailable(context) && isAppLoginAvailable.value == true) {
+        if (UserApiClient.instance.isKakaoTalkLoginAvailable(context) && isAppLoginAvailable.value) {
             UserApiClient.instance.loginWithKakaoTalk(
                 context = context,
                 callback = appLoginCallback,
@@ -117,11 +117,13 @@ class SignInViewModel @Inject constructor(
 
     fun checkFriendsListValid() {
         val scopes = mutableListOf(FRIEND_LIST)
-        UserApiClient.instance.scopes(scopes) { scopeInfo, error->
+        UserApiClient.instance.scopes(scopes) { scopeInfo, error ->
             if (error != null) {
                 _getKakaoValidState.value = UiState.Failure(error.message.toString())
             } else if (scopeInfo != null) {
                 _getKakaoValidState.value = UiState.Success(scopeInfo.scopes ?: listOf())
+            } else {
+                _getKakaoValidState.value = UiState.Failure(ERROR)
             }
         }
     }

app/src/main/java/com/el/yello/presentation/auth/SocialSyncActivity.kt

@@ -3,6 +3,8 @@ package com.el.yello.presentation.auth
 import android.content.Intent
 import android.os.Bundle
 import androidx.activity.viewModels
+import androidx.lifecycle.flowWithLifecycle
+import androidx.lifecycle.lifecycleScope
 import com.el.yello.R
 import com.el.yello.databinding.ActivitySocialSyncBinding
 import com.el.yello.presentation.auth.SignInActivity.Companion.EXTRA_EMAIL
@@ -17,6 +19,8 @@ import com.example.ui.base.BindingActivity
 import com.example.ui.view.UiState
 import com.example.ui.view.setOnSingleClickListener
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 
 @AndroidEntryPoint
 class SocialSyncActivity :
@@ -38,43 +42,39 @@ class SocialSyncActivity :
         }
     }
 
-    // 친구목록 동의만 받고 온보딩 뷰로 이동 (친구 목록은 이후에 추가)
+    // 친구목록 동의만 받고 온보딩 뷰로 이동
     private fun observeFriendsAccessState() {
-        viewModel.getFriendListState.observe(this) { state ->
+        viewModel.getFriendListState.flowWithLifecycle(lifecycle).onEach { state ->
             when (state) {
-                is UiState.Success -> {
-                    startOnBoardingActivity()
-                }
+                is UiState.Success -> startOnBoardingActivity()
 
-                is UiState.Failure -> {
-                    yelloSnackbar(binding.root, getString(R.string.msg_error))
-                }
+                is UiState.Failure -> yelloSnackbar(binding.root, getString(R.string.msg_error))
 
-                is UiState.Empty -> {}
+                is UiState.Empty -> return@onEach
 
-                is UiState.Loading -> {}
+                is UiState.Loading -> return@onEach
             }
-        }
+        }.launchIn(lifecycleScope)
     }
 
     private fun startOnBoardingActivity() {
-            intent.apply {
-                val kakaoId = getLongExtra(EXTRA_KAKAO_ID, -1)
-                val email = getStringExtra(EXTRA_EMAIL)
-                val profileImage = getStringExtra(EXTRA_PROFILE_IMAGE)
-                val name = getStringExtra(EXTRA_NAME)
-                val gender = getStringExtra(EXTRA_GENDER)
+        intent.apply {
+            val kakaoId = getLongExtra(EXTRA_KAKAO_ID, -1)
+            val email = getStringExtra(EXTRA_EMAIL)
+            val profileImage = getStringExtra(EXTRA_PROFILE_IMAGE)
+            val name = getStringExtra(EXTRA_NAME)
+            val gender = getStringExtra(EXTRA_GENDER)
 
-                Intent(this@SocialSyncActivity, OnBoardingActivity::class.java).apply {
-                    putExtra(EXTRA_KAKAO_ID, kakaoId)
-                    putExtra(EXTRA_EMAIL, email)
-                    putExtra(EXTRA_PROFILE_IMAGE, profileImage)
-                    putExtra(EXTRA_NAME, name)
-                    putExtra(EXTRA_GENDER, gender)
-                    addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
-                    startActivity(this)
-                }
-                finish()
+            Intent(this@SocialSyncActivity, OnBoardingActivity::class.java).apply {
+                putExtra(EXTRA_KAKAO_ID, kakaoId)
+                putExtra(EXTRA_EMAIL, email)
+                putExtra(EXTRA_PROFILE_IMAGE, profileImage)
+                putExtra(EXTRA_NAME, name)
+                putExtra(EXTRA_GENDER, gender)
+                addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
+                startActivity(this)
             }
+            finish()
+        }
     }
 }

app/src/main/java/com/el/yello/presentation/auth/SocialSyncViewModel.kt

@@ -1,19 +1,19 @@
 package com.el.yello.presentation.auth
 
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import com.example.ui.view.UiState
 import com.kakao.sdk.talk.TalkApiClient
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
 import javax.inject.Inject
 
 @HiltViewModel
 class SocialSyncViewModel @Inject constructor(
 ) : ViewModel() {
 
-    private val _getFriendListState = MutableLiveData<UiState<Unit>>()
-    val getFriendListState: LiveData<UiState<Unit>> = _getFriendListState
+    private val _getFriendListState = MutableStateFlow<UiState<Unit>>(UiState.Empty)
+    val getFriendListState: StateFlow<UiState<Unit>> = _getFriendListState
 
     // 카카오 통신 - 카카오 친구목록 동의 받기
     fun getKakaoFriendsList() {
@@ -22,7 +22,7 @@ class SocialSyncViewModel @Inject constructor(
             if (error == null) {
                 _getFriendListState.value = UiState.Success(Unit)
             } else {
-                _getFriendListState.value = UiState.Failure(error.message ?: "")
+                _getFriendListState.value = UiState.Failure(error.message.toString())
             }
         }
     }