Boolti-235 feat: 티켓 상세에 N매 티켓 반영

todo: 기존 티켓 정보 영역 제거 todo: 사용됐거나 공연 종료된 QR 블러처리
Nexters · Jun 16, 2024 · 84e3117 · 84e3117
1 parent 4319abc
commit 84e3117
Show file tree

Hide file tree

Showing 8 changed files with 215 additions and 84 deletions.
diff --git a/domain/src/main/java/com/nexters/boolti/domain/model/Ticket.kt b/domain/src/main/java/com/nexters/boolti/domain/model/Ticket.kt
@@ -15,30 +15,30 @@ data class Ticket(
 )
 
 data class TicketGroup(
-    val userId: String,
-    val showId: String,
-    val reservationId: String,
-    val showName: String,
-    val placeName: String,
-    val streetAddress: String,
-    val detailAddress: String,
-    val showDate: LocalDateTime,
-    val notice: String,
-    val ticketNotice: String,
-    val poster: String,
-    val ticketType: TicketType,
-    val ticketName: String,
-    val hostName: String,
-    val hostPhoneNumber: String,
-    val tickets: List<Ticket>,
+    val userId: String = "",
+    val showId: String = "",
+    val reservationId: String = "",
+    val showName: String = "",
+    val placeName: String = "",
+    val streetAddress: String = "",
+    val detailAddress: String = "",
+    val showDate: LocalDateTime = LocalDateTime.MIN,
+    val notice: String = "",
+    val ticketNotice: String = "",
+    val poster: String = "",
+    val ticketType: TicketType = TicketType.Unknown,
+    val ticketName: String = "",
+    val hostName: String = "",
+    val hostPhoneNumber: String = "",
+    val tickets: List<Ticket> = emptyList(),
 ) {
     data class Ticket(
-        val ticketId: String,
-        val entryCode: String,
-        val usedAt: LocalDateTime?,
-        val ticketCreatedAt: LocalDateTime,
-        val csTicketId: String,
-        val showDate: LocalDateTime,
+        val ticketId: String = "",
+        val entryCode: String = "",
+        val usedAt: LocalDateTime? = null,
+        val ticketCreatedAt: LocalDateTime = LocalDateTime.MIN,
+        val csTicketId: String = "",
+        val showDate: LocalDateTime = LocalDateTime.MIN,
     ) {
         val ticketState: TicketState
             get() = run {

diff --git a/presentation/src/main/java/com/nexters/boolti/presentation/screen/home/HomeNavigation.kt b/presentation/src/main/java/com/nexters/boolti/presentation/screen/home/HomeNavigation.kt
@@ -16,11 +16,6 @@ fun NavGraphBuilder.HomeScreen(
             modifier = modifier,
             onClickShowItem = { navigateTo("${MainDestination.ShowDetail.route}/$it") },
             onClickTicket = { navigateTo("${MainDestination.TicketDetail.route}/$it") },
-            onClickQr = { code, ticketName ->
-                navigateTo(
-                    "${MainDestination.Qr.route}/${code.filter { c -> c.isLetterOrDigit() }}?ticketName=$ticketName"
-                )
-            },
             onClickQrScan = { navigateTo(MainDestination.HostedShows.route) },
             onClickSignout = { navigateTo(MainDestination.SignOut.route) },
             navigateToReservations = { navigateTo(MainDestination.Reservations.route) },

diff --git a/presentation/src/main/java/com/nexters/boolti/presentation/screen/home/HomeScreen.kt b/presentation/src/main/java/com/nexters/boolti/presentation/screen/home/HomeScreen.kt
@@ -7,7 +7,7 @@ import androidx.annotation.StringRes
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.Divider
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.NavigationBar
@@ -40,13 +40,11 @@ import com.nexters.boolti.presentation.screen.ticket.TicketScreen
 import com.nexters.boolti.presentation.theme.Grey10
 import com.nexters.boolti.presentation.theme.Grey50
 import com.nexters.boolti.presentation.theme.Grey85
-import kotlinx.coroutines.channels.consumeEach
 
 @Composable
 fun HomeScreen(
     onClickShowItem: (showId: String) -> Unit,
     onClickTicket: (ticketId: String) -> Unit,
-    onClickQr: (data: String, ticketName: String) -> Unit,
     onClickQrScan: () -> Unit,
     onClickSignout: () -> Unit,
     navigateToReservations: () -> Unit,
@@ -108,7 +106,6 @@ fun HomeScreen(
                 when (loggedIn) {
                     true -> TicketScreen(
                         onClickTicket = onClickTicket,
-                        onClickQr = onClickQr,
                         modifier = modifier.padding(innerPadding),
                     )
 
@@ -153,7 +150,7 @@ private fun HomeNavigationBar(
     modifier: Modifier = Modifier,
 ) {
     Column {
-        Divider(
+        HorizontalDivider(
             modifier = Modifier.fillMaxWidth(),
             thickness = 1.dp,
             color = Grey85,

diff --git a/presentation/src/main/java/com/nexters/boolti/presentation/screen/ticket/TicketScreen.kt b/presentation/src/main/java/com/nexters/boolti/presentation/screen/ticket/TicketScreen.kt
@@ -30,7 +30,6 @@ import kotlin.math.absoluteValue
 @Composable
 fun TicketScreen(
     onClickTicket: (String) -> Unit,
-    onClickQr: (entryCode: String, ticketName: String) -> Unit,
     modifier: Modifier = Modifier,
     viewModel: TicketViewModel = hiltViewModel(),
 ) {
@@ -49,7 +48,6 @@ fun TicketScreen(
         uiState.tickets.isNotEmpty() -> TicketNotEmptyScreen(
             modifier,
             uiState,
-            onClickQr,
             onClickTicket = onClickTicket
         )
 
@@ -62,7 +60,6 @@ fun TicketScreen(
 private fun TicketNotEmptyScreen(
     modifier: Modifier,
     uiState: TicketUiState,
-    onClickQr: (entryCode: String, ticketName: String) -> Unit,
     onClickTicket: (ticketId: String) -> Unit,
 ) {
     Column(