Skip to content

Commit ef7a0c6

Browse files
authored
Merge branch 'feature/NDGL-12' into chore/NDGL-16
2 parents a9b729a + ac2d9a9 commit ef7a0c6

6 files changed

Lines changed: 11 additions & 11 deletions

File tree

core/ui/src/main/java/com/yapp/ui/base/BaseContract.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ interface UiState
55
interface UiIntent
66

77
interface UiSideEffect
8+

core/ui/src/main/java/com/yapp/ui/base/BaseViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import kotlinx.coroutines.channels.Channel.Factory.BUFFERED
1717
import kotlinx.coroutines.flow.MutableStateFlow
1818
import kotlinx.coroutines.flow.asStateFlow
1919
import kotlinx.coroutines.flow.receiveAsFlow
20-
import kotlinx.coroutines.flow.update
2120
import kotlinx.coroutines.launch
21+
import kotlinx.coroutines.flow.update
2222
import kotlinx.coroutines.withContext
2323

2424
abstract class BaseViewModel<S : UiState, I : UiIntent, SE : UiSideEffect>(

feature/travel/src/main/java/com/yapp/ndgl/feature/travel/TravelScreen.kt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,16 @@ private fun TravelScreen(
4848
Text(text = state.displayText)
4949
}
5050
item {
51-
Button(
52-
onClick = {
53-
clickTravel(123)
54-
},
55-
) {
51+
Button(onClick = {
52+
clickTravel(123)
53+
}) {
5654
Text(text = "Go to Travel Detail")
5755
}
5856
}
5957
}
6058
}
6159

60+
6261
@Preview(showBackground = true)
6362
@Composable
6463
private fun TravelScreenPreview() {

feature/travel/src/main/java/com/yapp/ndgl/feature/travel/TravelViewModel.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ class TravelViewModel @Inject constructor() : BaseViewModel<TravelState, TravelI
1515
}
1616
}
1717
}
18-
18+
1919
private fun clickTravel(travelId: Int) {
20-
reduce { copy(displayText = "클릭된 id: $travelId") }
20+
reduce { copy(displayText = "클릭된 id: ${travelId}") }
2121
postSideEffect(TravelSideEffect.NavigateToDetail(travelId))
2222
}
23-
}
23+
}

feature/travel/src/main/java/com/yapp/ndgl/feature/travel/detail/TravelDetailScreen.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,4 @@ internal fun TravelDetailScreen(
4545
fun TravelDetailScreenPreview() {
4646
TravelDetailScreen(travelId = 45)
4747
}
48+

feature/travel/src/main/java/com/yapp/ndgl/feature/travel/navigation/TravelEntry.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ fun EntryProviderScope<NavKey>.travelEntry(navigator: Navigator) {
1414
TravelRoute(
1515
navigateToDetail = { travelId ->
1616
navigator.navigate(Route.TravelDetail(travelId))
17-
},
18-
)
17+
})
1918
}
2019
entry<Route.TravelDetail> { route ->
2120
val viewModel =

0 commit comments

Comments
 (0)