[pos] use bottom sheet for showing errors instead of snackbar

15 files changed, 242 insertions, 45 deletions

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 <http://www.gnu.org/licenses/>
- */
-
-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 @@
     <string name="refund_error_deadline">Die Rückerstattungsfrist ist abgelaufen</string>
     <string name="refund_intro">Bitte scannen Sie den QR-Code, um eine Rückerstattung zu erhalten</string>
     <string name="refund_order_ref">Bestellreferenz: %1$s\n\n%2$s</string>
-    <string name="error_network">Netzwerkfehler</string>
     <string name="toast_back_to_exit">Klicken Sie zum Beenden erneut auf «zurück»</string>
     <string name="app_name">Taler Merchant Kassenterminal</string>
     <string name="config_label">Händlereinstellungen</string>
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 @@
     <string name="refund_order_ref">Référence d\'achat : %1$s
 \n
 \n%2$s</string>
-    <string name="error_network">Erreur réseau</string>
     <string name="toast_back_to_exit">Cliquez à nouveau sur «retour» pour quitter</string>
 </resources>
\ 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 @@
     <string name="refund_intro">Please let customer scan QR Code to offer refund</string>
     <string name="refund_order_ref">Purchase reference: %1$s\n\n%2$s</string>
 
-    <string name="error_network">Network error</string>
-    <string name="error_timeout">No payment found, please try again!</string>
+    <string name="error_payment">Error: No payment received</string>
+    <string name="error_timeout">No payment made within payment period, please try again!</string>
     <string name="error_cancelled">Payment cancelled</string>
 
     <string name="toast_back_to_exit">Click «back» again to exit</string>
diff --git a/taler-kotlin-android/build.gradle b/taler-kotlin-android/build.gradle
index 872b1cd..acd2dc7 100644
--- a/taler-kotlin-android/build.gradle
+++ b/taler-kotlin-android/build.gradle
@@ -47,6 +47,10 @@ android {
         }
     }
 
+    buildFeatures {
+        viewBinding = true
+    }
+
     packagingOptions {
         exclude("META-INF/*.kotlin_module")
     }
