aboutsummaryrefslogtreecommitdiff
path: root/wallet/src/main/res
diff options
context:
space:
mode:
authorTorsten Grote <t@grobox.de>2020-04-16 13:37:45 -0300
committerTorsten Grote <t@grobox.de>2020-04-16 13:37:45 -0300
commit0682c6b3d3f7cef22725f3db15916346fdc4529e (patch)
tree7f521a8b4f2520a7a83e84cc3c34d261c88a14c9 /wallet/src/main/res
parentea2abcac101645e429cab734c726e3b6a744dae9 (diff)
downloadtaler-android-0682c6b3d3f7cef22725f3db15916346fdc4529e.tar.gz
taler-android-0682c6b3d3f7cef22725f3db15916346fdc4529e.tar.bz2
taler-android-0682c6b3d3f7cef22725f3db15916346fdc4529e.zip
[wallet] change main screen if there is only one currency
If there is more than one currency, the screen shows a list of balances per currency like it used to. If there is only one currency, the main screen directly shows the list of transactions with the balance in the toolbar.
Diffstat (limited to 'wallet/src/main/res')
-rw-r--r--wallet/src/main/res/layout/fragment_balances.xml43
-rw-r--r--wallet/src/main/res/layout/fragment_main.xml22
-rw-r--r--wallet/src/main/res/layout/fragment_transactions.xml7
-rw-r--r--wallet/src/main/res/menu/fragment_main.xml19
-rw-r--r--wallet/src/main/res/navigation/nav_graph.xml50
-rw-r--r--wallet/src/main/res/values/strings.xml1
6 files changed, 81 insertions, 61 deletions
diff --git a/wallet/src/main/res/layout/fragment_balances.xml b/wallet/src/main/res/layout/fragment_balances.xml
new file mode 100644
index 0000000..84c7bca
--- /dev/null
+++ b/wallet/src/main/res/layout/fragment_balances.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ ~ This file is part of GNU Taler
+ ~ (C) 2020 Taler Systems S.A.
+ ~
+ ~ GNU Taler is free software; you can redistribute it and/or modify it under the
+ ~ terms of the GNU General Public License as published by the Free Software
+ ~ Foundation; either version 3, or (at your option) any later version.
+ ~
+ ~ GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY
+ ~ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ ~ A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU General Public License along with
+ ~ GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
+ -->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/mainList"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:visibility="invisible"
+ app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+ tools:listitem="@layout/list_item_balance"
+ tools:visibility="visible" />
+
+ <TextView
+ android:id="@+id/mainEmptyState"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:autoLink="web"
+ android:gravity="center"
+ android:padding="16dp"
+ android:text="@string/balances_empty_state"
+ android:textSize="18sp"
+ android:visibility="invisible"
+ tools:visibility="visible" />
+
+</FrameLayout>
diff --git a/wallet/src/main/res/layout/fragment_main.xml b/wallet/src/main/res/layout/fragment_main.xml
index 57fe73e..81121b5 100644
--- a/wallet/src/main/res/layout/fragment_main.xml
+++ b/wallet/src/main/res/layout/fragment_main.xml
@@ -15,29 +15,13 @@
-->
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
- xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
- <androidx.recyclerview.widget.RecyclerView
- android:id="@+id/mainList"
+ <androidx.fragment.app.FragmentContainerView
+ android:id="@+id/mainFragmentContainer"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:visibility="gone"
- tools:listitem="@layout/list_item_balance"
- tools:visibility="visible" />
-
- <TextView
- android:id="@+id/mainEmptyState"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:autoLink="web"
- android:gravity="center"
- android:padding="16dp"
- android:text="@string/balances_empty_state"
- android:textSize="18sp"
- android:visibility="gone"
- tools:visibility="visible" />
+ android:layout_height="match_parent" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/mainFab"
diff --git a/wallet/src/main/res/layout/fragment_transactions.xml b/wallet/src/main/res/layout/fragment_transactions.xml
index a2aebcd..aaf638c 100644
--- a/wallet/src/main/res/layout/fragment_transactions.xml
+++ b/wallet/src/main/res/layout/fragment_transactions.xml
@@ -15,6 +15,7 @@
-->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -23,7 +24,11 @@
android:id="@+id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:scrollbars="vertical" />
+ android:scrollbars="vertical"
+ android:visibility="invisible"
+ app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+ tools:listitem="@layout/list_item_transaction"
+ tools:visibility="visible" />
<TextView
android:id="@+id/emptyState"
diff --git a/wallet/src/main/res/menu/fragment_main.xml b/wallet/src/main/res/menu/fragment_main.xml
deleted file mode 100644
index d4568d4..0000000
--- a/wallet/src/main/res/menu/fragment_main.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
- ~ This file is part of GNU Taler
- ~ (C) 2020 Taler Systems S.A.
- ~
- ~ GNU Taler is free software; you can redistribute it and/or modify it under the
- ~ terms of the GNU General Public License as published by the Free Software
- ~ Foundation; either version 3, or (at your option) any later version.
- ~
- ~ GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY
- ~ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- ~ A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- ~
- ~ You should have received a copy of the GNU General Public License along with
- ~ GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
- -->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto">
-</menu>
diff --git a/wallet/src/main/res/navigation/nav_graph.xml b/wallet/src/main/res/navigation/nav_graph.xml
index ef0f48b..f8d515e 100644
--- a/wallet/src/main/res/navigation/nav_graph.xml
+++ b/wallet/src/main/res/navigation/nav_graph.xml
@@ -18,21 +18,24 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/nav_graph"
- app:startDestination="@id/showBalance"
- tools:ignore="UnusedNavigation">
+ app:startDestination="@id/nav_main">
<fragment
- android:id="@+id/showBalance"
+ android:id="@+id/nav_main"
android:name="net.taler.wallet.MainFragment"
android:label="@string/balances_title"
- tools:layout="@layout/fragment_main">
+ tools:layout="@layout/fragment_balances">
<action
- android:id="@+id/action_showBalance_to_promptPayment"
+ android:id="@+id/action_nav_main_to_promptPayment"
app:destination="@id/promptPayment" />
<action
- android:id="@+id/action_showBalance_to_promptWithdraw"
+ android:id="@+id/action_nav_main_to_promptWithdraw"
app:destination="@id/promptWithdraw" />
+ <action
+ android:id="@+id/action_nav_main_to_nav_transactions"
+ app:destination="@id/nav_transactions" />
</fragment>
+
<fragment
android:id="@+id/promptPayment"
android:name="net.taler.wallet.payment.PromptPaymentFragment"
@@ -41,31 +44,28 @@
<action
android:id="@+id/action_promptPayment_to_paymentSuccessful"
app:destination="@id/paymentSuccessful"
- app:popUpTo="@id/showBalance" />
+ app:popUpTo="@id/nav_main" />
<action
android:id="@+id/action_promptPayment_to_alreadyPaid"
app:destination="@id/alreadyPaid"
- app:popUpTo="@id/showBalance" />
+ app:popUpTo="@id/nav_main" />
</fragment>
<fragment
android:id="@+id/paymentSuccessful"
android:name="net.taler.wallet.payment.PaymentSuccessfulFragment"
android:label="Payment Successful"
tools:layout="@layout/fragment_payment_successful" />
+
<fragment
- android:id="@+id/settings"
+ android:id="@+id/nav_settings"
android:name="net.taler.wallet.SettingsFragment"
- android:label="Settings" />
+ android:label="@string/menu_settings" />
<fragment
android:id="@+id/nav_transactions"
android:name="net.taler.wallet.transactions.TransactionsFragment"
android:label="@string/transactions_title"
- tools:layout="@layout/fragment_transactions">
- <action
- android:id="@+id/action_nav_transactions_to_nav_transaction_detail"
- app:destination="@id/nav_transactions_detail" />
- </fragment>
+ tools:layout="@layout/fragment_transactions" />
<fragment
android:id="@+id/nav_transactions_detail"
@@ -76,7 +76,7 @@
<fragment
android:id="@+id/alreadyPaid"
android:name="net.taler.wallet.payment.AlreadyPaidFragment"
- android:label="Already Paid"
+ android:label="@string/payment_already_paid_title"
tools:layout="@layout/fragment_already_paid" />
<fragment
@@ -90,11 +90,11 @@
<action
android:id="@+id/action_promptWithdraw_to_withdrawSuccessful"
app:destination="@id/withdrawSuccessful"
- app:popUpTo="@id/showBalance" />
+ app:popUpTo="@id/nav_main" />
<action
android:id="@+id/action_promptWithdraw_to_errorFragment"
app:destination="@id/errorFragment"
- app:popUpTo="@id/showBalance" />
+ app:popUpTo="@id/nav_main" />
<action
android:id="@+id/action_promptWithdraw_to_selectExchangeFragment"
app:destination="@id/selectExchangeFragment" />
@@ -103,8 +103,9 @@
<fragment
android:id="@+id/withdrawSuccessful"
android:name="net.taler.wallet.withdraw.WithdrawSuccessfulFragment"
- android:label="Withdrawal Confirmed"
+ android:label="@string/withdraw_accepted"
tools:layout="@layout/fragment_withdraw_successful" />
+
<fragment
android:id="@+id/reviewExchangeTOS"
android:name="net.taler.wallet.withdraw.ReviewExchangeTosFragment"
@@ -113,7 +114,7 @@
<action
android:id="@+id/action_reviewExchangeTOS_to_promptWithdraw"
app:destination="@id/promptWithdraw"
- app:popUpTo="@id/showBalance" />
+ app:popUpTo="@id/nav_main" />
</fragment>
<fragment
android:id="@+id/selectExchangeFragment"
@@ -124,8 +125,9 @@
<fragment
android:id="@+id/nav_pending_operations"
android:name="net.taler.wallet.pending.PendingOperationsFragment"
- android:label="Pending Operations"
+ android:label="@string/pending_operations_title"
tools:layout="@layout/fragment_pending_operations" />
+
<fragment
android:id="@+id/errorFragment"
android:name="net.taler.wallet.withdraw.ErrorFragment"
@@ -140,4 +142,8 @@
android:id="@+id/action_global_pending_operations"
app:destination="@id/nav_pending_operations" />
-</navigation> \ No newline at end of file
+ <action
+ android:id="@+id/action_nav_transaction_detail"
+ app:destination="@id/nav_transactions_detail" />
+
+</navigation>
diff --git a/wallet/src/main/res/values/strings.xml b/wallet/src/main/res/values/strings.xml
index e0b3183..b4af3b8 100644
--- a/wallet/src/main/res/values/strings.xml
+++ b/wallet/src/main/res/values/strings.xml
@@ -80,6 +80,7 @@
<string name="payment_hide_details">Hide Details</string>
<string name="payment_successful">Payment was successful</string>
<string name="payment_back_button">OK</string>
+ <string name="payment_already_paid_title">Already paid</string>
<string name="payment_already_paid">You\'ve already paid for this order.</string>
<string name="withdraw_accepted">Withdrawal accepted</string>