[Oztechan/CCC#3903] Move WatchersScreen to SelectCurrencyPurpose

android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/selectcurrency/SelectCurrencyAdapter.kt

@@ -34,7 +34,7 @@
             root.setOnClickListener {
                 selectCurrencyEvent.onItemClick(
                     item,
-                    SelectCurrencyPurpose.BASE
+                    SelectCurrencyPurpose.Base
                 )
             }
         }

client/viewmodel/selectcurrency/client-viewmodel-selectcurrency.gradle.kts

@@ -27,6 +27,7 @@ kotlin {
 
             Modules.Client.DataSource.apply {
                 implementation(project(currency))
+                implementation(project(watcher))
             }
             Modules.Client.Storage.apply {
                 implementation(project(calculation))

client/viewmodel/selectcurrency/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/selectcurrency/SelectCurrencyViewModel.kt

@@ -8,15 +8,18 @@
 import com.oztechan.ccc.client.core.viewmodel.BaseData
 import com.oztechan.ccc.client.core.viewmodel.SEEDViewModel
 import com.oztechan.ccc.client.datasource.currency.CurrencyDataSource
+import com.oztechan.ccc.client.datasource.watcher.WatcherDataSource
 import com.oztechan.ccc.client.storage.calculation.CalculationStorage
 import com.oztechan.ccc.client.viewmodel.selectcurrency.model.SelectCurrencyPurpose
 import com.oztechan.ccc.common.core.model.Currency
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
 
 class SelectCurrencyViewModel(
     private val calculationStorage: CalculationStorage,
     currencyDataSource: CurrencyDataSource,
+    private val watcherDataSource: WatcherDataSource
 ) : SEEDViewModel<SelectCurrencyState, SelectCurrencyEffect, SelectCurrencyEvent, BaseData>(
     initialState = SelectCurrencyState()
 ),
@@ -38,14 +41,20 @@
     // region Event
     override fun onItemClick(currency: Currency, purpose: SelectCurrencyPurpose) {
         Logger.d { "SelectCurrencyViewModel onItemClick ${currency.code} $purpose" }
-        when (purpose) {
-            SelectCurrencyPurpose.BASE -> {
-                calculationStorage.currentBase = currency.code
-                sendEffect { SelectCurrencyEffect.CurrencyChange(currency.code) }
-            }
+        viewModelScope.launch {
+            when (purpose) {
+                SelectCurrencyPurpose.Base -> calculationStorage.currentBase = currency.code
+                is SelectCurrencyPurpose.Source -> watcherDataSource.updateWatcherBaseById(
+                    currency.code,
+                    purpose.watcher.id
+                )
 
-            SelectCurrencyPurpose.SOURCE -> TODO()
-            SelectCurrencyPurpose.TARGET -> TODO()
+                is SelectCurrencyPurpose.Target -> watcherDataSource.updateWatcherTargetById(
+                    currency.code,
+                    purpose.watcher.id
+                )
+            }
+            sendEffect { SelectCurrencyEffect.CurrencyChange(currency.code) }
         }
     }
 

client/viewmodel/selectcurrency/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/selectcurrency/di/ClientViewModelSelectCurrencyModule.kt

@@ -5,5 +5,5 @@
 import org.koin.dsl.module
 
 val clientViewModelSelectCurrencyModule = module {
-    viewModelDefinition { SelectCurrencyViewModel(get(), get()) }
+    viewModelDefinition { SelectCurrencyViewModel(get(), get(), get()) }
 }

client/viewmodel/selectcurrency/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/selectcurrency/model/SelectCurrencyPurpose.kt

@@ -1,7 +1,9 @@
 package com.oztechan.ccc.client.viewmodel.selectcurrency.model
 
-enum class SelectCurrencyPurpose {
-    BASE,
-    SOURCE,
-    TARGET,
+import com.oztechan.ccc.common.core.model.Watcher
+
+sealed class SelectCurrencyPurpose {
+    data object Base : SelectCurrencyPurpose()
+    data class Source(val watcher: Watcher) : SelectCurrencyPurpose()
+    data class Target(val watcher: Watcher) : SelectCurrencyPurpose()
 }

client/viewmodel/selectcurrency/src/commonTest/kotlin/com/oztechan/ccc/client/viewmodel/selectcurrency/SelectCurrencyViewModelTest.kt

@@ -6,6 +6,7 @@ package com.oztechan.ccc.client.viewmodel.selectcurrency
 import co.touchlab.kermit.CommonWriter
 import co.touchlab.kermit.Logger
 import com.oztechan.ccc.client.datasource.currency.CurrencyDataSource
+import com.oztechan.ccc.client.datasource.watcher.WatcherDataSource
 import com.oztechan.ccc.client.storage.calculation.CalculationStorage
 import com.oztechan.ccc.client.viewmodel.selectcurrency.model.SelectCurrencyPurpose
 import dev.mokkery.MockMode
@@ -33,11 +34,12 @@ import com.oztechan.ccc.common.core.model.Currency as CurrencyCommon
 internal class SelectCurrencyViewModelTest {
 
     private val viewModel: SelectCurrencyViewModel by lazy {
-        SelectCurrencyViewModel(calculationStorage, currencyDataSource)
+        SelectCurrencyViewModel(calculationStorage, currencyDataSource, watcherDataSource)
     }
 
     private val currencyDataSource = mock<CurrencyDataSource>()
     private val calculationStorage = mock<CalculationStorage>(MockMode.autoUnit)
+    private val watcherDataSource = mock<WatcherDataSource>(MockMode.autoUnit)
 
     private val currencyDollar = CurrencyCommon("USD", "Dollar", "$", "", true)
     private val currencyEuro = CurrencyCommon("Eur", "Euro", "", "", true)
@@ -101,7 +103,7 @@ internal class SelectCurrencyViewModelTest {
     fun onItemClick() = runTest {
         // base
         viewModel.effect.onSubscription {
-            viewModel.event.onItemClick(currencyDollar, SelectCurrencyPurpose.BASE)
+            viewModel.event.onItemClick(currencyDollar, SelectCurrencyPurpose.Base)
         }.firstOrNull().let {
             assertNotNull(it)
             assertIs<SelectCurrencyEffect.CurrencyChange>(it)

ios/CCC/UI/Calculator/CalculatorRootView.swift

@@ -83,7 +83,7 @@ struct CalculatorRootView: View {
             content: {
                 SelectCurrencyRootView(
                     isBarShown: $isBarShown,
-                    purpose: .base
+                    purpose: SelectCurrencyPurpose.Base()
                 ).environmentObject(navigationStack)
             }
         )

ios/CCC/UI/Watchers/WatcherItem.swift

@@ -16,7 +16,7 @@ struct WatcherItem: View {
     @State private var relationSelection = 0
     @State private var amount = ""
 
-    @Binding var isBaseBarShown: Bool
+    @Binding var isSourceBarShown: Bool
     @Binding var isTargetBarShown: Bool
 
     let watcher: Provider.Watcher
@@ -73,6 +73,23 @@ struct WatcherItem: View {
         .onAppear {
             relationSelection = watcher.isGreater ? 1 : 0
             amount = "\(watcher.rate)"
-        }
+        }.sheet(
+            isPresented: $isSourceBarShown,
+            content: {
+                SelectCurrencyRootView(
+                    isBarShown: $isSourceBarShown,
+                    purpose: SelectCurrencyPurpose.Source(watcher: watcher)
+                )
+            }
+        )
+        .sheet(
+            isPresented: $isTargetBarShown,
+            content: {
+                SelectCurrencyRootView(
+                    isBarShown: $isTargetBarShown,
+                    purpose: SelectCurrencyPurpose.Target(watcher: watcher)
+                )
+            }
+        )
     }
 }

ios/CCC/UI/Watchers/WatchersRootView.swift

@@ -21,8 +21,8 @@ struct WatchersRootView: View {
         WatchersViewModel
     >()
     @StateObject var notificationManager = NotificationManager()
-    @State var sourceBarInfo = BarInfo(isShown: false, watcher: nil)
-    @State var targetBarInfo = BarInfo(isShown: false, watcher: nil)
+    @State var isSourceBarShown = false
+    @State var isTargetBarShown = false
     @State var isInvalidInputSnackShown = false
     @State var isMaxWatchersSnackShown = false
     @State var isTooBigInputSnackShown = false
@@ -34,8 +34,8 @@ struct WatchersRootView: View {
             event: observable.event,
             state: observable.state,
             authorizationStatus: notificationManager.authorizationStatus,
-            sourceBarInfo: $sourceBarInfo,
-            targetBarInfo: $targetBarInfo
+            isSourceBarShown: $isSourceBarShown,
+            isTargetBarShown: $isTargetBarShown
         )
         .snack(isPresented: $isInvalidInputSnackShown) {
             SnackView(text: String(\.text_invalid_input))
@@ -46,24 +46,6 @@ struct WatchersRootView: View {
         .snack(isPresented: $isTooBigInputSnackShown) {
             SnackView(text: String(\.text_too_big_input))
         }
-        .sheet(
-            isPresented: $sourceBarInfo.isShown,
-            content: {
-                SelectCurrencyRootView(
-                    isBarShown: $sourceBarInfo.isShown,
-                    purpose: .source
-                ).environmentObject(navigationStack)
-            }
-        )
-        .sheet(
-            isPresented: $targetBarInfo.isShown,
-            content: {
-                SelectCurrencyRootView(
-                    isBarShown: $targetBarInfo.isShown,
-                    purpose: .target
-                ).environmentObject(navigationStack)
-            }
-        )
         .onAppear {
             observable.startObserving()
             notificationManager.reloadAuthorisationStatus()
@@ -87,12 +69,10 @@ struct WatchersRootView: View {
         switch effect {
         case is WatchersEffect.Back:
             navigationStack.pop()
-        case let selectBaseEffect as WatchersEffect.SelectBase:
-            sourceBarInfo.watcher = selectBaseEffect.watcher
-            sourceBarInfo.isShown.toggle()
-        case let selectTargetEffect as WatchersEffect.SelectTarget:
-            targetBarInfo.watcher = selectTargetEffect.watcher
-            targetBarInfo.isShown.toggle()
+        case is WatchersEffect.SelectBase:
+            isSourceBarShown.toggle()
+        case is WatchersEffect.SelectTarget:
+            isTargetBarShown .toggle()
         case is WatchersEffect.TooBigInput:
             isTooBigInputSnackShown.toggle()
         case is WatchersEffect.InvalidInput:
@@ -117,9 +97,4 @@ struct WatchersRootView: View {
             break
         }
     }
-
-    public struct BarInfo {
-        var isShown: Bool
-        var watcher: Provider.Watcher?
-    }
 }

ios/CCC/UI/Watchers/WatchersView.swift

@@ -8,6 +8,7 @@
 
 import Provider
 import SwiftUI
+import NavigationStack
 
 struct WatchersView: View {
     @Environment(\.colorScheme) private var colorScheme
@@ -16,8 +17,8 @@ struct WatchersView: View {
     var state: WatchersState
     var authorizationStatus: UNAuthorizationStatus?
 
-    @Binding var sourceBarInfo: WatchersRootView.BarInfo
-    @Binding var targetBarInfo: WatchersRootView.BarInfo
+    @Binding var isSourceBarShown: Bool
+    @Binding var isTargetBarShown: Bool
 
     var body: some View {
         ZStack {
@@ -33,8 +34,8 @@ struct WatchersView: View {
                     Form {
                         List(state.watcherList, id: \.id) { watcher in
                             WatcherItem(
-                                isBaseBarShown: $sourceBarInfo.isShown,
-                                isTargetBarShown: $targetBarInfo.isShown,
+                                isSourceBarShown: $isSourceBarShown,
+                                isTargetBarShown: $isTargetBarShown,
                                 watcher: watcher,
                                 event: event
                             )