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.

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

Refactor/253 Navigation 2.8.x Safe Args 적용 #313

Merged
merged 43 commits into from
Jan 1, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
48550d8
refactor : home navigation safe args 적용
HamBP Oct 17, 2024
75e78f5
refactor : innerPadding 적용 위치 변경
HamBP Oct 17, 2024
289f2bb
refactor : composable 추가하는 코드 각 파일로 추출하기
HamBP Oct 17, 2024
4c2c3a8
refactor : HomeScreen에서 사용하는 변수, 파라미터 이름 변경
HamBP Oct 17, 2024
b3174f6
add : main route 정의
HamBP Oct 20, 2024
c6b101d
refactor : current destination 정보를 통해 리팩토링
HamBP Oct 22, 2024
299d5f3
refactor : modifier 적용 위치 변경
HamBP Oct 24, 2024
3e3c081
refactor : 내비게이션 컴포저블 함수 명 카멜케이스로 변경
HamBP Oct 24, 2024
79027e8
refactor : 내비게이션 컴포저블 함수 명 카멜케이스로 변경 (Home)
HamBP Oct 24, 2024
6a16ac7
refactor : NavConroller를 파라미터로 전달 - Main 화면 refactoring 사전 작업
HamBP Oct 24, 2024
5999aaa
refactor : Home 화면 route 변경
HamBP Oct 24, 2024
6f29b6f
refactor : Login 화면 route 변경
HamBP Oct 24, 2024
52d0c28
refactor : sign out 화면 route 변경
HamBP Oct 24, 2024
f446939
refactor : reservations 화면 route 변경
HamBP Oct 24, 2024
2a06282
refactor : reservationDetail 화면 route 변경
HamBP Oct 24, 2024
0c37eb4
refactor : refund 화면 route 변경
HamBP Oct 24, 2024
16bb38b
refactor : ShowDetail 화면 route 변경
HamBP Oct 24, 2024
b506e80
refactor : Ticketing 화면 route 변경
HamBP Oct 24, 2024
b4ba3d3
refactor : Gift 화면 route 변경
HamBP Oct 24, 2024
2abe195
refactor : Business 화면 route 변경
HamBP Oct 24, 2024
a7146ff
refactor : settings 화면 route 변경
HamBP Oct 24, 2024
24f3adf
refactor : Profile 화면 route 변경
HamBP Oct 24, 2024
66b9e83
refactor : GiftComplete 화면 route 변경
HamBP Oct 24, 2024
f193967
refactor : HostedShow 화면 route 변경
HamBP Oct 24, 2024
5667e9e
refactor : PaymentComplete 화면 route 변경
HamBP Oct 24, 2024
66053a0
fix : Hosted Show 화면 누락된 것 수정
HamBP Oct 24, 2024
1abd04a
refactor : 안 쓰는 변수 제거
HamBP Oct 24, 2024
dabc189
refactor : navController를 직접 넘겨 파라미터 간소화
HamBP Oct 24, 2024
a3230e9
fix : firebase 로깅 변경
HamBP Oct 24, 2024
2c3bcb6
fix : 누락된 변경 수정
HamBP Oct 24, 2024
b7ff7c7
fix : Login Screen 화면 레이아웃 수정
HamBP Oct 24, 2024
b7da551
fix : 선물 완료 후 뒤로 가기 시 발생하는 에러 해결
HamBP Oct 26, 2024
bd1d873
Merge branch 'refs/heads/develop' into refactor/253
mangbaam Dec 31, 2024
567416d
refactor/253 develop 머지 충돌 해결
mangbaam Dec 31, 2024
4f9ecb9
refactor/253 qr 이동 마이그레이션
mangbaam Dec 31, 2024
56310b6
refactor/253 참여한 공연 마이그레이션
mangbaam Dec 31, 2024
83885db
refactor/253 링크 목록 마이그레이션 및 toRoute 로 대체
mangbaam Dec 31, 2024
4c3f9fc
refactor/253 SNS 편집 마이그레이션 및 크래시 해결
mangbaam Dec 31, 2024
a2af5c8
refactor/253 링크 편집 마이그레이션
mangbaam Dec 31, 2024
6c160ca
refactor/253 localProvider 로 NavController 제공하도록 변경
mangbaam Dec 31, 2024
11a3224
refactor/253 티켓 관련 화면 마이그레이션
mangbaam Dec 31, 2024
eb2e04c
refactor/253 공연 관련 화면 마이그레이션
mangbaam Dec 31, 2024
a5c5217
refactor/253 todo 추가
mangbaam Dec 31, 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
3 changes: 3 additions & 0 deletions domain/src/main/java/com/nexters/boolti/domain/model/Sns.kt
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
package com.nexters.boolti.domain.model

import kotlinx.serialization.Serializable

data class Sns(
val id: String,
val type: SnsType,
val username: String,
) {
@Serializable
enum class SnsType {
INSTAGRAM, YOUTUBE;

Expand Down
2 changes: 2 additions & 0 deletions presentation/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.hilt)
alias(libs.plugins.kotlin.serialization)
id("kotlin-kapt")
id("kotlin-parcelize")
}
Expand Down Expand Up @@ -78,6 +79,7 @@ dependencies {

implementation(libs.hilt.android)
implementation(libs.androidx.hilt.navigation.compose)
implementation(libs.kotlinx.serialization.json)
implementation(libs.androidx.material3.android)
implementation(libs.zoomable)
kapt(libs.hilt.compiler)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.nexters.boolti.presentation.extension

import androidx.navigation.NavController
import com.nexters.boolti.presentation.screen.MainDestination
import com.nexters.boolti.presentation.screen.navigation.MainRoute

fun NavController.navigateToHome() {
popBackStack(graph.startDestinationId, true)
try {
navigate(MainDestination.Home.route)
navigate(MainRoute.Home)
} catch (e: IllegalArgumentException) {
navigate(graph.startDestinationId)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,16 @@ package com.nexters.boolti.presentation.reservationdetail

import androidx.navigation.NavGraphBuilder
import androidx.navigation.compose.composable
import com.nexters.boolti.presentation.screen.MainDestination
import com.nexters.boolti.presentation.screen.LocalNavController
import com.nexters.boolti.presentation.screen.navigation.MainRoute

fun NavGraphBuilder.ReservationDetailScreen(
navigateTo: (String) -> Unit,
popBackStack: () -> Unit,
) {
composable(
route = MainDestination.ReservationDetail.route,
arguments = MainDestination.ReservationDetail.arguments,
) {
fun NavGraphBuilder.reservationDetailScreen() {
composable<MainRoute.ReservationDetail> {
val navController = LocalNavController.current
ReservationDetailScreen(
onBackPressed = popBackStack,
onBackPressed = navController::popBackStack,
navigateToRefund = { id, isGift ->
navigateTo(MainDestination.Refund.createRoute(id = id, isGift = isGift))
navController.navigate(MainRoute.Refund(reservationId = id, isGift = isGift))
},
)
}
Expand Down
Loading
Loading