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
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ fun WatchersViewPreview() = Preview {
override fun onBackClick() = Unit
override fun onBaseClick(watcher: Watcher) = Unit
override fun onTargetClick(watcher: Watcher) = Unit
override fun onBaseChanged(watcher: Watcher, newBase: String) = Unit
override fun onSourceChanged(watcher: Watcher, newBase: String) = Unit
override fun onTargetChanged(watcher: Watcher, newTarget: String) = Unit
override fun onAddClick() = Unit
override fun onDeleteClick(watcher: Watcher) = Unit
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ interface WatchersEvent : BaseEvent {
fun onBackClick()
fun onBaseClick(watcher: Watcher)
fun onTargetClick(watcher: Watcher)
fun onBaseChanged(watcher: Watcher, newBase: String)
fun onSourceChanged(watcher: Watcher, newBase: String)
fun onTargetChanged(watcher: Watcher, newTarget: String)
fun onAddClick()
fun onDeleteClick(watcher: Watcher)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ class WatchersViewModel(
sendEffect { WatchersEffect.SelectTarget(watcher) }
}

override fun onBaseChanged(watcher: Watcher, newBase: String) {
Logger.d { "WatcherViewModel onBaseChanged $watcher $newBase" }
override fun onSourceChanged(watcher: Watcher, newBase: String) {
Logger.d { "WatcherViewModel onSourceChanged $watcher $newBase" }
viewModelScope.launch {
watcherDataSource.updateWatcherBaseById(newBase, watcher.id)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,9 @@ internal class WatchersViewModelTest {
}

@Test
fun onBaseChanged() {
fun onSourceChanged() {
val mockBase = "mock"
viewModel.event.onBaseChanged(watcher, mockBase)
viewModel.event.onSourceChanged(watcher, mockBase)

runTest {
verifySuspend { watcherDataSource.updateWatcherBaseById(mockBase, watcher.id) }
Expand Down
12 changes: 6 additions & 6 deletions ios/CCC/UI/Watchers/WatchersRootView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ struct WatchersRootView: View {
WatchersViewModel
>()
@StateObject var notificationManager = NotificationManager()
@State var baseBarInfo = BarInfo(isShown: false, watcher: nil)
@State var sourceBarInfo = BarInfo(isShown: false, watcher: nil)
@State var targetBarInfo = BarInfo(isShown: false, watcher: nil)
@State var isInvalidInputSnackShown = false
@State var isMaxWatchersSnackShown = false
Expand All @@ -34,7 +34,7 @@ struct WatchersRootView: View {
event: observable.event,
state: observable.state,
authorizationStatus: notificationManager.authorizationStatus,
baseBarInfo: $baseBarInfo,
sourceBarInfo: $sourceBarInfo,
targetBarInfo: $targetBarInfo
)
.snack(isPresented: $isInvalidInputSnackShown) {
Expand All @@ -47,8 +47,8 @@ struct WatchersRootView: View {
SnackView(text: String(\.text_too_big_input))
}
.sheet(
isPresented: $baseBarInfo.isShown,
content: { SelectCurrencyRootView(isBarShown: $baseBarInfo.isShown).environmentObject(navigationStack) }
isPresented: $sourceBarInfo.isShown,
content: { SelectCurrencyRootView(isBarShown: $sourceBarInfo.isShown).environmentObject(navigationStack) }
)
.sheet(
isPresented: $targetBarInfo.isShown,
Expand Down Expand Up @@ -78,8 +78,8 @@ struct WatchersRootView: View {
case is WatchersEffect.Back:
navigationStack.pop()
case let selectBaseEffect as WatchersEffect.SelectBase:
baseBarInfo.watcher = selectBaseEffect.watcher
baseBarInfo.isShown.toggle()
sourceBarInfo.watcher = selectBaseEffect.watcher
sourceBarInfo.isShown.toggle()
case let selectTargetEffect as WatchersEffect.SelectTarget:
targetBarInfo.watcher = selectTargetEffect.watcher
targetBarInfo.isShown.toggle()
Expand Down
4 changes: 2 additions & 2 deletions ios/CCC/UI/Watchers/WatchersView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ struct WatchersView: View {
var state: WatchersState
var authorizationStatus: UNAuthorizationStatus?

@Binding var baseBarInfo: WatchersRootView.BarInfo
@Binding var sourceBarInfo: WatchersRootView.BarInfo
@Binding var targetBarInfo: WatchersRootView.BarInfo

var body: some View {
Expand All @@ -33,7 +33,7 @@ struct WatchersView: View {
Form {
List(state.watcherList, id: \.id) { watcher in
WatcherItem(
isBaseBarShown: $baseBarInfo.isShown,
isBaseBarShown: $sourceBarInfo.isShown,
isTargetBarShown: $targetBarInfo.isShown,
watcher: watcher,
event: event
Expand Down