[UI] 미션 선택 단계에서 선택된 미션을 표시하는 UI 추가

Author: DongChyeon

feature/home/src/main/java/com/yapp/home/alarm/component/bottomsheet/AlarmMissionBottomSheet.kt

@@ -73,11 +73,15 @@ internal fun AlarmMissionBottomSheet(
     onSaveMission: (MissionType, Int) -> Unit,
     onPreviewMission: (MissionType, Int) -> Unit,
 ) {
+    val initialMissionType = missionState.missionType
+    val initialMissionCount = missionState.missionCount
+
     var stepStack by rememberSaveable(saver = StepStackSaver) {
         mutableStateOf(listOf(AlarmMissionSelectBottomSheetType.MISSION_SETTING))
     }
-    var selectedMissionType by rememberSaveable { mutableStateOf(missionState.missionType) }
-    var selectedMissionCount by rememberSaveable { mutableIntStateOf(missionState.missionCount) }
+
+    var currentSelectedMissionType by rememberSaveable { mutableStateOf(initialMissionType) }
+    var currentSelectedMissionCount by rememberSaveable { mutableIntStateOf(initialMissionCount) }
 
     fun push(step: AlarmMissionSelectBottomSheetType) {
         stepStack = stepStack + step
@@ -93,22 +97,22 @@ internal fun AlarmMissionBottomSheet(
 
     when (currentStep) {
         AlarmMissionSelectBottomSheetType.MISSION_SETTING -> {
-            if (selectedMissionType == MissionType.NONE) {
+            if (currentSelectedMissionType == MissionType.NONE) {
                 MissionAddContent {
                     push(AlarmMissionSelectBottomSheetType.MISSION_SELECT)
                 }
             } else {
                 MissionSettingContent(
-                    missionType = selectedMissionType,
-                    missionCount = selectedMissionCount,
+                    missionType = currentSelectedMissionType,
+                    missionCount = currentSelectedMissionCount,
                     onDetail = { push(AlarmMissionSelectBottomSheetType.MISSION_DETAIL) },
                     onDelete = {
-                        selectedMissionType = MissionType.NONE
-                        onSaveMission(selectedMissionType, selectedMissionCount)
+                        currentSelectedMissionType = MissionType.NONE
+                        onSaveMission(currentSelectedMissionType, currentSelectedMissionCount)
                     },
                     onChange = { push(AlarmMissionSelectBottomSheetType.MISSION_SELECT) },
                     onDone = {
-                        onSaveMission(selectedMissionType, selectedMissionCount)
+                        onSaveMission(currentSelectedMissionType, currentSelectedMissionCount)
                         onDismiss()
                     },
                 )
@@ -118,31 +122,28 @@ internal fun AlarmMissionBottomSheet(
         AlarmMissionSelectBottomSheetType.MISSION_SELECT -> {
             MissionSelectContent(
                 onBack = { pop() },
-                onClose = {
-                    onDismiss()
-                },
-                onSelect = { mission ->
-                    selectedMissionType = mission
+                onClose = { onDismiss() },
+                initialMission = currentSelectedMissionType,
+                onSelect = { selected ->
+                    currentSelectedMissionType = selected
                     push(AlarmMissionSelectBottomSheetType.MISSION_DETAIL)
                 },
             )
         }
 
         AlarmMissionSelectBottomSheetType.MISSION_DETAIL -> {
             MissionDetailContent(
-                missionType = selectedMissionType,
-                selectedMissionCount = selectedMissionCount,
-                onCountChange = { selectedMissionCount = it },
+                missionType = currentSelectedMissionType,
+                selectedMissionCount = currentSelectedMissionCount,
+                onCountChange = { currentSelectedMissionCount = it },
                 onBack = { pop() },
-                onClose = {
-                    onDismiss()
-                },
+                onClose = { onDismiss() },
                 onSave = {
-                    onSaveMission(selectedMissionType, selectedMissionCount)
+                    onSaveMission(currentSelectedMissionType, currentSelectedMissionCount)
                     onDismiss()
                 },
                 onPreview = {
-                    onPreviewMission(selectedMissionType, selectedMissionCount)
+                    onPreviewMission(currentSelectedMissionType, currentSelectedMissionCount)
                 },
             )
         }
@@ -390,6 +391,7 @@ private fun MissionCountChip(
 private fun MissionSelectContent(
     onBack: () -> Unit,
     onClose: () -> Unit,
+    initialMission: MissionType,
     onSelect: (MissionType) -> Unit,
 ) {
     Column(
@@ -401,7 +403,7 @@ private fun MissionSelectContent(
         Spacer(modifier = Modifier.height(14.dp))
 
         MissionSelectTopAppBar(
-            title = stringResource(id = feature.home.R.string.mission_bottom_sheet_title),
+            title = stringResource(id = feature.home.R.string.mission_select_content_title),
             onBack = onBack,
             onClose = onClose,
         )
@@ -411,12 +413,14 @@ private fun MissionSelectContent(
         ) {
             MissionTypeItem(
                 missionType = MissionType.SHAKE,
+                selected = initialMission == MissionType.SHAKE,
                 onClick = {
                     onSelect(MissionType.SHAKE)
                 },
             )
             MissionTypeItem(
                 missionType = MissionType.TAP,
+                selected = initialMission == MissionType.TAP,
                 onClick = {
                     onSelect(MissionType.TAP)
                 },
@@ -428,6 +432,7 @@ private fun MissionSelectContent(
 @Composable
 private fun MissionTypeItem(
     missionType: MissionType,
+    selected: Boolean,
     onClick: () -> Unit,
 ) {
     val (iconRes, titleRes) = missionType.displayData()
@@ -436,6 +441,7 @@ private fun MissionTypeItem(
     Row(
         modifier = Modifier
             .fillMaxWidth()
+            .clip(RoundedCornerShape(12.dp))
             .clickable(
                 onClick = onClick,
             )
@@ -458,6 +464,28 @@ private fun MissionTypeItem(
             style = OrbitTheme.typography.headline2SemiBold,
             color = OrbitTheme.colors.white,
         )
+
+        if (selected) {
+            Spacer(modifier = Modifier.weight(1f))
+
+            Row(
+                horizontalArrangement = Arrangement.spacedBy(2.dp),
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
+                Icon(
+                    modifier = Modifier.size(16.dp),
+                    painter = painterResource(id = R.drawable.ic_check),
+                    tint = OrbitTheme.colors.white.copy(alpha = 0.5f),
+                    contentDescription = null,
+                )
+
+                Text(
+                    text = stringResource(id = feature.home.R.string.mission_select_content_selected),
+                    style = OrbitTheme.typography.body2Medium,
+                    color = OrbitTheme.colors.white.copy(alpha = 0.4f),
+                )
+            }
+        }
     }
 }
 

feature/home/src/main/res/values/strings.xml

@@ -48,6 +48,9 @@
     <string name="mission_setting_content_btn_change">미션 변경</string>
     <string name="mission_setting_content_btn_done">완료</string>
 
+    <string name="mission_select_content_title">미션 선택</string>
+    <string name="mission_select_content_selected">선택됨</string>
+
     <string name="mission_count_chip_format">%d회</string>
 
     <string name="mission_detail_content_count_title">횟수</string>