[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-android] 05/06: [pos] make app work on API 24+
From: |
gnunet |
Subject: |
[taler-taler-android] 05/06: [pos] make app work on API 24+ |
Date: |
Thu, 03 Sep 2020 18:42:02 +0200 |
This is an automated email from the git hooks/post-receive script.
torsten-grote pushed a commit to branch master
in repository taler-android.
commit 1cb91611af564116e75384f17bc5af97b1ed2d12
Author: Torsten Grote <t@grobox.de>
AuthorDate: Thu Sep 3 13:27:05 2020 -0300
[pos] make app work on API 24+
---
.../src/main/java/net/taler/merchantpos/config/PosConfig.kt | 4 +++-
.../src/main/java/net/taler/common/ContractTerms.kt | 9 ++++++---
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git
a/merchant-terminal/src/main/java/net/taler/merchantpos/config/PosConfig.kt
b/merchant-terminal/src/main/java/net/taler/merchantpos/config/PosConfig.kt
index cc8caf6..7def7cc 100644
--- a/merchant-terminal/src/main/java/net/taler/merchantpos/config/PosConfig.kt
+++ b/merchant-terminal/src/main/java/net/taler/merchantpos/config/PosConfig.kt
@@ -16,6 +16,7 @@
package net.taler.merchantpos.config
+import android.os.Build.VERSION.SDK_INT
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
import net.taler.common.ContractProduct
@@ -49,7 +50,8 @@ data class Category(
val nameI18n: Map<String, String>? = null
) {
var selected: Boolean = false
- val localizedName: String get() = TalerUtils.getLocalizedString(nameI18n,
name)
+ val localizedName: String
+ get() = if (SDK_INT >= 26) TalerUtils.getLocalizedString(nameI18n,
name) else name
}
@Serializable
diff --git
a/taler-kotlin-android/src/main/java/net/taler/common/ContractTerms.kt
b/taler-kotlin-android/src/main/java/net/taler/common/ContractTerms.kt
index d22eaa0..fb30692 100644
--- a/taler-kotlin-android/src/main/java/net/taler/common/ContractTerms.kt
+++ b/taler-kotlin-android/src/main/java/net/taler/common/ContractTerms.kt
@@ -16,7 +16,7 @@
package net.taler.common
-import androidx.annotation.RequiresApi
+import android.os.Build
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
import net.taler.common.TalerUtils.getLocalizedString
@@ -48,8 +48,11 @@ abstract class Product {
abstract val location: String?
abstract val image: String?
val localizedDescription: String
- @RequiresApi(26)
- get() = getLocalizedString(descriptionI18n, description)
+ get() = if (Build.VERSION.SDK_INT >= 26) {
+ getLocalizedString(descriptionI18n, description)
+ } else {
+ description
+ }
}
@Serializable
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-taler-android] branch master updated (36821f9 -> ce5a1d2), gnunet, 2020/09/03
- [taler-taler-android] 01/06: Don't crash on empty manual withdrawal amount, gnunet, 2020/09/03
- [taler-taler-android] 02/06: [cashier] migrate to view binding as kotlin extensions are broken, gnunet, 2020/09/03
- [taler-taler-android] 06/06: [wallet] show different withdrawal error message when app is offline, gnunet, 2020/09/03
- [taler-taler-android] 05/06: [pos] make app work on API 24+,
gnunet <=
- [taler-taler-android] 03/06: [pos] migrate to view binding, gnunet, 2020/09/03
- [taler-taler-android] 04/06: [wallet] migrate away from kotlin view extensions, gnunet, 2020/09/03