diff options
| author | Torsten Grote <t@grobox.de> | 2023-04-11 12:38:36 -0300 |
|---|---|---|
| committer | Torsten Grote <t@grobox.de> | 2023-04-11 12:38:36 -0300 |
| commit | d9985f0db0c8c603a6814b332328b43b97d1d367 (patch) | |
| tree | bdf14bc2d63971f3cb2f3102430209618fb84e8b | |
| parent | 92045c93baf45e627254246db4ea21f1eee11ce0 (diff) | |
| download | taler-android-d9985f0db0c8c603a6814b332328b43b97d1d367.tar.gz taler-android-d9985f0db0c8c603a6814b332328b43b97d1d367.tar.bz2 taler-android-d9985f0db0c8c603a6814b332328b43b97d1d367.zip | |
[wallet] Show text on floating scan action button
hide on scroll behavior still needs to be fixed for multi currency mode
| -rw-r--r-- | wallet/src/main/res/layout/fragment_main.xml | 5 | ||||
| -rw-r--r-- | wallet/src/main/res/layout/fragment_transactions.xml | 5 | ||||
| -rw-r--r-- | wallet/src/main/res/values/strings.xml | 1 |
3 files changed, 7 insertions, 4 deletions
diff --git a/wallet/src/main/res/layout/fragment_main.xml b/wallet/src/main/res/layout/fragment_main.xml index 3f680ba..6f9e693 100644 --- a/wallet/src/main/res/layout/fragment_main.xml +++ b/wallet/src/main/res/layout/fragment_main.xml @@ -23,13 +23,14 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - <com.google.android.material.floatingactionbutton.FloatingActionButton + <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton android:id="@+id/mainFab" style="@style/FabStyle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/button_scan_qr_code" - android:src="@drawable/ic_scan_qr" + android:text="@string/button_scan_qr_code_label" + app:icon="@drawable/ic_scan_qr" app:layout_behavior="com.google.android.material.behavior.HideBottomViewOnScrollBehavior" /> </androidx.coordinatorlayout.widget.CoordinatorLayout> diff --git a/wallet/src/main/res/layout/fragment_transactions.xml b/wallet/src/main/res/layout/fragment_transactions.xml index 00bde32..8fa46f5 100644 --- a/wallet/src/main/res/layout/fragment_transactions.xml +++ b/wallet/src/main/res/layout/fragment_transactions.xml @@ -131,13 +131,14 @@ app:layout_constraintTop_toBottomOf="@+id/divider" tools:visibility="visible" /> - <com.google.android.material.floatingactionbutton.FloatingActionButton + <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton android:id="@+id/mainFab" style="@style/FabStyle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/button_scan_qr_code" - android:src="@drawable/ic_scan_qr" + android:text="@string/button_scan_qr_code_label" + app:icon="@drawable/ic_scan_qr" app:layout_behavior="com.google.android.material.behavior.HideBottomViewOnScrollBehavior" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" /> diff --git a/wallet/src/main/res/values/strings.xml b/wallet/src/main/res/values/strings.xml index cc0a31c..1a16a69 100644 --- a/wallet/src/main/res/values/strings.xml +++ b/wallet/src/main/res/values/strings.xml @@ -44,6 +44,7 @@ GNU Taler is immune against many types of fraud, such as phishing of credit card <string name="button_back">Go Back</string> <string name="button_scan_qr_code">Scan Taler QR Code</string> + <string name="button_scan_qr_code_label">Scan QR code</string> <string name="enter_uri">Enter Taler URI</string> <string name="copy" tools:override="true">Copy</string> <string name="copy_uri">Copy Taler URI</string> |