[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-merchant-terminal-android] 18/19: Don't talk about NFC if it is n
From: |
gnunet |
Subject: |
[taler-merchant-terminal-android] 18/19: Don't talk about NFC if it is not supported |
Date: |
Fri, 21 Feb 2020 19:00:11 +0100 |
This is an automated email from the git hooks/post-receive script.
torsten-grote pushed a commit to branch master
in repository merchant-terminal-android.
commit 4f96a05d39626be0546879a29c5fed49225fa513
Author: Torsten Grote <address@hidden>
AuthorDate: Thu Feb 20 17:03:31 2020 -0300
Don't talk about NFC if it is not supported
---
app/src/main/java/net/taler/merchantpos/NfcManager.kt | 7 +++++++
.../java/net/taler/merchantpos/payment/ProcessPaymentFragment.kt | 4 ++++
app/src/main/res/layout/fragment_process_payment.xml | 2 +-
app/src/main/res/values/strings.xml | 6 +++---
4 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/net/taler/merchantpos/NfcManager.kt
b/app/src/main/java/net/taler/merchantpos/NfcManager.kt
index d6b40b7..1d21795 100644
--- a/app/src/main/java/net/taler/merchantpos/NfcManager.kt
+++ b/app/src/main/java/net/taler/merchantpos/NfcManager.kt
@@ -19,6 +19,13 @@ class NfcManager : NfcAdapter.ReaderCallback {
companion object {
const val TAG = "taler-merchant"
+ /**
+ * Returns true if NFC is supported and false otherwise.
+ */
+ fun hasNfc(context: Context): Boolean {
+ return getNfcAdapter(context) != null
+ }
+
/**
* Enables NFC reader mode. Don't forget to call [stop] afterwards.
*/
diff --git
a/app/src/main/java/net/taler/merchantpos/payment/ProcessPaymentFragment.kt
b/app/src/main/java/net/taler/merchantpos/payment/ProcessPaymentFragment.kt
index a7195ec..89198b8 100644
--- a/app/src/main/java/net/taler/merchantpos/payment/ProcessPaymentFragment.kt
+++ b/app/src/main/java/net/taler/merchantpos/payment/ProcessPaymentFragment.kt
@@ -12,6 +12,7 @@ import com.google.android.material.snackbar.Snackbar
import com.google.android.material.snackbar.Snackbar.LENGTH_SHORT
import kotlinx.android.synthetic.main.fragment_process_payment.*
import net.taler.merchantpos.MainViewModel
+import net.taler.merchantpos.NfcManager.Companion.hasNfc
import net.taler.merchantpos.QrCodeManager.makeQrCode
import net.taler.merchantpos.R
@@ -28,6 +29,9 @@ class ProcessPaymentFragment : Fragment() {
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ val introRes =
+ if (hasNfc(requireContext())) R.string.payment_intro_nfc else
R.string.payment_intro
+ textView2.setText(introRes)
paymentManager.payment.observe(viewLifecycleOwner, Observer { payment
->
onPaymentStateChanged(payment)
})
diff --git a/app/src/main/res/layout/fragment_process_payment.xml
b/app/src/main/res/layout/fragment_process_payment.xml
index 53c3bc3..89e88d8 100644
--- a/app/src/main/res/layout/fragment_process_payment.xml
+++ b/app/src/main/res/layout/fragment_process_payment.xml
@@ -25,7 +25,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="32dp" />
<TextView
- android:text="Please scan QR Code or use NFC to pay"
+ android:text="@string/payment_intro_nfc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/textView2"
diff --git a/app/src/main/res/values/strings.xml
b/app/src/main/res/values/strings.xml
index 98f2da4..1a1c4ca 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -14,9 +14,6 @@
<string name="menu_share">Share</string>
<string name="menu_send">Send</string>
- <!-- TODO: Remove or change this placeholder text -->
- <string name="hello_blank_fragment">Hello blank fragment</string>
-
<string name="order_total">Total: %1$.2f</string>
<string name="order_restart">Restart</string>
<string name="order_undo">Undo</string>
@@ -37,4 +34,7 @@
<string name="config_save_password">Remember Password</string>
<string name="config_forget_password">Forget</string>
+ <string name="payment_intro_nfc">Please scan QR Code or use NFC to
pay</string>
+ <string name="payment_intro">Please scan QR Code to pay</string>
+
</resources>
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [taler-merchant-terminal-android] branch master updated (f463d1b -> 39af919), gnunet, 2020/02/21
- [taler-merchant-terminal-android] 03/19: Fix crash when loading history, gnunet, 2020/02/21
- [taler-merchant-terminal-android] 01/19: Upgrade libraries to latest stable versions, gnunet, 2020/02/21
- [taler-merchant-terminal-android] 05/19: Allow user to undo restarting the order, gnunet, 2020/02/21
- [taler-merchant-terminal-android] 07/19: Add ordered products to order's contract terms, gnunet, 2020/02/21
- [taler-merchant-terminal-android] 08/19: Use actual taler icon for the app, gnunet, 2020/02/21
- [taler-merchant-terminal-android] 09/19: Factor out NFC code from MainActivity, gnunet, 2020/02/21
- [taler-merchant-terminal-android] 06/19: Create payments directly from the order, gnunet, 2020/02/21
- [taler-merchant-terminal-android] 04/19: Fetch merchant config from central configuration JSON, gnunet, 2020/02/21
- [taler-merchant-terminal-android] 02/19: Add screen to process an order, gnunet, 2020/02/21
- [taler-merchant-terminal-android] 18/19: Don't talk about NFC if it is not supported,
gnunet <=
- [taler-merchant-terminal-android] 14/19: Use product categories for order summary, gnunet, 2020/02/21
- [taler-merchant-terminal-android] 11/19: Allow user to decide if they want to save password, add FORGET option, gnunet, 2020/02/21
- [taler-merchant-terminal-android] 13/19: Make NFC and QR code re-useable in another app, gnunet, 2020/02/21
- [taler-merchant-terminal-android] 15/19: Introduce different product classes for re-use in other taler apps, gnunet, 2020/02/21
- [taler-merchant-terminal-android] 17/19: Make order sorting deterministic, gnunet, 2020/02/21
- [taler-merchant-terminal-android] 12/19: Fix invalid product configuration, gnunet, 2020/02/21
- [taler-merchant-terminal-android] 19/19: Check for duplicate product IDs, gnunet, 2020/02/21
- [taler-merchant-terminal-android] 10/19: Require valid configuration before showing UI, gnunet, 2020/02/21
- [taler-merchant-terminal-android] 16/19: Allow editing order with -1 and +1 buttons, gnunet, 2020/02/21