diff options
Diffstat (limited to 'app/src/main/java/net/taler/wallet/history')
3 files changed, 35 insertions, 7 deletions
diff --git a/app/src/main/java/net/taler/wallet/history/HistoryEvent.kt b/app/src/main/java/net/taler/wallet/history/HistoryEvent.kt index fbae49c..9e5c99d 100644 --- a/app/src/main/java/net/taler/wallet/history/HistoryEvent.kt +++ b/app/src/main/java/net/taler/wallet/history/HistoryEvent.kt @@ -19,11 +19,16 @@ package net.taler.wallet.history import androidx.annotation.DrawableRes import androidx.annotation.LayoutRes import androidx.annotation.StringRes -import com.fasterxml.jackson.annotation.* +import com.fasterxml.jackson.annotation.JsonIgnoreProperties +import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonInclude.Include.NON_EMPTY +import com.fasterxml.jackson.annotation.JsonProperty +import com.fasterxml.jackson.annotation.JsonSubTypes import com.fasterxml.jackson.annotation.JsonSubTypes.Type +import com.fasterxml.jackson.annotation.JsonTypeInfo import com.fasterxml.jackson.annotation.JsonTypeInfo.As.PROPERTY import com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME +import com.fasterxml.jackson.annotation.JsonTypeName import net.taler.wallet.ParsedAmount.Companion.parseAmount import net.taler.wallet.R import org.json.JSONObject @@ -38,6 +43,7 @@ enum class ReserveType { * Withdrawn from a bank that has "tight" Taler integration */ @JsonProperty("taler-bank-withdraw") + @Suppress("unused") TALER_BANK_WITHDRAW, } @@ -46,16 +52,21 @@ class ReserveCreationDetail(val type: ReserveType, val bankUrl: String?) enum class RefreshReason { @JsonProperty("manual") + @Suppress("unused") MANUAL, @JsonProperty("pay") PAY, @JsonProperty("refund") + @Suppress("unused") REFUND, @JsonProperty("abort-pay") + @Suppress("unused") ABORT_PAY, @JsonProperty("recoup") + @Suppress("unused") RECOUP, @JsonProperty("backup-restored") + @Suppress("unused") BACKUP_RESTORED } @@ -406,6 +417,7 @@ class HistoryRefundedEvent( ) abstract class WithdrawalSource +@Suppress("unused") @JsonTypeName("tip") class WithdrawalSourceTip( val tipId: String diff --git a/app/src/main/java/net/taler/wallet/history/WalletHistory.kt b/app/src/main/java/net/taler/wallet/history/WalletHistory.kt index a534f24..76b11ea 100644 --- a/app/src/main/java/net/taler/wallet/history/WalletHistory.kt +++ b/app/src/main/java/net/taler/wallet/history/WalletHistory.kt @@ -18,9 +18,14 @@ package net.taler.wallet.history import android.os.Bundle -import android.view.* +import android.view.LayoutInflater +import android.view.Menu +import android.view.MenuInflater +import android.view.MenuItem +import android.view.View import android.view.View.INVISIBLE import android.view.View.VISIBLE +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProvider @@ -40,7 +45,7 @@ interface OnEventClickListener { */ class WalletHistory : Fragment(), OnEventClickListener { - lateinit var model: WalletViewModel + private lateinit var model: WalletViewModel private lateinit var showAllItem: MenuItem private val historyAdapter = WalletHistoryAdapter(this) @@ -107,7 +112,4 @@ class WalletHistory : Fragment(), OnEventClickListener { .show(parentFragmentManager, null) } - companion object { - const val TAG = "taler-wallet" - } } diff --git a/app/src/main/java/net/taler/wallet/history/WalletHistoryAdapter.kt b/app/src/main/java/net/taler/wallet/history/WalletHistoryAdapter.kt index d47c31f..71bdebc 100644 --- a/app/src/main/java/net/taler/wallet/history/WalletHistoryAdapter.kt +++ b/app/src/main/java/net/taler/wallet/history/WalletHistoryAdapter.kt @@ -16,8 +16,17 @@ package net.taler.wallet.history +import android.annotation.SuppressLint import android.graphics.Paint.STRIKE_THRU_TEXT_FLAG -import android.text.format.DateUtils.* +import android.text.format.DateUtils.DAY_IN_MILLIS +import android.text.format.DateUtils.FORMAT_ABBREV_MONTH +import android.text.format.DateUtils.FORMAT_ABBREV_RELATIVE +import android.text.format.DateUtils.FORMAT_NO_YEAR +import android.text.format.DateUtils.FORMAT_SHOW_DATE +import android.text.format.DateUtils.FORMAT_SHOW_TIME +import android.text.format.DateUtils.MINUTE_IN_MILLIS +import android.text.format.DateUtils.formatDateTime +import android.text.format.DateUtils.getRelativeTimeSpanString import android.view.LayoutInflater import android.view.View import android.view.View.GONE @@ -172,12 +181,14 @@ internal class WalletHistoryAdapter( } private fun showAmounts(effective: ParsedAmount, raw: ParsedAmount) { + @SuppressLint("SetTextI18n") amountWithdrawn.text = "+$raw" val calculatedFee = raw - effective if (calculatedFee.isZero()) { fee.visibility = GONE feeLabel.visibility = GONE } else { + @SuppressLint("SetTextI18n") fee.text = "-$calculatedFee" fee.visibility = VISIBLE feeLabel.visibility = VISIBLE @@ -208,11 +219,13 @@ internal class WalletHistoryAdapter( private fun bind(event: HistoryPaymentSentEvent) { title.text = event.orderShortInfo.summary + @SuppressLint("SetTextI18n") amountPaidWithFees.text = "-${parseAmount(event.amountPaidWithFees)}" } private fun bind(event: HistoryPaymentAbortedEvent) { title.text = event.orderShortInfo.summary + @SuppressLint("SetTextI18n") amountPaidWithFees.text = "-${parseAmount(event.amountLost)}" } @@ -220,6 +233,7 @@ internal class WalletHistoryAdapter( title.text = "" val fee = parseAmount(event.amountRefreshedRaw) - parseAmount(event.amountRefreshedEffective) + @SuppressLint("SetTextI18n") if (fee.isZero()) amountPaidWithFees.text = null else amountPaidWithFees.text = "-$fee" } |