diff options
author | Torsten Grote <t@grobox.de> | 2020-05-12 15:26:44 -0300 |
---|---|---|
committer | Torsten Grote <t@grobox.de> | 2020-05-15 14:26:41 -0300 |
commit | e74f39ee86f32b4e0324405af1f0c7be061fb372 (patch) | |
tree | 484a9e2f6ad3d8d6c9662ff5f41c6f254d218b30 /wallet/src/main/res | |
parent | 4a6630d1d147ae35358272dc5222964831c234ab (diff) | |
download | taler-android-e74f39ee86f32b4e0324405af1f0c7be061fb372.tar.gz taler-android-e74f39ee86f32b4e0324405af1f0c7be061fb372.tar.bz2 taler-android-e74f39ee86f32b4e0324405af1f0c7be061fb372.zip |
[wallet] separate history and transactions UI
The history with its JSON payload is only shown in dev mode
while the transactions are prepared to move to the new API.
Diffstat (limited to 'wallet/src/main/res')
-rw-r--r-- | wallet/src/main/res/drawable/ic_history.xml | 9 | ||||
-rw-r--r-- | wallet/src/main/res/layout/fragment_transactions.xml | 2 | ||||
-rw-r--r-- | wallet/src/main/res/layout/list_item_history.xml (renamed from wallet/src/main/res/layout/list_item_transaction.xml) | 0 | ||||
-rw-r--r-- | wallet/src/main/res/menu/activity_main_drawer.xml | 27 | ||||
-rw-r--r-- | wallet/src/main/res/navigation/nav_graph.xml | 10 | ||||
-rw-r--r-- | wallet/src/main/res/values/strings.xml | 1 |
6 files changed, 43 insertions, 6 deletions
diff --git a/wallet/src/main/res/drawable/ic_history.xml b/wallet/src/main/res/drawable/ic_history.xml new file mode 100644 index 0000000..d9f75ea --- /dev/null +++ b/wallet/src/main/res/drawable/ic_history.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="#FF000000" + android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z" /> +</vector> diff --git a/wallet/src/main/res/layout/fragment_transactions.xml b/wallet/src/main/res/layout/fragment_transactions.xml index aaf638c..547da24 100644 --- a/wallet/src/main/res/layout/fragment_transactions.xml +++ b/wallet/src/main/res/layout/fragment_transactions.xml @@ -27,7 +27,7 @@ android:scrollbars="vertical" android:visibility="invisible" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" - tools:listitem="@layout/list_item_transaction" + tools:listitem="@layout/list_item_history" tools:visibility="visible" /> <TextView diff --git a/wallet/src/main/res/layout/list_item_transaction.xml b/wallet/src/main/res/layout/list_item_history.xml index 2fabe1d..2fabe1d 100644 --- a/wallet/src/main/res/layout/list_item_transaction.xml +++ b/wallet/src/main/res/layout/list_item_history.xml diff --git a/wallet/src/main/res/menu/activity_main_drawer.xml b/wallet/src/main/res/menu/activity_main_drawer.xml index 896ff69..62abc32 100644 --- a/wallet/src/main/res/menu/activity_main_drawer.xml +++ b/wallet/src/main/res/menu/activity_main_drawer.xml @@ -18,7 +18,9 @@ xmlns:tools="http://schemas.android.com/tools" tools:showIn="@layout/activity_main"> - <group android:checkableBehavior="single"> + <group + android:id="@+id/nav_group_main" + android:checkableBehavior="single"> <item android:id="@+id/nav_home" android:icon="@drawable/ic_account_balance_wallet" @@ -28,10 +30,25 @@ android:id="@+id/nav_settings" android:icon="@drawable/ic_settings" android:title="@string/menu_settings" /> - <item - android:id="@+id/nav_pending_operations" - android:icon="@drawable/ic_sync" - android:title="@string/pending_operations_title" /> </group> + <item + android:id="@+id/nav_dev" + android:title="@string/settings_dev_mode"> + <menu> + <group + android:id="@+id/nav_group_dev" + android:checkableBehavior="single"> + <item + android:id="@+id/nav_pending_operations" + android:icon="@drawable/ic_sync" + android:title="@string/pending_operations_title" /> + <item + android:id="@+id/nav_history" + android:icon="@drawable/ic_history" + android:title="@string/nav_history" /> + </group> + </menu> + </item> + </menu> diff --git a/wallet/src/main/res/navigation/nav_graph.xml b/wallet/src/main/res/navigation/nav_graph.xml index f8d515e..8e717c1 100644 --- a/wallet/src/main/res/navigation/nav_graph.xml +++ b/wallet/src/main/res/navigation/nav_graph.xml @@ -129,6 +129,12 @@ tools:layout="@layout/fragment_pending_operations" /> <fragment + android:id="@+id/nav_history" + android:name="net.taler.wallet.history.DevHistoryFragment" + android:label="@string/nav_history" + tools:layout="@layout/fragment_transactions" /> + + <fragment android:id="@+id/errorFragment" android:name="net.taler.wallet.withdraw.ErrorFragment" android:label="@string/nav_error" @@ -143,6 +149,10 @@ app:destination="@id/nav_pending_operations" /> <action + android:id="@+id/action_global_history" + app:destination="@id/nav_history" /> + + <action android:id="@+id/action_nav_transaction_detail" app:destination="@id/nav_transactions_detail" /> diff --git a/wallet/src/main/res/values/strings.xml b/wallet/src/main/res/values/strings.xml index a28545f..56ff2ef 100644 --- a/wallet/src/main/res/values/strings.xml +++ b/wallet/src/main/res/values/strings.xml @@ -40,6 +40,7 @@ GNU Taler is immune against many types of fraud, such as phishing of credit card <string name="nav_prompt_withdraw">Withdraw Digital Cash</string> <string name="nav_exchange_tos">Exchange\'s Terms of Service</string> <string name="nav_exchange_fees">Exchange Fees</string> + <string name="nav_history">Event History</string> <string name="nav_error">Error</string> <string name="button_back">Go Back</string> |