From 47d08095c3499a4cc5058d9082c7554f12208779 Mon Sep 17 00:00:00 2001 From: Iván Ávalos Date: Tue, 24 Oct 2023 11:50:38 -0600 Subject: [wallet] Remove deprecated ExperimentalMaterial3Api decorators --- wallet/src/main/java/net/taler/wallet/ReceiveFundsFragment.kt | 2 -- wallet/src/main/java/net/taler/wallet/SendFundsFragment.kt | 2 -- wallet/src/main/java/net/taler/wallet/compose/AmountInputField.kt | 2 -- wallet/src/main/java/net/taler/wallet/compose/NumericInputField.kt | 2 -- wallet/src/main/java/net/taler/wallet/compose/SelectionChip.kt | 2 -- .../main/java/net/taler/wallet/deposit/MakeBitcoinDepositComposable.kt | 2 -- wallet/src/main/java/net/taler/wallet/deposit/MakeDepositComposable.kt | 2 -- wallet/src/main/java/net/taler/wallet/deposit/PayToUriFragment.kt | 3 --- .../main/java/net/taler/wallet/payment/PayTemplateOrderComposable.kt | 2 -- .../src/main/java/net/taler/wallet/peer/OutgoingPullIntroComposable.kt | 2 -- .../src/main/java/net/taler/wallet/peer/OutgoingPushIntroComposable.kt | 1 - 11 files changed, 22 deletions(-) diff --git a/wallet/src/main/java/net/taler/wallet/ReceiveFundsFragment.kt b/wallet/src/main/java/net/taler/wallet/ReceiveFundsFragment.kt index e560a71..d7a7f62 100644 --- a/wallet/src/main/java/net/taler/wallet/ReceiveFundsFragment.kt +++ b/wallet/src/main/java/net/taler/wallet/ReceiveFundsFragment.kt @@ -31,7 +31,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material3.Button -import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Surface import androidx.compose.material3.Text @@ -111,7 +110,6 @@ class ReceiveFundsFragment : Fragment() { } } -@OptIn(ExperimentalMaterial3Api::class) @Composable private fun ReceiveFundsIntro( currency: String, diff --git a/wallet/src/main/java/net/taler/wallet/SendFundsFragment.kt b/wallet/src/main/java/net/taler/wallet/SendFundsFragment.kt index b33e53b..5523a60 100644 --- a/wallet/src/main/java/net/taler/wallet/SendFundsFragment.kt +++ b/wallet/src/main/java/net/taler/wallet/SendFundsFragment.kt @@ -29,7 +29,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material3.Button -import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Surface import androidx.compose.material3.Text @@ -91,7 +90,6 @@ class SendFundsFragment : Fragment() { } } -@OptIn(ExperimentalMaterial3Api::class) @Composable private fun SendFundsIntro( currency: String, diff --git a/wallet/src/main/java/net/taler/wallet/compose/AmountInputField.kt b/wallet/src/main/java/net/taler/wallet/compose/AmountInputField.kt index 0229ec5..20f8006 100644 --- a/wallet/src/main/java/net/taler/wallet/compose/AmountInputField.kt +++ b/wallet/src/main/java/net/taler/wallet/compose/AmountInputField.kt @@ -22,7 +22,6 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.text.KeyboardActions import androidx.compose.foundation.text.KeyboardOptions -import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.LocalTextStyle import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Text @@ -43,7 +42,6 @@ import androidx.compose.ui.unit.dp import net.taler.common.Amount import java.text.DecimalFormat -@OptIn(ExperimentalMaterial3Api::class) @Composable fun AmountInputField( value: String, diff --git a/wallet/src/main/java/net/taler/wallet/compose/NumericInputField.kt b/wallet/src/main/java/net/taler/wallet/compose/NumericInputField.kt index c9d2fc5..5911039 100644 --- a/wallet/src/main/java/net/taler/wallet/compose/NumericInputField.kt +++ b/wallet/src/main/java/net/taler/wallet/compose/NumericInputField.kt @@ -20,14 +20,12 @@ import androidx.compose.foundation.layout.Row import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Add import androidx.compose.material.icons.filled.Remove -import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.OutlinedTextField import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -@OptIn(ExperimentalMaterial3Api::class) @Composable fun NumericInputField( modifier: Modifier = Modifier, diff --git a/wallet/src/main/java/net/taler/wallet/compose/SelectionChip.kt b/wallet/src/main/java/net/taler/wallet/compose/SelectionChip.kt index 454bbfa..c47f55d 100644 --- a/wallet/src/main/java/net/taler/wallet/compose/SelectionChip.kt +++ b/wallet/src/main/java/net/taler/wallet/compose/SelectionChip.kt @@ -16,7 +16,6 @@ package net.taler.wallet.compose -import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.MaterialTheme import androidx.compose.material3.SuggestionChip import androidx.compose.material3.SuggestionChipDefaults @@ -24,7 +23,6 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color -@OptIn(ExperimentalMaterial3Api::class) @Composable fun SelectionChip( label: @Composable () -> Unit, diff --git a/wallet/src/main/java/net/taler/wallet/deposit/MakeBitcoinDepositComposable.kt b/wallet/src/main/java/net/taler/wallet/deposit/MakeBitcoinDepositComposable.kt index d961f34..27348bc 100644 --- a/wallet/src/main/java/net/taler/wallet/deposit/MakeBitcoinDepositComposable.kt +++ b/wallet/src/main/java/net/taler/wallet/deposit/MakeBitcoinDepositComposable.kt @@ -23,7 +23,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material3.Button -import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.MaterialTheme import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Surface @@ -51,7 +50,6 @@ import net.taler.wallet.R import net.taler.wallet.transactions.AmountType import net.taler.wallet.transactions.TransactionAmountComposable -@OptIn(ExperimentalMaterial3Api::class) @Composable fun MakeBitcoinDepositComposable( state: DepositState, diff --git a/wallet/src/main/java/net/taler/wallet/deposit/MakeDepositComposable.kt b/wallet/src/main/java/net/taler/wallet/deposit/MakeDepositComposable.kt index d14ed96..74b97d1 100644 --- a/wallet/src/main/java/net/taler/wallet/deposit/MakeDepositComposable.kt +++ b/wallet/src/main/java/net/taler/wallet/deposit/MakeDepositComposable.kt @@ -23,7 +23,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material3.Button -import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.MaterialTheme import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Surface @@ -49,7 +48,6 @@ import androidx.compose.ui.unit.sp import net.taler.common.Amount import net.taler.wallet.R -@OptIn(ExperimentalMaterial3Api::class) @Composable fun MakeDepositComposable( state: DepositState, diff --git a/wallet/src/main/java/net/taler/wallet/deposit/PayToUriFragment.kt b/wallet/src/main/java/net/taler/wallet/deposit/PayToUriFragment.kt index 4bc91e1..c7a4eb0 100644 --- a/wallet/src/main/java/net/taler/wallet/deposit/PayToUriFragment.kt +++ b/wallet/src/main/java/net/taler/wallet/deposit/PayToUriFragment.kt @@ -34,7 +34,6 @@ import androidx.compose.foundation.verticalScroll import androidx.compose.material3.Button import androidx.compose.material3.DropdownMenu import androidx.compose.material3.DropdownMenuItem -import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.LocalTextStyle import androidx.compose.material3.MaterialTheme import androidx.compose.material3.OutlinedTextField @@ -115,7 +114,6 @@ class PayToUriFragment : Fragment() { } -@OptIn(ExperimentalMaterial3Api::class) @Composable private fun PayToComposable( currencies: List, @@ -181,7 +179,6 @@ private fun PayToComposable( } } -@OptIn(ExperimentalMaterial3Api::class) @Composable fun CurrencyDropdown( currencies: List, diff --git a/wallet/src/main/java/net/taler/wallet/payment/PayTemplateOrderComposable.kt b/wallet/src/main/java/net/taler/wallet/payment/PayTemplateOrderComposable.kt index 1524faf..d6131c7 100644 --- a/wallet/src/main/java/net/taler/wallet/payment/PayTemplateOrderComposable.kt +++ b/wallet/src/main/java/net/taler/wallet/payment/PayTemplateOrderComposable.kt @@ -21,7 +21,6 @@ import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.material3.Button -import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -41,7 +40,6 @@ import net.taler.wallet.compose.AmountInputField import net.taler.wallet.compose.TalerSurface import net.taler.wallet.deposit.CurrencyDropdown -@OptIn(ExperimentalMaterial3Api::class) @Composable fun PayTemplateOrderComposable( currencies: List, // assumed to have size > 0 diff --git a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullIntroComposable.kt b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullIntroComposable.kt index ff6e2ee..92bc72e 100644 --- a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullIntroComposable.kt +++ b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullIntroComposable.kt @@ -22,7 +22,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material3.Button -import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.MaterialTheme import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Surface @@ -52,7 +51,6 @@ import net.taler.wallet.transactions.TransactionAmountComposable import net.taler.wallet.transactions.TransactionInfoComposable import kotlin.random.Random -@OptIn(ExperimentalMaterial3Api::class) @Composable fun OutgoingPullIntroComposable( amount: Amount, diff --git a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushIntroComposable.kt b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushIntroComposable.kt index ecd666c..98391be 100644 --- a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushIntroComposable.kt +++ b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushIntroComposable.kt @@ -48,7 +48,6 @@ import net.taler.common.Amount import net.taler.wallet.R import kotlin.random.Random -@OptIn(ExperimentalMaterial3Api::class) @Composable fun OutgoingPushIntroComposable( state: OutgoingState, -- cgit v1.2.3