Factor out code from merchant-terminal into common library

1 files changed, 4 insertions, 5 deletions

diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/order/OrderFragment.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/order/OrderFragment.kt
index 49f7cf2..ad6cd87 100644
--- a/merchant-terminal/src/main/java/net/taler/merchantpos/order/OrderFragment.kt
+++ b/merchant-terminal/src/main/java/net/taler/merchantpos/order/OrderFragment.kt
@@ -23,12 +23,11 @@ import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.Observer
-import androidx.navigation.fragment.findNavController
 import androidx.transition.TransitionManager.beginDelayedTransition
 import kotlinx.android.synthetic.main.fragment_order.*
+import net.taler.common.navigate
 import net.taler.merchantpos.MainViewModel
 import net.taler.merchantpos.R
-import net.taler.merchantpos.navigate
 import net.taler.merchantpos.order.OrderFragmentDirections.Companion.actionGlobalConfigFetcher
 import net.taler.merchantpos.order.OrderFragmentDirections.Companion.actionOrderToMerchantSettings
 import net.taler.merchantpos.order.OrderFragmentDirections.Companion.actionOrderToProcessPayment
@@ -65,9 +64,9 @@ class OrderFragment : Fragment() {
     override fun onStart() {
         super.onStart()
         if (!viewModel.configManager.config.isValid()) {
-            actionOrderToMerchantSettings().navigate(findNavController())
+            navigate(actionOrderToMerchantSettings())
         } else if (viewModel.configManager.merchantConfig?.currency == null) {
-            actionGlobalConfigFetcher().navigate(findNavController())
+            navigate(actionGlobalConfigFetcher())
         }
     }
 
@@ -108,7 +107,7 @@ class OrderFragment : Fragment() {
         completeButton.setOnClickListener {
             val order = liveOrder.order.value ?: return@setOnClickListener
             paymentManager.createPayment(order)
-            actionOrderToProcessPayment().navigate(findNavController())
+            navigate(actionOrderToProcessPayment())
         }
     }