diff options
| author | Torsten Grote <t@grobox.de> | 2020-08-18 11:35:28 -0300 |
|---|---|---|
| committer | Torsten Grote <t@grobox.de> | 2020-08-18 11:36:07 -0300 |
| commit | 612876e44de35cdbd563ac2ce40dcd1d4e397bc5 (patch) | |
| tree | b2127aff7376b7d2304e300d216d838a2e1d2595 /cashier | |
| parent | 451157d992a4c771e3bdf80b6563f80fb1582c77 (diff) | |
| download | taler-android-612876e44de35cdbd563ac2ce40dcd1d4e397bc5.tar.gz taler-android-612876e44de35cdbd563ac2ce40dcd1d4e397bc5.tar.bz2 taler-android-612876e44de35cdbd563ac2ce40dcd1d4e397bc5.zip | |
Include Taler common Kotlin library as a submodule
Diffstat (limited to 'cashier')
3 files changed, 4 insertions, 4 deletions
diff --git a/cashier/src/main/java/net/taler/cashier/BalanceFragment.kt b/cashier/src/main/java/net/taler/cashier/BalanceFragment.kt index 246cba0..5b963a0 100644 --- a/cashier/src/main/java/net/taler/cashier/BalanceFragment.kt +++ b/cashier/src/main/java/net/taler/cashier/BalanceFragment.kt @@ -33,11 +33,11 @@ import kotlinx.android.synthetic.main.fragment_balance.* import net.taler.cashier.BalanceFragmentDirections.Companion.actionBalanceFragmentToTransactionFragment import net.taler.cashier.withdraw.LastTransaction import net.taler.cashier.withdraw.WithdrawStatus -import net.taler.common.Amount import net.taler.common.SignedAmount import net.taler.common.exhaustive import net.taler.common.fadeIn import net.taler.common.fadeOut +import net.taler.lib.common.Amount sealed class BalanceResult { class Error(val msg: String) : BalanceResult() diff --git a/cashier/src/main/java/net/taler/cashier/MainViewModel.kt b/cashier/src/main/java/net/taler/cashier/MainViewModel.kt index 1740494..a0796df 100644 --- a/cashier/src/main/java/net/taler/cashier/MainViewModel.kt +++ b/cashier/src/main/java/net/taler/cashier/MainViewModel.kt @@ -34,11 +34,11 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import net.taler.cashier.HttpHelper.makeJsonGetRequest import net.taler.cashier.withdraw.WithdrawManager -import net.taler.common.AmountParserException import net.taler.common.SignedAmount -import net.taler.common.Version import net.taler.common.getIncompatibleStringOrNull import net.taler.common.isOnline +import net.taler.lib.common.AmountParserException +import net.taler.lib.common.Version private val TAG = MainViewModel::class.java.simpleName diff --git a/cashier/src/main/java/net/taler/cashier/withdraw/WithdrawManager.kt b/cashier/src/main/java/net/taler/cashier/withdraw/WithdrawManager.kt index 59e0c50..9f3cf54 100644 --- a/cashier/src/main/java/net/taler/cashier/withdraw/WithdrawManager.kt +++ b/cashier/src/main/java/net/taler/cashier/withdraw/WithdrawManager.kt @@ -34,9 +34,9 @@ import net.taler.cashier.HttpJsonResult.Error import net.taler.cashier.HttpJsonResult.Success import net.taler.cashier.MainViewModel import net.taler.cashier.R -import net.taler.common.Amount import net.taler.common.QrCodeManager.makeQrCode import net.taler.common.isOnline +import net.taler.lib.common.Amount import org.json.JSONObject import java.util.concurrent.TimeUnit.MINUTES import java.util.concurrent.TimeUnit.SECONDS |