Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion feature/auth/.gitignore

This file was deleted.

11 changes: 0 additions & 11 deletions feature/auth/build.gradle.kts

This file was deleted.

Empty file removed feature/auth/consumer-rules.pro
Empty file.
4 changes: 0 additions & 4 deletions feature/auth/src/main/AndroidManifest.xml

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ sealed interface HomeIntent : UiIntent {
data class ClickTravel(val travelId: Long, val days: Int) : HomeIntent
data object ClickTravelMore : HomeIntent
data class ClickMyTravel(val travelId: Long, val days: Int) : HomeIntent
data class ClickMyTravelPlace(val placeId: String) : HomeIntent
data class ClickMyTravelPlace(val googlePlaceId: String) : HomeIntent
}

sealed interface HomeSideEffect : UiSideEffect {
Expand All @@ -83,5 +83,5 @@ sealed interface HomeSideEffect : UiSideEffect {
data class NavigateToFollowTravel(val travelId: Long, val days: Int) : HomeSideEffect
data object NavigateToTravelMore : HomeSideEffect
data class NavigateToTravelDetail(val travelId: Long, val days: Int) : HomeSideEffect
data class NavigateToPlaceDetail(val placeId: String) : HomeSideEffect
data class NavigateToPlaceDetail(val googlePlaceId: String) : HomeSideEffect
}
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ internal fun HomeRoute(
sideEffect.days,
)

is HomeSideEffect.NavigateToPlaceDetail -> navigateToPlaceDetail(sideEffect.placeId)
is HomeSideEffect.NavigateToPlaceDetail -> navigateToPlaceDetail(sideEffect.googlePlaceId)
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ class HomeViewModel @Inject constructor(
is HomeIntent.ClickTravel -> postNavigateToTravelTemplate(travelId = intent.travelId, days = intent.days)
HomeIntent.ClickTravelMore -> postNavigateToTravelMore()
is HomeIntent.ClickMyTravel -> postNavigateToTravelDetail(travelId = intent.travelId, days = intent.days)
is HomeIntent.ClickMyTravelPlace -> postNavigateToPlaceDetail(placeId = intent.placeId)
is HomeIntent.ClickMyTravelPlace -> postNavigateToPlaceDetail(googlePlaceId = intent.googlePlaceId)
}
}

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

