From bf70ff2d11078e38c8dd3c5d689ebe949fef95d8 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Tue, 3 Jan 2023 09:28:53 -0300 Subject: [wallet] Move to accompanist theme adapter as the old one is deprecated --- .../taler/wallet/transactions/TransactionDepositFragment.kt | 13 +++++-------- .../taler/wallet/transactions/TransactionPeerFragment.kt | 13 +++++-------- 2 files changed, 10 insertions(+), 16 deletions(-) (limited to 'wallet/src/main/java/net/taler/wallet/transactions') diff --git a/wallet/src/main/java/net/taler/wallet/transactions/TransactionDepositFragment.kt b/wallet/src/main/java/net/taler/wallet/transactions/TransactionDepositFragment.kt index 5443942..0162502 100644 --- a/wallet/src/main/java/net/taler/wallet/transactions/TransactionDepositFragment.kt +++ b/wallet/src/main/java/net/taler/wallet/transactions/TransactionDepositFragment.kt @@ -20,9 +20,8 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import androidx.compose.material.Surface import androidx.compose.ui.platform.ComposeView -import com.google.android.material.composethemeadapter.MdcTheme +import net.taler.wallet.TalerSurface import net.taler.wallet.deposit.TransactionDepositComposable class TransactionDepositFragment : TransactionDetailFragment() { @@ -33,12 +32,10 @@ class TransactionDepositFragment : TransactionDetailFragment() { savedInstanceState: Bundle?, ): View = ComposeView(requireContext()).apply { setContent { - MdcTheme { - Surface { - val t = transaction ?: error("No transaction") - TransactionDepositComposable(t as TransactionDeposit) { - onDeleteButtonClicked(t) - } + TalerSurface { + val t = transaction ?: error("No transaction") + TransactionDepositComposable(t as TransactionDeposit) { + onDeleteButtonClicked(t) } } } diff --git a/wallet/src/main/java/net/taler/wallet/transactions/TransactionPeerFragment.kt b/wallet/src/main/java/net/taler/wallet/transactions/TransactionPeerFragment.kt index b03eb39..52d6095 100644 --- a/wallet/src/main/java/net/taler/wallet/transactions/TransactionPeerFragment.kt +++ b/wallet/src/main/java/net/taler/wallet/transactions/TransactionPeerFragment.kt @@ -26,7 +26,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material.MaterialTheme -import androidx.compose.material.Surface import androidx.compose.material.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment.Companion.CenterHorizontally @@ -37,10 +36,10 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.colorResource import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.google.android.material.composethemeadapter.MdcTheme import net.taler.common.Amount import net.taler.common.toAbsoluteTime import net.taler.wallet.R +import net.taler.wallet.TalerSurface import net.taler.wallet.peer.TransactionPeerPullCreditComposable import net.taler.wallet.peer.TransactionPeerPullDebitComposable import net.taler.wallet.peer.TransactionPeerPushCreditComposable @@ -54,12 +53,10 @@ class TransactionPeerFragment : TransactionDetailFragment() { savedInstanceState: Bundle?, ): View = ComposeView(requireContext()).apply { setContent { - MdcTheme { - Surface { - val t = transaction ?: error("No transaction") - TransactionPeerComposable(t) { - onDeleteButtonClicked(t) - } + TalerSurface { + val t = transaction ?: error("No transaction") + TransactionPeerComposable(t) { + onDeleteButtonClicked(t) } } } -- cgit v1.2.3