fix/node navigation onboarding

androidNode/src/androidMain/kotlin/network/bisq/mobile/android/node/presentation/NodeSplashPresenter.kt

@@ -15,9 +15,10 @@ class NodeSplashPresenter(
 ) : SplashPresenter(mainPresenter, applicationBootstrapFacade, userProfileService, settingsRepository) {
 
     /**
-     * Default implementation in shared is for xClients. Override on node to avoid this.
+     * 
      */
-    override fun doCustomNavigationLogic(settings: Settings) {
+    override fun doCustomNavigationLogic(settings: Settings): Boolean {
         // do nothin
+        return false
     }
 }

shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/uicases/settings/SettingsScreen.kt

@@ -5,16 +5,10 @@ import androidx.compose.foundation.layout.*
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.navigation.NavController
-import androidx.navigation.NavHostController
 import network.bisq.mobile.presentation.ui.components.atoms.BisqText
 import network.bisq.mobile.presentation.ui.components.layout.BisqScrollLayout
 import network.bisq.mobile.presentation.ui.theme.BisqTheme
-import org.jetbrains.compose.resources.ExperimentalResourceApi
-import org.koin.compose.koinInject
-import org.koin.core.qualifier.named
 
-@OptIn(ExperimentalResourceApi::class)
 @Composable
 fun SettingsScreen(
 ) {

shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/uicases/startup/SplashPresenter.kt

@@ -46,18 +46,14 @@ open class SplashPresenter(
             val settings: Settings? = settingsRepository.data.value
 
             if (settings == null) {
-                rootNavigator.navigate(Routes.TrustedNodeSetup.name) {
-                    popUpTo(Routes.Splash.name) { inclusive = true }
+                if (!doCustomNavigationLogic(Settings())) {
+                    navigateToHome()
                 }
             } else {
                 if (userProfileService.hasUserProfile()) {
-                    // rootNavigator.navigate(Routes.TrustedNodeSetup.name) {
-                    // [DONE] For androidNode, goto TabContainer
-                    rootNavigator.navigate(Routes.TabContainer.name) {
-                        popUpTo(Routes.Splash.name) { inclusive = true }
+                    if (!doCustomNavigationLogic(settings)) {
+                        navigateToHome()
                     }
-
-                    doCustomNavigationLogic(settings)
                 } else {
                     // If firstTimeApp launch, goto Onboarding[clientMode] (androidNode / xClient)
                     // If not, goto CreateProfile
@@ -75,19 +71,24 @@ open class SplashPresenter(
         }
     }
 
+    private fun navigateToHome() {
+        rootNavigator.navigate(Routes.TabContainer.name) {
+            popUpTo(Routes.Splash.name) { inclusive = true }
+        }
+    }
     /**
      * Default implementation in shared is for xClients. Override on node to avoid this.
+     * @return true if handled, false otherwise
      */
-    open fun doCustomNavigationLogic(settings: Settings) {
+    open fun doCustomNavigationLogic(settings: Settings): Boolean {
         if (settings.bisqApiUrl.isNotEmpty()) {
-            // Test if the Bisq remote instance is up and responding
-            // If yes, goto TabContainer screen.
-            // If no, goto TrustedNodeSetupScreen
+            navigateToHome()
         } else {
             rootNavigator.navigate(Routes.TrustedNodeSetup.name) {
                 popUpTo(Routes.Splash.name) { inclusive = true }
             }
         }
+        return true
     }
 
     private fun cancelJob() {