Skip to content

Commit b827757

Browse files
authored
Merge pull request #43 from YAPP-Github/NDGL-127
각종 오류 해결 및 리팩토링
2 parents 242f5ab + 5129dbe commit b827757

File tree

32 files changed

+132
-130
lines changed

32 files changed

+132
-130
lines changed

feature/auth/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

feature/auth/build.gradle.kts

Lines changed: 0 additions & 11 deletions
This file was deleted.

feature/auth/consumer-rules.pro

Whitespace-only changes.

feature/auth/src/main/AndroidManifest.xml

Lines changed: 0 additions & 4 deletions
This file was deleted.

feature/auth/src/main/java/com/yapp/ndgl/feature/auth/AuthScreen.kt

Lines changed: 0 additions & 37 deletions
This file was deleted.

feature/auth/src/main/java/com/yapp/ndgl/feature/auth/AuthViewModel.kt

Lines changed: 0 additions & 8 deletions
This file was deleted.

feature/home/src/main/java/com/yapp/ndgl/feature/home/main/HomeContract.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ sealed interface HomeIntent : UiIntent {
7474
data class ClickTravel(val travelId: Long, val days: Int) : HomeIntent
7575
data object ClickTravelMore : HomeIntent
7676
data class ClickMyTravel(val travelId: Long, val days: Int) : HomeIntent
77-
data class ClickMyTravelPlace(val placeId: String) : HomeIntent
77+
data class ClickMyTravelPlace(val googlePlaceId: String) : HomeIntent
7878
}
7979

8080
sealed interface HomeSideEffect : UiSideEffect {
@@ -83,5 +83,5 @@ sealed interface HomeSideEffect : UiSideEffect {
8383
data class NavigateToFollowTravel(val travelId: Long, val days: Int) : HomeSideEffect
8484
data object NavigateToTravelMore : HomeSideEffect
8585
data class NavigateToTravelDetail(val travelId: Long, val days: Int) : HomeSideEffect
86-
data class NavigateToPlaceDetail(val placeId: String) : HomeSideEffect
86+
data class NavigateToPlaceDetail(val googlePlaceId: String) : HomeSideEffect
8787
}

feature/home/src/main/java/com/yapp/ndgl/feature/home/main/HomeScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ internal fun HomeRoute(
7777
sideEffect.days,
7878
)
7979

80-
is HomeSideEffect.NavigateToPlaceDetail -> navigateToPlaceDetail(sideEffect.placeId)
80+
is HomeSideEffect.NavigateToPlaceDetail -> navigateToPlaceDetail(sideEffect.googlePlaceId)
8181
}
8282
}
8383
}

feature/home/src/main/java/com/yapp/ndgl/feature/home/main/HomeViewModel.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ class HomeViewModel @Inject constructor(
204204
is HomeIntent.ClickTravel -> postNavigateToTravelTemplate(travelId = intent.travelId, days = intent.days)
205205
HomeIntent.ClickTravelMore -> postNavigateToTravelMore()
206206
is HomeIntent.ClickMyTravel -> postNavigateToTravelDetail(travelId = intent.travelId, days = intent.days)
207-
is HomeIntent.ClickMyTravelPlace -> postNavigateToPlaceDetail(placeId = intent.placeId)
207+
is HomeIntent.ClickMyTravelPlace -> postNavigateToPlaceDetail(googlePlaceId = intent.googlePlaceId)
208208
}
209209
}
210210

@@ -228,8 +228,8 @@ class HomeViewModel @Inject constructor(
228228
postSideEffect(HomeSideEffect.NavigateToTravelDetail(travelId = travelId, days = days))
229229
}
230230

231-
private fun postNavigateToPlaceDetail(placeId: String) {
232-
postSideEffect(HomeSideEffect.NavigateToPlaceDetail(placeId))
231+
private fun postNavigateToPlaceDetail(googlePlaceId: String) {
232+
postSideEffect(HomeSideEffect.NavigateToPlaceDetail(googlePlaceId))
233233
}
234234

235235
companion object {

feature/home/src/main/java/com/yapp/ndgl/feature/home/navigation/HomeEntry.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ fun EntryProviderScope<NavKey>.homeEntry(
2929
navigateToTravelDetail = { travelId, days ->
3030
navigator.navigate(Route.TravelDetail(travelId = travelId, days = days))
3131
},
32-
navigateToPlaceDetail = { placeId ->
33-
navigator.navigate(Route.PlaceDetail(googlePlaceId = placeId))
32+
navigateToPlaceDetail = { googlePlaceId ->
33+
navigator.navigate(Route.PlaceDetail(googlePlaceId = googlePlaceId))
3434
},
3535
)
3636
}

0 commit comments

Comments
 (0)