From 61f64daf56a4f0ae6cb89ce17fdb22c9431c89c7 Mon Sep 17 00:00:00 2001 From: Infi Date: Tue, 30 May 2023 14:19:50 +0200 Subject: [PATCH] chore: remove unneeded @OptIn annotations Signed-off-by: Infi --- .../chat/revolt/activities/MainActivity.kt | 11 ++++---- .../activities/media/ImageViewActivity.kt | 2 -- .../activities/media/VideoViewActivity.kt | 2 -- .../components/generic/FormTextField.kt | 2 -- .../screens/chat/dialogs/FeedbackDialog.kt | 2 -- .../dialogs/safety/ReportMessageDialog.kt | 27 ++++++++++++++++--- 6 files changed, 29 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/chat/revolt/activities/MainActivity.kt b/app/src/main/java/chat/revolt/activities/MainActivity.kt index 66c9efba..276a8eae 100644 --- a/app/src/main/java/chat/revolt/activities/MainActivity.kt +++ b/app/src/main/java/chat/revolt/activities/MainActivity.kt @@ -2,13 +2,15 @@ package chat.revolt.activities import android.os.Bundle import androidx.activity.compose.setContent -import androidx.compose.animation.* +import androidx.compose.animation.AnimatedContentTransitionScope import androidx.compose.animation.core.EaseInOutExpo import androidx.compose.animation.core.FiniteAnimationSpec import androidx.compose.animation.core.tween -import androidx.compose.foundation.layout.* -import androidx.compose.material3.* -import androidx.compose.runtime.* +import androidx.compose.animation.fadeOut +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.IntOffset @@ -59,7 +61,6 @@ val RevoltTweenInt: FiniteAnimationSpec = tween(400, easing = EaseInO val RevoltTweenFloat: FiniteAnimationSpec = tween(400, easing = EaseInOutExpo) val RevoltTweenDp: FiniteAnimationSpec = tween(400, easing = EaseInOutExpo) -@OptIn(ExperimentalAnimationApi::class) @Composable fun AppEntrypoint() { val navController = rememberNavController() diff --git a/app/src/main/java/chat/revolt/activities/media/ImageViewActivity.kt b/app/src/main/java/chat/revolt/activities/media/ImageViewActivity.kt index de86ad62..2a1119bf 100644 --- a/app/src/main/java/chat/revolt/activities/media/ImageViewActivity.kt +++ b/app/src/main/java/chat/revolt/activities/media/ImageViewActivity.kt @@ -18,7 +18,6 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding import androidx.compose.material3.DropdownMenu import androidx.compose.material3.DropdownMenuItem -import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme @@ -76,7 +75,6 @@ class ImageViewActivity : ComponentActivity() { } } -@OptIn(ExperimentalMaterial3Api::class) @Composable fun ImageViewScreen( resource: AutumnResource, diff --git a/app/src/main/java/chat/revolt/activities/media/VideoViewActivity.kt b/app/src/main/java/chat/revolt/activities/media/VideoViewActivity.kt index 0f2c5558..227ff003 100644 --- a/app/src/main/java/chat/revolt/activities/media/VideoViewActivity.kt +++ b/app/src/main/java/chat/revolt/activities/media/VideoViewActivity.kt @@ -18,7 +18,6 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding import androidx.compose.material3.DropdownMenu import androidx.compose.material3.DropdownMenuItem -import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme @@ -79,7 +78,6 @@ class VideoViewActivity : ComponentActivity() { } } -@OptIn(ExperimentalMaterial3Api::class) @androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class) @Composable fun VideoViewScreen( diff --git a/app/src/main/java/chat/revolt/components/generic/FormTextField.kt b/app/src/main/java/chat/revolt/components/generic/FormTextField.kt index 8cd224fb..fa56d30a 100644 --- a/app/src/main/java/chat/revolt/components/generic/FormTextField.kt +++ b/app/src/main/java/chat/revolt/components/generic/FormTextField.kt @@ -1,7 +1,6 @@ package chat.revolt.components.generic import androidx.compose.foundation.text.KeyboardOptions -import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Text import androidx.compose.material3.TextField import androidx.compose.runtime.Composable @@ -13,7 +12,6 @@ import androidx.compose.ui.text.input.VisualTransformation /** * Convenience wrapper around [TextField] that sets the [KeyboardOptions] and [VisualTransformation] */ -@OptIn(ExperimentalMaterial3Api::class) @Composable fun FormTextField( value: String, diff --git a/app/src/main/java/chat/revolt/screens/chat/dialogs/FeedbackDialog.kt b/app/src/main/java/chat/revolt/screens/chat/dialogs/FeedbackDialog.kt index 0df0a15f..32315ded 100644 --- a/app/src/main/java/chat/revolt/screens/chat/dialogs/FeedbackDialog.kt +++ b/app/src/main/java/chat/revolt/screens/chat/dialogs/FeedbackDialog.kt @@ -12,7 +12,6 @@ import androidx.compose.material.icons.filled.ArrowDropDown import androidx.compose.material3.AlertDialog import androidx.compose.material3.DropdownMenu import androidx.compose.material3.DropdownMenuItem -import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.IconToggleButton import androidx.compose.material3.Text @@ -99,7 +98,6 @@ suspend fun sendFeedback(type: FeedbackType, message: String): String { return response.bodyAsText() } -@OptIn(ExperimentalMaterial3Api::class) @Composable fun FeedbackDialog(navController: NavController) { if (!BuildConfig.ANALYSIS_ENABLED) { diff --git a/app/src/main/java/chat/revolt/screens/chat/dialogs/safety/ReportMessageDialog.kt b/app/src/main/java/chat/revolt/screens/chat/dialogs/safety/ReportMessageDialog.kt index 19835ca5..74dcf0a6 100644 --- a/app/src/main/java/chat/revolt/screens/chat/dialogs/safety/ReportMessageDialog.kt +++ b/app/src/main/java/chat/revolt/screens/chat/dialogs/safety/ReportMessageDialog.kt @@ -2,15 +2,35 @@ package chat.revolt.screens.chat.dialogs.safety import android.util.Log import androidx.compose.foundation.background -import androidx.compose.foundation.layout.* +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.heightIn +import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.ArrowDropDown import androidx.compose.material.icons.filled.Check import androidx.compose.material.icons.filled.Close -import androidx.compose.material3.* -import androidx.compose.runtime.* +import androidx.compose.material3.AlertDialog +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.DropdownMenu +import androidx.compose.material3.DropdownMenuItem +import androidx.compose.material3.Icon +import androidx.compose.material3.IconToggleButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.material3.TextField +import androidx.compose.material3.surfaceColorAtElevation +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip @@ -37,7 +57,6 @@ enum class ReportFlowState { Error } -@OptIn(ExperimentalMaterial3Api::class) @Composable fun ReportMessageDialog( navController: NavController,