@@ -58,6 +62,7 @@ dependencies {
 
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.core:core-ktx:1.3.1'
+    implementation "androidx.constraintlayout:constraintlayout:$constraintlayout_version"
 
     // Navigation
     implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
diff --git a/taler-kotlin-android/src/main/java/net/taler/common/AndroidUtils.kt b/taler-kotlin-android/src/main/java/net/taler/common/AndroidUtils.kt
index c925515..093194f 100644
--- a/taler-kotlin-android/src/main/java/net/taler/common/AndroidUtils.kt
+++ b/taler-kotlin-android/src/main/java/net/taler/common/AndroidUtils.kt
@@ -20,7 +20,6 @@ import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Context.CONNECTIVITY_SERVICE
 import android.content.Intent
-import android.content.pm.PackageManager.MATCH_DEFAULT_ONLY
 import android.net.ConnectivityManager
 import android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET
 import android.os.Build.VERSION.SDK_INT
@@ -41,13 +40,15 @@ import android.view.View
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
 import android.view.inputmethod.InputMethodManager
+import androidx.annotation.StringRes
 import androidx.core.content.ContextCompat.getSystemService
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
 import androidx.navigation.NavDirections
 import androidx.navigation.fragment.findNavController
 import com.github.pedrovgs.lynx.LynxActivity
 import com.github.pedrovgs.lynx.LynxConfig
-import com.github.pedrovgs.lynx.model.TraceLevel
+import net.taler.lib.android.ErrorBottomSheet
 import net.taler.lib.common.Version
 
 fun View.fadeIn(endAction: () -> Unit = {}) {
@@ -102,6 +103,14 @@ fun Context.showLogViewer() {
     startActivity(lynxActivityIntent)
 }
 
+fun FragmentActivity.showError(mainText: String, detailText: String = "") = ErrorBottomSheet
+        .newInstance(mainText, detailText)
+        .show(supportFragmentManager, "ERROR_BOTTOM_SHEET")
+
+fun FragmentActivity.showError(@StringRes mainId: Int, detailText: String = "") {
+    showError(getString(mainId), detailText)
+}
+
 fun Fragment.startActivitySafe(intent: Intent) {
     try {
         startActivity(intent)
diff --git a/taler-kotlin-android/src/main/java/net/taler/lib/android/ErrorBottomSheet.kt b/taler-kotlin-android/src/main/java/net/taler/lib/android/ErrorBottomSheet.kt
new file mode 100644
index 0000000..2815b64
--- /dev/null
+++ b/taler-kotlin-android/src/main/java/net/taler/lib/android/ErrorBottomSheet.kt
@@ -0,0 +1,64 @@
+/*
+ * 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/>
+ */
+
+package net.taler.lib.android
+
+import android.content.Intent
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import net.taler.common.R
+import net.taler.common.databinding.BottomsheetErrorBinding
+
+class ErrorBottomSheet : BottomSheetDialogFragment() {
+
+    companion object {
+        fun newInstance(mainText: String, detailText: String) = ErrorBottomSheet().apply {
+            arguments = Bundle().apply {
+                putString("TEXT_MAIN", mainText)
+                putString("TEXT_DETAIL", detailText)
+            }
+            setStyle(STYLE_NORMAL, R.style.ErrorBottomSheetTheme)
+        }
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        val ui = BottomsheetErrorBinding.inflate(inflater, container, false)
+        val args = requireArguments()
+        val mainText = args.getString("TEXT_MAIN")
+        val detailText = args.getString("TEXT_DETAIL")
+        ui.mainText.text = mainText
+        ui.closeButton.setOnClickListener { dismiss() }
+        ui.detailText.text = detailText
+        ui.shareButton.setOnClickListener {
+            val sendIntent: Intent = Intent().apply {
+                action = Intent.ACTION_SEND
+                putExtra(Intent.EXTRA_TEXT, "$mainText\n\n$detailText")
+                type = "text/plain"
+            }
+            val shareIntent = Intent.createChooser(sendIntent, null)
+            startActivity(shareIntent)
+        }
+        return ui.root
+    }
+
+}
diff --git a/taler-kotlin-android/src/main/res/drawable/ic_close.xml b/taler-kotlin-android/src/main/res/drawable/ic_close.xml
new file mode 100644
index 0000000..d5d2297
--- /dev/null
+++ b/taler-kotlin-android/src/main/res/drawable/ic_close.xml
@@ -0,0 +1,10 @@
+<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,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" />
+</vector>
diff --git a/taler-kotlin-android/src/main/res/drawable/ic_share.xml b/taler-kotlin-android/src/main/res/drawable/ic_share.xml
new file mode 100644
index 0000000..59b0e84
--- /dev/null
+++ b/taler-kotlin-android/src/main/res/drawable/ic_share.xml
@@ -0,0 +1,10 @@
+<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="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z" />
+</vector>
diff --git a/taler-kotlin-android/src/main/res/layout/bottomsheet_error.xml b/taler-kotlin-android/src/main/res/layout/bottomsheet_error.xml
new file mode 100644
index 0000000..8d8e540
--- /dev/null
+++ b/taler-kotlin-android/src/main/res/layout/bottomsheet_error.xml
@@ -0,0 +1,84 @@
+<?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"
+    tools:layout_height="500dp">
+
+    <TextView
+        android:id="@+id/mainText"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_margin="16dp"
+        android:textColor="?android:attr/textColorPrimary"
+        app:layout_constrainedHeight="true"
+        app:layout_constraintBottom_toTopOf="@+id/guideline"
+        app:layout_constraintEnd_toStartOf="@+id/closeButton"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="@tools:sample/lorem" />
+
+    <ImageButton
+        android:id="@+id/closeButton"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:contentDescription="@string/close"
+        android:src="@drawable/ic_close"
+        app:layout_constraintBottom_toTopOf="@+id/guideline"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.0" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_begin="@dimen/bottom_sheet_peek_height" />
+
+    <TextView
+        android:id="@+id/detailText"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_margin="16dp"
+        android:fontFamily="monospace"
+        android:minHeight="48dp"
+        android:textColor="@color/red"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/shareButton"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/guideline"
+        app:layout_constraintVertical_bias="0.0"
+        tools:text="@tools:sample/lorem/random" />
+
+    <ImageButton
+        android:id="@+id/shareButton"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:layout_margin="16dp"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:contentDescription="@string/share"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/guideline"
+        app:layout_constraintVertical_bias="1.0"
+        app:srcCompat="@drawable/ic_share" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/taler-kotlin-android/src/main/res/values/dimens.xml b/taler-kotlin-android/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..03c413d
--- /dev/null
+++ b/taler-kotlin-android/src/main/res/values/dimens.xml
@@ -0,0 +1,20 @@
+<?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/>
+  -->
+
+<resources>
+    <item name="bottom_sheet_peek_height" type="dimen">80dp</item>
+</resources>
diff --git a/taler-kotlin-android/src/main/res/values/strings.xml b/taler-kotlin-android/src/main/res/values/strings.xml
index a5b1df1..9903ada 100644
--- a/taler-kotlin-android/src/main/res/values/strings.xml
+++ b/taler-kotlin-android/src/main/res/values/strings.xml
@@ -18,4 +18,7 @@
     <string name="version_invalid">Invalid version. Please try again later!</string>
     <string name="version_too_old">App too old. Please upgrade!</string>
     <string name="version_too_new">Service outdated. Please wait until it gets upgraded.</string>
+
+    <string name="close">Close</string>
+    <string name="share">Share</string>
 </resources>
diff --git a/taler-kotlin-android/src/main/res/values/styles.xml b/taler-kotlin-android/src/main/res/values/styles.xml
new file mode 100644
index 0000000..af11cbd
--- /dev/null
+++ b/taler-kotlin-android/src/main/res/values/styles.xml
@@ -0,0 +1,27 @@
+<?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/>
+  -->
+
+<resources>
+
+    <style name="ErrorBottomSheet" parent="Widget.MaterialComponents.BottomSheet.Modal">
+        <item name="behavior_peekHeight">@dimen/bottom_sheet_peek_height</item>
+    </style>
+
+    <style name="ErrorBottomSheetTheme" parent="Theme.MaterialComponents.BottomSheetDialog">
+        <item name="bottomSheetStyle">@style/ErrorBottomSheet</item>
+    </style>
+
+</resources>
\ No newline at end of file