taler-android

commit 5320c6d585d9b91363dd2e028f2c8eac99fea5bb
parent e2c2831e0b1f9d902d84023c860fb9e029aa47da
Author: Iván Ávalos <avalos@disroot.org>
Date:   Fri, 15 May 2026 19:59:42 +0200

[pos] make "Order by amount" the default tab at launch

Diffstat:
M
merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigFetcherFragment.kt
 | 
2
+-
M
merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigFragment.kt
 | 
2
+-
M
merchant-terminal/src/main/res/menu/activity_main_drawer.xml
 | 
8
++++----
M
merchant-terminal/src/main/res/navigation/nav_graph.xml
 | 
10
+++++-----

4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigFetcherFragment.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigFetcherFragment.kt
@@ -63,7 +63,7 @@ class ConfigFetcherFragment : Fragment() {
                 is ConfigUpdateResult.Success -> {
                     if (!navigating) {
                         navigating = true
-                        findNavController().navigate(R.id.action_global_order)
+                        findNavController().navigate(R.id.action_global_amountEntry)
                     }
                 }
             }
diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigFragment.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigFragment.kt
@@ -293,7 +293,7 @@ class ConfigFragment : Fragment() {
         onResultReceived()
         updateView()
         Snackbar.make(requireView(), getString(R.string.config_changed, currency), LENGTH_LONG).show()
-        findNavController().navigate(R.id.action_instanceSettings_to_order)
+        findNavController().navigate(R.id.action_instanceSettings_to_amountEntry)
         configManager.configUpdateResult.removeObservers(viewLifecycleOwner)
     }
 
diff --git a/merchant-terminal/src/main/res/menu/activity_main_drawer.xml b/merchant-terminal/src/main/res/menu/activity_main_drawer.xml
@@ -20,14 +20,14 @@
 
     <group android:checkableBehavior="single">
         <item
-            android:id="@+id/nav_order"
-            android:icon="@drawable/ic_move_money_24dp"
-            android:title="@string/menu_order" />
-        <item
             android:id="@+id/nav_amountEntry"
             android:icon="@drawable/ic_dialpad"
             android:title="@string/menu_amount_entry" />
         <item
+            android:id="@+id/nav_order"
+            android:icon="@drawable/ic_move_money_24dp"
+            android:title="@string/menu_order" />
+        <item
             android:id="@+id/nav_history"
             android:icon="@drawable/ic_history_black_24dp"
             android:title="@string/menu_history" />
diff --git a/merchant-terminal/src/main/res/navigation/nav_graph.xml b/merchant-terminal/src/main/res/navigation/nav_graph.xml
@@ -18,7 +18,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/nav_graph"
-    app:startDestination="@+id/nav_order"
+    app:startDestination="@+id/nav_amountEntry"
     tools:ignore="UnusedNavigation">
 
     <fragment
@@ -104,8 +104,8 @@
         android:label="@string/config_label"
         tools:layout="@layout/fragment_merchant_config">
         <action
-            android:id="@+id/action_instanceSettings_to_order"
-            app:destination="@+id/nav_order"
+            android:id="@+id/action_instanceSettings_to_amountEntry"
+            app:destination="@+id/nav_amountEntry"
             app:launchSingleTop="true"
             app:popUpTo="@+id/nav_graph"
             app:popUpToInclusive="true" />
@@ -123,8 +123,8 @@
             app:popUpTo="@+id/nav_graph"
             app:popUpToInclusive="true" />
         <action
-            android:id="@+id/action_configFetcher_to_order"
-            app:destination="@+id/nav_order"
+            android:id="@+id/action_configFetcher_to_amountEntry"
+            app:destination="@+id/nav_amountEntry"
             app:launchSingleTop="true"
             app:popUpTo="@+id/nav_graph"
             app:popUpToInclusive="true" />