feat/#156: 전체 보기 클릭 시 일정 탭으로 이동

Author: DongChyeon

app/src/main/java/com/yapp/app/official/navigation/YappNavHost.kt

@@ -50,16 +50,14 @@ fun YappNavHost(
             }
         )
         homeNavGraph(
-            navigateNotice = { navigator.navigateNoticeScreen() },
-            navigateSetting = { navigator.navigateSettingScreen() },
             navigateLogin = {
                 navigator.navigateLoginScreen(
                     navOptions = clearBackStackNavOptions
                 )
             },
-            navigateToNoticeDetail = { noticeId ->
-                navigator.navigateToNoticeDetail(noticeId)
-            }
+            navigateSchedule = {
+                navigator.navigateToTopLevelDestination(TopLevelDestination.SCHEDULE)
+            },
         )
         settingNavGraph(
             navigateLogin = {

feature/home/src/main/java/com/yapp/feature/home/HomeContract.kt

@@ -99,19 +99,15 @@ data class HomeState(
 }
 
 sealed interface HomeIntent {
-    data object ClickMoreButton : HomeIntent
-    data object ClickSettingButton : HomeIntent
     data object ClickRequestAttendCode : HomeIntent
     data object ClickDismissDialog : HomeIntent
     data class ClickRequestAttendance(val code: String, val sessionId: String) : HomeIntent
     data object EnterHomeScreen : HomeIntent
-    data class ClickNoticeItem(val noticeId: String) : HomeIntent
+    data object ClickShowAllSession : HomeIntent
 }
 
 sealed interface HomeSideEffect {
-    data object NavigateToNotice : HomeSideEffect
-    data class NavigateToNoticeDetail(val noticeId: String) : HomeSideEffect
-    data object NavigateToSetting : HomeSideEffect
+    data object NavigateToSchedule : HomeSideEffect
     data object NavigateToLogin : HomeSideEffect
     data class ShowToast(val message: String) : HomeSideEffect
 }

feature/home/src/main/java/com/yapp/feature/home/HomeScreen.kt

@@ -22,10 +22,8 @@ import com.yapp.feature.home.dialog.AttendanceDialog
 
 @Composable
 internal fun HomeRoute(
-    navigateToNotice: () -> Unit,
-    navigateToSetting: () -> Unit,
     navigateToLogin: () -> Unit,
-    navigateToNoticeDetail: (String) -> Unit,
+    navigateToSchedule: () -> Unit,
     viewModel: HomeViewModel = hiltViewModel(),
 ) {
     LaunchedEffect(Unit) {
@@ -36,14 +34,9 @@ internal fun HomeRoute(
     val context = LocalContext.current
     viewModel.store.sideEffects.collectWithLifecycle { effect ->
         when (effect) {
-            HomeSideEffect.NavigateToNotice -> navigateToNotice()
-            HomeSideEffect.NavigateToSetting -> navigateToSetting()
-            is HomeSideEffect.ShowToast -> {
-                Toast.makeText(context, effect.message, Toast.LENGTH_SHORT).show()
-            }
-
+            HomeSideEffect.NavigateToSchedule -> navigateToSchedule()
+            is HomeSideEffect.ShowToast -> Toast.makeText(context, effect.message, Toast.LENGTH_SHORT).show()
             HomeSideEffect.NavigateToLogin -> navigateToLogin()
-            is HomeSideEffect.NavigateToNoticeDetail -> navigateToNoticeDetail(effect.noticeId)
         }
     }
 
@@ -72,7 +65,7 @@ fun HomeScreen(
                     .background(brush = Brush.horizontalGradient(colorStops = colorSteps)),
                 sessions = homeState.sessions,
                 upcomingSessionId = homeState.upcomingSessionId,
-                onClickSessionItem = { }
+                onClickShowAll = { onIntent(HomeIntent.ClickShowAllSession) },
             )
 
             HomeAttendanceNotice(title = homeState.attendanceTitle)
@@ -109,9 +102,7 @@ private fun HomeScreenPreview() {
     YappTheme {
         HomeRoute(
             navigateToLogin = {},
-            navigateToNotice = {},
-            navigateToSetting = {},
-            navigateToNoticeDetail = {}
+            navigateToSchedule = {}
         )
     }
 }

feature/home/src/main/java/com/yapp/feature/home/HomeViewModel.kt

@@ -35,9 +35,8 @@ internal class HomeViewModel @Inject constructor(
         postSideEffect: (HomeSideEffect) -> Unit,
     ) {
         when (intent) {
-            HomeIntent.ClickMoreButton -> postSideEffect(HomeSideEffect.NavigateToNotice)
-            HomeIntent.ClickSettingButton -> postSideEffect(HomeSideEffect.NavigateToSetting)
             HomeIntent.EnterHomeScreen -> { loadHomeInfo( reduce,postSideEffect)  }
+            HomeIntent.ClickShowAllSession -> postSideEffect(HomeSideEffect.NavigateToSchedule)
             HomeIntent.ClickRequestAttendCode -> {
                 reduce {
                     copy(showAttendCodeBottomSheet = true)
@@ -51,7 +50,6 @@ internal class HomeViewModel @Inject constructor(
             is HomeIntent.ClickRequestAttendance -> {
                 requestAttendance(intent.sessionId, intent.code, state, reduce)
             }
-            is HomeIntent.ClickNoticeItem -> postSideEffect(HomeSideEffect.NavigateToNoticeDetail(intent.noticeId))
         }
     }
 

feature/home/src/main/java/com/yapp/feature/home/component/HomeHeader.kt

@@ -49,7 +49,7 @@ internal fun HomeHeader(
     modifier: Modifier = Modifier,
     sessions: List<HomeState.Session>,
     upcomingSessionId: String,
-    onClickSessionItem: (String) -> Unit
+    onClickShowAll: () -> Unit,
 ) {
     val pageIndex = sessions.indexOfFirst { it.id == upcomingSessionId }
     val scope = rememberCoroutineScope()
@@ -78,7 +78,9 @@ internal fun HomeHeader(
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
         Row(
-            modifier = Modifier.fillMaxWidth().padding(horizontal = 20.dp),
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 20.dp),
             verticalAlignment = Alignment.CenterVertically,
             horizontalArrangement = Arrangement.SpaceBetween
         ) {
@@ -98,13 +100,16 @@ internal fun HomeHeader(
             }
 
             Text(
+                modifier = Modifier.yappClickable(onClick = onClickShowAll),
                 text = stringResource(R.string.home_session_all_title),
                 style = YappTheme.typography.label1NormalBold,
                 color = YappTheme.colorScheme.staticWhite
             )
         }
         LazyRow(
-            modifier = Modifier.fillMaxWidth().padding(top = 10.dp),
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(top = 10.dp),
             state = lazyListState,
             flingBehavior = flingBehavior,
             horizontalArrangement = Arrangement.spacedBy(8.dp),
@@ -123,7 +128,7 @@ internal fun HomeHeader(
                     endTime = it.endTime,
                     startDayOfWeek = it.startDayOfWeek,
                     progressPhase = it.progressPhase,
-                    onClickSessionItem = onClickSessionItem
+                    onClickSessionItem = {  }
                 )
             }
         }
@@ -244,7 +249,7 @@ private fun HomeStickHeaderPreview() {
                 progressPhase = ScheduleProgressPhase.TODAY
             )
         ),
-        onClickSessionItem = {},
+        onClickShowAll = { },
         upcomingSessionId = "123"
     )
 }

feature/home/src/main/java/com/yapp/feature/home/navigation/HomeNavigation.kt

@@ -23,19 +23,13 @@ fun NavController.navigateToSetting(navOptions: NavOptions? = null) {
 }
 
 fun NavGraphBuilder.homeNavGraph(
-    navigateNotice: () -> Unit,
-    navigateSetting: () -> Unit,
     navigateLogin : () -> Unit,
-    navigateToNoticeDetail: (String) -> Unit
+    navigateSchedule: () -> Unit,
 ) {
     composable<HomeRoute> {
         HomeRoute(
-            navigateToNotice = navigateNotice,
-            navigateToSetting = navigateSetting,
             navigateToLogin = navigateLogin,
-            navigateToNoticeDetail = { noticeId ->
-                navigateToNoticeDetail(noticeId)
-            }
+            navigateToSchedule = navigateSchedule,
         )
     }
 }