Connect trusted node setup screen with settings menu (#133)

* - reusing bisq onboarding trusted node setup screen with minimal adaptations * turn off notifications test code
bisq-network · Dec 19, 2024 · 896d1c9 · 896d1c9
1 parent bea9064
commit 896d1c9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 30 deletions.
diff --git a/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/MainPresenter.kt b/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/MainPresenter.kt
@@ -24,7 +24,7 @@ open class MainPresenter(private val notificationServiceController: Notification
     companion object {
         // FIXME this will be erased eventually, for now you can turn on to see the notifications working
         // it will push a notification every 60 sec
-        const val testNotifications = true
+        const val testNotifications = false
         const val PUSH_DELAY = 60000L
     }
 

diff --git a/...mmonMain/kotlin/network/bisq/mobile/presentation/ui/uicases/settings/SettingsPresenter.kt b/...mmonMain/kotlin/network/bisq/mobile/presentation/ui/uicases/settings/SettingsPresenter.kt
@@ -4,6 +4,7 @@ import network.bisq.mobile.domain.data.repository.SettingsRepository
 import network.bisq.mobile.presentation.BasePresenter
 import network.bisq.mobile.presentation.MainPresenter
 import network.bisq.mobile.presentation.ui.components.molecules.settings.MenuItem
+import network.bisq.mobile.presentation.ui.uicases.startup.TrustedNodeSetupScreen
 
 /**
  * SettingsPresenter with default implementation
@@ -29,7 +30,7 @@ open class SettingsPresenter(
     }
 
     protected open fun addCustomSettings(menuItems: MutableList<MenuItem>): List<MenuItem> {
-        menuItems.add(MenuItem.Leaf("Trusted Node", content = { TrustedNodeSettingsScreen() }))
+        menuItems.add(MenuItem.Leaf("Trusted Node", content = { TrustedNodeSetupScreen(false) }))
         return menuItems.toList()
     }
 }
diff --git a/...Main/kotlin/network/bisq/mobile/presentation/ui/uicases/settings/TrustedSettingsScreen.kt b/...Main/kotlin/network/bisq/mobile/presentation/ui/uicases/settings/TrustedSettingsScreen.kt
diff --git a/...Main/kotlin/network/bisq/mobile/presentation/ui/uicases/startup/TrustedNodeSetupScreen.kt b/...Main/kotlin/network/bisq/mobile/presentation/ui/uicases/startup/TrustedNodeSetupScreen.kt
@@ -45,8 +45,7 @@ interface ITrustedNodeSetupPresenter: ViewPresenter {
 
 @OptIn(ExperimentalResourceApi::class)
 @Composable
-fun TrustedNodeSetupScreen(
-) {
+fun TrustedNodeSetupScreen(isWorkflow: Boolean = true) {
     val strings = LocalStrings.current
     val presenter: ITrustedNodeSetupPresenter = koinInject()
     val navController: NavHostController = presenter.getRootNavController()
@@ -151,9 +150,9 @@ fun TrustedNodeSetupScreen(
 
                     ) {
                     BisqButton(
-                        text = "Next",
+                        text = if (isWorkflow) "Next" else "Save",
                         color = BisqTheme.colors.light1,
-                        onClick = { presenter.navigateToNextScreen() },
+                        onClick = { if (isWorkflow) presenter.navigateToNextScreen() else presenter.testConnection(true) },
                         padding = PaddingValues(horizontal = 32.dp, vertical = 12.dp),
                     )
                 }