FEAT: 온보딩 추천 루팅 등록없이 건너뛰기 버튼 추가

Author: l5x5l

presentation/src/main/java/com/threegap/bitnagil/presentation/common/flow/CollectAsEffect.kt

@@ -0,0 +1,22 @@
+package com.threegap.bitnagil.presentation.common.flow
+
+import android.annotation.SuppressLint
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import kotlin.coroutines.CoroutineContext
+import kotlin.coroutines.EmptyCoroutineContext
+
+@SuppressLint("ComposableNaming")
+@Composable
+fun <T> Flow<T>.collectAsEffect(
+    context: CoroutineContext = EmptyCoroutineContext,
+    block: (T) -> Unit,
+) {
+    LaunchedEffect(Unit) {
+        onEach(block).flowOn(context).launchIn(this)
+    }
+}

presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/OnBoardingScreen.kt

@@ -15,19 +15,34 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
+import com.threegap.bitnagil.presentation.common.flow.collectAsEffect
 import com.threegap.bitnagil.presentation.onboarding.component.atom.iconbutton.IconButton
 import com.threegap.bitnagil.presentation.onboarding.component.atom.progress.OnBoardingProgressBar
 import com.threegap.bitnagil.presentation.onboarding.component.template.OnBoardingAbstractTemplate
 import com.threegap.bitnagil.presentation.onboarding.component.template.OnBoardingSelectTemplate
 import com.threegap.bitnagil.presentation.onboarding.model.OnBoardingPageInfo
+import com.threegap.bitnagil.presentation.onboarding.model.mvi.OnBoardingSideEffect
 import com.threegap.bitnagil.presentation.onboarding.model.mvi.OnBoardingState
 
 @Composable
 fun OnBoardingScreenContainer(
     onBoardingViewModel: OnBoardingViewModel = hiltViewModel(),
+    navigateToHome: () -> Unit,
+    navigateToBack: () -> Unit,
 ) {
     val state by onBoardingViewModel.stateFlow.collectAsState()
 
+    onBoardingViewModel.sideEffectFlow.collectAsEffect { sideEffect ->
+        when (sideEffect) {
+            OnBoardingSideEffect.MoveToPreviousScreen -> {
+                navigateToBack()
+            }
+            OnBoardingSideEffect.NavigateToHomeScreen -> {
+                navigateToHome()
+            }
+        }
+    }
+
     OnBoardingScreen(
         state = state,
         onClickNext = onBoardingViewModel::selectNext,
@@ -37,11 +52,12 @@ fun OnBoardingScreenContainer(
         loadRecommendRoutines = onBoardingViewModel::loadRecommendRoutines,
         onClickRegister = onBoardingViewModel::registerRecommendRoutines,
         cancelRecommendRoutines = onBoardingViewModel::cancelLoadRecommendRoutines,
+        onClickSkip = onBoardingViewModel::skipRegisterRecommendRoutines,
     )
 }
 
 @Composable
-fun OnBoardingScreen(
+private fun OnBoardingScreen(
     state: OnBoardingState,
     onClickNext: () -> Unit,
     onClickPreviousInSelectOnBoarding: () -> Unit,
@@ -50,6 +66,7 @@ fun OnBoardingScreen(
     loadRecommendRoutines: () -> Unit,
     cancelRecommendRoutines: () -> Unit,
     onClickRegister: () -> Unit,
+    onClickSkip: () -> Unit,
 ) {
     Column(
         modifier = Modifier.background(color = Color(0xFFF7F7F8)),
@@ -90,6 +107,7 @@ fun OnBoardingScreen(
                             nextButtonEnable = state.nextButtonEnable,
                             onClickNextButton = onClickRegister,
                             onClickItem = onClickRoutine,
+                            onClickSkip = onClickSkip,
                         )
                     }
                     is OnBoardingPageInfo.SelectOnBoarding -> {
@@ -129,5 +147,6 @@ fun OnBoardingScreenPreview() {
         loadRecommendRoutines = {},
         onClickRegister = {},
         cancelRecommendRoutines = {},
+        onClickSkip = {},
     )
 }

presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/OnBoardingViewModel.kt

@@ -299,4 +299,10 @@ class OnBoardingViewModel @Inject constructor(
             )
         }
     }
+
+    fun skipRegisterRecommendRoutines() {
+        viewModelScope.launch {
+            sendIntent(intent = OnBoardingIntent.NavigateToHome)
+        }
+    }
 }

presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/component/template/OnBoardingSelectTemplate.kt

@@ -1,15 +1,23 @@
 package com.threegap.bitnagil.presentation.onboarding.component.template
 
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.threegap.bitnagil.presentation.onboarding.component.atom.textbutton.TextButton
@@ -25,6 +33,7 @@ fun OnBoardingSelectTemplate(
     nextButtonEnable: Boolean = false,
     onClickNextButton: () -> Unit,
     onClickItem: (String) -> Unit,
+    onClickSkip: (() -> Unit)? = null,
 ) {
     val titleTextStyle = TextStyle(fontSize = 20.sp)
     val subTextStyle = TextStyle(fontSize = 14.sp)
@@ -68,5 +77,27 @@ fun OnBoardingSelectTemplate(
             onClick = onClickNextButton,
             enabled = nextButtonEnable,
         )
+
+        onClickSkip?.let {
+            Spacer(modifier = Modifier.height(10.dp))
+
+            Box(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .height(54.dp)
+                    .clickable(
+                        indication = null,
+                        interactionSource = remember { MutableInteractionSource() },
+                        onClick = onClickSkip,
+                    ),
+                contentAlignment = Alignment.Center,
+            ) {
+                Text(
+                    text = "건너뛰기",
+                    style = TextStyle(textDecoration = TextDecoration.Underline),
+                    textAlign = TextAlign.Center,
+                )
+            }
+        }
     }
 }

presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/component/template/Preview.kt

@@ -34,5 +34,6 @@ fun OnBoardingTemplatePreview() {
         ),
         onClickNextButton = {},
         onClickItem = {},
+        onClickSkip = {},
     )
 }