private fun postNavigateToPlaceDetail(placeId: String) {
postSideEffect(HomeSideEffect.NavigateToPlaceDetail(placeId))
private fun postNavigateToPlaceDetail(googlePlaceId: String) {
postSideEffect(HomeSideEffect.NavigateToPlaceDetail(googlePlaceId))
}

companion object {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ fun EntryProviderScope<NavKey>.homeEntry(
navigateToTravelDetail = { travelId, days ->
navigator.navigate(Route.TravelDetail(travelId = travelId, days = days))
},
navigateToPlaceDetail = { placeId ->
navigator.navigate(Route.PlaceDetail(googlePlaceId = placeId))
navigateToPlaceDetail = { googlePlaceId ->
navigator.navigate(Route.PlaceDetail(googlePlaceId = googlePlaceId))
},
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,7 @@ fun SplashRoute(
)

onDispose {
activity?.enableEdgeToEdge(
statusBarStyle = SystemBarStyle.auto(
android.graphics.Color.TRANSPARENT,
android.graphics.Color.TRANSPARENT,
),
navigationBarStyle = SystemBarStyle.auto(
android.graphics.Color.TRANSPARENT,
android.graphics.Color.TRANSPARENT,
),
)
activity?.enableEdgeToEdge()
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,12 @@ sealed interface TravelHelperIntent : UiIntent {
data object SwapCurrency : TravelHelperIntent
data class SelectCurrency(val currencyCode: String) : TravelHelperIntent
data class ClickTravelCard(val travelId: Long, val days: Int) : TravelHelperIntent
data class ClickPlace(val placeId: String) : TravelHelperIntent
data class ClickPlace(val googlePlaceId: String) : TravelHelperIntent
}

sealed interface TravelHelperSideEffect : UiSideEffect {
data object NavigateToSearch : TravelHelperSideEffect
data object ShowExchangeRateError : TravelHelperSideEffect
data class NavigateToTravelDetail(val travelId: Long, val days: Int) : TravelHelperSideEffect
data class NavigateToPlaceDetail(val placeId: String) : TravelHelperSideEffect
data class NavigateToPlaceDetail(val googlePlaceId: String) : TravelHelperSideEffect
}
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ internal fun TravelHelperRoute(
}
}

is TravelHelperSideEffect.NavigateToPlaceDetail -> navigateToPlaceDetail(sideEffect.placeId)
is TravelHelperSideEffect.NavigateToPlaceDetail -> navigateToPlaceDetail(sideEffect.googlePlaceId)
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ class TravelHelperViewModel @Inject constructor(
}

is TravelHelperIntent.ClickPlace -> {
postSideEffect(TravelHelperSideEffect.NavigateToPlaceDetail(intent.placeId))
postSideEffect(TravelHelperSideEffect.NavigateToPlaceDetail(intent.googlePlaceId))
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ fun EntryProviderScope<NavKey>.travelHelperEntry(navigator: Navigator) {
navigator.navigate(Route.TravelDetail(travelId, days))
},
navigateToPopularTravelList = { navigator.navigate(Route.PopularTravelList) },
navigateToPlaceDetail = { placeId -> navigator.navigate(Route.PlaceDetail(placeId)) },
navigateToPlaceDetail = { googlePlaceId -> navigator.navigate(Route.PlaceDetail(googlePlaceId)) },
)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,12 @@ sealed interface AddItineraryIntent : UiIntent {
data object ClickAddItinerary : AddItineraryIntent
data object ClickAddress : AddItineraryIntent
data object ClickMenu : AddItineraryIntent
data class BookMarkPlace(val placeId: String) : AddItineraryIntent
data class BookMarkPlace(val googlePlaceId: String) : AddItineraryIntent
data class ClickSelectablePlace(val googlePlaceId: String) : AddItineraryIntent
}

sealed interface AddItinerarySideEffect : UiSideEffect {
data object NavigateBack : AddItinerarySideEffect
data class NavigateToBrowser(val url: String) : AddItinerarySideEffect
data class NavigateToAddPlace(val placeId: String) : AddItinerarySideEffect
data class NavigateToAddPlace(val googlePlaceId: String) : AddItinerarySideEffect
}
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ internal fun AddItineraryRoute(
when (sideEffect) {
is AddItinerarySideEffect.NavigateBack -> navigateBack()
is AddItinerarySideEffect.NavigateToBrowser -> context.launchBrowser(sideEffect.url)
is AddItinerarySideEffect.NavigateToAddPlace -> navigateToAddPlace(sideEffect.placeId)
is AddItinerarySideEffect.NavigateToAddPlace -> navigateToAddPlace(sideEffect.googlePlaceId)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ class AddItineraryViewModel @AssistedInject constructor(
is AddItineraryIntent.ClickAddItinerary -> clickAddItinerary()
is AddItineraryIntent.ClickAddress -> clickAddress()
is AddItineraryIntent.ClickMenu -> clickMenu()
is AddItineraryIntent.BookMarkPlace -> bookmarkPlace(intent.placeId)
is AddItineraryIntent.BookMarkPlace -> bookmarkPlace(intent.googlePlaceId)
is AddItineraryIntent.ClickSelectablePlace -> clickSelectablePlace(intent.googlePlaceId)
}
}
Expand Down Expand Up @@ -217,11 +217,11 @@ class AddItineraryViewModel @AssistedInject constructor(
}
}

private fun loadPlaceDetail(placeId: String) = viewModelScope.launch {
private fun loadPlaceDetail(googlePlaceId: String) = viewModelScope.launch {
suspendRunCatching {
placeRepository.getPlace(placeId)
placeRepository.getPlace(googlePlaceId)
}.onSuccess { response ->
loadPlacePhotos(placeId)
loadPlacePhotos(googlePlaceId)
reduce {
val currentDetail = selectedPlaceDetail ?: SelectedPlaceDetail()
copy(
Expand All @@ -235,10 +235,10 @@ class AddItineraryViewModel @AssistedInject constructor(
}
}

private fun loadPlacePhotos(placeId: String) = viewModelScope.launch {
private fun loadPlacePhotos(googlePlaceId: String) = viewModelScope.launch {
repeat(3) {
delay(1000)
val result = suspendRunCatching { placeRepository.getPlacePhotos(placeId) }
val result = suspendRunCatching { placeRepository.getPlacePhotos(googlePlaceId) }
val photos = result.getOrNull()?.photos
if (!photos.isNullOrEmpty()) {
reduce {
Expand Down Expand Up @@ -346,15 +346,15 @@ class AddItineraryViewModel @AssistedInject constructor(
postSideEffect(AddItinerarySideEffect.NavigateToBrowser(url))
}

private fun bookmarkPlace(placeId: String) = viewModelScope.launch {
private fun bookmarkPlace(googlePlaceId: String) = viewModelScope.launch {
val currentPlaceDetail = state.value.selectedPlaceDetail
val isBookmarked = currentPlaceDetail?.placeInfo?.isBookMarked ?: false

suspendRunCatching {
if (isBookmarked) {
placeRepository.unBookmarkPlace(placeId)
placeRepository.unBookmarkPlace(googlePlaceId)
} else {
placeRepository.bookmarkPlace(placeId)
placeRepository.bookmarkPlace(googlePlaceId)
}
}.onSuccess {
currentPlaceDetail?.let { detail ->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import kotlinx.coroutines.launch

@HiltViewModel(assistedFactory = AddPlaceViewModel.Factory::class)
class AddPlaceViewModel @AssistedInject constructor(
@Assisted private val placeId: String,
@Assisted private val googlePlaceId: String,
private val placeRepository: PlaceRepository,
) : BaseViewModel<AddPlaceState, AddPlaceIntent, AddPlaceSideEffect>(
initialState = AddPlaceState(),
Expand All @@ -27,7 +27,7 @@ class AddPlaceViewModel @AssistedInject constructor(

private fun loadPlaceDetail() = viewModelScope.launch {
suspendRunCatching {
placeRepository.getPlace(placeId)
placeRepository.getPlace(googlePlaceId)
}.onSuccess { response ->
loadPlacePhotos()
reduce {
Expand All @@ -41,7 +41,7 @@ class AddPlaceViewModel @AssistedInject constructor(
private fun loadPlacePhotos() = viewModelScope.launch {
repeat(3) {
delay(1000)
val result = suspendRunCatching { placeRepository.getPlacePhotos(placeId) }
val result = suspendRunCatching { placeRepository.getPlacePhotos(googlePlaceId) }
val photos = result.getOrNull()?.photos

if (!photos.isNullOrEmpty()) {
Expand Down Expand Up @@ -91,6 +91,6 @@ class AddPlaceViewModel @AssistedInject constructor(

@AssistedFactory
interface Factory {
fun create(placeId: String): AddPlaceViewModel
fun create(googlePlaceId: String): AddPlaceViewModel
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ internal fun PlaceInfoTab(
onAddressClick: () -> Unit = {},
onMenuClick: () -> Unit = {},
onAlternativePlaceClick: (String) -> Unit = {},
onChangePlaceClick: (AlternativePlace) -> Unit = {},
onChangePlaceClick: ((AlternativePlace) -> Unit)? = null,
) {
Column(
modifier = Modifier.fillMaxSize(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ sealed interface FollowTravelIntent : UiIntent {

sealed interface FollowTravelSideEffect : UiSideEffect {
data class NavigateToFollowPlaceDetail(
val placeId: String,
val googlePlaceId: String,
val tipContent: TipContent?,
val alternativePlaces: List<AlternativePlace>?,
) :
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ internal fun FollowTravelRoute(
viewModel.collectSideEffect { sideEffect ->
when (sideEffect) {
is FollowTravelSideEffect.NavigateToFollowPlaceDetail ->
navigateToFollowPlaceDetail(sideEffect.placeId, sideEffect.tipContent, sideEffect.alternativePlaces)
navigateToFollowPlaceDetail(sideEffect.googlePlaceId, sideEffect.tipContent, sideEffect.alternativePlaces)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ class FollowTravelViewModel @AssistedInject constructor(
is FollowTravelIntent.ClickPlaceItem -> {
postSideEffect(
FollowTravelSideEffect.NavigateToFollowPlaceDetail(
placeId = intent.place.placeInfo.googlePlaceId,
googlePlaceId = intent.place.placeInfo.googlePlaceId,
tipContent = intent.place.placeInfo.tipContent?.let {
TipContent(creatorName = state.value.creatorName, tips = it.tips)
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ internal fun TravelMap(
places: List<TravelPlace>,
onScrollEnabledChange: (Boolean) -> Unit,
) {
require(places.isNotEmpty()) { "TravelMap requires at least one place" }

Comment thread
mj010504 marked this conversation as resolved.
val routePoints = remember(places) {
places.map { place ->
LatLng(place.placeInfo.latitude, place.placeInfo.longitude)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ data class MyTravelState(

@Immutable
data class TravelPlace(
val placeId: String,
val googlePlaceId: String,
val category: PlaceCategory,
val estimatedDuration: Int,
val name: String,
Expand Down Expand Up @@ -83,7 +83,7 @@ sealed interface MyTravelIntent : UiIntent {
data object ClickSettings : MyTravelIntent
data class ClickTravel(val travelId: Long, val days: Int) : MyTravelIntent
data class ClickTravelDetail(val travelId: Long, val days: Int) : MyTravelIntent
data class ClickPlaceDetail(val placeId: String) : MyTravelIntent
data class ClickPlaceDetail(val googlePlaceId: String) : MyTravelIntent
data object ClickFindNewTravel : MyTravelIntent
}

Expand All @@ -92,6 +92,6 @@ sealed interface MyTravelSideEffect : UiSideEffect {
data object NavigateToSettings : MyTravelSideEffect
data class NavigateToFollowTravel(val travelId: Long, val days: Int) : MyTravelSideEffect
data class NavigateToTravelDetail(val travelId: Long, val days: Int) : MyTravelSideEffect
data class NavigateToTravelPlace(val placeId: String) : MyTravelSideEffect
data class NavigateToTravelPlace(val googlePlaceId: String) : MyTravelSideEffect
data object NavigateToPopularTravelList : MyTravelSideEffect
}
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ internal fun MyTravelRoute(
onTravelClick = { travelId, days ->
viewModel.onIntent(MyTravelIntent.ClickTravelDetail(travelId = travelId, days = days))
},
onPlaceClick = { placeId ->
viewModel.onIntent(MyTravelIntent.ClickPlaceDetail(placeId = placeId))
onPlaceClick = { googlePlaceId ->
viewModel.onIntent(MyTravelIntent.ClickPlaceDetail(googlePlaceId = googlePlaceId))
},
onNewTravelFindClick = {
viewModel.onIntent(MyTravelIntent.ClickFindNewTravel)
Expand All @@ -73,7 +73,7 @@ internal fun MyTravelRoute(
)

is MyTravelSideEffect.NavigateToTravelPlace -> navigateToTravelPlace(
sideEffect.placeId,
sideEffect.googlePlaceId,
)

MyTravelSideEffect.NavigateToPopularTravelList -> navigateToPopularTravelList()
Expand Down
Loading
Loading