Feature/270 1.6.X 버전 선물하기 디자인 QA

data/src/main/java/com/nexters/boolti/data/network/response/GiftPaymentInfoResponse.kt

@@ -53,12 +53,21 @@ internal data class GiftPaymentInfoResponse(
             reservationState = reservationStatus.toReservationState(),
             completedDateTime = null,
             visitorName = recipientName,
-            visitorPhoneNumber = recipientPhoneNumber,
+            visitorPhoneNumber = recipientPhoneNumber.toDashedPhoneNumber(),
             depositorName = senderName,
-            depositorPhoneNumber = senderPhoneNumber,
+            depositorPhoneNumber = senderPhoneNumber.toDashedPhoneNumber(),
             csReservationId = csReservationId,
             cardDetail = cardDetail?.toDomain(),
             provider = easyPayDetail?.provider ?: ""
         )
     }
+
+    private fun String.toDashedPhoneNumber(): String {
+        if (!isPurePhoneNumber) return this
+
+        return slice(0..2) + "-" + slice(3..6) + "-" + slice(7..10)
+    }
+
+    private val String.isPurePhoneNumber
+        get() = "^\\d{11}$".toRegex().matches(this)
 }

presentation/src/main/java/com/nexters/boolti/presentation/reservationdetail/ReservationDetailScreen.kt

@@ -57,14 +57,12 @@ import com.nexters.boolti.presentation.screen.giftcomplete.GiftPolicy
 import com.nexters.boolti.presentation.screen.giftcomplete.sendMessage
 import com.nexters.boolti.presentation.theme.Grey10
 import com.nexters.boolti.presentation.theme.Grey15
-import com.nexters.boolti.presentation.theme.Grey20
 import com.nexters.boolti.presentation.theme.Grey30
 import com.nexters.boolti.presentation.theme.Grey50
 import com.nexters.boolti.presentation.theme.Grey80
 import com.nexters.boolti.presentation.theme.Grey90
 import com.nexters.boolti.presentation.theme.marginHorizontal
 import com.nexters.boolti.presentation.theme.point2
