#218 : 새로운 기능 소개 기능 구현해요

app/build.gradle.kts

@@ -71,6 +71,7 @@ dependencies {
     implementation(project(":feature:message"))
     implementation(project(":feature:entire"))
     implementation(project(":feature:notification"))
+    implementation(project(":feature:server-driven"))
 
     implementation(libs.splash.screen)
     implementation(platform(libs.firebase.bom))

app/src/main/kotlin/com/bff/wespot/MainActivity.kt

@@ -31,6 +31,7 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.NavigationBar
 import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SheetValue
 import androidx.compose.material3.Text
 import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
@@ -51,7 +52,10 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
 import androidx.core.content.ContextCompat
+import androidx.core.net.toUri
 import androidx.navigation.NavController
 import androidx.navigation.NavGraph.Companion.findStartDestination
 import androidx.navigation.compose.rememberNavController
@@ -68,18 +72,19 @@ import com.bff.wespot.designsystem.theme.WeSpotThemeManager
 import com.bff.wespot.entire.screen.destinations.SettingScreenDestination
 import com.bff.wespot.model.common.RestrictionType
 import com.bff.wespot.model.notification.NotificationType
+import com.bff.wespot.model.serverDriven.OnBoardingCategory
 import com.bff.wespot.navigation.Navigator
+import com.bff.wespot.navigation.util.EXTRA_DATE
 import com.bff.wespot.navigation.util.EXTRA_TARGET_ID
 import com.bff.wespot.navigation.util.EXTRA_TYPE
 import com.bff.wespot.navigation.util.EXTRA_USER_ID
-import com.bff.wespot.notification.screen.NotificationNavigator
 import com.bff.wespot.state.MainAction
 import com.bff.wespot.state.MainUiState
-import com.bff.wespot.data.remote.extensions.toLocalDateFromDashPattern
 import com.bff.wespot.designsystem.component.modal.WSDialog
-import com.bff.wespot.model.VersionUpdateDialogState
-import com.bff.wespot.navigation.util.EXTRA_DATE
+import com.bff.wespot.model.VersionUpdateType
 import com.bff.wespot.state.MainSideEffect
+import com.bff.wespot.server.driven.onboarding.OnBoardingBottomSheet
+import com.bff.wespot.server.driven.overview.UpdateOverviewScreen
 import com.bff.wespot.ui.component.TopToast
 import com.bff.wespot.ui.component.WSBottomSheet
 import com.bff.wespot.ui.model.ToastState
@@ -93,7 +98,6 @@ import kotlinx.coroutines.launch
 import org.orbitmvi.orbit.compose.collectAsState
 import org.orbitmvi.orbit.compose.collectSideEffect
 import timber.log.Timber
-import java.time.LocalDate
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -117,15 +121,12 @@ class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         requestNotificationPermission()
-
-        val navArgs = getMainScreenArgsFromIntent()
-        checkEnteredFromPushNotification(navArgs)
+        handleIntentData()
 
         setContent {
             WeSpotTheme {
                 MainScreen(
                     navigator = navigator,
-                    navArgs = navArgs,
                     analyticsHelper = analyticsHelper,
                     viewModel = viewModel,
                 )
@@ -146,66 +147,73 @@ class MainActivity : ComponentActivity() {
         }
     }
 
-    private fun checkEnteredFromPushNotification(data: MainScreenNavArgs) {
-        if (data.type != NotificationType.IDLE) {
-            viewModel.onAction(MainAction.OnEnteredByPushNotification(data))
-        }
-    }
+    private fun handleIntentData() = with(intent) {
+        val type = NotificationType.convertNotificationType(getStringExtra(EXTRA_TYPE).orEmpty())
+        if (type == NotificationType.IDLE) return
 
-    private fun getMainScreenArgsFromIntent(): MainScreenNavArgs = with(intent) {
         val targetId = getIntExtra(EXTRA_TARGET_ID, -1)
         val userId = getStringExtra(EXTRA_USER_ID).orEmpty()
-        val type = NotificationType.convertNotificationType(getStringExtra(EXTRA_TYPE).orEmpty())
         val date = getStringExtra(EXTRA_DATE).orEmpty()
 
         removeExtra(EXTRA_TARGET_ID)
         removeExtra(EXTRA_USER_ID)
         removeExtra(EXTRA_TYPE)
         removeExtra(EXTRA_DATE)
 
-        MainScreenNavArgs(
-            targetId = targetId,
-            userId = userId,
-            type = type,
-            date = date,
+        viewModel.onAction(
+            MainAction.OnEnteredByPushNotification(
+                type = type,
+                targetId = targetId,
+                userId = userId,
+                date = date,
+                appVersion = [email protected](),
+            ),
         )
     }
 }
 
-data class MainScreenNavArgs(
-    val type: NotificationType,
-    val userId: String,
-    val targetId: Int,
-    val date: String,
-)
-
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun MainScreen(
     navigator: Navigator,
-    navArgs: MainScreenNavArgs,
     analyticsHelper: AnalyticsHelper,
     viewModel: MainViewModel,
 ) {
     val state by viewModel.collectAsState()
     val action = viewModel::onAction
 
     val navController = rememberNavController()
+    val notificationNavigator by remember { mutableStateOf(NotificationNavigatorImpl(navController)) }
+
     val context = LocalContext.current
     var toast by remember { mutableStateOf(ToastState()) }
-    var showVersionUpdateDialog by remember { mutableStateOf(VersionUpdateDialogState()) }
 
     val isTopNavigationScreen by navController.checkCurrentScreen(NavigationBarPosition.TOP)
     val isBottomNavigationScreen by navController.checkCurrentScreen(NavigationBarPosition.BOTTOM)
 
     viewModel.collectSideEffect {
         when (it) {
-            is MainSideEffect.ShowVersionUpdateDialog -> {
-                showVersionUpdateDialog = VersionUpdateDialogState(
-                    show = true,
-                    versionUpdateType = it.versionUpdateType,
+            is MainSideEffect.NavigateToVoteResultScreen -> {
+                notificationNavigator.navigateToVoteResultScreen(
+                    isNavigateFromNotification = false,
+                    isTodayVoteResult = it.isTodayVoteResult
                 )
             }
+            is MainSideEffect.NavigateToMessageScreen -> {
+                notificationNavigator.navigateToMessageScreen(type = it.type, messageId = it.messageId)
+            }
+            is MainSideEffect.NavigateToDeepLink -> {
+                navController.navigate(it.deepLink.toUri())
+            }
+            MainSideEffect.NavigateToVoteStorageScreen -> {
+                notificationNavigator.navigateToVoteStorageScreen()
+            }
+            MainSideEffect.NavigateToReceiverSelectionScreen -> {
+                notificationNavigator.navigateToReceiverSelectionScreen()
+            }
+            MainSideEffect.NavigateToVotingScreen -> {
+                notificationNavigator.navigateToVotingScreen()
+            }
         }
     }
 
@@ -306,11 +314,6 @@ private fun MainScreen(
                 restricted = state.restriction.restrictionType != RestrictionType.NONE,
             )
         }
-
-        if (state.isPushNotificationNavigation) {
-            action(MainAction.OnNavigateByPushNotification)
-            navigateScreenFromNavArgs(navArgs, NotificationNavigatorImpl(navController))
-        }
     }
 
     TopToast(
@@ -321,17 +324,17 @@ private fun MainScreen(
         toast = toast.copy(show = false)
     }
 
-    if (showVersionUpdateDialog.show) {
+    if (state.versionUpdateType != VersionUpdateType.NONE) {
         WSDialog(
-            title = showVersionUpdateDialog.versionUpdateType.title,
-            subTitle = showVersionUpdateDialog.versionUpdateType.subTitle,
+            title = state.versionUpdateType.title,
+            subTitle = state.versionUpdateType.subTitle,
             okButtonText = stringResource(string.update),
             cancelButtonText = stringResource(string.next_time_update),
             okButtonClick = {
                 navigator.navigateToWebLink(context, state.playStoreLink)
             },
             cancelButtonClick = {
-                showVersionUpdateDialog = showVersionUpdateDialog.copy(show = false)
+                action(MainAction.OnVersionUpdateDialogDismiss)
             },
             onDismissRequest = {},
         )
@@ -350,6 +353,29 @@ private fun MainScreen(
         )
     }
 
+    if (state.notificationType.isUpdateOverviewType()) {
+        Dialog(
+            onDismissRequest = { },
+            properties = DialogProperties(usePlatformDefaultWidth = false),
+        ) {
+            UpdateOverviewScreen(
+                notificationType = state.notificationType,
+                onDismiss = {
+                    action(MainAction.OnUpdateOverviewDismiss)
+                },
+                onNavigate = { deepLink ->
+                    action(MainAction.OnUpdateOverviewNavigate(deepLink))
+                },
+            )
+        }
+    }
+
+    OnBoardingSheet(
+        state = state,
+        navController = navController,
+        action = action,
+    )
+
     LaunchedEffect(Unit) {
         action(MainAction.OnMainScreenEntered(context.getAppVersionName()))
     }
@@ -385,6 +411,41 @@ private fun BottomNavigationTab(
     }
 }
 
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+private fun OnBoardingSheet(
+    state: MainUiState,
+    navController: NavController,
+    action: (MainAction) -> Unit,
+) {
+    val current by navController.currentScreenAsState()
+    val category = when {
+        current == BottomBarDestinations.Vote.screen && state.showVoteOnBoarding -> {
+            OnBoardingCategory.VOTE
+        }
+        current == BottomBarDestinations.Message.screen && state.showMessageOnBoarding -> {
+            OnBoardingCategory.MESSAGE
+        }
+        else -> null
+    }
+
+    category?.let {
+        WSBottomSheet(
+            closeSheet = {},
+            sheetState = rememberModalBottomSheetState(
+                skipPartiallyExpanded = true,
+                confirmValueChange = { it != SheetValue.Hidden })
+        ) {
+            OnBoardingBottomSheet(
+                category = it,
+                closeOnBoarding = {
+                    action(MainAction.CloseOnBoarding(it))
+                }
+            )
+        }
+    }
+}
+
 @Stable
 @Composable
 private fun NavController.currentScreenAsState(): State<NavGraphSpec> {
@@ -466,45 +527,6 @@ private fun RowScope.TabItem(
     }
 }
 
-private fun navigateScreenFromNavArgs(
-    navArgs: MainScreenNavArgs,
-    navigator: NotificationNavigator
-) {
-    when (navArgs.type) {
-        NotificationType.MESSAGE -> {
-            navigator.navigateToReceiverSelectionScreen()
-        }
-
-        NotificationType.MESSAGE_SENT, NotificationType.MESSAGE_RECEIVED -> {
-            navigator.navigateToMessageScreen(type = navArgs.type, messageId = navArgs.targetId)
-        }
-
-        NotificationType.VOTE -> {
-            navigator.navigateToVotingScreen()
-        }
-
-        NotificationType.VOTE_RESULT -> {
-            val voteResultDate = navArgs.date.toLocalDateFromDashPattern()
-            val isTodayVoteResult = LocalDate.now().equals(voteResultDate)
-            navigator.navigateToVoteResultScreen(
-                isNavigateFromNotification = false,
-                isTodayVoteResult = isTodayVoteResult
-            )
-        }
-
-        NotificationType.VOTE_RECEIVED -> {
-            navigator.navigateToVoteStorageScreen()
-        }
-
-        NotificationType.PROFILE_UPDATE -> {
-            navigator.navigateToProfileEditScreen()
-        }
-
-        NotificationType.IDLE -> {
-        }
-    }
-}
-
 private fun NavController.navigateToNavGraph(navGraph: NavGraphSpec) {
     this.navigate(navGraph) {
         launchSingleTop = true

app/src/main/kotlin/com/bff/wespot/NotificationNavigatorImpl.kt

@@ -15,6 +15,9 @@ import com.bff.wespot.vote.screen.destinations.VotingScreenDestination
 import com.ramcosta.composedestinations.dynamic.within
 import com.ramcosta.composedestinations.navigation.navigate
 
+/**
+ * 알림 화면에서의 전환과 푸시 알림 전환에서 사용되는 Navigator
+ */
 class NotificationNavigatorImpl(private val navController: NavController): NotificationNavigator {
     override fun navigateUp() {
         navController.navigateUp()

app/src/main/kotlin/com/bff/wespot/model/VersionUpdateDialogState.kt

@@ -5,18 +5,14 @@ import androidx.compose.runtime.ReadOnlyComposable
 import androidx.compose.ui.res.stringResource
 import com.bff.wespot.R
 
-data class VersionUpdateDialogState(
-    val show: Boolean = false,
-    val versionUpdateType: VersionUpdateType = VersionUpdateType.USABILITY_IMPROVEMENT,
-)
-
 /**
  * @property [USABILITY_IMPROVEMENT] 사용성 개선
  * @property [NEW_FEATURE_ADDED] 새로운 기능 추가
  */
 enum class VersionUpdateType {
     USABILITY_IMPROVEMENT,
     NEW_FEATURE_ADDED,
+    NONE,
     ;
 
     val title: String
@@ -25,6 +21,7 @@ enum class VersionUpdateType {
         get() = when(this) {
             USABILITY_IMPROVEMENT -> stringResource(id = R.string.update_title_usability_improvement)
             NEW_FEATURE_ADDED -> stringResource(id = R.string.update_title_new_feature_added)
+            NONE -> ""
         }
 
     val subTitle: String
@@ -33,6 +30,7 @@ enum class VersionUpdateType {
         get() = when(this) {
             USABILITY_IMPROVEMENT -> stringResource(id = R.string.update_subtitle_usability_improvement)
             NEW_FEATURE_ADDED -> stringResource(id = R.string.update_subtitle_new_feature_added)
+            NONE -> ""
         }
 
     companion object {

app/src/main/kotlin/com/bff/wespot/state/MainAction.kt

@@ -1,10 +1,20 @@
 package com.bff.wespot.state
 
-import com.bff.wespot.MainScreenNavArgs
+import com.bff.wespot.model.notification.NotificationType
+import com.bff.wespot.model.serverDriven.OnBoardingCategory
 
 sealed class MainAction {
-    data object OnNavigateByPushNotification : MainAction()
     data class OnMainScreenEntered(val appVersionName: String) : MainAction()
-    data class OnEnteredByPushNotification(val data: MainScreenNavArgs) : MainAction()
     data class OnNotificationSet(val isEnableNotification: Boolean) : MainAction()
+    data class OnEnteredByPushNotification(
+        val type: NotificationType,
+        val userId: String,
+        val targetId: Int,
+        val date: String,
+        val appVersion: String,
+    ) : MainAction()
+    data object OnVersionUpdateDialogDismiss : MainAction()
+    data object OnUpdateOverviewDismiss : MainAction()
+    data class OnUpdateOverviewNavigate(val deepLink: String) : MainAction()
+    data class CloseOnBoarding(val category: OnBoardingCategory) : MainAction()
 }