From f769dcb3156d3fc61aca84d9ac3a03bdb401dce1 Mon Sep 17 00:00:00 2001 From: Infi Date: Thu, 7 Mar 2024 21:10:15 +0100 Subject: [PATCH] style(lint): fix deprecation issues Signed-off-by: Infi --- .../activities/media/ImageViewActivity.kt | 4 +-- .../activities/media/VideoViewActivity.kt | 4 +-- .../chat/revolt/api/internals/SpecialUsers.kt | 4 +-- .../components/chat/NativeMessageField.kt | 4 +-- .../revolt/components/emoji/EmojiPicker.kt | 13 +++----- .../screens/chat/AttachmentManager.kt | 2 +- .../components/screens/chat/ChannelHeader.kt | 4 +-- .../chat/revolt/screens/about/AboutScreen.kt | 5 +-- .../revolt/screens/about/AttributionScreen.kt | 4 +-- .../revolt/screens/chat/ChatRouterScreen.kt | 1 - .../screens/create/CreateGroupScreen.kt | 4 +-- .../revolt/screens/labs/LabsHomeScreen.kt | 4 +-- .../labs/ui/mockups/CallScreenMockup.kt | 4 +-- .../revolt/screens/services/DiscoverScreen.kt | 4 +-- .../settings/AppearanceSettingsScreen.kt | 33 ++++++------------- .../screens/settings/ChangelogsScreen.kt | 10 +++--- .../screens/settings/ChatSettingsScreen.kt | 4 +-- .../screens/settings/DebugSettingsScreen.kt | 4 +-- .../screens/settings/ProfileSettngsScreen.kt | 9 ++--- .../screens/settings/SessionSettngsScreen.kt | 4 +-- .../revolt/screens/settings/SettingsScreen.kt | 8 ++--- .../settings/channel/ChannelSettingsHome.kt | 4 +-- .../channel/ChannelSettingsOverview.kt | 6 ++-- .../channel/ChannelSettingsPermissions.kt | 4 +-- .../java/chat/revolt/sheets/AddServerSheet.kt | 4 +-- .../chat/revolt/sheets/ChannelInfoSheet.kt | 4 +-- .../chat/revolt/sheets/ReactionInfoSheet.kt | 4 +-- 27 files changed, 71 insertions(+), 88 deletions(-) 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 a6e7063a..cdf02bda 100644 --- a/app/src/main/java/chat/revolt/activities/media/ImageViewActivity.kt +++ b/app/src/main/java/chat/revolt/activities/media/ImageViewActivity.kt @@ -15,7 +15,7 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.ArrowBack +import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material3.DropdownMenu import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.ExperimentalMaterial3Api @@ -205,7 +205,7 @@ fun ImageViewScreen(resource: AutumnResource, onClose: () -> Unit = {}) { onClose() }) { Icon( - imageVector = Icons.Default.ArrowBack, + imageVector = Icons.AutoMirrored.Default.ArrowBack, contentDescription = stringResource(id = R.string.back) ) } 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 9b0c78d2..683c5312 100644 --- a/app/src/main/java/chat/revolt/activities/media/VideoViewActivity.kt +++ b/app/src/main/java/chat/revolt/activities/media/VideoViewActivity.kt @@ -15,7 +15,7 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.ArrowBack +import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material3.DropdownMenu import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.ExperimentalMaterial3Api @@ -219,7 +219,7 @@ fun VideoViewScreen(resource: AutumnResource, onClose: () -> Unit = {}) { onClose() }) { Icon( - imageVector = Icons.Default.ArrowBack, + imageVector = Icons.AutoMirrored.Default.ArrowBack, contentDescription = stringResource(id = R.string.back) ) } diff --git a/app/src/main/java/chat/revolt/api/internals/SpecialUsers.kt b/app/src/main/java/chat/revolt/api/internals/SpecialUsers.kt index f44a492d..819db4ba 100644 --- a/app/src/main/java/chat/revolt/api/internals/SpecialUsers.kt +++ b/app/src/main/java/chat/revolt/api/internals/SpecialUsers.kt @@ -10,9 +10,9 @@ import org.intellij.lang.annotations.Language import androidx.compose.ui.graphics.Brush as AndroidBrush object SpecialUsers { - val JENNIFER = "01F1WKM5TK2V6KCZWR6DGBJDTZ" + const val JENNIFER = "01F1WKM5TK2V6KCZWR6DGBJDTZ" - val PLATFORM_MODERATION_USER = "01FC17E1WTM2BGE4F3ARN3FDAF" + const val PLATFORM_MODERATION_USER = "01FC17E1WTM2BGE4F3ARN3FDAF" val TRUSTED_MODERATION_BOTS = listOf( "01GXBYCNQ52A9QYCQ99RBPXPAW", // AutoMod diff --git a/app/src/main/java/chat/revolt/components/chat/NativeMessageField.kt b/app/src/main/java/chat/revolt/components/chat/NativeMessageField.kt index d2f1ea11..47b713d8 100644 --- a/app/src/main/java/chat/revolt/components/chat/NativeMessageField.kt +++ b/app/src/main/java/chat/revolt/components/chat/NativeMessageField.kt @@ -34,10 +34,10 @@ import androidx.compose.foundation.lazy.LazyRow import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.shape.CircleShape import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.Send import androidx.compose.material.icons.filled.Add import androidx.compose.material.icons.filled.Close import androidx.compose.material.icons.filled.Edit -import androidx.compose.material.icons.filled.Send import androidx.compose.material3.Icon import androidx.compose.material3.LocalContentColor import androidx.compose.material3.MaterialTheme @@ -579,7 +579,7 @@ fun NativeMessageField( Icon( when { editMode -> Icons.Default.Edit - else -> Icons.Default.Send + else -> Icons.AutoMirrored.Default.Send }, tint = MaterialTheme.colorScheme.primary, contentDescription = stringResource(id = R.string.send_alt), diff --git a/app/src/main/java/chat/revolt/components/emoji/EmojiPicker.kt b/app/src/main/java/chat/revolt/components/emoji/EmojiPicker.kt index cc2150ad..ca5c525f 100644 --- a/app/src/main/java/chat/revolt/components/emoji/EmojiPicker.kt +++ b/app/src/main/java/chat/revolt/components/emoji/EmojiPicker.kt @@ -31,10 +31,9 @@ import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.text.BasicTextField import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight import androidx.compose.material.icons.filled.Close -import androidx.compose.material.icons.filled.KeyboardArrowLeft -import androidx.compose.material.icons.filled.KeyboardArrowRight -import androidx.compose.material3.Divider +import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.LocalContentColor import androidx.compose.material3.LocalTextStyle @@ -338,11 +337,7 @@ fun EmojiPicker(onEmojiSelected: (String) -> Unit) { textAlign = TextAlign.Center ) Icon( - imageVector = if (LocalLayoutDirection.current == LayoutDirection.Rtl) { - Icons.Default.KeyboardArrowLeft - } else { - Icons.Default.KeyboardArrowRight - }, + imageVector = Icons.AutoMirrored.Default.KeyboardArrowRight, contentDescription = stringResource( R.string.emoji_picker_close_skin_tone_menu ), @@ -542,7 +537,7 @@ fun EmojiPicker(onEmojiSelected: (String) -> Unit) { GridItemSpan(spanCount) } ) { - Divider() + HorizontalDivider() } } diff --git a/app/src/main/java/chat/revolt/components/screens/chat/AttachmentManager.kt b/app/src/main/java/chat/revolt/components/screens/chat/AttachmentManager.kt index 7a6ea72a..eab138d6 100644 --- a/app/src/main/java/chat/revolt/components/screens/chat/AttachmentManager.kt +++ b/app/src/main/java/chat/revolt/components/screens/chat/AttachmentManager.kt @@ -84,7 +84,7 @@ fun AttachmentManager( AnimatedVisibility(visible = uploading) { LinearProgressIndicator( - progress = animatedProgress, + progress = { animatedProgress }, modifier = Modifier .fillMaxWidth() ) diff --git a/app/src/main/java/chat/revolt/components/screens/chat/ChannelHeader.kt b/app/src/main/java/chat/revolt/components/screens/chat/ChannelHeader.kt index 6902a26b..07706ac0 100644 --- a/app/src/main/java/chat/revolt/components/screens/chat/ChannelHeader.kt +++ b/app/src/main/java/chat/revolt/components/screens/chat/ChannelHeader.kt @@ -9,7 +9,7 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.KeyboardArrowRight +import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight import androidx.compose.material.icons.filled.Menu import androidx.compose.material3.Icon import androidx.compose.material3.IconButton @@ -92,7 +92,7 @@ fun ChannelHeader( Spacer(modifier = Modifier.width(4.dp)) Icon( - imageVector = Icons.Default.KeyboardArrowRight, + imageVector = Icons.AutoMirrored.Default.KeyboardArrowRight, contentDescription = stringResource(R.string.menu), modifier = Modifier .size(18.dp) diff --git a/app/src/main/java/chat/revolt/screens/about/AboutScreen.kt b/app/src/main/java/chat/revolt/screens/about/AboutScreen.kt index 8b78689c..1308071d 100644 --- a/app/src/main/java/chat/revolt/screens/about/AboutScreen.kt +++ b/app/src/main/java/chat/revolt/screens/about/AboutScreen.kt @@ -16,6 +16,7 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material.icons.filled.ArrowBack import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.ElevatedButton @@ -63,7 +64,7 @@ import kotlinx.coroutines.launch import kotlinx.serialization.encodeToString import java.net.URI -class AboutViewModel() : ViewModel() { +class AboutViewModel : ViewModel() { var root by mutableStateOf(null) var selectedTabIndex by mutableIntStateOf(0) @@ -169,7 +170,7 @@ fun AboutScreen(navController: NavController, viewModel: AboutViewModel = viewMo navController.popBackStack() }) { Icon( - imageVector = Icons.Default.ArrowBack, + imageVector = Icons.AutoMirrored.Default.ArrowBack, contentDescription = stringResource(id = R.string.back) ) } diff --git a/app/src/main/java/chat/revolt/screens/about/AttributionScreen.kt b/app/src/main/java/chat/revolt/screens/about/AttributionScreen.kt index d88fc714..b4844022 100644 --- a/app/src/main/java/chat/revolt/screens/about/AttributionScreen.kt +++ b/app/src/main/java/chat/revolt/screens/about/AttributionScreen.kt @@ -13,7 +13,7 @@ import androidx.compose.foundation.lazy.items import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.ArrowBack +import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.IconButton @@ -171,7 +171,7 @@ fun AttributionScreen(navController: NavController) { navController.popBackStack() }) { Icon( - imageVector = Icons.Default.ArrowBack, + imageVector = Icons.AutoMirrored.Default.ArrowBack, contentDescription = stringResource(id = R.string.back) ) } diff --git a/app/src/main/java/chat/revolt/screens/chat/ChatRouterScreen.kt b/app/src/main/java/chat/revolt/screens/chat/ChatRouterScreen.kt index c9d3d5b4..9ac4d8df 100644 --- a/app/src/main/java/chat/revolt/screens/chat/ChatRouterScreen.kt +++ b/app/src/main/java/chat/revolt/screens/chat/ChatRouterScreen.kt @@ -50,7 +50,6 @@ import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.setValue import androidx.compose.runtime.snapshotFlow import androidx.compose.ui.Alignment -import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalContext diff --git a/app/src/main/java/chat/revolt/screens/create/CreateGroupScreen.kt b/app/src/main/java/chat/revolt/screens/create/CreateGroupScreen.kt index 2ade3e7a..d4d30845 100644 --- a/app/src/main/java/chat/revolt/screens/create/CreateGroupScreen.kt +++ b/app/src/main/java/chat/revolt/screens/create/CreateGroupScreen.kt @@ -11,7 +11,7 @@ import androidx.compose.foundation.layout.imePadding import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.ArrowBack +import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material.icons.filled.Check import androidx.compose.material.icons.filled.Search import androidx.compose.material3.Checkbox @@ -124,7 +124,7 @@ fun CreateGroupScreen( navController.popBackStack() }) { Icon( - imageVector = Icons.Default.ArrowBack, + imageVector = Icons.AutoMirrored.Default.ArrowBack, contentDescription = stringResource(id = R.string.back) ) } diff --git a/app/src/main/java/chat/revolt/screens/labs/LabsHomeScreen.kt b/app/src/main/java/chat/revolt/screens/labs/LabsHomeScreen.kt index adf07e92..e4eee9c9 100644 --- a/app/src/main/java/chat/revolt/screens/labs/LabsHomeScreen.kt +++ b/app/src/main/java/chat/revolt/screens/labs/LabsHomeScreen.kt @@ -13,8 +13,8 @@ import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Home import androidx.compose.material.icons.filled.Menu -import androidx.compose.material3.Divider import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.ListItem import androidx.compose.material3.MaterialTheme @@ -125,7 +125,7 @@ fun LabsHomeScreen(navController: NavController) { navController.navigate("mockups/call") } ) - Divider() + HorizontalDivider() } } } diff --git a/app/src/main/java/chat/revolt/screens/labs/ui/mockups/CallScreenMockup.kt b/app/src/main/java/chat/revolt/screens/labs/ui/mockups/CallScreenMockup.kt index 580b71ca..05b04eb0 100644 --- a/app/src/main/java/chat/revolt/screens/labs/ui/mockups/CallScreenMockup.kt +++ b/app/src/main/java/chat/revolt/screens/labs/ui/mockups/CallScreenMockup.kt @@ -19,8 +19,8 @@ import androidx.compose.foundation.layout.safeDrawingPadding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight import androidx.compose.material.icons.filled.KeyboardArrowDown -import androidx.compose.material.icons.filled.KeyboardArrowRight import androidx.compose.material3.Button import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.Checkbox @@ -149,7 +149,7 @@ fun CallScreenMockup() { Spacer(modifier = Modifier.width(4.dp)) Icon( - imageVector = Icons.Default.KeyboardArrowRight, + imageVector = Icons.AutoMirrored.Default.KeyboardArrowRight, contentDescription = stringResource(R.string.menu), modifier = Modifier .size(18.dp) diff --git a/app/src/main/java/chat/revolt/screens/services/DiscoverScreen.kt b/app/src/main/java/chat/revolt/screens/services/DiscoverScreen.kt index b833e94e..3e53351f 100644 --- a/app/src/main/java/chat/revolt/screens/services/DiscoverScreen.kt +++ b/app/src/main/java/chat/revolt/screens/services/DiscoverScreen.kt @@ -4,7 +4,7 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.ArrowBack +import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.IconButton @@ -37,7 +37,7 @@ fun DiscoverScreen(navController: NavController) { navController.popBackStack() }) { Icon( - imageVector = Icons.Default.ArrowBack, + imageVector = Icons.AutoMirrored.Default.ArrowBack, contentDescription = stringResource(id = R.string.back) ) } diff --git a/app/src/main/java/chat/revolt/screens/settings/AppearanceSettingsScreen.kt b/app/src/main/java/chat/revolt/screens/settings/AppearanceSettingsScreen.kt index 844ba227..aa7fa68c 100644 --- a/app/src/main/java/chat/revolt/screens/settings/AppearanceSettingsScreen.kt +++ b/app/src/main/java/chat/revolt/screens/settings/AppearanceSettingsScreen.kt @@ -24,12 +24,11 @@ import androidx.compose.foundation.layout.width import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.ArrowBack +import androidx.compose.material.icons.automirrored.filled.ArrowBack +import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight import androidx.compose.material.icons.filled.Check import androidx.compose.material.icons.filled.Close import androidx.compose.material.icons.filled.Delete -import androidx.compose.material.icons.filled.KeyboardArrowLeft -import androidx.compose.material.icons.filled.KeyboardArrowRight import androidx.compose.material.ripple.LocalRippleTheme import androidx.compose.material3.Button import androidx.compose.material3.ExperimentalMaterial3Api @@ -288,7 +287,7 @@ fun AppearanceSettingsScreen( navController.popBackStack() }) { Icon( - imageVector = Icons.Default.ArrowBack, + imageVector = Icons.AutoMirrored.Default.ArrowBack, contentDescription = stringResource(id = R.string.back) ) } @@ -401,15 +400,13 @@ fun AppearanceSettingsScreen( .padding(vertical = 10.dp), verticalAlignment = Alignment.CenterVertically ) { - if (LocalLayoutDirection.current == LayoutDirection.Ltr) { - Icon( - imageVector = Icons.Default.KeyboardArrowRight, - contentDescription = null, - modifier = Modifier - .padding(start = 20.dp, end = 4.dp) - .rotate(colourOverridesOpenerArrowRotation) - ) - } + Icon( + imageVector = Icons.AutoMirrored.Default.KeyboardArrowRight, + contentDescription = null, + modifier = Modifier + .padding(start = 20.dp, end = 4.dp) + .rotate(colourOverridesOpenerArrowRotation) + ) Text( text = stringResource(id = R.string.settings_appearance_colour_overrides), @@ -417,16 +414,6 @@ fun AppearanceSettingsScreen( modifier = Modifier .weight(1f) ) - - if (LocalLayoutDirection.current == LayoutDirection.Rtl) { - Icon( - imageVector = Icons.Default.KeyboardArrowLeft, - contentDescription = null, - modifier = Modifier - .padding(start = 4.dp, end = 20.dp) - .rotate(colourOverridesOpenerArrowRotation) - ) - } } AnimatedVisibility(viewModel.showColourOverrides) { diff --git a/app/src/main/java/chat/revolt/screens/settings/ChangelogsScreen.kt b/app/src/main/java/chat/revolt/screens/settings/ChangelogsScreen.kt index 35579911..f76c7e85 100644 --- a/app/src/main/java/chat/revolt/screens/settings/ChangelogsScreen.kt +++ b/app/src/main/java/chat/revolt/screens/settings/ChangelogsScreen.kt @@ -8,9 +8,9 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.ArrowBack -import androidx.compose.material3.Divider +import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.LargeTopAppBar @@ -72,7 +72,7 @@ fun ChangelogsSettingsScreen( ChangelogSheet(version = currentChangelog) } } - + val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior() Scaffold( @@ -92,7 +92,7 @@ fun ChangelogsSettingsScreen( navController.popBackStack() }) { Icon( - imageVector = Icons.Default.ArrowBack, + imageVector = Icons.AutoMirrored.Default.ArrowBack, contentDescription = stringResource(id = R.string.back) ) } @@ -134,7 +134,7 @@ fun ChangelogsSettingsScreen( ) } ) - Divider() + HorizontalDivider() } } } diff --git a/app/src/main/java/chat/revolt/screens/settings/ChatSettingsScreen.kt b/app/src/main/java/chat/revolt/screens/settings/ChatSettingsScreen.kt index 473d2b96..72c79db2 100644 --- a/app/src/main/java/chat/revolt/screens/settings/ChatSettingsScreen.kt +++ b/app/src/main/java/chat/revolt/screens/settings/ChatSettingsScreen.kt @@ -8,7 +8,7 @@ import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.selection.selectableGroup import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.ArrowBack +import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.IconButton @@ -67,7 +67,7 @@ fun ChatSettingsScreen( navController.popBackStack() }) { Icon( - imageVector = Icons.Default.ArrowBack, + imageVector = Icons.AutoMirrored.Default.ArrowBack, contentDescription = stringResource(id = R.string.back) ) } diff --git a/app/src/main/java/chat/revolt/screens/settings/DebugSettingsScreen.kt b/app/src/main/java/chat/revolt/screens/settings/DebugSettingsScreen.kt index 12713603..7f65d40d 100644 --- a/app/src/main/java/chat/revolt/screens/settings/DebugSettingsScreen.kt +++ b/app/src/main/java/chat/revolt/screens/settings/DebugSettingsScreen.kt @@ -8,7 +8,7 @@ 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.ArrowBack +import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material3.ElevatedButton import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon @@ -81,7 +81,7 @@ fun DebugSettingsScreen( navController.popBackStack() }) { Icon( - imageVector = Icons.Default.ArrowBack, + imageVector = Icons.AutoMirrored.Default.ArrowBack, contentDescription = stringResource(id = R.string.back) ) } diff --git a/app/src/main/java/chat/revolt/screens/settings/ProfileSettngsScreen.kt b/app/src/main/java/chat/revolt/screens/settings/ProfileSettngsScreen.kt index 8481ff00..7e7e718f 100644 --- a/app/src/main/java/chat/revolt/screens/settings/ProfileSettngsScreen.kt +++ b/app/src/main/java/chat/revolt/screens/settings/ProfileSettngsScreen.kt @@ -19,7 +19,7 @@ import androidx.compose.foundation.layout.width import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.ArrowBack +import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material.icons.filled.Check import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.ExperimentalMaterial3Api @@ -259,7 +259,7 @@ fun ProfileSettingsScreen( navController.popBackStack() }) { Icon( - imageVector = Icons.Default.ArrowBack, + imageVector = Icons.AutoMirrored.Default.ArrowBack, contentDescription = stringResource(id = R.string.back) ) } @@ -270,7 +270,8 @@ fun ProfileSettingsScreen( Box( Modifier .padding(pv) - .imePadding()) { + .imePadding() + ) { val scrollState = rememberScrollState() Column( modifier = Modifier @@ -310,7 +311,7 @@ fun ProfileSettingsScreen( AnimatedVisibility(visible = viewModel.uploadProgress > 0f) { LinearProgressIndicator( - progress = viewModel.uploadProgress, + progress = { viewModel.uploadProgress }, modifier = Modifier .fillMaxSize() .padding(start = 20.dp, end = 20.dp, top = 20.dp, bottom = 0.dp) diff --git a/app/src/main/java/chat/revolt/screens/settings/SessionSettngsScreen.kt b/app/src/main/java/chat/revolt/screens/settings/SessionSettngsScreen.kt index 1d8df3bf..8c2ce10c 100644 --- a/app/src/main/java/chat/revolt/screens/settings/SessionSettngsScreen.kt +++ b/app/src/main/java/chat/revolt/screens/settings/SessionSettngsScreen.kt @@ -15,7 +15,7 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.ArrowBack +import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material3.AlertDialog import androidx.compose.material3.Button import androidx.compose.material3.CircularProgressIndicator @@ -155,7 +155,7 @@ fun SessionSettingsScreen( navController.popBackStack() }) { Icon( - imageVector = Icons.Default.ArrowBack, + imageVector = Icons.AutoMirrored.Default.ArrowBack, contentDescription = stringResource(id = R.string.back) ) } diff --git a/app/src/main/java/chat/revolt/screens/settings/SettingsScreen.kt b/app/src/main/java/chat/revolt/screens/settings/SettingsScreen.kt index 14a3b5bf..fff7e24f 100644 --- a/app/src/main/java/chat/revolt/screens/settings/SettingsScreen.kt +++ b/app/src/main/java/chat/revolt/screens/settings/SettingsScreen.kt @@ -9,8 +9,8 @@ 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.ArrowBack -import androidx.compose.material.icons.filled.ArrowForward +import androidx.compose.material.icons.automirrored.filled.ArrowBack +import androidx.compose.material.icons.automirrored.filled.ArrowForward import androidx.compose.material.icons.filled.Close import androidx.compose.material.icons.filled.DateRange import androidx.compose.material.icons.filled.Info @@ -92,7 +92,7 @@ fun SettingsScreen( navController.popBackStack() }) { Icon( - imageVector = Icons.Default.ArrowBack, + imageVector = Icons.AutoMirrored.Default.ArrowBack, contentDescription = stringResource(id = R.string.back) ) } @@ -252,7 +252,7 @@ fun SettingsScreen( }, leadingContent = { Icon( - imageVector = Icons.Default.ArrowForward, + imageVector = Icons.AutoMirrored.Default.ArrowForward, contentDescription = null, ) }, diff --git a/app/src/main/java/chat/revolt/screens/settings/channel/ChannelSettingsHome.kt b/app/src/main/java/chat/revolt/screens/settings/channel/ChannelSettingsHome.kt index 4cc452c6..330e6ff5 100644 --- a/app/src/main/java/chat/revolt/screens/settings/channel/ChannelSettingsHome.kt +++ b/app/src/main/java/chat/revolt/screens/settings/channel/ChannelSettingsHome.kt @@ -8,7 +8,7 @@ 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.ArrowBack +import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material.icons.filled.Delete import androidx.compose.material.icons.filled.Info import androidx.compose.material3.AlertDialog @@ -114,7 +114,7 @@ fun ChannelSettingsHome(navController: NavController, channelId: String) { navController.popBackStack() }) { Icon( - imageVector = Icons.Default.ArrowBack, + imageVector = Icons.AutoMirrored.Default.ArrowBack, contentDescription = stringResource(id = R.string.back) ) } diff --git a/app/src/main/java/chat/revolt/screens/settings/channel/ChannelSettingsOverview.kt b/app/src/main/java/chat/revolt/screens/settings/channel/ChannelSettingsOverview.kt index e625654a..b3c3ce16 100644 --- a/app/src/main/java/chat/revolt/screens/settings/channel/ChannelSettingsOverview.kt +++ b/app/src/main/java/chat/revolt/screens/settings/channel/ChannelSettingsOverview.kt @@ -15,7 +15,7 @@ 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.ArrowBack +import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material.icons.filled.Check import androidx.compose.material3.AlertDialog import androidx.compose.material3.Button @@ -300,7 +300,7 @@ fun ChannelSettingsOverview( navController.popBackStack() }) { Icon( - imageVector = Icons.Default.ArrowBack, + imageVector = Icons.AutoMirrored.Default.ArrowBack, contentDescription = stringResource(id = R.string.back) ) } @@ -355,7 +355,7 @@ fun ChannelSettingsOverview( AnimatedVisibility(visible = viewModel.iconIsUploading) { LinearProgressIndicator( - progress = viewModel.iconUploadProgress, + progress = { viewModel.iconUploadProgress }, modifier = Modifier .fillMaxWidth() .padding(vertical = 8.dp, horizontal = 16.dp) diff --git a/app/src/main/java/chat/revolt/screens/settings/channel/ChannelSettingsPermissions.kt b/app/src/main/java/chat/revolt/screens/settings/channel/ChannelSettingsPermissions.kt index 5846cdbe..58da4906 100644 --- a/app/src/main/java/chat/revolt/screens/settings/channel/ChannelSettingsPermissions.kt +++ b/app/src/main/java/chat/revolt/screens/settings/channel/ChannelSettingsPermissions.kt @@ -8,7 +8,7 @@ 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.ArrowBack +import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon @@ -50,7 +50,7 @@ fun ChannelSettingsPermissions(navController: NavController, channelId: String) navController.popBackStack() }) { Icon( - imageVector = Icons.Default.ArrowBack, + imageVector = Icons.AutoMirrored.Default.ArrowBack, contentDescription = stringResource(id = R.string.back) ) } diff --git a/app/src/main/java/chat/revolt/sheets/AddServerSheet.kt b/app/src/main/java/chat/revolt/sheets/AddServerSheet.kt index 0267837a..42771b79 100644 --- a/app/src/main/java/chat/revolt/sheets/AddServerSheet.kt +++ b/app/src/main/java/chat/revolt/sheets/AddServerSheet.kt @@ -12,8 +12,8 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.ExitToApp import androidx.compose.material.icons.filled.Build -import androidx.compose.material.icons.filled.ExitToApp import androidx.compose.material3.AlertDialog import androidx.compose.material3.Icon import androidx.compose.material3.ListItem @@ -67,7 +67,7 @@ fun AddServerSheet() { }, leadingContent = { Icon( - imageVector = Icons.Default.ExitToApp, + imageVector = Icons.AutoMirrored.Default.ExitToApp, contentDescription = null ) }, diff --git a/app/src/main/java/chat/revolt/sheets/ChannelInfoSheet.kt b/app/src/main/java/chat/revolt/sheets/ChannelInfoSheet.kt index 1dc27417..034fdad1 100644 --- a/app/src/main/java/chat/revolt/sheets/ChannelInfoSheet.kt +++ b/app/src/main/java/chat/revolt/sheets/ChannelInfoSheet.kt @@ -9,8 +9,8 @@ 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.automirrored.filled.List import androidx.compose.material.icons.filled.Add -import androidx.compose.material.icons.filled.List import androidx.compose.material.icons.filled.Notifications import androidx.compose.material.icons.filled.Settings import androidx.compose.material3.CircularProgressIndicator @@ -152,7 +152,7 @@ fun ChannelInfoSheet(channelId: String, onHideSheet: suspend () -> Unit) { SheetClickable( icon = { modifier -> Icon( - imageVector = Icons.Default.List, + imageVector = Icons.AutoMirrored.Default.List, contentDescription = null, modifier = modifier ) diff --git a/app/src/main/java/chat/revolt/sheets/ReactionInfoSheet.kt b/app/src/main/java/chat/revolt/sheets/ReactionInfoSheet.kt index b24b33f1..1d2eb65b 100644 --- a/app/src/main/java/chat/revolt/sheets/ReactionInfoSheet.kt +++ b/app/src/main/java/chat/revolt/sheets/ReactionInfoSheet.kt @@ -10,7 +10,7 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.lazy.LazyColumn -import androidx.compose.material3.Divider +import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.MaterialTheme import androidx.compose.material3.ScrollableTabRow import androidx.compose.material3.Tab @@ -105,7 +105,7 @@ fun ReactionInfoSheet(messageId: String, emoji: String, onDismiss: () -> Unit) { ) } } - Divider() + HorizontalDivider() } if (reactionEmoji?.isNotEmpty() == true) {