summaryrefslogtreecommitdiff
path: root/taler-kotlin-android/src/main
diff options
context:
space:
mode:
authorTorsten Grote <t@grobox.de>2020-08-18 11:35:28 -0300
committerTorsten Grote <t@grobox.de>2020-08-18 11:36:07 -0300
commit612876e44de35cdbd563ac2ce40dcd1d4e397bc5 (patch)
treeb2127aff7376b7d2304e300d216d838a2e1d2595 /taler-kotlin-android/src/main
parent451157d992a4c771e3bdf80b6563f80fb1582c77 (diff)
downloadtaler-android-612876e44de35cdbd563ac2ce40dcd1d4e397bc5.tar.gz
taler-android-612876e44de35cdbd563ac2ce40dcd1d4e397bc5.tar.bz2
taler-android-612876e44de35cdbd563ac2ce40dcd1d4e397bc5.zip
Include Taler common Kotlin library as a submodule
Diffstat (limited to 'taler-kotlin-android/src/main')
-rw-r--r--taler-kotlin-android/src/main/java/net/taler/common/AndroidUtils.kt1
-rw-r--r--taler-kotlin-android/src/main/java/net/taler/common/ContractTerms.kt2
-rw-r--r--taler-kotlin-android/src/main/java/net/taler/common/SignedAmount.kt4
-rw-r--r--taler-kotlin-android/src/main/java/net/taler/lib/common/AmountMixin.kt (renamed from taler-kotlin-android/src/main/java/net/taler/common/AmountMixin.kt)2
-rw-r--r--taler-kotlin-android/src/main/java/net/taler/lib/common/TimestampMixin.kt (renamed from taler-kotlin-android/src/main/java/net/taler/common/TimestampMixin.kt)2
5 files changed, 8 insertions, 3 deletions
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 b46f306..ceb5ead 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
@@ -43,6 +43,7 @@ import androidx.core.content.ContextCompat.getSystemService
import androidx.fragment.app.Fragment
import androidx.navigation.NavDirections
import androidx.navigation.fragment.findNavController
+import net.taler.lib.common.Version
fun View.fadeIn(endAction: () -> Unit = {}) {
if (visibility == VISIBLE && alpha == 1f) return
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 ab442f2..8bf77e8 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
@@ -24,6 +24,8 @@ import com.fasterxml.jackson.annotation.JsonProperty
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
import net.taler.common.TalerUtils.getLocalizedString
+import net.taler.lib.common.Amount
+import net.taler.lib.common.Timestamp
@Serializable
data class ContractTerms(
diff --git a/taler-kotlin-android/src/main/java/net/taler/common/SignedAmount.kt b/taler-kotlin-android/src/main/java/net/taler/common/SignedAmount.kt
index 03a0d6e..e95685a 100644
--- a/taler-kotlin-android/src/main/java/net/taler/common/SignedAmount.kt
+++ b/taler-kotlin-android/src/main/java/net/taler/common/SignedAmount.kt
@@ -17,6 +17,8 @@
package net.taler.common
import android.annotation.SuppressLint
+import net.taler.lib.common.Amount
+import net.taler.lib.common.AmountParserException
data class SignedAmount(
val positive: Boolean,
@@ -37,4 +39,4 @@ data class SignedAmount(
return if (positive) "$amount" else "-$amount"
}
-} \ No newline at end of file
+}
diff --git a/taler-kotlin-android/src/main/java/net/taler/common/AmountMixin.kt b/taler-kotlin-android/src/main/java/net/taler/lib/common/AmountMixin.kt
index f9b1330..59285b6 100644
--- a/taler-kotlin-android/src/main/java/net/taler/common/AmountMixin.kt
+++ b/taler-kotlin-android/src/main/java/net/taler/lib/common/AmountMixin.kt
@@ -14,7 +14,7 @@
* GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
*/
-package net.taler.common
+package net.taler.lib.common
import com.fasterxml.jackson.core.JsonGenerator
import com.fasterxml.jackson.core.JsonParser
diff --git a/taler-kotlin-android/src/main/java/net/taler/common/TimestampMixin.kt b/taler-kotlin-android/src/main/java/net/taler/lib/common/TimestampMixin.kt
index 6c1bebf..40c03f6 100644
--- a/taler-kotlin-android/src/main/java/net/taler/common/TimestampMixin.kt
+++ b/taler-kotlin-android/src/main/java/net/taler/lib/common/TimestampMixin.kt
@@ -14,7 +14,7 @@
* GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
*/
-package net.taler.common
+package net.taler.lib.common
import com.fasterxml.jackson.annotation.JsonProperty
import com.fasterxml.jackson.core.JsonParser