- fix running condition related to navhostcontrollers (#123)

bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/uicases/offers/TakeOfferReviewTradeScreen.kt

@@ -19,8 +19,7 @@ import org.koin.core.qualifier.named
 fun TakeOfferReviewTradeScreen() {
     // TODO presenter for this? And call RememberLifecycle...
 
-    val navController: NavHostController = koinInject(named("RootNavController"))
-    TakeOfferScaffold {
+   TakeOfferScaffold {
         Column(modifier = Modifier.padding(horizontal = 32.dp, vertical = 24.dp)) {
             BisqText.h3Regular(
                 text = "Review trade",

shared/presentation/src/commonMain/kotlin/network/bisq/mobile/client/ClientMainPresenter.kt

@@ -1,7 +1,5 @@
 package network.bisq.mobile.client
 
-import kotlinx.coroutines.launch
-import network.bisq.mobile.client.websocket.WebSocketClient
 import network.bisq.mobile.domain.service.TrustedNodeService
 import network.bisq.mobile.domain.service.bootstrap.ApplicationBootstrapFacade
 import network.bisq.mobile.domain.service.controller.NotificationServiceController

shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/BasePresenter.kt

@@ -19,6 +19,14 @@ import network.bisq.mobile.utils.Logging
  * Presenter methods accesible by all views. Views should extend this interface when defining the behaviour expected for their presenter.
  */
 interface ViewPresenter {
+    /**
+     * @return root navigation controller
+     */
+    fun getRootNavController(): NavHostController
+    /**
+     * @return main app tab nav controller
+     */
+    fun getRootTabNavController(): NavHostController
     /**
      * This can be used as initialization method AFTER view gets attached (so view is available)
      */
@@ -65,6 +73,26 @@ abstract class BasePresenter(private val rootPresenter: MainPresenter?): ViewPre
         rootPresenter?.registerChild(child = this)
     }
 
+    /**
+     * Default implementation assumes is a child presenter
+     */
+    override fun getRootNavController(): NavHostController {
+        if (isRoot()) {
+            throw IllegalStateException("You need to redefine this method in your root presenter implementation")
+        }
+        return rootPresenter!!.getRootNavController()
+    }
+
+    /**
+     * Default implementation assumes is a child presenter
+     */
+    override fun getRootTabNavController(): NavHostController {
+        if (isRoot()) {
+            throw IllegalStateException("You need to redefine this method in your root presenter implementation")
+        }
+        return rootPresenter!!.getRootNavController()
+    }
+
     @CallSuper
     override fun onViewAttached() {
         log.i { "Lifecycle: View attached to presenter" }

shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/MainPresenter.kt

@@ -28,12 +28,8 @@ open class MainPresenter(private val notificationServiceController: Notification
         const val PUSH_DELAY = 60000L
     }
 
-    lateinit var navController: NavHostController
-        private set
-
-    override fun setNavController(controller: NavHostController) {
-        navController = controller
-    }
+    override lateinit var navController: NavHostController
+    override lateinit var tabNavController: NavHostController
 
     // Observable state
     private val _isContentVisible = MutableStateFlow(false)
@@ -84,4 +80,12 @@ open class MainPresenter(private val notificationServiceController: Notification
         return isIOS
     }
 
+    override fun getRootNavController(): NavHostController {
+        return navController
+    }
+
+    override fun getRootTabNavController(): NavHostController {
+        return tabNavController
+    }
+
 }

shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/di/PresentationModule.kt

@@ -39,9 +39,6 @@ import org.koin.dsl.bind
 import org.koin.dsl.module
 
 val presentationModule = module {
-    single(named("RootNavController")) { getKoin().getProperty<NavHostController>("RootNavController") }
-    single(named("TabNavController")) { getKoin().getProperty<NavHostController>("TabNavController") }
-
     single<MainPresenter> { ClientMainPresenter(get(), get(), get(), get(), get()) } bind AppPresenter::class
 
     single<TopBarPresenter> { TopBarPresenter(get(), get()) } bind ITopBarPresenter::class
@@ -95,10 +92,9 @@ val presentationModule = module {
 
     single{ ReviewTradePresenter(get(), get()) } bind ITakeOfferReviewTradePresenter::class
 
-    single { (navController: NavController, tabController: NavController) ->
+    single {
         MyTradesPresenter(
             get(),
-            tabController = tabController,
             myTradesRepository = get()
         )
     } bind IMyTrades::class

shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/App.kt

@@ -12,14 +12,14 @@ import network.bisq.mobile.presentation.ViewPresenter
 import network.bisq.mobile.presentation.ui.components.SwipeBackIOSNavigationHandler
 import network.bisq.mobile.presentation.ui.helpers.RememberPresenterLifecycle
 import org.koin.compose.koinInject
-import network.bisq.mobile.presentation.ui.navigation.Routes
 
 import network.bisq.mobile.presentation.ui.navigation.graph.RootNavGraph
 import network.bisq.mobile.presentation.ui.theme.BisqTheme
-import org.koin.mp.KoinPlatform.getKoin
 
 interface AppPresenter : ViewPresenter {
-    fun setNavController(controller: NavHostController)
+    var navController: NavHostController
+
+    var tabNavController: NavHostController
 
     // Observables for state
     val isContentVisible: StateFlow<Boolean>
@@ -43,9 +43,8 @@ fun App() {
     val presenter: AppPresenter = koinInject()
 
     RememberPresenterLifecycle(presenter, {
-        getKoin().setProperty("RootNavController", rootNavController)
-        getKoin().setProperty("TabNavController", tabNavController)
-        presenter.setNavController(rootNavController)
+        presenter.navController = rootNavController
+        presenter.tabNavController = tabNavController
         isNavControllerSet = true
     })
 
@@ -55,7 +54,7 @@ fun App() {
         ProvideStrings(lyricist) {
             if (isNavControllerSet) {
                 SwipeBackIOSNavigationHandler(rootNavController) {
-                    RootNavGraph()
+                    RootNavGraph(rootNavController)
                 }
             }
         }

shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/components/molecules/TopBar.kt

@@ -37,8 +37,8 @@ fun TopBar(
     isFlowScreen: Boolean = false,
     stepText: String = ""
 ) {
-    val navController: NavHostController = koinInject(named("RootNavController"))
     val presenter: ITopBarPresenter = koinInject()
+    val navController: NavHostController = presenter.getRootNavController()
 
     val showBackButton = customBackButton == null && navController.previousBackStackEntry != null
 

shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/navigation/graph/RootNavGraph.kt

@@ -24,16 +24,12 @@ import network.bisq.mobile.presentation.ui.uicases.startup.OnBoardingScreen
 import network.bisq.mobile.presentation.ui.uicases.startup.SplashScreen
 import network.bisq.mobile.presentation.ui.uicases.startup.TrustedNodeSetupScreen
 import network.bisq.mobile.presentation.ui.uicases.trades.TradeFlowScreen
-import org.koin.compose.koinInject
-import org.koin.core.qualifier.named
 
 @Composable
-fun RootNavGraph() {
-    val navController: NavHostController = koinInject(named("RootNavController"))
-
+fun RootNavGraph(rootNavController: NavHostController) {
     NavHost(
         modifier = Modifier.background(color = BisqTheme.colors.backgroundColor),
-        navController = navController,
+        navController = rootNavController,
         startDestination = Routes.Splash.name,
     ) {
         composable(route = Routes.Splash.name) {

shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/navigation/graph/TabNavGraph.kt

@@ -9,6 +9,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.navigation.compose.composable
 import androidx.navigation.navigation
+import network.bisq.mobile.presentation.ui.AppPresenter
 import network.bisq.mobile.presentation.ui.navigation.Routes
 import network.bisq.mobile.presentation.ui.navigation.Graph
 import network.bisq.mobile.presentation.ui.theme.BisqTheme
@@ -22,12 +23,12 @@ import org.koin.core.qualifier.named
 @Composable
 fun TabNavGraph() {
 
-    val navController: NavHostController = koinInject(named("TabNavController"))
+    val mainPresenter: AppPresenter = koinInject()
     val selectedTab = remember { mutableStateOf(Routes.TabHome.name) }
 
     NavHost(
         modifier = Modifier.background(color = BisqTheme.colors.backgroundColor),
-        navController = navController,
+        navController = mainPresenter.getRootTabNavController(),
         startDestination = Graph.MAIN_SCREEN_GRAPH_KEY,
     ) {
         navigation(

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

@@ -5,6 +5,7 @@ import androidx.navigation.NavHostController
 import androidx.navigation.compose.currentBackStackEntryAsState
 import bisqapps.shared.presentation.generated.resources.*
 import bisqapps.shared.presentation.generated.resources.Res
+import network.bisq.mobile.presentation.ui.AppPresenter
 import network.bisq.mobile.presentation.ui.components.layout.BisqStaticScaffold
 import network.bisq.mobile.presentation.ui.components.molecules.TopBar
 import network.bisq.mobile.presentation.ui.composeModels.BottomNavigationItem
@@ -24,7 +25,8 @@ val navigationListItem = listOf(
 
 @Composable
 fun TabContainerScreen() {
-    val navController: NavHostController = koinInject(named("TabNavController"))
+    val mainPresenter: AppPresenter = koinInject()
+    val navController: NavHostController = mainPresenter.getRootTabNavController()
     val navBackStackEntry by navController.currentBackStackEntryAsState()
     val currentRoute by remember(navBackStackEntry) {
         derivedStateOf {

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

@@ -31,8 +31,8 @@ fun CreateProfileScreen(
 ) {
     val strings = LocalStrings.current.application
     val commonStrings = LocalStrings.current.common
-    val navController: NavHostController = koinInject(named("RootNavController"))
-    val presenter: CreateProfilePresenter = koinInject { parametersOf(navController) }
+    val presenter: CreateProfilePresenter = koinInject()
+    val navController: NavHostController = presenter.getRootNavController()
 
     RememberPresenterLifecycle(presenter)
 

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

@@ -48,8 +48,8 @@ interface ITrustedNodeSetupPresenter: ViewPresenter {
 fun TrustedNodeSetupScreen(
 ) {
     val strings = LocalStrings.current
-    val navController: NavHostController = koinInject(named("RootNavController"))
-    val presenter: ITrustedNodeSetupPresenter = koinInject { parametersOf(navController) }
+    val presenter: ITrustedNodeSetupPresenter = koinInject()
+    val navController: NavHostController = presenter.getRootNavController()
 
     val bisqApiUrl = presenter.bisqApiUrl.collectAsState().value
     val isConnected = presenter.isConnected.collectAsState().value

shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/uicases/trades/MyTradesPresenter.kt

@@ -1,6 +1,5 @@
 package network.bisq.mobile.presentation.ui.uicases.trades
 
-import androidx.navigation.NavController
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -15,15 +14,14 @@ import network.bisq.mobile.presentation.ui.navigation.Routes
 
 class MyTradesPresenter(
     mainPresenter: MainPresenter,
-    private val tabController: NavController,
     private val myTradesRepository: MyTradesRepository
 ) : BasePresenter(mainPresenter), IMyTrades {
 
     private val _myTrades = MutableStateFlow<List<BisqOffer>>(emptyList())
     override val myTrades: StateFlow<List<BisqOffer>> = _myTrades
 
     override fun navigateToCurrencyList() {
-
+        val tabController = getRootTabNavController()
         tabController.navigate(Routes.TabCurrencies.name) {
             tabController.graph.startDestinationRoute?.let { route ->
                 popUpTo(route) {

shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/uicases/trades/MyTradesScreen.kt

@@ -14,7 +14,6 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
-import androidx.navigation.NavHostController
 import bisqapps.shared.presentation.generated.resources.Res
 import bisqapps.shared.presentation.generated.resources.img_no_trades
 import kotlinx.coroutines.flow.StateFlow
@@ -27,8 +26,6 @@ import network.bisq.mobile.presentation.ui.helpers.RememberPresenterLifecycle
 import network.bisq.mobile.presentation.ui.theme.BisqTheme
 import org.jetbrains.compose.resources.painterResource
 import org.koin.compose.koinInject
-import org.koin.core.parameter.parametersOf
-import org.koin.core.qualifier.named
 
 interface IMyTrades : ViewPresenter {
     val myTrades: StateFlow<List<BisqOffer>>
@@ -38,10 +35,7 @@ interface IMyTrades : ViewPresenter {
 
 @Composable
 fun MyTradesScreen() {
-    val navController: NavHostController = koinInject(named("RootNavController"))
-    val tabController: NavHostController = koinInject(named("TabNavController"))
-
-    val presenter: IMyTrades = koinInject { parametersOf(navController, tabController) }
+    val presenter: IMyTrades = koinInject()
 
     val myTrades: List<BisqOffer> = presenter.myTrades.collectAsState().value