[wallet] bye bye tips!

2 files changed, 1 insertions, 160 deletions

diff --git a/wallet/src/main/java/net/taler/wallet/transactions/TransactionTipFragment.kt b/wallet/src/main/java/net/taler/wallet/transactions/TransactionTipFragment.kt
deleted file mode 100644
index c15f931..0000000
--- a/wallet/src/main/java/net/taler/wallet/transactions/TransactionTipFragment.kt
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * This file is part of GNU Taler
- * (C) 2022 Taler Systems S.A.
- *
- * GNU Taler is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 3, or (at your option) any later version.
- *
- * GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * GNU Taler; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
- */
-
-package net.taler.wallet.transactions
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.livedata.observeAsState
-import androidx.compose.ui.Alignment.Companion.CenterHorizontally
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.ComposeView
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import net.taler.common.Amount
-import net.taler.common.Timestamp
-import net.taler.common.toAbsoluteTime
-import net.taler.wallet.R
-import net.taler.wallet.backend.TalerErrorCode.EXCHANGE_GENERIC_KYC_REQUIRED
-import net.taler.wallet.backend.TalerErrorInfo
-import net.taler.wallet.compose.TalerSurface
-import net.taler.wallet.transactions.TransactionAction.Abort
-import net.taler.wallet.transactions.TransactionAction.Retry
-import net.taler.wallet.transactions.TransactionAction.Suspend
-import net.taler.wallet.transactions.TransactionMajorState.Pending
-
-class TransactionTipFragment : TransactionDetailFragment() {
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?,
-    ): View = ComposeView(requireContext()).apply {
-        setContent {
-            TalerSurface {
-                val t = transactionManager.selectedTransaction.observeAsState(null).value
-                if (t is TransactionTip) TransactionTipComposable(t, devMode) {
-                    onTransitionButtonClicked(t, it)
-                }
-            }
-        }
-    }
-}
-
-@Composable
-fun TransactionTipComposable(
-    t: TransactionTip,
-    devMode: Boolean?,
-    onTransition: (t: TransactionAction) -> Unit,
-) {
-    val scrollState = rememberScrollState()
-    Column(
-        modifier = Modifier
-            .fillMaxWidth()
-            .verticalScroll(scrollState),
-        horizontalAlignment = CenterHorizontally,
-    ) {
-        val context = LocalContext.current
-        Text(
-            modifier = Modifier.padding(16.dp),
-            text = t.timestamp.ms.toAbsoluteTime(context).toString(),
-            style = MaterialTheme.typography.bodyLarge,
-        )
-
-        TransactionAmountComposable(
-            label = stringResource(id = R.string.send_peer_payment_amount_received),
-            amount = t.amountEffective,
-            amountType = AmountType.Positive,
-        )
-        TransactionAmountComposable(
-            label = stringResource(id = R.string.send_peer_payment_amount_sent),
-            amount = t.amountRaw,
-            amountType = AmountType.Neutral,
-        )
-        val fee = t.amountRaw - t.amountEffective
-        if (!fee.isZero()) {
-            TransactionAmountComposable(
-                label = stringResource(id = R.string.withdraw_fees),
-                amount = fee,
-                amountType = AmountType.Negative,
-            )
-        }
-        TransactionInfoComposable(
-            label = stringResource(id = R.string.tip_merchant_url),
-            info = t.merchantBaseUrl,
-        )
-        TransitionsComposable(t, devMode == true, onTransition)
-        if (devMode == true && t.error != null) {
-            ErrorTransactionButton(error = t.error)
-        }
-    }
-}
-
-@Preview
-@Composable
-fun TransactionTipPreview() {
-    val t = TransactionTip(
-        transactionId = "transactionId",
-        timestamp = Timestamp.fromMillis(System.currentTimeMillis() - 360 * 60 * 1000),
-        txState = TransactionState(Pending),
-        txActions = listOf(Retry, Suspend, Abort),
-        merchantBaseUrl = "https://merchant.example.org/",
-        amountRaw = Amount.fromString("TESTKUDOS", "42.23"),
-        amountEffective = Amount.fromString("TESTKUDOS", "42.1337"),
-        error = TalerErrorInfo(code = EXCHANGE_GENERIC_KYC_REQUIRED),
-    )
-    Surface {
-        TransactionTipComposable(t, true) {}
-    }
-}
diff --git a/wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt b/wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt
index de47f68..9017854 100644
--- a/wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt
+++ b/wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt
@@ -41,8 +41,8 @@ import net.taler.wallet.R
 import net.taler.wallet.TAG
 import net.taler.wallet.backend.TalerErrorCode
 import net.taler.wallet.backend.TalerErrorInfo
-import net.taler.wallet.cleanExchange
 import net.taler.wallet.balances.CurrencySpecification
+import net.taler.wallet.cleanExchange
 import net.taler.wallet.refund.RefundPaymentInfo
 import net.taler.wallet.transactions.TransactionMajorState.None
 import net.taler.wallet.transactions.TransactionMajorState.Pending
@@ -337,30 +337,6 @@ class TransactionRefund(
 }
 
 @Serializable
-@SerialName("tip")
-class TransactionTip(
-    override val transactionId: String,
-    override val timestamp: Timestamp,
-    override val txState: TransactionState,
-    override val txActions: List<TransactionAction>,
-    val merchantBaseUrl: String,
-    override val error: TalerErrorInfo? = null,
-    override val amountRaw: Amount,
-    override val amountEffective: Amount,
-) : Transaction() {
-    override val icon = R.drawable.transaction_tip_accepted
-    override val detailPageNav = R.id.action_nav_transactions_detail_tip
-
-    @Transient
-    override val amountType = AmountType.Positive
-    override fun getTitle(context: Context): String {
-        return context.getString(R.string.transaction_tip_from, merchantBaseUrl)
-    }
-
-    override val generalTitleRes = R.string.tip_title
-}
-
-@Serializable
 @SerialName("refresh")
 class TransactionRefresh(
     override val transactionId: String,