diff options
author | Torsten Grote <t@grobox.de> | 2020-07-17 14:46:09 -0300 |
---|---|---|
committer | Torsten Grote <t@grobox.de> | 2020-07-17 15:14:14 -0300 |
commit | aa4472c62acd909cea65dd26102b5d7188c7aacd (patch) | |
tree | 930a4705a2437e82deec7991678aeec2b4f38712 /wallet/src/main/res | |
parent | 1c8da5aea284a0299840721afc86dae75b16ba78 (diff) | |
download | taler-android-aa4472c62acd909cea65dd26102b5d7188c7aacd.tar.gz taler-android-aa4472c62acd909cea65dd26102b5d7188c7aacd.tar.bz2 taler-android-aa4472c62acd909cea65dd26102b5d7188c7aacd.zip |
[wallet] Allow to add an exchange manually by providing its base URL
Diffstat (limited to 'wallet/src/main/res')
-rw-r--r-- | wallet/src/main/res/drawable/ic_baseline_add.xml | 26 | ||||
-rw-r--r-- | wallet/src/main/res/layout/dialog_exchange_add.xml | 45 | ||||
-rw-r--r-- | wallet/src/main/res/layout/fragment_exchange_list.xml | 9 | ||||
-rw-r--r-- | wallet/src/main/res/layout/fragment_main.xml | 9 | ||||
-rw-r--r-- | wallet/src/main/res/values/strings.xml | 4 | ||||
-rw-r--r-- | wallet/src/main/res/values/styles.xml | 11 |
6 files changed, 97 insertions, 7 deletions
diff --git a/wallet/src/main/res/drawable/ic_baseline_add.xml b/wallet/src/main/res/drawable/ic_baseline_add.xml new file mode 100644 index 0000000..d123476 --- /dev/null +++ b/wallet/src/main/res/drawable/ic_baseline_add.xml @@ -0,0 +1,26 @@ +<!-- + ~ 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:tint="?attr/colorControlNormal" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:fillColor="@android:color/white" + android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" /> +</vector> diff --git a/wallet/src/main/res/layout/dialog_exchange_add.xml b/wallet/src/main/res/layout/dialog_exchange_add.xml new file mode 100644 index 0000000..dfa0f70 --- /dev/null +++ b/wallet/src/main/res/layout/dialog_exchange_add.xml @@ -0,0 +1,45 @@ +<?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="match_parent"> + + <com.google.android.material.textfield.TextInputLayout + android:id="@+id/urlLayout" + style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_margin="16dp" + android:hint="@string/exchange_add_url" + app:boxBackgroundMode="outline" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + + <com.google.android.material.textfield.TextInputEditText + android:id="@+id/urlView" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:inputType="textUri" + android:text="https://" + tools:ignore="HardcodedText" /> + + </com.google.android.material.textfield.TextInputLayout> + +</androidx.constraintlayout.widget.ConstraintLayout> diff --git a/wallet/src/main/res/layout/fragment_exchange_list.xml b/wallet/src/main/res/layout/fragment_exchange_list.xml index e08901e..c7404ae 100644 --- a/wallet/src/main/res/layout/fragment_exchange_list.xml +++ b/wallet/src/main/res/layout/fragment_exchange_list.xml @@ -49,4 +49,13 @@ android:visibility="invisible" tools:visibility="visible" /> + <com.google.android.material.floatingactionbutton.FloatingActionButton + android:id="@+id/addExchangeFab" + style="@style/FabStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@string/exchange_list_add" + android:src="@drawable/ic_baseline_add" + app:layout_behavior="com.google.android.material.behavior.HideBottomViewOnScrollBehavior" /> + </androidx.coordinatorlayout.widget.CoordinatorLayout> diff --git a/wallet/src/main/res/layout/fragment_main.xml b/wallet/src/main/res/layout/fragment_main.xml index 81121b5..3f680ba 100644 --- a/wallet/src/main/res/layout/fragment_main.xml +++ b/wallet/src/main/res/layout/fragment_main.xml @@ -25,16 +25,11 @@ <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/mainFab" + style="@style/FabStyle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="bottom|end" - android:layout_marginEnd="16dp" - android:layout_marginBottom="16dp" android:contentDescription="@string/button_scan_qr_code" android:src="@drawable/ic_scan_qr" - app:backgroundTint="@color/colorPrimary" - app:layout_behavior="com.google.android.material.behavior.HideBottomViewOnScrollBehavior" - app:layout_dodgeInsetEdges="bottom" - app:tint="?attr/colorOnPrimary" /> + app:layout_behavior="com.google.android.material.behavior.HideBottomViewOnScrollBehavior" /> </androidx.coordinatorlayout.widget.CoordinatorLayout> diff --git a/wallet/src/main/res/values/strings.xml b/wallet/src/main/res/values/strings.xml index 79a3630..226c7d1 100644 --- a/wallet/src/main/res/values/strings.xml +++ b/wallet/src/main/res/values/strings.xml @@ -50,6 +50,7 @@ GNU Taler is immune against many types of fraud, such as phishing of credit card <string name="paste_invalid">Clipboard contains an invalid data type</string> <string name="uri_invalid">Not a valid Taler URI</string> <string name="ok">OK</string> + <string name="cancel">Cancel</string> <string name="search">Search</string> <string name="menu_settings">Settings</string> @@ -117,6 +118,9 @@ GNU Taler is immune against many types of fraud, such as phishing of credit card <string name="exchange_list_title">Exchanges</string> <string name="exchange_list_empty">No exchanges known\n\nAdd one manually or withdraw digital cash!</string> <string name="exchange_list_currency">Currency: %s</string> + <string name="exchange_list_add">Add exchange</string> + <string name="exchange_add_url">Enter address of exchange</string> + <string name="exchange_add_error">Could not add exchange</string> <string name="exchange_fee_withdrawal_fee_label">Withdrawal Fee:</string> <string name="exchange_fee_overhead_label">Rounding Loss:</string> diff --git a/wallet/src/main/res/values/styles.xml b/wallet/src/main/res/values/styles.xml index 093f43f..33e31a3 100644 --- a/wallet/src/main/res/values/styles.xml +++ b/wallet/src/main/res/values/styles.xml @@ -35,6 +35,8 @@ <style name="AppTheme.Toolbar" parent="Widget.MaterialComponents.Toolbar.Primary" /> + <style name="DialogTheme" parent="Theme.MaterialComponents.DayNight.Dialog.Alert" /> + <style name="TransactionTitle"> <item name="android:textSize">16sp</item> <item name="android:textColor">?android:textColorPrimary</item> @@ -70,4 +72,13 @@ <item name="cardElevation">8dp</item> </style> + <style name="FabStyle" parent="Widget.MaterialComponents.FloatingActionButton"> + <item name="android:layout_gravity">bottom|end</item> + <item name="android:layout_marginEnd">16dp</item> + <item name="android:layout_marginBottom">16dp</item> + <item name="backgroundTint">@color/colorPrimary</item> + <item name="layout_dodgeInsetEdges">bottom</item> + <item name="tint">?attr/colorOnPrimary</item> + </style> + </resources> |