-import java.time.LocalDateTime
 
 @Composable
 fun ReservationDetailScreen(
@@ -124,7 +122,9 @@ fun ReservationDetailScreen(
             }
             Header(reservation = state.reservation)
             TicketHolderInfo(reservation = state.reservation)
-            if (state.reservation.totalAmountPrice > 0) DepositorInfo(reservation = state.reservation)
+            if (state.reservation.totalAmountPrice > 0 || state.reservation.isGift) {
+                DepositorInfo(reservation = state.reservation)
+            }
             TicketInfo(reservation = state.reservation)
             PaymentInfo(reservation = state.reservation)
             if (state.reservation.reservationState in listOf(
@@ -141,7 +141,7 @@ fun ReservationDetailScreen(
                         .padding(horizontal = marginHorizontal, vertical = 8.dp)
                         .fillMaxWidth(),
                     colors = MainButtonDefaults.buttonColors(
-                        containerColor = Grey20,
+                        containerColor = Grey15,
                         contentColor = Grey90,
                     ),
                     label = stringResource(id = R.string.refund_button),
@@ -323,7 +323,7 @@ private fun TicketHolderInfo(
                 key = stringResource(id = R.string.contact_label),
                 value = reservation.visitorPhoneNumber
             )
-            if (isGift) {
+            if (isGift && reservation.reservationState != ReservationState.CANCELED) {
                 val month = reservation.salesEndDateTime.month.value
                 val day = reservation.salesEndDateTime.dayOfMonth
                 val dateText = stringResource(id = R.string.gift_expiration_date, month, day)

presentation/src/main/java/com/nexters/boolti/presentation/screen/Main.kt

@@ -189,6 +189,7 @@ fun MainNavigation(modifier: Modifier, onClickQrScan: (showId: String, showName:
             navigateToHome = navController::navigateToHome,
         )
         addGiftCompleteScreen(
+            navigateTo = navController::navigateTo,
             navigateToHome = navController::navigateToHome,
             popBackStack = { navController.popBackStack(MainDestination.Gift.route, true)}
         )

presentation/src/main/java/com/nexters/boolti/presentation/screen/MainDestination.kt

@@ -40,15 +40,14 @@ sealed class MainDestination(val route: String) {
         )
     }
 
-    data object GiftComplete : MainDestination(route = "giftComplete?reservationId={reservationId}&giftUuid={giftUuid}") {
+    data object GiftComplete : MainDestination(route = "giftComplete?giftId={giftId}") {
         val arguments = listOf(
-            navArgument(reservationId) { type = NavType.StringType },
+            navArgument("giftId") { type = NavType.StringType },
         )
 
         fun createRoute(
-            reservationId: String,
-            giftUuid: String,
-        ): String = "giftComplete?reservationId=$reservationId&giftUuid=$giftUuid"
+            giftId: String
+        ): String = "giftComplete?giftId=${giftId}"
     }
 
     data object TicketDetail : MainDestination(route = "tickets") {

presentation/src/main/java/com/nexters/boolti/presentation/screen/gift/CardSelection.kt

@@ -66,7 +66,8 @@ fun CardSelection(
                     color = Color(0xFFFFA883),
                     shape = RoundedCornerShape(8.dp)
                 )
-                .padding(horizontal = 20.dp, vertical = 32.dp)
+                .padding(top = 32.dp)
+                .padding(horizontal = 20.dp)
                 .fillMaxWidth(),
             horizontalAlignment = Alignment.CenterHorizontally,
         ) {
@@ -97,7 +98,6 @@ fun CardSelection(
                 modifier = Modifier
                     .padding(top = 28.dp)
                     .fillMaxWidth()
-                    .aspectRatio(3 / 2f)
                     .background(Color.White),
                 contentScale = ContentScale.Crop,
             )

presentation/src/main/java/com/nexters/boolti/presentation/screen/gift/GiftEvent.kt

@@ -1,7 +1,7 @@
 package com.nexters.boolti.presentation.screen.gift
 
 sealed interface GiftEvent {
-    data class GiftSuccess(val reservationId: String, val giftUuid: String) : GiftEvent
+    data class GiftSuccess(val giftId: String) : GiftEvent
     data class ProgressPayment(val userId: String, val orderId: String) : GiftEvent
     data object NoRemainingQuantity : GiftEvent
 }

presentation/src/main/java/com/nexters/boolti/presentation/screen/gift/GiftNavigation.kt

@@ -18,8 +18,8 @@ fun NavGraphBuilder.addGiftScreen(
             modifier = modifier,
             popBackStack = popBackStack,
             navigateToBusiness = { navigateTo(MainDestination.Business.route) },
-            navigateToComplete = { reservationId, giftUuid ->
-                navigateTo(MainDestination.GiftComplete.createRoute(reservationId, giftUuid))
+            navigateToComplete = { giftId ->
+                navigateTo(MainDestination.GiftComplete.createRoute(giftId))
             }
         )
     }

presentation/src/main/java/com/nexters/boolti/presentation/screen/gift/GiftScreen.kt

@@ -62,7 +62,7 @@ import com.nexters.boolti.tosspayments.TossPaymentWidgetActivity.Companion.RESUL
 fun GiftScreen(
     popBackStack: () -> Unit,
     navigateToBusiness: () -> Unit,
-    navigateToComplete: (reservationId: String, giftUuid: String) -> Unit,
+    navigateToComplete: (giftId: String) -> Unit,
     modifier: Modifier = Modifier,
     viewModel: GiftViewModel = hiltViewModel(),
 ) {
@@ -78,13 +78,10 @@ fun GiftScreen(
             when (result.resultCode) {
                 RESULT_SUCCESS -> {
                     val intent = result.data ?: return@rememberLauncherForActivityResult
-                    val reservationId =
-                        intent.getStringExtra("reservationId")
-                            ?: return@rememberLauncherForActivityResult
-                    val giftUuid = intent.getStringExtra("giftUuid")
+                    val giftId = intent.getStringExtra("giftId")
                         ?: return@rememberLauncherForActivityResult
 
-                    navigateToComplete(reservationId, giftUuid)
+                    navigateToComplete(giftId)
                 }
 
                 RESULT_SOLD_OUT -> showTicketSoldOutDialog = true
@@ -97,7 +94,7 @@ fun GiftScreen(
             .collect { event ->
                 when (event) {
                     is GiftEvent.GiftSuccess -> {
-                        navigateToComplete(event.reservationId, event.giftUuid)
+                        navigateToComplete(event.giftId)
                     }
 
                     is GiftEvent.ProgressPayment -> {

presentation/src/main/java/com/nexters/boolti/presentation/screen/gift/GiftViewModel.kt

@@ -138,12 +138,7 @@ class GiftViewModel @Inject constructor(
             )
                 .onStart { _uiState.update { it.copy(loading = true) } }
                 .onEach { giftPayment ->
-                    sendEvent(
-                        GiftEvent.GiftSuccess(
-                            reservationId = giftPayment.reservationId,
-                            giftUuid = giftPayment.giftUuid
-                        )
-                    )
+                    sendEvent(GiftEvent.GiftSuccess(giftId = giftPayment.giftId))
                 }
                 .onCompletion { _uiState.update { it.copy(loading = false) } }
                 .launchIn(viewModelScope + recordExceptionHandler)

presentation/src/main/java/com/nexters/boolti/presentation/screen/giftcomplete/GiftCompleteNavigation.kt

@@ -5,12 +5,24 @@ import androidx.navigation.compose.composable
 import com.nexters.boolti.presentation.screen.MainDestination
 
 fun NavGraphBuilder.addGiftCompleteScreen(
+    navigateTo: (String) -> Unit,
     navigateToHome: () -> Unit,
     popBackStack: () -> Unit,
 ) {
     composable(
         route = MainDestination.GiftComplete.route,
     ) {
-        GiftCompleteScreen(onClickClose = popBackStack, onClickHome = navigateToHome)
+        GiftCompleteScreen(
+            onClickClose = popBackStack,
+            onClickHome = navigateToHome,
+            navigateToReservation = { reservation ->
+                navigateTo(
+                    MainDestination.ReservationDetail.createRoute(
+                        id = reservation.id,
+                        isGift = true,
+                    )
+                )
+            },
+        )
     }
 }