Skip to content

Commit 6e8871e

Browse files
authored
Merge branch 'develop' into chore/NDGL-16
2 parents 6839670 + b5ee9d5 commit 6e8871e

4 files changed

Lines changed: 5 additions & 3 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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ private fun TravelScreen(
5959
}
6060
}
6161

62+
6263
@Preview(showBackground = true)
6364
@Composable
6465
private fun TravelScreenPreview() {

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

Lines changed: 2 additions & 2 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
}
2323
}

0 commit comments

Comments
 (0)