Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/283 티켓 보기 버튼 구현 #284

Merged
merged 2 commits into from
Aug 12, 2024
Merged

Feature/283 티켓 보기 버튼 구현 #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ffc315
feat : 티켓 상세 딥 링크 설정
HamBP Aug 12, 2024
35a6785
feat : 티켓 보기 버튼 구현
HamBP Aug 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions presentation/src/main/java/com/nexters/boolti/presentation/screen/Main.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,12 @@ fun MainNavigation(modifier: Modifier, onClickQrScan: (showId: String, showName:

navigation(
route = "${MainDestination.TicketDetail.route}/{$ticketId}",
deepLinks = listOf(
navDeepLink {
uriPattern = "https://app.boolti.in/tickets/{ticketId}"
action = Intent.ACTION_VIEW
}
),
startDestination = "detail",
arguments = MainDestination.TicketDetail.arguments,
) {
Expand Down Expand Up @@ -179,6 +185,7 @@ fun MainNavigation(modifier: Modifier, onClickQrScan: (showId: String, showName:

PaymentCompleteScreen(
navigateTo = navController::navigateTo,
navigateByDeepLink = navController::navigate,
popBackStack = navController::popBackStack,
popInclusiveBackStack = { route ->
navController.popBackStack(
Expand Down
5 changes: 3 additions & 2 deletions ...ion/src/main/java/com/nexters/boolti/presentation/screen/payment/PaymentCompleteScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import com.nexters.boolti.domain.model.ReservationState
import com.nexters.boolti.presentation.R
import com.nexters.boolti.presentation.component.BtAppBar
import com.nexters.boolti.presentation.component.BtAppBarDefaults
import com.nexters.boolti.presentation.component.MainButton
import com.nexters.boolti.presentation.component.SecondaryButton
import com.nexters.boolti.presentation.extension.cardCodeToCompanyName
import com.nexters.boolti.presentation.theme.BooltiTheme
Expand Down Expand Up @@ -169,12 +170,12 @@ private fun PaymentCompleteScreen(
) {
navigateToReservation(reservation)
}
/*MainButton(
MainButton(
modifier = Modifier.weight(1f),
label = stringResource(R.string.show_ticket),
) {
navigateToTicketDetail(reservation)
}*/
}
}
}
}
Expand Down
7 changes: 6 additions & 1 deletion ...ntation/src/main/java/com/nexters/boolti/presentation/screen/payment/PaymentNavigation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.nexters.boolti.presentation.screen.payment

import android.net.Uri
import androidx.core.net.toUri
import androidx.navigation.NavGraphBuilder
import androidx.navigation.compose.composable
import com.nexters.boolti.presentation.screen.MainDestination
Expand All @@ -8,6 +10,7 @@ import com.nexters.boolti.presentation.screen.showId

fun NavGraphBuilder.PaymentCompleteScreen(
navigateTo: (String) -> Unit,
navigateByDeepLink: (Uri) -> Unit,
popBackStack: () -> Unit,
popInclusiveBackStack: (String) -> Unit,
navigateToHome: () -> Unit,
Expand All @@ -28,7 +31,9 @@ fun NavGraphBuilder.PaymentCompleteScreen(
navigateToReservation = { reservation ->
navigateTo(MainDestination.ReservationDetail.createRoute(id = reservation.id))
},
navigateToTicketDetail = { reservation -> navigateTo("${MainDestination.TicketDetail.route}/${reservation.id}") },
navigateToTicketDetail = { reservation ->
navigateByDeepLink("https://app.boolti.in/tickets/${reservation.id}".toUri())
},
)
}
}
Loading