- generalization of goBack behaviour with default basePresenter impl…

…ementation.

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

@@ -27,6 +27,12 @@ interface ViewPresenter {
      * @return main app tab nav controller
      */
     fun getRootTabNavController(): NavHostController
+
+    /**
+     * Navigate back in the stack
+     */
+    fun goBack()
+
     /**
      * This can be used as initialization method AFTER view gets attached (so view is available)
      */
@@ -93,6 +99,15 @@ abstract class BasePresenter(private val rootPresenter: MainPresenter?): ViewPre
         return rootPresenter!!.getRootTabNavController()
     }
 
+    override fun goBack() {
+        try {
+            log.i { "goBack defaut implementation" }
+            rootNavigator.popBackStack()
+        } catch (e: Exception) {
+            log.e(e) { "Faled to navigate back" }
+        }
+    }
+
     @CallSuper
     override fun onViewAttached() {
         log.i { "Lifecycle: View attached to presenter" }

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 = false
+        const val testNotifications = true
         const val PUSH_DELAY = 60000L
     }
 

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

@@ -52,7 +52,7 @@ fun TopBar(
     val defaultBackButton: @Composable () -> Unit = {
         IconButton(onClick = {
             if (navController.previousBackStackEntry != null) {
-                navController.popBackStack()
+                presenter.goBack()
             }
         }) {
             Icon(

shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/uicases/offers/createOffer/CreateOfferPresenter.kt

@@ -44,8 +44,6 @@ interface ICreateOfferPresenter : ViewPresenter {
 
     fun onSelectAmountType(amountType: AmountType)
 
-    fun goBack()
-
     fun navigateToCurrencySelector()
 
     fun buyBitcoinClicked()
@@ -158,11 +156,6 @@ open class CreateOfferPresenter(
         navigateToCurrencySelector()
     }
 
-    override fun goBack() {
-        log.i { "goBack" }
-        rootNavigator.popBackStack()
-    }
-
     override fun navigateToCurrencySelector() {
         log.i { "navigateToCurrencySelector" }
 

shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/uicases/offers/takeOffer/PaymentMethodPresenter.kt

@@ -20,11 +20,6 @@ open class PaymentMethodPresenter(
     override fun onViewUnattaching() {
     }
 
-    override fun goBack() {
-        log.i { "goBack" }
-        rootNavigator.popBackStack()
-    }
-
     override fun paymentMethodConfirmed() {
         log.i { "Payment method selected" }
         rootNavigator.navigate(Routes.TakeOfferReviewTrade.name)

shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/uicases/offers/takeOffer/PaymentMethodScreen.kt

@@ -25,7 +25,6 @@ interface ITakeOfferPaymentMethodPresenter : ViewPresenter {
     // TODO: Update later to refer to a single OfferListItem
     val offerListItems: StateFlow<List<OfferListItem>>
 
-    fun goBack()
     fun paymentMethodConfirmed()
 }
 

shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/uicases/offers/takeOffer/ReviewTradePresenter.kt

@@ -21,11 +21,6 @@ open class ReviewTradePresenter(
     override fun onViewUnattaching() {
     }
 
-    override fun goBack() {
-        log.i { "goBack" }
-        rootNavigator.popBackStack()
-    }
-
     override fun tradeConfirmed() {
         log.i { "Trade confirmed" }
         // TODO: Confirmation popup goes here

shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/uicases/offers/takeOffer/ReviewTradeScreen.kt

@@ -23,8 +23,6 @@ import org.koin.compose.koinInject
 interface ITakeOfferReviewTradePresenter : ViewPresenter {
     // TODO: Update later to refer to a single OfferListItem
     val offerListItems: StateFlow<List<OfferListItem>>
-
-    fun goBack()
     fun tradeConfirmed()
 }
 

shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/uicases/offers/takeOffer/TradeAmountPresenter.kt

@@ -19,11 +19,6 @@ open class TradeAmountPresenter(
 
     override fun onViewUnattaching() {
     }
-
-    override fun goBack() {
-        log.i { "goBack" }
-        rootNavigator.popBackStack()
-    }
 
     override fun amountConfirmed() {
         log.i { "Amount selected" }

shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/uicases/offers/takeOffer/TradeAmountScreen.kt

@@ -20,8 +20,6 @@ import org.koin.compose.koinInject
 interface ITakeOfferTradeAmountPresenter : ViewPresenter {
     // TODO: Update later to refer to a single OfferListItem
     val offerListItems: StateFlow<List<OfferListItem>>
-
-    fun goBack()
     fun amountConfirmed()
 
     fun onFixedAmountChange(amount: Float)