From 0030ad13496571616501500dfd9df18652869004 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Tue, 8 Sep 2020 15:14:43 -0300 Subject: [pos] use bottom sheet for showing errors instead of snackbar --- .../src/main/java/net/taler/merchantpos/Utils.kt | 32 ---------------------- .../net/taler/merchantpos/config/ConfigFragment.kt | 6 ++-- .../merchantpos/payment/ProcessPaymentFragment.kt | 7 +++-- .../src/main/res/values-de/strings.xml | 1 - .../src/main/res/values-fr/strings.xml | 1 - merchant-terminal/src/main/res/values/strings.xml | 4 +-- 6 files changed, 8 insertions(+), 43 deletions(-) delete mode 100644 merchant-terminal/src/main/java/net/taler/merchantpos/Utils.kt (limited to 'merchant-terminal') diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/Utils.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/Utils.kt deleted file mode 100644 index 137dd37..0000000 --- a/merchant-terminal/src/main/java/net/taler/merchantpos/Utils.kt +++ /dev/null @@ -1,32 +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 - */ - -package net.taler.merchantpos - -import android.view.View -import androidx.annotation.StringRes -import com.google.android.material.bottomsheet.BottomSheetDialog -import com.google.android.material.snackbar.BaseTransientBottomBar.ANIMATION_MODE_FADE -import com.google.android.material.snackbar.BaseTransientBottomBar.Duration -import com.google.android.material.snackbar.Snackbar.make - -fun topSnackbar(view: View, text: CharSequence, @Duration duration: Int) { - make(view, text, duration).show() -} - -fun topSnackbar(view: View, @StringRes resId: Int, @Duration duration: Int) { - topSnackbar(view, view.resources.getText(resId), duration) -} diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigFragment.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigFragment.kt index c31eb61..3ee5148 100644 --- a/merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigFragment.kt +++ b/merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigFragment.kt @@ -27,7 +27,6 @@ import android.view.View.VISIBLE import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels -import androidx.lifecycle.Observer import com.google.android.material.snackbar.BaseTransientBottomBar.LENGTH_LONG import com.google.android.material.snackbar.Snackbar import net.taler.common.navigate @@ -35,7 +34,6 @@ import net.taler.merchantpos.MainViewModel import net.taler.merchantpos.R import net.taler.merchantpos.config.ConfigFragmentDirections.Companion.actionSettingsToOrder import net.taler.merchantpos.databinding.FragmentMerchantConfigBinding -import net.taler.merchantpos.topSnackbar /** * Fragment that displays merchant settings. @@ -76,7 +74,7 @@ class ConfigFragment : Fragment() { password = ui.passwordView.editText!!.text.toString() ) configManager.fetchConfig(config, true, ui.savePasswordCheckBox.isChecked) - configManager.configUpdateResult.observe(viewLifecycleOwner, Observer { result -> + configManager.configUpdateResult.observe(viewLifecycleOwner, { result -> if (onConfigUpdate(result)) { configManager.configUpdateResult.removeObservers(viewLifecycleOwner) } @@ -150,7 +148,7 @@ class ConfigFragment : Fragment() { private fun onConfigReceived(currency: String) { onResultReceived() updateView() - topSnackbar(requireView(), getString(R.string.config_changed, currency), LENGTH_LONG) + Snackbar.make(requireView(), getString(R.string.config_changed, currency), LENGTH_LONG).show() navigate(actionSettingsToOrder()) } diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/payment/ProcessPaymentFragment.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/payment/ProcessPaymentFragment.kt index 5c0a894..dc5d554 100644 --- a/merchant-terminal/src/main/java/net/taler/merchantpos/payment/ProcessPaymentFragment.kt +++ b/merchant-terminal/src/main/java/net/taler/merchantpos/payment/ProcessPaymentFragment.kt @@ -24,16 +24,17 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.navigation.fragment.findNavController import com.google.android.material.snackbar.BaseTransientBottomBar.LENGTH_LONG +import com.google.android.material.snackbar.Snackbar import net.taler.common.NfcManager.Companion.hasNfc import net.taler.common.QrCodeManager.makeQrCode import net.taler.common.fadeIn import net.taler.common.fadeOut import net.taler.common.navigate +import net.taler.common.showError import net.taler.merchantpos.MainViewModel import net.taler.merchantpos.R import net.taler.merchantpos.databinding.FragmentProcessPaymentBinding import net.taler.merchantpos.payment.ProcessPaymentFragmentDirections.Companion.actionProcessPaymentToPaymentSuccess -import net.taler.merchantpos.topSnackbar class ProcessPaymentFragment : Fragment() { @@ -69,7 +70,7 @@ class ProcessPaymentFragment : Fragment() { private fun onPaymentStateChanged(payment: Payment) { if (payment.error != null) { - topSnackbar(requireView(), payment.error, LENGTH_LONG) + requireActivity().showError(R.string.error_payment, payment.error) findNavController().navigateUp() return } @@ -95,7 +96,7 @@ class ProcessPaymentFragment : Fragment() { private fun onPaymentCancel() { paymentManager.cancelPayment(getString(R.string.error_cancelled)) findNavController().navigateUp() - topSnackbar(requireView(), R.string.payment_canceled, LENGTH_LONG) + Snackbar.make(requireView(), R.string.payment_canceled, LENGTH_LONG).show() } } diff --git a/merchant-terminal/src/main/res/values-de/strings.xml b/merchant-terminal/src/main/res/values-de/strings.xml index 03877cb..22f9450 100644 --- a/merchant-terminal/src/main/res/values-de/strings.xml +++ b/merchant-terminal/src/main/res/values-de/strings.xml @@ -40,7 +40,6 @@ Die Rückerstattungsfrist ist abgelaufen Bitte scannen Sie den QR-Code, um eine Rückerstattung zu erhalten Bestellreferenz: %1$s\n\n%2$s - Netzwerkfehler Klicken Sie zum Beenden erneut auf «zurück» Taler Merchant Kassenterminal Händlereinstellungen diff --git a/merchant-terminal/src/main/res/values-fr/strings.xml b/merchant-terminal/src/main/res/values-fr/strings.xml index bcc2a16..10c7af5 100644 --- a/merchant-terminal/src/main/res/values-fr/strings.xml +++ b/merchant-terminal/src/main/res/values-fr/strings.xml @@ -58,6 +58,5 @@ Référence d\'achat : %1$s \n \n%2$s - Erreur réseau Cliquez à nouveau sur «retour» pour quitter \ No newline at end of file diff --git a/merchant-terminal/src/main/res/values/strings.xml b/merchant-terminal/src/main/res/values/strings.xml index f7a62da..bedc486 100644 --- a/merchant-terminal/src/main/res/values/strings.xml +++ b/merchant-terminal/src/main/res/values/strings.xml @@ -64,8 +64,8 @@ Please let customer scan QR Code to offer refund Purchase reference: %1$s\n\n%2$s - Network error - No payment found, please try again! + Error: No payment received + No payment made within payment period, please try again! Payment cancelled Click «back» again to exit -- cgit v1.2.3