Chore: Onboarding 관련 UiModel 네이밍 변경 및 Mapper 추가

- Onboarding에서 사용하는 UiModel 클래스명에 `UiModel` 접미사를 추가했습니다.
- Domain Model을 UiModel로 변환하는 Mapper 함수를 추가하고, 기존의 `from` 팩토리 메서드를 대체했습니다.

Author: wjdrjs00

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

@@ -17,7 +17,7 @@ import com.threegap.bitnagil.presentation.onboarding.component.template.OnBoardi
 import com.threegap.bitnagil.presentation.onboarding.component.template.OnBoardingSelectTemplate
 import com.threegap.bitnagil.presentation.onboarding.contract.OnBoardingSideEffect
 import com.threegap.bitnagil.presentation.onboarding.contract.OnBoardingState
-import com.threegap.bitnagil.presentation.onboarding.model.OnBoardingItem
+import com.threegap.bitnagil.presentation.onboarding.model.OnBoardingItemUiModel
 import com.threegap.bitnagil.presentation.onboarding.model.OnBoardingPageInfo
 import com.threegap.bitnagil.presentation.onboarding.model.OnBoardingSetType
 import org.orbitmvi.orbit.compose.collectAsState
@@ -163,7 +163,7 @@ fun OnBoardingScreenPreview() {
             nextButtonEnable = false,
             currentOnBoardingPageInfo = OnBoardingPageInfo.RecommendRoutines(
                 listOf(
-                    OnBoardingItem("1", "루틴명", "세부 루틴 한 줄 설명", null),
+                    OnBoardingItemUiModel("1", "루틴명", "세부 루틴 한 줄 설명", null),
                 ),
             ),
             totalStep = 5,

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

@@ -11,11 +11,12 @@ import com.threegap.bitnagil.domain.onboarding.usecase.RegisterRecommendOnBoardi
 import com.threegap.bitnagil.domain.user.usecase.FetchUserProfileUseCase
 import com.threegap.bitnagil.presentation.onboarding.contract.OnBoardingSideEffect
 import com.threegap.bitnagil.presentation.onboarding.contract.OnBoardingState
-import com.threegap.bitnagil.presentation.onboarding.model.OnBoardingAbstractTextItem
-import com.threegap.bitnagil.presentation.onboarding.model.OnBoardingItem
+import com.threegap.bitnagil.presentation.onboarding.model.OnBoardingAbstractTextItemUiModel
+import com.threegap.bitnagil.presentation.onboarding.model.OnBoardingItemUiModel
 import com.threegap.bitnagil.presentation.onboarding.model.OnBoardingPageInfo
 import com.threegap.bitnagil.presentation.onboarding.model.OnBoardingSetType
 import com.threegap.bitnagil.presentation.onboarding.model.navarg.OnBoardingScreenArg
+import com.threegap.bitnagil.presentation.onboarding.model.toUiModel
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
@@ -100,9 +101,7 @@ class OnBoardingViewModel @AssistedInject constructor(
 
         val abstractPagePrefixText = onBoardingAbstract.prefix
         val abstractTexts = onBoardingAbstract.abstractTexts.map { onBoardingAbstractText ->
-            onBoardingAbstractText.textItems.map { onBoardingAbstractTextItem ->
-                OnBoardingAbstractTextItem.fromOnBoardingAbstractTextItem(onBoardingAbstractTextItem)
-            }
+            onBoardingAbstractText.textItems.map { it.toUiModel() }
         }
 
         val existedOnBoardingAbstract = OnBoardingPageInfo.ExistedOnBoardingAbstract(
@@ -125,9 +124,7 @@ class OnBoardingViewModel @AssistedInject constructor(
 
     fun loadOnBoardingItems() = intent {
         val onBoardings = getOnBoardingsUseCase()
-        val onBoardingPages = onBoardings.map { onBoarding ->
-            OnBoardingPageInfo.SelectOnBoarding.fromOnBoarding(onBoarding = onBoarding)
-        }
+        val onBoardingPages = onBoardings.map { it.toUiModel() }
 
         val currentState = state
         if (currentState !is OnBoardingState.Idle) return@intent
@@ -175,9 +172,7 @@ class OnBoardingViewModel @AssistedInject constructor(
 
             val abstractPagePrefixText = onBoardingAbstract.prefix
             val abstractTexts = onBoardingAbstract.abstractTexts.map { onBoardingAbstractText ->
-                onBoardingAbstractText.textItems.map { onBoardingAbstractTextItem ->
-                    OnBoardingAbstractTextItem.fromOnBoardingAbstractTextItem(onBoardingAbstractTextItem)
-                }
+                onBoardingAbstractText.textItems.map { it.toUiModel() }
             }
 
             reduce {
@@ -291,9 +286,7 @@ class OnBoardingViewModel @AssistedInject constructor(
                 onSuccess = { recommendRoutines ->
                     if (isActive) {
                         applyRecommendRoutines(
-                            routines = recommendRoutines.map {
-                                OnBoardingItem.fromOnBoardingRecommendRoutine(it)
-                            },
+                            routines = recommendRoutines.map { it.toUiModel() },
                         )
                     }
                 },
@@ -303,7 +296,7 @@ class OnBoardingViewModel @AssistedInject constructor(
         }
     }
 
-    private fun applyRecommendRoutines(routines: List<OnBoardingItem>) = intent {
+    private fun applyRecommendRoutines(routines: List<OnBoardingItemUiModel>) = intent {
         val currentState = state
         if (currentState !is OnBoardingState.Idle) return@intent
 

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

@@ -38,14 +38,14 @@ import com.threegap.bitnagil.designsystem.BitnagilTheme
 import com.threegap.bitnagil.designsystem.R
 import com.threegap.bitnagil.designsystem.component.atom.BitnagilTextButton
 import com.threegap.bitnagil.presentation.common.ninepatch.ninePatchBackgroundNode
-import com.threegap.bitnagil.presentation.onboarding.model.OnBoardingAbstractTextItem
+import com.threegap.bitnagil.presentation.onboarding.model.OnBoardingAbstractTextItemUiModel
 
 @Composable
 fun OnBoardingAbstractTemplate(
     modifier: Modifier = Modifier,
     title: String,
     userName: String,
-    onBoardingAbstractTexts: List<List<OnBoardingAbstractTextItem>>,
+    onBoardingAbstractTexts: List<List<OnBoardingAbstractTextItemUiModel>>,
     onDispose: () -> Unit,
     onClickNextButton: () -> Unit,
     nextButtonEnable: Boolean,
@@ -120,7 +120,7 @@ private fun getIndexIconResourceId(index: Int): Int {
 
 @Composable
 private fun OnBoardingAbstractText(
-    onBoardingAbstractTextList: List<OnBoardingAbstractTextItem>,
+    onBoardingAbstractTextList: List<OnBoardingAbstractTextItemUiModel>,
     iconResourceId: Int,
 ) {
     val annotatedString = buildAnnotatedString {
@@ -214,31 +214,31 @@ private fun OnBoardingAbstractTemplatePreview() {
             userName = "안드로이드",
             onBoardingAbstractTexts = listOf(
                 listOf(
-                    OnBoardingAbstractTextItem(
+                    OnBoardingAbstractTextItemUiModel(
                         text = "텍스트1",
                         isBold = true,
                     ),
-                    OnBoardingAbstractTextItem(
+                    OnBoardingAbstractTextItemUiModel(
                         text = "텍스트2 아아아아아아아아아ㅏ아앙아아ㅏ아아아아아",
                         isBold = false,
                     ),
                 ),
                 listOf(
-                    OnBoardingAbstractTextItem(
+                    OnBoardingAbstractTextItemUiModel(
                         text = "텍스트1",
                         isBold = true,
                     ),
-                    OnBoardingAbstractTextItem(
+                    OnBoardingAbstractTextItemUiModel(
                         text = "텍스트2",
                         isBold = false,
                     ),
                 ),
                 listOf(
-                    OnBoardingAbstractTextItem(
+                    OnBoardingAbstractTextItemUiModel(
                         text = "텍스트1",
                         isBold = true,
                     ),
-                    OnBoardingAbstractTextItem(
+                    OnBoardingAbstractTextItemUiModel(
                         text = "텍스트2",
                         isBold = false,
                     ),

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

@@ -16,14 +16,14 @@ import com.threegap.bitnagil.designsystem.BitnagilTheme
 import com.threegap.bitnagil.designsystem.component.atom.BitnagilSelectButton
 import com.threegap.bitnagil.designsystem.component.atom.BitnagilTextButton
 import com.threegap.bitnagil.designsystem.component.atom.BitnagilTextButtonColor
-import com.threegap.bitnagil.presentation.onboarding.model.OnBoardingItem
+import com.threegap.bitnagil.presentation.onboarding.model.OnBoardingItemUiModel
 
 @Composable
 fun OnBoardingSelectTemplate(
     modifier: Modifier = Modifier,
     title: String,
     subText: String? = null,
-    items: List<OnBoardingItem>,
+    items: List<OnBoardingItemUiModel>,
     nextButtonEnable: Boolean = false,
     onClickNextButton: () -> Unit,
     onClickItem: ((String) -> Unit)?,

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

@@ -2,7 +2,7 @@ package com.threegap.bitnagil.presentation.onboarding.component.template
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.tooling.preview.Preview
-import com.threegap.bitnagil.presentation.onboarding.model.OnBoardingItem
+import com.threegap.bitnagil.presentation.onboarding.model.OnBoardingItemUiModel
 
 @Preview(showBackground = true)
 @Composable
@@ -11,22 +11,22 @@ fun OnBoardingTemplatePreview() {
         title = "title",
         subText = "subText",
         items = listOf(
-            OnBoardingItem(
+            OnBoardingItemUiModel(
                 id = "item1",
                 title = "title1",
                 description = "description1",
             ),
-            OnBoardingItem(
+            OnBoardingItemUiModel(
                 id = "item2",
                 title = "title2",
                 description = "description2",
             ),
-            OnBoardingItem(
+            OnBoardingItemUiModel(
                 id = "item3",
                 title = "title3",
                 description = "description3",
             ),
-            OnBoardingItem(
+            OnBoardingItemUiModel(
                 id = "item4",
                 title = "title4",
                 description = "description4",

presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/model/OnBoardingAbstractTextItem.kt

@@ -0,0 +1,17 @@
+package com.threegap.bitnagil.presentation.onboarding.model
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+import com.threegap.bitnagil.domain.onboarding.model.OnBoardingAbstractTextItem
+
+@Parcelize
+data class OnBoardingAbstractTextItemUiModel(
+    val text: String,
+    val isBold: Boolean,
+) : Parcelable
+
+internal fun OnBoardingAbstractTextItem.toUiModel(): OnBoardingAbstractTextItemUiModel =
+    OnBoardingAbstractTextItemUiModel(
+        text = this.text,
+        isBold = this.isBold,
+    )

presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/model/OnBoardingAbstractTextItemUiModel.kt

@@ -0,0 +1,33 @@
+package com.threegap.bitnagil.presentation.onboarding.model
+
+import android.os.Parcelable
+import com.threegap.bitnagil.domain.onboarding.model.OnBoardingItem
+import com.threegap.bitnagil.domain.onboarding.model.OnBoardingRecommendRoutine
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class OnBoardingItemUiModel(
+    val id: String,
+    val title: String,
+    val description: String?,
+    val selectedIndex: Int? = null,
+) : Parcelable {
+    val selected: Boolean
+        get() = selectedIndex != null
+}
+
+internal fun OnBoardingItem.toUiModel(): OnBoardingItemUiModel =
+    OnBoardingItemUiModel(
+        id = this.id,
+        title = this.title,
+        description = this.description,
+        selectedIndex = null,
+    )
+
+internal fun OnBoardingRecommendRoutine.toUiModel(): OnBoardingItemUiModel =
+    OnBoardingItemUiModel(
+        id = this.id,
+        title = this.name,
+        description = this.description,
+        selectedIndex = null,
+    )

presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/model/OnBoardingItem.kt

@@ -3,6 +3,7 @@ package com.threegap.bitnagil.presentation.onboarding.model
 import android.os.Parcelable
 import androidx.compose.runtime.Stable
 import com.threegap.bitnagil.domain.onboarding.model.OnBoarding
+import com.threegap.bitnagil.presentation.onboarding.model.OnBoardingPageInfo.SelectOnBoarding
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
@@ -13,30 +14,18 @@ sealed class OnBoardingPageInfo : Parcelable {
     @Parcelize
     data class ExistedOnBoardingAbstract(
         val prefix: String,
-        @Stable val abstractTexts: List<List<OnBoardingAbstractTextItem>>,
+        @Stable val abstractTexts: List<List<OnBoardingAbstractTextItemUiModel>>,
     ) : OnBoardingPageInfo()
 
     @Parcelize
     data class SelectOnBoarding(
         val id: String,
         val title: String,
         val description: String?,
-        @Stable val items: List<OnBoardingItem> = emptyList(),
+        @Stable val items: List<OnBoardingItemUiModel> = emptyList(),
         val multipleSelectable: Boolean = false,
     ) : OnBoardingPageInfo() {
         companion object {
-            fun fromOnBoarding(onBoarding: OnBoarding): SelectOnBoarding {
-                return SelectOnBoarding(
-                    id = onBoarding.id,
-                    title = onBoarding.title,
-                    description = onBoarding.description,
-                    items = onBoarding.onboardingItemList.map {
-                        OnBoardingItem.fromOnBoardingItem(it)
-                    },
-                    multipleSelectable = onBoarding.multipleSelectable,
-                )
-            }
-
             private var lastSelectedIndex = 0
         }
 
@@ -68,11 +57,11 @@ sealed class OnBoardingPageInfo : Parcelable {
     @Parcelize
     data class Abstract(
         val prefix: String,
-        @Stable val abstractTexts: List<List<OnBoardingAbstractTextItem>>,
+        @Stable val abstractTexts: List<List<OnBoardingAbstractTextItemUiModel>>,
     ) : OnBoardingPageInfo()
 
     @Parcelize
-    data class RecommendRoutines(@Stable val routines: List<OnBoardingItem>) : OnBoardingPageInfo() {
+    data class RecommendRoutines(@Stable val routines: List<OnBoardingItemUiModel>) : OnBoardingPageInfo() {
         companion object {
             private var lastSelectedIndex = 0
         }
@@ -98,3 +87,12 @@ sealed class OnBoardingPageInfo : Parcelable {
         }
     }
 }
+
+internal fun OnBoarding.toUiModel(): SelectOnBoarding =
+    SelectOnBoarding(
+        id = this.id,
+        title = this.title,
+        description = this.description,
+        items = this.onboardingItemList.map { it.toUiModel() },
+        multipleSelectable = this.multipleSelectable,
+    )