From c0a8673e9f97fbeb565000fe85d2f1ce55f6e8c2 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 16 Sep 2020 10:21:33 -0300
Subject: Make apps work on API 21+ (except cashier that needs 23+)

---
 merchant-terminal/build.gradle                                        | 4 ++--
 merchant-terminal/proguard-rules.pro                                  | 1 +
 .../src/main/java/net/taler/merchantpos/history/HistoryItemAdapter.kt | 3 ++-
 merchant-terminal/src/main/java/net/taler/merchantpos/order/Order.kt  | 2 +-
 .../src/main/java/net/taler/merchantpos/refund/RefundFragment.kt      | 2 --
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'merchant-terminal')

diff --git a/merchant-terminal/build.gradle b/merchant-terminal/build.gradle
index d56dd5c..1f803cb 100644
--- a/merchant-terminal/build.gradle
+++ b/merchant-terminal/build.gradle
@@ -12,7 +12,7 @@ android {
 
     defaultConfig {
         applicationId "net.taler.merchantpos"
-        minSdkVersion 24
+        minSdkVersion 21
         targetSdkVersion 29
         versionCode 2
         versionName "0.1"
@@ -78,5 +78,5 @@ dependencies {
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
 
     testImplementation 'androidx.test.ext:junit:1.1.2'
-    testImplementation 'org.robolectric:robolectric:4.3.1'
+    testImplementation 'org.robolectric:robolectric:4.4'
 }
diff --git a/merchant-terminal/proguard-rules.pro b/merchant-terminal/proguard-rules.pro
index 1a50a50..f417733 100644
--- a/merchant-terminal/proguard-rules.pro
+++ b/merchant-terminal/proguard-rules.pro
@@ -20,4 +20,5 @@
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
 
+#noinspection ShrinkerUnresolvedReference
 -keep class net.taler.merchantpos.** {*;}
diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/history/HistoryItemAdapter.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/history/HistoryItemAdapter.kt
index 25e94fb..4643cb4 100644
--- a/merchant-terminal/src/main/java/net/taler/merchantpos/history/HistoryItemAdapter.kt
+++ b/merchant-terminal/src/main/java/net/taler/merchantpos/history/HistoryItemAdapter.kt
@@ -21,6 +21,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageButton
 import android.widget.TextView
+import androidx.core.content.ContextCompat.getColor
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerView.Adapter
 import net.taler.common.toRelativeTime
@@ -73,7 +74,7 @@ internal class HistoryItemAdapter(private val listener: RefundClickListener) :
                 orderIdView.setTextColor(orderIdColor)
             } else {
                 orderIdView.text = v.context.getString(R.string.history_unpaid)
-                orderIdView.setTextColor(v.context.getColor(R.color.red))
+                orderIdView.setTextColor(getColor(v.context, R.color.red))
             }
             if (item.refundable) {
                 refundButton.visibility = View.VISIBLE
diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/order/Order.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/order/Order.kt
index 4fc2907..0bea20c 100644
--- a/merchant-terminal/src/main/java/net/taler/merchantpos/order/Order.kt
+++ b/merchant-terminal/src/main/java/net/taler/merchantpos/order/Order.kt
@@ -84,7 +84,7 @@ data class Order(val id: Int, val currency: String, val availableCategories: Map
      * Returns a map of i18n summaries for each locale present in *all* given [Category]s
      * or null if there's no locale that fulfills this criteria.
      */
-    val summaryI18n: Map<String, String>?
+    private val summaryI18n: Map<String, String>?
         get() {
             if (products.size == 1) return products[0].descriptionI18n
             val categoryQuantities = getCategoryQuantities()
diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/refund/RefundFragment.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/refund/RefundFragment.kt
index 5306b2f..bb98dbd 100644
--- a/merchant-terminal/src/main/java/net/taler/merchantpos/refund/RefundFragment.kt
+++ b/merchant-terminal/src/main/java/net/taler/merchantpos/refund/RefundFragment.kt
@@ -24,8 +24,6 @@ import androidx.annotation.StringRes
 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.fadeIn
 import net.taler.common.fadeOut
 import net.taler.common.navigate
-- 
cgit v1.2.3