summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIván Ávalos <avalos@disroot.org>2023-10-13 20:54:55 -0600
committerIván Ávalos <avalos@disroot.org>2023-11-11 13:20:09 -0600
commit47372922558c4f0463c647b65332695d156b3754 (patch)
tree6b139f5f90321710bd197279c51b7e101c46fca2
parentc2c2fadc3af743251031c726653bfdbb12e7ddb0 (diff)
downloadtaler-android-47372922558c4f0463c647b65332695d156b3754.tar.gz
taler-android-47372922558c4f0463c647b65332695d156b3754.tar.bz2
taler-android-47372922558c4f0463c647b65332695d156b3754.zip
[anastasis] Remove ExperimentalMaterial3Api where no longer needed
-rw-r--r--anastasis/src/main/java/net/taler/anastasis/ui/components/DatePickerField.kt2
-rw-r--r--anastasis/src/main/java/net/taler/anastasis/ui/components/Form.kt2
-rw-r--r--anastasis/src/main/java/net/taler/anastasis/ui/components/PinInputField.kt2
-rw-r--r--anastasis/src/main/java/net/taler/anastasis/ui/forms/EditAnswerForm.kt2
-rw-r--r--anastasis/src/main/java/net/taler/anastasis/ui/forms/EditQuestionForm.kt3
-rw-r--r--anastasis/src/main/java/net/taler/anastasis/ui/forms/EditTotpForm.kt3
-rw-r--r--anastasis/src/main/java/net/taler/anastasis/ui/screens/backup/ReviewPoliciesScreen.kt1
-rw-r--r--anastasis/src/main/java/net/taler/anastasis/ui/screens/common/ManageProvidersScreen.kt2
-rw-r--r--anastasis/src/main/java/net/taler/anastasis/ui/screens/common/SelectUserAttributesScreen.kt2
-rw-r--r--anastasis/src/main/java/net/taler/anastasis/ui/screens/recovery/RecoveryFinishedScreen.kt2
10 files changed, 1 insertions, 20 deletions
diff --git a/anastasis/src/main/java/net/taler/anastasis/ui/components/DatePickerField.kt b/anastasis/src/main/java/net/taler/anastasis/ui/components/DatePickerField.kt
index 2e4ff08..69a01ef 100644
--- a/anastasis/src/main/java/net/taler/anastasis/ui/components/DatePickerField.kt
+++ b/anastasis/src/main/java/net/taler/anastasis/ui/components/DatePickerField.kt
@@ -25,7 +25,6 @@ import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Edit
import androidx.compose.material3.Button
import androidx.compose.material3.ButtonDefaults
-import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.LocalTextStyle
import androidx.compose.material3.MaterialTheme
@@ -46,7 +45,6 @@ import kotlinx.datetime.atStartOfDayIn
import net.taler.anastasis.shared.Utils
import net.taler.anastasis.ui.theme.LocalSpacing
-@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun DatePickerField(
modifier: Modifier = Modifier,
diff --git a/anastasis/src/main/java/net/taler/anastasis/ui/components/Form.kt b/anastasis/src/main/java/net/taler/anastasis/ui/components/Form.kt
index 503259c..33e0fe9 100644
--- a/anastasis/src/main/java/net/taler/anastasis/ui/components/Form.kt
+++ b/anastasis/src/main/java/net/taler/anastasis/ui/components/Form.kt
@@ -24,7 +24,6 @@ import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.material3.Button
-import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
@@ -64,7 +63,6 @@ fun Form(
}
}
-@OptIn(ExperimentalMaterial3Api::class)
@Preview
@Composable
fun FormPreview() {
diff --git a/anastasis/src/main/java/net/taler/anastasis/ui/components/PinInputField.kt b/anastasis/src/main/java/net/taler/anastasis/ui/components/PinInputField.kt
index c3081bb..e2d11a9 100644
--- a/anastasis/src/main/java/net/taler/anastasis/ui/components/PinInputField.kt
+++ b/anastasis/src/main/java/net/taler/anastasis/ui/components/PinInputField.kt
@@ -18,12 +18,10 @@ package net.taler.anastasis.ui.components
import androidx.compose.foundation.text.KeyboardActions
import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.OutlinedTextField
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
-@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun PinInputField(
modifier: Modifier = Modifier,
diff --git a/anastasis/src/main/java/net/taler/anastasis/ui/forms/EditAnswerForm.kt b/anastasis/src/main/java/net/taler/anastasis/ui/forms/EditAnswerForm.kt
index 7034fda..d572def 100644
--- a/anastasis/src/main/java/net/taler/anastasis/ui/forms/EditAnswerForm.kt
+++ b/anastasis/src/main/java/net/taler/anastasis/ui/forms/EditAnswerForm.kt
@@ -20,7 +20,6 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.text.KeyboardActions
import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
@@ -42,7 +41,6 @@ import net.taler.anastasis.R
import net.taler.anastasis.shared.FieldStatus
import net.taler.anastasis.ui.theme.AnastasisTheme
-@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun EditAnswerForm(
questionLabel: String? = null,
diff --git a/anastasis/src/main/java/net/taler/anastasis/ui/forms/EditQuestionForm.kt b/anastasis/src/main/java/net/taler/anastasis/ui/forms/EditQuestionForm.kt
index a402a5d..a5f459c 100644
--- a/anastasis/src/main/java/net/taler/anastasis/ui/forms/EditQuestionForm.kt
+++ b/anastasis/src/main/java/net/taler/anastasis/ui/forms/EditQuestionForm.kt
@@ -20,7 +20,6 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.text.KeyboardActions
import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
@@ -33,9 +32,7 @@ import androidx.compose.ui.platform.LocalFocusManager
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.input.ImeAction
import net.taler.anastasis.R
-import net.taler.anastasis.models.AuthMethod
-@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun EditQuestionForm(
question: String?,
diff --git a/anastasis/src/main/java/net/taler/anastasis/ui/forms/EditTotpForm.kt b/anastasis/src/main/java/net/taler/anastasis/ui/forms/EditTotpForm.kt
index 1f66f76..bfc5423 100644
--- a/anastasis/src/main/java/net/taler/anastasis/ui/forms/EditTotpForm.kt
+++ b/anastasis/src/main/java/net/taler/anastasis/ui/forms/EditTotpForm.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.OutlinedTextField
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
@@ -49,7 +48,7 @@ import net.taler.anastasis.ui.theme.LocalSpacing
import net.taler.common.CryptoUtils
import kotlin.random.Random
-@OptIn(ExperimentalMaterial3Api::class, ExperimentalUnsignedTypes::class)
+@OptIn(ExperimentalUnsignedTypes::class)
@Composable
fun EditTotpForm(
modifier: Modifier = Modifier,
diff --git a/anastasis/src/main/java/net/taler/anastasis/ui/screens/backup/ReviewPoliciesScreen.kt b/anastasis/src/main/java/net/taler/anastasis/ui/screens/backup/ReviewPoliciesScreen.kt
index 66b6990..8094c7b 100644
--- a/anastasis/src/main/java/net/taler/anastasis/ui/screens/backup/ReviewPoliciesScreen.kt
+++ b/anastasis/src/main/java/net/taler/anastasis/ui/screens/backup/ReviewPoliciesScreen.kt
@@ -66,7 +66,6 @@ import net.taler.anastasis.viewmodels.FakeBackupViewModel
import net.taler.anastasis.viewmodels.ReducerViewModel
import net.taler.anastasis.viewmodels.ReducerViewModelI
-@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun ReviewPoliciesScreen(
viewModel: ReducerViewModelI = hiltViewModel<ReducerViewModel>(),
diff --git a/anastasis/src/main/java/net/taler/anastasis/ui/screens/common/ManageProvidersScreen.kt b/anastasis/src/main/java/net/taler/anastasis/ui/screens/common/ManageProvidersScreen.kt
index e393c24..f66a85c 100644
--- a/anastasis/src/main/java/net/taler/anastasis/ui/screens/common/ManageProvidersScreen.kt
+++ b/anastasis/src/main/java/net/taler/anastasis/ui/screens/common/ManageProvidersScreen.kt
@@ -35,7 +35,6 @@ import androidx.compose.material.icons.filled.Error
import androidx.compose.material.icons.filled.QuestionMark
import androidx.compose.material.icons.filled.SyncDisabled
import androidx.compose.material3.ElevatedCard
-import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.FloatingActionButton
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
@@ -65,7 +64,6 @@ import net.taler.anastasis.ui.pages.WizardPage
import net.taler.anastasis.ui.theme.LocalSpacing
import net.taler.anastasis.viewmodels.FakeBackupViewModel
-@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun ManageProvidersScreen(
nestedScrollConnection: NestedScrollConnection,
diff --git a/anastasis/src/main/java/net/taler/anastasis/ui/screens/common/SelectUserAttributesScreen.kt b/anastasis/src/main/java/net/taler/anastasis/ui/screens/common/SelectUserAttributesScreen.kt
index 8dfb3ec..45375ab 100644
--- a/anastasis/src/main/java/net/taler/anastasis/ui/screens/common/SelectUserAttributesScreen.kt
+++ b/anastasis/src/main/java/net/taler/anastasis/ui/screens/common/SelectUserAttributesScreen.kt
@@ -26,7 +26,6 @@ import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.text.KeyboardActions
import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
@@ -55,7 +54,6 @@ import net.taler.anastasis.viewmodels.FakeBackupViewModel
import net.taler.anastasis.viewmodels.ReducerViewModel
import net.taler.anastasis.viewmodels.ReducerViewModelI
-@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun SelectUserAttributesScreen(
viewModel: ReducerViewModelI = hiltViewModel<ReducerViewModel>(),
diff --git a/anastasis/src/main/java/net/taler/anastasis/ui/screens/recovery/RecoveryFinishedScreen.kt b/anastasis/src/main/java/net/taler/anastasis/ui/screens/recovery/RecoveryFinishedScreen.kt
index ea893a9..3bc48d2 100644
--- a/anastasis/src/main/java/net/taler/anastasis/ui/screens/recovery/RecoveryFinishedScreen.kt
+++ b/anastasis/src/main/java/net/taler/anastasis/ui/screens/recovery/RecoveryFinishedScreen.kt
@@ -31,7 +31,6 @@ import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material.Icon
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.CloudDone
-import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedButton
import androidx.compose.material3.OutlinedTextField
@@ -58,7 +57,6 @@ import net.taler.common.CryptoUtils
import java.io.IOException
import java.util.UUID
-@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun RecoveryFinishedScreen(
viewModel: ReducerViewModelI = hiltViewModel<ReducerViewModel>(),