diff options
author | Torsten Grote <t@grobox.de> | 2020-02-20 17:03:31 -0300 |
---|---|---|
committer | Torsten Grote <t@grobox.de> | 2020-02-20 17:03:31 -0300 |
commit | 4f96a05d39626be0546879a29c5fed49225fa513 (patch) | |
tree | 993bf4e87cf692cba8851abd5395c30431cae4cf /app | |
parent | 2256d2fa3e6b9b25a1e90c4a690a4af3820d651e (diff) | |
download | merchant-terminal-android-4f96a05d39626be0546879a29c5fed49225fa513.tar.gz merchant-terminal-android-4f96a05d39626be0546879a29c5fed49225fa513.tar.bz2 merchant-terminal-android-4f96a05d39626be0546879a29c5fed49225fa513.zip |
Don't talk about NFC if it is not supported
Diffstat (limited to 'app')
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 @@ -20,6 +20,13 @@ class NfcManager : NfcAdapter.ReaderCallback { 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. */ fun start(activity: Activity, nfcManager: NfcManager) { 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> |