#56 Feat : 인증번호 입력 화면, 또는 취향 설정 첫페이지일 시 뒤로 가기 버튼을 누르면 로그인으로 돌아가기 바텀시트 노출

AdultOfNineteen · Mar 4, 2024 · 55691a5 · 55691a5
1 parent c439c4c
commit 55691a5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 18 deletions.
diff --git a/feature/auth/src/main/java/com/teamwiney/auth/signup/SignUpAuthenticationScreen.kt b/feature/auth/src/main/java/com/teamwiney/auth/signup/SignUpAuthenticationScreen.kt
@@ -60,21 +60,7 @@ fun SignUpAuthenticationScreen(
         if (bottomSheetState.bottomSheetState.isVisible) {
             bottomSheetState.hideBottomSheet()
         } else {
-            bottomSheetState.showBottomSheet {
-                ReturnToLoginBottomSheet(
-                    onConfirm = {
-                        bottomSheetState.hideBottomSheet()
-                        appState.navigate(AuthDestinations.Login.ROUTE) {
-                            popUpTo(AuthDestinations.Login.ROUTE) {
-                                inclusive = true
-                            }
-                        }
-                    },
-                    onCancel = {
-                        bottomSheetState.hideBottomSheet()
-                    }
-                )
-            }
+            viewModel.processEvent(SignUpContract.Event.BackToLogin)
         }
     }
 

diff --git a/feature/auth/src/main/java/com/teamwiney/auth/signup/SignUpFavoriteTasteScreen.kt b/feature/auth/src/main/java/com/teamwiney/auth/signup/SignUpFavoriteTasteScreen.kt
@@ -52,7 +52,11 @@ fun SignUpFavoriteTasteScreen(
         if (bottomSheetState.bottomSheetState.isVisible) {
             bottomSheetState.hideBottomSheet()
         } else {
-            appState.navController.navigateUp()
+            if (pagerState.currentPage == 0) {
+                viewModel.processEvent(SignUpContract.Event.CancelTasteSelection)
+            } else {
+                scope.launch { pagerState.animateScrollToPage(pagerState.currentPage - 1) }
+            }
         }
     }
 
@@ -90,8 +94,6 @@ fun SignUpFavoriteTasteScreen(
                         else -> {}
                     }
                 }
-
-                else -> {}
             }
         }
     }