[AN/USER] 홈 화면 회전시 이전에 선택한 화면을 그대로 보여준다. (#534)

android/festago/app/src/main/java/com/festago/festago/presentation/ui/home/HomeActivity.kt

@@ -3,6 +3,8 @@ package com.festago.festago.presentation.ui.home
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
@@ -18,26 +20,27 @@ import dagger.hilt.android.AndroidEntryPoint
 @AndroidEntryPoint
 class HomeActivity : AppCompatActivity() {
 
-    private var _binding: ActivityHomeBinding? = null
-    private val binding get() = _binding!!
+    private val binding by lazy { ActivityHomeBinding.inflate(layoutInflater) }
 
     private val vm: HomeViewModel by viewModels()
 
+    private lateinit var resultLauncher: ActivityResultLauncher<Intent>
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         initBinding()
         initView()
         initObserve()
+        initActivityResult()
     }
 
     private fun initBinding() {
-        _binding = ActivityHomeBinding.inflate(layoutInflater)
         setContentView(binding.root)
     }
 
     private fun initView() {
         binding.bnvHome.setOnItemSelectedListener {
-            vm.loadHomeItem(getItemType(it.itemId))
+            vm.selectItem(getItemType(it.itemId))
             true
         }
 
@@ -52,13 +55,20 @@ class HomeActivity : AppCompatActivity() {
         repeatOnStarted(this) {
             vm.event.collect { event ->
                 when (event) {
-                    is HomeEvent.ShowFestivalList -> showFestivalList()
-                    is HomeEvent.ShowTicketList -> showTicketList()
-                    is HomeEvent.ShowMyPage -> showMyPage()
                     is HomeEvent.ShowSignIn -> showSignIn()
                 }
             }
         }
+
+        repeatOnStarted(this) {
+            vm.selectedItem.collect { homeItemType ->
+                when (homeItemType) {
+                    HomeItemType.FESTIVAL_LIST -> showFestivalList()
+                    HomeItemType.TICKET_LIST -> showTicketList()
+                    HomeItemType.MY_PAGE -> showMyPage()
+                }
+            }
+        }
     }
 
     private fun getItemType(menuItemId: Int): HomeItemType {
@@ -86,7 +96,7 @@ class HomeActivity : AppCompatActivity() {
     }
 
     private fun showSignIn() {
-        startActivity(SignInActivity.getIntent(this))
+        resultLauncher.launch(SignInActivity.getIntent(this))
     }
 
     private inline fun <reified T : Fragment> changeFragment() {
@@ -109,6 +119,15 @@ class HomeActivity : AppCompatActivity() {
         fragmentTransaction.commit()
     }
 
+    private fun initActivityResult() {
+        resultLauncher =
+            registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+                if (result.resultCode == SignInActivity.RESULT_NOT_SIGN_IN) {
+                    binding.bnvHome.selectedItemId = R.id.item_festival
+                }
+            }
+    }
+
     companion object {
         fun getIntent(context: Context): Intent {
             return Intent(context, HomeActivity::class.java)

android/festago/app/src/main/java/com/festago/festago/presentation/ui/home/HomeEvent.kt

@@ -1,8 +1,5 @@
 package com.festago.festago.presentation.ui.home
 
 sealed interface HomeEvent {
-    object ShowFestivalList : HomeEvent
-    object ShowTicketList : HomeEvent
-    object ShowMyPage : HomeEvent
     object ShowSignIn : HomeEvent
 }

android/festago/app/src/main/java/com/festago/festago/presentation/ui/home/HomeViewModel.kt

@@ -2,14 +2,14 @@ package com.festago.festago.presentation.ui.home
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.festago.festago.presentation.ui.home.HomeItemType.FESTIVAL_LIST
-import com.festago.festago.presentation.ui.home.HomeItemType.MY_PAGE
-import com.festago.festago.presentation.ui.home.HomeItemType.TICKET_LIST
 import com.festago.festago.repository.AuthRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
@@ -19,13 +19,23 @@ class HomeViewModel @Inject constructor(private val authRepository: AuthReposito
     private val _event = MutableSharedFlow<HomeEvent>()
     val event: SharedFlow<HomeEvent> = _event.asSharedFlow()
 
-    fun loadHomeItem(homeItemType: HomeItemType) {
+    private val _selectedItem = MutableStateFlow(HomeItemType.FESTIVAL_LIST)
+    val selectedItem: StateFlow<HomeItemType> = _selectedItem.asStateFlow()
+
+    fun selectItem(homeItemType: HomeItemType) {
+        when (homeItemType) {
+            HomeItemType.FESTIVAL_LIST -> _selectedItem.value = homeItemType
+            HomeItemType.TICKET_LIST -> selectItemOrSignIn(HomeItemType.TICKET_LIST)
+            HomeItemType.MY_PAGE -> selectItemOrSignIn(HomeItemType.MY_PAGE)
+        }
+    }
+
+    private fun selectItemOrSignIn(homeItemType: HomeItemType) {
         viewModelScope.launch {
-            when {
-                homeItemType == FESTIVAL_LIST -> _event.emit(HomeEvent.ShowFestivalList)
-                !authRepository.isSigned -> _event.emit(HomeEvent.ShowSignIn)
-                homeItemType == TICKET_LIST -> _event.emit(HomeEvent.ShowTicketList)
-                homeItemType == MY_PAGE -> _event.emit(HomeEvent.ShowMyPage)
+            if (authRepository.isSigned) {
+                _selectedItem.emit(homeItemType)
+            } else {
+                _event.emit(HomeEvent.ShowSignIn)
             }
         }
     }

android/festago/app/src/main/java/com/festago/festago/presentation/ui/signin/SignInActivity.kt

@@ -6,16 +6,15 @@ import android.os.Bundle
 import android.text.Spannable
 import android.text.SpannableStringBuilder
 import android.text.style.ForegroundColorSpan
+import androidx.activity.OnBackPressedCallback
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
-import androidx.lifecycle.lifecycleScope
 import com.festago.festago.R
 import com.festago.festago.databinding.ActivitySignInBinding
 import com.festago.festago.presentation.ui.customview.OkDialogFragment
 import com.festago.festago.presentation.ui.home.HomeActivity
 import com.festago.festago.presentation.util.repeatOnStarted
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.launch
 
 @AndroidEntryPoint
 class SignInActivity : AppCompatActivity() {
@@ -40,20 +39,28 @@ class SignInActivity : AppCompatActivity() {
         binding.lifecycleOwner = this
         binding.vm = vm
         initComment()
+        initBackPressed()
     }
 
-    private fun initObserve() {
-        repeatOnStarted(this) {
-            vm.event.collect {
-                handleEvent(it)
+    private fun initBackPressed() {
+        val callback = object : OnBackPressedCallback(true) {
+            override fun handleOnBackPressed() {
+                setResult(RESULT_NOT_SIGN_IN, intent)
+                finish()
             }
         }
+        this.onBackPressedDispatcher.addCallback(this, callback)
     }
 
-    private fun handleEvent(event: SignInEvent) = when (event) {
-        SignInEvent.ShowSignInPage -> handleSignInEvent()
-        SignInEvent.SignInSuccess -> handleSuccessEvent()
-        SignInEvent.SignInFailure -> handleFailureEvent()
+    private fun initObserve() {
+        repeatOnStarted(this) {
+            vm.event.collect { event ->
+                when (event) {
+                    is SignInEvent.SignInSuccess -> handleSuccessEvent()
+                    is SignInEvent.SignInFailure -> handleFailureEvent()
+                }
+            }
+        }
     }
 
     private fun initComment() {
@@ -70,12 +77,6 @@ class SignInActivity : AppCompatActivity() {
         binding.tvLoginDescription.text = spannableStringBuilder
     }
 
-    private fun handleSignInEvent() {
-        lifecycleScope.launch {
-            vm.signIn()
-        }
-    }
-
     private fun handleSuccessEvent() {
         showHomeWithFinish()
     }
@@ -102,7 +103,7 @@ class SignInActivity : AppCompatActivity() {
         private const val COLOR_SPAN_END_INDEX = 4
 
         private const val FAILURE_SIGN_IN = "로그인에 실패했습니다."
-
+        const val RESULT_NOT_SIGN_IN = 1
         fun getIntent(context: Context): Intent {
             return Intent(context, SignInActivity::class.java)
         }

android/festago/app/src/main/java/com/festago/festago/presentation/ui/signin/SignInEvent.kt

@@ -1,7 +1,6 @@
 package com.festago.festago.presentation.ui.signin
 
 sealed interface SignInEvent {
-    object ShowSignInPage : SignInEvent
     object SignInSuccess : SignInEvent
     object SignInFailure : SignInEvent
 }

android/festago/app/src/main/java/com/festago/festago/presentation/ui/signin/SignInViewModel.kt

@@ -20,12 +20,6 @@ class SignInViewModel @Inject constructor(
     private val _event = MutableSharedFlow<SignInEvent>()
     val event: SharedFlow<SignInEvent> = _event
 
-    fun signInKakao() {
-        viewModelScope.launch {
-            _event.emit(SignInEvent.ShowSignInPage)
-        }
-    }
-
     fun signIn() {
         viewModelScope.launch {
             authRepository.signIn().onSuccess {

android/festago/app/src/main/res/layout/activity_sign_in.xml

@@ -58,7 +58,7 @@
             android:layout_width="0dp"
             android:layout_height="48dp"
             android:background="@drawable/bg_mypage_kakao_login"
-            android:onClick="@{() -> vm.signInKakao()}"
+            android:onClick="@{() -> vm.signIn()}"
             android:text="@string/mypage_btn_kakao"
             android:textColor="@color/kakao_label"
             android:textSize="16sp"

android/festago/app/src/test/java/com/festago/festago/presentation/ui/home/HomeViewModelTest.kt

@@ -38,85 +38,104 @@ class HomeViewModelTest {
     }
 
     @Test
-    fun `축제 목록을 요청했을 때 토큰이 있으면 축제 목록이 보인다`() = runTest {
+    fun `축제 목록을 요청했을 때 토큰이 있으면 축제 목록이 보이고 이벤트가 발생하지 않는다`() = runTest {
         // given
         `사용자 인증 유무가 다음과 같을 때`(true)
 
-        // when
         vm.event.test {
-            vm.loadHomeItem(HomeItemType.FESTIVAL_LIST)
+            // when
+            vm.selectItem(HomeItemType.FESTIVAL_LIST)
 
             // then
-            assertThat(awaitItem()).isExactlyInstanceOf(HomeEvent.ShowFestivalList::class.java)
+            assertThat(vm.selectedItem.value).isEqualTo(HomeItemType.FESTIVAL_LIST)
+
+            // and
+            expectNoEvents()
         }
     }
 
     @Test
-    fun `축제 목록을 요청했을 때 토큰이 없어도 축제 목록이 보인다`() = runTest {
+    fun `축제 목록을 요청했을 때 토큰이 없어도 축제 목록이 보이고 이벤트가 발생하지 않는다`() = runTest {
         // given
         `사용자 인증 유무가 다음과 같을 때`(false)
 
         vm.event.test {
             // when
-            vm.loadHomeItem(HomeItemType.FESTIVAL_LIST)
+            vm.selectItem(HomeItemType.FESTIVAL_LIST)
 
             // then
-            assertThat(awaitItem()).isExactlyInstanceOf(HomeEvent.ShowFestivalList::class.java)
+            assertThat(vm.selectedItem.value).isEqualTo(HomeItemType.FESTIVAL_LIST)
+
+            // and
+            expectNoEvents()
         }
     }
 
     @Test
-    fun `티켓 목록을 요청했을 때 토큰이 있으면 티켓 목록 보기 이벤트가 발생한다`() = runTest {
+    fun `티켓 목록을 요청했을 때 토큰이 있으면 티켓 목록이 보이고 이벤트가 발생하지 않는다`() = runTest {
         // given
         `사용자 인증 유무가 다음과 같을 때`(true)
 
         vm.event.test {
             // when
-            vm.loadHomeItem(HomeItemType.TICKET_LIST)
+            vm.selectItem(HomeItemType.TICKET_LIST)
 
             // then
-            assertThat(awaitItem()).isExactlyInstanceOf(HomeEvent.ShowTicketList::class.java)
+            assertThat(vm.selectedItem.value).isEqualTo(HomeItemType.TICKET_LIST)
+
+            // and
+            expectNoEvents()
         }
     }
 
     @Test
-    fun `티켓 목록을 요청했을 때 토큰이 있으면 로그인 보기 이벤트가 발생한다`() = runTest {
+    fun `티켓 목록을 요청했을 때 토큰이 있으면 로그인 이벤트가 발생하고 선택된 화면은 축제 목록 그대로이다`() = runTest {
         // given
         `사용자 인증 유무가 다음과 같을 때`(false)
 
         vm.event.test {
             // when
-            vm.loadHomeItem(HomeItemType.TICKET_LIST)
+            vm.selectItem(HomeItemType.TICKET_LIST)
 
             // then
             assertThat(awaitItem()).isExactlyInstanceOf(HomeEvent.ShowSignIn::class.java)
+
+            // and
+            assertThat(vm.selectedItem.value).isEqualTo(HomeItemType.FESTIVAL_LIST)
         }
     }
 
     @Test
-    fun `마이페이지를 요청했을 때 토큰이 있으면 마이페이지 보기 이벤트가 발생한다`() = runTest {
+    fun `마이페이지를 요청했을 때 토큰이 있으면 마이페이지가 보이고 이벤트가 발생하지 않는다`() = runTest {
         // given
         `사용자 인증 유무가 다음과 같을 때`(true)
 
         vm.event.test {
             // when
-            vm.loadHomeItem(HomeItemType.MY_PAGE)
+            vm.selectItem(HomeItemType.MY_PAGE)
 
             // then
-            assertThat(awaitItem()).isExactlyInstanceOf(HomeEvent.ShowMyPage::class.java)
+            assertThat(vm.selectedItem.value).isEqualTo(HomeItemType.MY_PAGE)
+
+            // and
+            expectNoEvents()
         }
     }
 
     @Test
-    fun `마이페이즈를 요청했을 때 토큰이 없으면 로그인 보기 이벤트가 발생한다`() = runTest {
+    fun `마이페이즈를 요청했을 때 토큰이 없으면 로그인 보기 이벤트가 발생하고 선택된 화면은 축제 목록 그대로이다`() = runTest {
         // given
         `사용자 인증 유무가 다음과 같을 때`(false)
 
         vm.event.test {
             // when
-            vm.loadHomeItem(HomeItemType.MY_PAGE)
+            vm.selectItem(HomeItemType.MY_PAGE)
 
+            // then
             assertThat(awaitItem()).isExactlyInstanceOf(HomeEvent.ShowSignIn::class.java)
+
+            // and
+            assertThat(vm.selectedItem.value).isEqualTo(HomeItemType.FESTIVAL_LIST)
         }
     }
 }

android/festago/app/src/test/java/com/festago/festago/presentation/ui/signin/SignInViewModelTest.kt

@@ -68,17 +68,4 @@ class SignInViewModelTest {
             assertThat(awaitItem()).isExactlyInstanceOf(SignInEvent.SignInFailure::class.java)
         }
     }
-
-    @Test
-    fun `로그인을 요청하면 로그인 화면을 보여주는 이벤트가 발생한다`() = runTest {
-        // given
-
-        vm.event.test {
-            // when
-            vm.signInKakao()
-
-            // then
-            assertThat(awaitItem()).isExactlyInstanceOf(SignInEvent.ShowSignInPage::class.java)
-        }
-    }
 }