diff options
Diffstat (limited to 'wallet/src/main/res')
-rw-r--r-- | wallet/src/main/res/drawable/ic_directions.xml | 25 | ||||
-rw-r--r-- | wallet/src/main/res/drawable/ic_edit.xml | 10 | ||||
-rw-r--r-- | wallet/src/main/res/drawable/ic_history.xml | 9 | ||||
-rw-r--r-- | wallet/src/main/res/drawable/transaction_payment_aborted.xml | 25 | ||||
-rw-r--r-- | wallet/src/main/res/drawable/transaction_tip_declined.xml | 25 | ||||
-rw-r--r-- | wallet/src/main/res/layout/fragment_json.xml | 40 | ||||
-rw-r--r-- | wallet/src/main/res/layout/fragment_prompt_withdraw.xml | 6 | ||||
-rw-r--r-- | wallet/src/main/res/layout/fragment_transactions.xml | 2 | ||||
-rw-r--r-- | wallet/src/main/res/layout/list_item_history.xml | 75 | ||||
-rw-r--r-- | wallet/src/main/res/menu/activity_main_drawer.xml | 4 | ||||
-rw-r--r-- | wallet/src/main/res/navigation/nav_graph.xml | 12 | ||||
-rw-r--r-- | wallet/src/main/res/values/strings.xml | 1 | ||||
-rw-r--r-- | wallet/src/main/res/xml/settings_backup.xml | 2 |
13 files changed, 16 insertions, 220 deletions
diff --git a/wallet/src/main/res/drawable/ic_directions.xml b/wallet/src/main/res/drawable/ic_directions.xml deleted file mode 100644 index 229d69c..0000000 --- a/wallet/src/main/res/drawable/ic_directions.xml +++ /dev/null @@ -1,25 +0,0 @@ -<!-- - ~ 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/> - --> - -<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="M21.71,11.29l-9,-9c-0.39,-0.39 -1.02,-0.39 -1.41,0l-9,9c-0.39,0.39 -0.39,1.02 0,1.41l9,9c0.39,0.39 1.02,0.39 1.41,0l9,-9c0.39,-0.38 0.39,-1.01 0,-1.41zM14,14.5V12h-4v3H8v-4c0,-0.55 0.45,-1 1,-1h5V7.5l3.5,3.5 -3.5,3.5z" /> -</vector> diff --git a/wallet/src/main/res/drawable/ic_edit.xml b/wallet/src/main/res/drawable/ic_edit.xml new file mode 100644 index 0000000..69d2830 --- /dev/null +++ b/wallet/src/main/res/drawable/ic_edit.xml @@ -0,0 +1,10 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:tint="?attr/colorControlNormal" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:fillColor="#FFFFFF" + android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z" /> +</vector> diff --git a/wallet/src/main/res/drawable/ic_history.xml b/wallet/src/main/res/drawable/ic_history.xml deleted file mode 100644 index d9f75ea..0000000 --- a/wallet/src/main/res/drawable/ic_history.xml +++ /dev/null @@ -1,9 +0,0 @@ -<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/drawable/transaction_payment_aborted.xml b/wallet/src/main/res/drawable/transaction_payment_aborted.xml deleted file mode 100644 index 8d47c26..0000000 --- a/wallet/src/main/res/drawable/transaction_payment_aborted.xml +++ /dev/null @@ -1,25 +0,0 @@ -<!-- - ~ 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/> - --> - -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:viewportWidth="24" - android:viewportHeight="24"> - <path - android:fillColor="#000" - android:pathData="M15.46 18.12L16.88 19.54L19 17.41L21.12 19.54L22.54 18.12L20.41 16L22.54 13.88L21.12 12.46L19 14.59L16.88 12.46L15.46 13.88L17.59 16M14.97 11.62C14.86 10.28 13.58 8.97 12 9C10.3 9.04 9 10.3 9 12C9 13.7 10.3 14.94 12 15C12.39 15 12.77 14.92 13.14 14.77C13.41 13.67 13.86 12.63 14.97 11.62M13 16H7C7 14.9 6.1 14 5 14V10C6.1 10 7 9.1 7 8H17C17 9.1 17.9 10 19 10V10.05C19.67 10.06 20.34 10.18 21 10.4V6H3V18H13.32C13.1 17.33 13 16.66 13 16Z" /> -</vector> diff --git a/wallet/src/main/res/drawable/transaction_tip_declined.xml b/wallet/src/main/res/drawable/transaction_tip_declined.xml deleted file mode 100644 index 4bd1633..0000000 --- a/wallet/src/main/res/drawable/transaction_tip_declined.xml +++ /dev/null @@ -1,25 +0,0 @@ -<!-- - ~ 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/> - --> - -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:viewportWidth="24" - android:viewportHeight="24"> - <path - android:fillColor="#000" - android:pathData="M10 4A4 4 0 0 0 6 8A4 4 0 0 0 10 12A4 4 0 0 0 14 8A4 4 0 0 0 10 4M17.5 13C15 13 13 15 13 17.5C13 20 15 22 17.5 22C20 22 22 20 22 17.5C22 15 20 13 17.5 13M10 14C5.58 14 2 15.79 2 18V20H11.5A6.5 6.5 0 0 1 11 17.5A6.5 6.5 0 0 1 11.95 14.14C11.32 14.06 10.68 14 10 14M17.5 14.5C19.16 14.5 20.5 15.84 20.5 17.5C20.5 18.06 20.35 18.58 20.08 19L16 14.92C16.42 14.65 16.94 14.5 17.5 14.5M14.92 16L19 20.08C18.58 20.35 18.06 20.5 17.5 20.5C15.84 20.5 14.5 19.16 14.5 17.5C14.5 16.94 14.65 16.42 14.92 16Z" /> -</vector> diff --git a/wallet/src/main/res/layout/fragment_json.xml b/wallet/src/main/res/layout/fragment_json.xml deleted file mode 100644 index d9bca8f..0000000 --- a/wallet/src/main/res/layout/fragment_json.xml +++ /dev/null @@ -1,40 +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/> - --> - -<ScrollView 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="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical"> - - <TextView - android:id="@+id/jsonView" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="8dp" - android:layout_marginTop="8dp" - android:layout_marginEnd="8dp" - android:layout_marginBottom="8dp" - android:fontFamily="monospace" - android:textSize="12sp" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - tools:text="[JSON]" /> - -</ScrollView> diff --git a/wallet/src/main/res/layout/fragment_prompt_withdraw.xml b/wallet/src/main/res/layout/fragment_prompt_withdraw.xml index c9c9402..6bca4ef 100644 --- a/wallet/src/main/res/layout/fragment_prompt_withdraw.xml +++ b/wallet/src/main/res/layout/fragment_prompt_withdraw.xml @@ -162,12 +162,12 @@ <ImageButton android:id="@+id/selectExchangeButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_width="48dp" + android:layout_height="48dp" android:layout_marginEnd="16dp" android:backgroundTint="@color/colorPrimary" android:contentDescription="@string/nav_exchange_fees" - android:src="@drawable/ic_cash_usd_outline" + android:src="@drawable/ic_edit" android:tint="?attr/colorOnPrimary" android:visibility="invisible" app:layout_constraintBottom_toBottomOf="@+id/withdrawExchangeUrl" diff --git a/wallet/src/main/res/layout/fragment_transactions.xml b/wallet/src/main/res/layout/fragment_transactions.xml index 547da24..aaf638c 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_history" + tools:listitem="@layout/list_item_transaction" tools:visibility="visible" /> <TextView diff --git a/wallet/src/main/res/layout/list_item_history.xml b/wallet/src/main/res/layout/list_item_history.xml deleted file mode 100644 index bc94738..0000000 --- a/wallet/src/main/res/layout/list_item_history.xml +++ /dev/null @@ -1,75 +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/> - --> - -<androidx.constraintlayout.widget.ConstraintLayout 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="wrap_content" - android:background="@drawable/selectable_background" - android:foreground="?attr/selectableItemBackground" - android:paddingStart="16dp" - android:paddingTop="8dp" - android:paddingEnd="16dp" - android:paddingBottom="8dp"> - - <ImageView - android:id="@+id/icon" - android:layout_width="32dp" - android:layout_height="32dp" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:tint="?android:colorControlNormal" - tools:ignore="ContentDescription" - tools:src="@drawable/ic_cash_usd_outline" /> - - <TextView - android:id="@+id/title" - style="@style/TransactionTitle" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_marginEnd="8dp" - app:layout_constraintEnd_toStartOf="@+id/amount" - app:layout_constraintStart_toEndOf="@+id/icon" - app:layout_constraintTop_toTopOf="parent" - tools:text="@string/payment_title" /> - - <TextView - android:id="@+id/amount" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textSize="24sp" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="parent" - tools:text="- 1337.23" /> - - <TextView - android:id="@+id/time" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:layout_marginEnd="8dp" - android:textSize="14sp" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toStartOf="@+id/amount" - app:layout_constraintStart_toStartOf="@+id/title" - app:layout_constraintTop_toBottomOf="@+id/title" - tools:text="23 min ago" /> - -</androidx.constraintlayout.widget.ConstraintLayout> diff --git a/wallet/src/main/res/menu/activity_main_drawer.xml b/wallet/src/main/res/menu/activity_main_drawer.xml index 62abc32..d1cc462 100644 --- a/wallet/src/main/res/menu/activity_main_drawer.xml +++ b/wallet/src/main/res/menu/activity_main_drawer.xml @@ -43,10 +43,6 @@ 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> diff --git a/wallet/src/main/res/navigation/nav_graph.xml b/wallet/src/main/res/navigation/nav_graph.xml index 93db557..285fac9 100644 --- a/wallet/src/main/res/navigation/nav_graph.xml +++ b/wallet/src/main/res/navigation/nav_graph.xml @@ -133,7 +133,7 @@ </fragment> <fragment android:id="@+id/selectExchangeFragment" - android:name="net.taler.wallet.withdraw.SelectExchangeFragment" + android:name="net.taler.wallet.exchanges.SelectExchangeFragment" android:label="@string/nav_exchange_fees" tools:layout="@layout/fragment_select_exchange" /> @@ -144,12 +144,6 @@ 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/nav_uri_input" android:name="net.taler.wallet.UriInputFragment" android:label="@string/enter_uri" @@ -174,10 +168,6 @@ 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 421d4ab..1e629a6 100644 --- a/wallet/src/main/res/values/strings.xml +++ b/wallet/src/main/res/values/strings.xml @@ -40,7 +40,6 @@ 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> diff --git a/wallet/src/main/res/xml/settings_backup.xml b/wallet/src/main/res/xml/settings_backup.xml index 52b72ac..f8c5839 100644 --- a/wallet/src/main/res/xml/settings_backup.xml +++ b/wallet/src/main/res/xml/settings_backup.xml @@ -14,7 +14,7 @@ ~ GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/> --> -<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" +<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto"> <SwitchPreferenceCompat |