RomanNum3ral
/
for-android
mirror of https://github.com/stoatchat/for-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

style(lint): fix deprecation issues 

Signed-off-by: Infi <infi@infi.sh>
This commit is contained in:
Infi 2024-03-07 21:10:15 +01:00
parent 4050e97970
commit f769dcb315
27 changed files with 71 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/chat/revolt/activities/media/ImageViewActivity.kt
View File

@ -15,7 +15,7 @@ import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.material.icons.Icons 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.DropdownMenu
import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExperimentalMaterial3Api
@ -205,7 +205,7 @@ fun ImageViewScreen(resource: AutumnResource, onClose: () -> Unit = {}) {
onClose() onClose()
}) { }) {
Icon( Icon(
imageVector = Icons.Default.ArrowBack, imageVector = Icons.AutoMirrored.Default.ArrowBack,
contentDescription = stringResource(id = R.string.back) contentDescription = stringResource(id = R.string.back)
) )
} }

4
app/src/main/java/chat/revolt/activities/media/VideoViewActivity.kt
View File

@ -15,7 +15,7 @@ import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.material.icons.Icons 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.DropdownMenu
import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExperimentalMaterial3Api
@ -219,7 +219,7 @@ fun VideoViewScreen(resource: AutumnResource, onClose: () -> Unit = {}) {
onClose() onClose()
}) { }) {
Icon( Icon(
imageVector = Icons.Default.ArrowBack, imageVector = Icons.AutoMirrored.Default.ArrowBack,
contentDescription = stringResource(id = R.string.back) contentDescription = stringResource(id = R.string.back)
) )
} }

4
app/src/main/java/chat/revolt/api/internals/SpecialUsers.kt
View File

@ -10,9 +10,9 @@ import org.intellij.lang.annotations.Language
import androidx.compose.ui.graphics.Brush as AndroidBrush import androidx.compose.ui.graphics.Brush as AndroidBrush
object SpecialUsers { 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( val TRUSTED_MODERATION_BOTS = listOf(
"01GXBYCNQ52A9QYCQ99RBPXPAW", // AutoMod "01GXBYCNQ52A9QYCQ99RBPXPAW", // AutoMod

4
app/src/main/java/chat/revolt/components/chat/NativeMessageField.kt
View File

@ -34,10 +34,10 @@ import androidx.compose.foundation.lazy.LazyRow
import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material.icons.Icons 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.Add
import androidx.compose.material.icons.filled.Close import androidx.compose.material.icons.filled.Close
import androidx.compose.material.icons.filled.Edit import androidx.compose.material.icons.filled.Edit
import androidx.compose.material.icons.filled.Send
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.LocalContentColor import androidx.compose.material3.LocalContentColor
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
@ -579,7 +579,7 @@ fun NativeMessageField(
Icon( Icon(
when { when {
editMode -> Icons.Default.Edit editMode -> Icons.Default.Edit
else -> Icons.Default.Send else -> Icons.AutoMirrored.Default.Send
}, },
tint = MaterialTheme.colorScheme.primary, tint = MaterialTheme.colorScheme.primary,
contentDescription = stringResource(id = R.string.send_alt), contentDescription = stringResource(id = R.string.send_alt),

13
app/src/main/java/chat/revolt/components/emoji/EmojiPicker.kt
View File

@ -31,10 +31,9 @@ import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.text.BasicTextField import androidx.compose.foundation.text.BasicTextField
import androidx.compose.material.icons.Icons 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.Close
import androidx.compose.material.icons.filled.KeyboardArrowLeft import androidx.compose.material3.HorizontalDivider
import androidx.compose.material.icons.filled.KeyboardArrowRight
import androidx.compose.material3.Divider
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.LocalContentColor import androidx.compose.material3.LocalContentColor
import androidx.compose.material3.LocalTextStyle import androidx.compose.material3.LocalTextStyle
@ -338,11 +337,7 @@ fun EmojiPicker(onEmojiSelected: (String) -> Unit) {
textAlign = TextAlign.Center textAlign = TextAlign.Center
) )
Icon( Icon(
imageVector = if (LocalLayoutDirection.current == LayoutDirection.Rtl) { imageVector = Icons.AutoMirrored.Default.KeyboardArrowRight,
Icons.Default.KeyboardArrowLeft
} else {
Icons.Default.KeyboardArrowRight
},
contentDescription = stringResource( contentDescription = stringResource(
R.string.emoji_picker_close_skin_tone_menu R.string.emoji_picker_close_skin_tone_menu
), ),
@ -542,7 +537,7 @@ fun EmojiPicker(onEmojiSelected: (String) -> Unit) {
GridItemSpan(spanCount) GridItemSpan(spanCount)
} }
) { ) {
Divider() HorizontalDivider()
} }
} }

2
app/src/main/java/chat/revolt/components/screens/chat/AttachmentManager.kt
View File

@ -84,7 +84,7 @@ fun AttachmentManager(
AnimatedVisibility(visible = uploading) { AnimatedVisibility(visible = uploading) {
LinearProgressIndicator( LinearProgressIndicator(
progress = animatedProgress, progress = { animatedProgress },
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
) )

4
app/src/main/java/chat/revolt/components/screens/chat/ChannelHeader.kt
View File

@ -9,7 +9,7 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.width
import androidx.compose.material.icons.Icons 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.material.icons.filled.Menu
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton import androidx.compose.material3.IconButton
@ -92,7 +92,7 @@ fun ChannelHeader(
Spacer(modifier = Modifier.width(4.dp)) Spacer(modifier = Modifier.width(4.dp))
Icon( Icon(
imageVector = Icons.Default.KeyboardArrowRight, imageVector = Icons.AutoMirrored.Default.KeyboardArrowRight,
contentDescription = stringResource(R.string.menu), contentDescription = stringResource(R.string.menu),
modifier = Modifier modifier = Modifier
.size(18.dp) .size(18.dp)

5
app/src/main/java/chat/revolt/screens/about/AboutScreen.kt
View File

@ -16,6 +16,7 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.width
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.filled.ArrowBack import androidx.compose.material.icons.filled.ArrowBack
import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.ElevatedButton import androidx.compose.material3.ElevatedButton
@ -63,7 +64,7 @@ import kotlinx.coroutines.launch
import kotlinx.serialization.encodeToString import kotlinx.serialization.encodeToString
import java.net.URI import java.net.URI
class AboutViewModel() : ViewModel() { class AboutViewModel : ViewModel() {
var root by mutableStateOf<Root?>(null) var root by mutableStateOf<Root?>(null)
var selectedTabIndex by mutableIntStateOf(0) var selectedTabIndex by mutableIntStateOf(0)
@ -169,7 +170,7 @@ fun AboutScreen(navController: NavController, viewModel: AboutViewModel = viewMo
navController.popBackStack() navController.popBackStack()
}) { }) {
Icon( Icon(
imageVector = Icons.Default.ArrowBack, imageVector = Icons.AutoMirrored.Default.ArrowBack,
contentDescription = stringResource(id = R.string.back) contentDescription = stringResource(id = R.string.back)
) )
} }

4
app/src/main/java/chat/revolt/screens/about/AttributionScreen.kt
View File

@ -13,7 +13,7 @@ import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons 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.ExperimentalMaterial3Api
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton import androidx.compose.material3.IconButton
@ -171,7 +171,7 @@ fun AttributionScreen(navController: NavController) {
navController.popBackStack() navController.popBackStack()
}) { }) {
Icon( Icon(
imageVector = Icons.Default.ArrowBack, imageVector = Icons.AutoMirrored.Default.ArrowBack,
contentDescription = stringResource(id = R.string.back) contentDescription = stringResource(id = R.string.back)
) )
} }

1
app/src/main/java/chat/revolt/screens/chat/ChatRouterScreen.kt
View File

@ -50,7 +50,6 @@ import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.setValue import androidx.compose.runtime.setValue
import androidx.compose.runtime.snapshotFlow import androidx.compose.runtime.snapshotFlow
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.ExperimentalComposeUiApi
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext

4
app/src/main/java/chat/revolt/screens/create/CreateGroupScreen.kt
View File

@ -11,7 +11,7 @@ import androidx.compose.foundation.layout.imePadding
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.material.icons.Icons 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.Check
import androidx.compose.material.icons.filled.Search import androidx.compose.material.icons.filled.Search
import androidx.compose.material3.Checkbox import androidx.compose.material3.Checkbox
@ -124,7 +124,7 @@ fun CreateGroupScreen(
navController.popBackStack() navController.popBackStack()
}) { }) {
Icon( Icon(
imageVector = Icons.Default.ArrowBack, imageVector = Icons.AutoMirrored.Default.ArrowBack,
contentDescription = stringResource(id = R.string.back) contentDescription = stringResource(id = R.string.back)
) )
} }

4
app/src/main/java/chat/revolt/screens/labs/LabsHomeScreen.kt
View File

@ -13,8 +13,8 @@ import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Home import androidx.compose.material.icons.filled.Home
import androidx.compose.material.icons.filled.Menu import androidx.compose.material.icons.filled.Menu
import androidx.compose.material3.Divider
import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.ListItem import androidx.compose.material3.ListItem
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
@ -125,7 +125,7 @@ fun LabsHomeScreen(navController: NavController) {
navController.navigate("mockups/call") navController.navigate("mockups/call")
} }
) )
Divider() HorizontalDivider()
} }
} }
} }

4
app/src/main/java/chat/revolt/screens/labs/ui/mockups/CallScreenMockup.kt
View File

@ -19,8 +19,8 @@ import androidx.compose.foundation.layout.safeDrawingPadding
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.width
import androidx.compose.material.icons.Icons 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.KeyboardArrowDown
import androidx.compose.material.icons.filled.KeyboardArrowRight
import androidx.compose.material3.Button import androidx.compose.material3.Button
import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.Checkbox import androidx.compose.material3.Checkbox
@ -149,7 +149,7 @@ fun CallScreenMockup() {
Spacer(modifier = Modifier.width(4.dp)) Spacer(modifier = Modifier.width(4.dp))
Icon( Icon(
imageVector = Icons.Default.KeyboardArrowRight, imageVector = Icons.AutoMirrored.Default.KeyboardArrowRight,
contentDescription = stringResource(R.string.menu), contentDescription = stringResource(R.string.menu),
modifier = Modifier modifier = Modifier
.size(18.dp) .size(18.dp)

4
app/src/main/java/chat/revolt/screens/services/DiscoverScreen.kt
View File

@ -4,7 +4,7 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.material.icons.Icons 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.ExperimentalMaterial3Api
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton import androidx.compose.material3.IconButton
@ -37,7 +37,7 @@ fun DiscoverScreen(navController: NavController) {
navController.popBackStack() navController.popBackStack()
}) { }) {
Icon( Icon(
imageVector = Icons.Default.ArrowBack, imageVector = Icons.AutoMirrored.Default.ArrowBack,
contentDescription = stringResource(id = R.string.back) contentDescription = stringResource(id = R.string.back)
) )
} }

33
app/src/main/java/chat/revolt/screens/settings/AppearanceSettingsScreen.kt
View File

@ -24,12 +24,11 @@ import androidx.compose.foundation.layout.width
import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons 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.Check
import androidx.compose.material.icons.filled.Close import androidx.compose.material.icons.filled.Close
import androidx.compose.material.icons.filled.Delete 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.material.ripple.LocalRippleTheme
import androidx.compose.material3.Button import androidx.compose.material3.Button
import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExperimentalMaterial3Api
@ -288,7 +287,7 @@ fun AppearanceSettingsScreen(
navController.popBackStack() navController.popBackStack()
}) { }) {
Icon( Icon(
imageVector = Icons.Default.ArrowBack, imageVector = Icons.AutoMirrored.Default.ArrowBack,
contentDescription = stringResource(id = R.string.back) contentDescription = stringResource(id = R.string.back)
) )
} }
@ -401,15 +400,13 @@ fun AppearanceSettingsScreen(
.padding(vertical = 10.dp), .padding(vertical = 10.dp),
verticalAlignment = Alignment.CenterVertically verticalAlignment = Alignment.CenterVertically
) { ) {
if (LocalLayoutDirection.current == LayoutDirection.Ltr) { Icon(
Icon( imageVector = Icons.AutoMirrored.Default.KeyboardArrowRight,
imageVector = Icons.Default.KeyboardArrowRight, contentDescription = null,
contentDescription = null, modifier = Modifier
modifier = Modifier .padding(start = 20.dp, end = 4.dp)
.padding(start = 20.dp, end = 4.dp) .rotate(colourOverridesOpenerArrowRotation)
.rotate(colourOverridesOpenerArrowRotation) )
)
}
Text( Text(
text = stringResource(id = R.string.settings_appearance_colour_overrides), text = stringResource(id = R.string.settings_appearance_colour_overrides),
@ -417,16 +414,6 @@ fun AppearanceSettingsScreen(
modifier = Modifier modifier = Modifier
.weight(1f) .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) { AnimatedVisibility(viewModel.showColourOverrides) {

10
app/src/main/java/chat/revolt/screens/settings/ChangelogsScreen.kt
View File

@ -8,9 +8,9 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.material.icons.Icons 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.Divider
import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton import androidx.compose.material3.IconButton
import androidx.compose.material3.LargeTopAppBar import androidx.compose.material3.LargeTopAppBar
@ -72,7 +72,7 @@ fun ChangelogsSettingsScreen(
ChangelogSheet(version = currentChangelog) ChangelogSheet(version = currentChangelog)
} }
} }
val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior() val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior()
Scaffold( Scaffold(
@ -92,7 +92,7 @@ fun ChangelogsSettingsScreen(
navController.popBackStack() navController.popBackStack()
}) { }) {
Icon( Icon(
imageVector = Icons.Default.ArrowBack, imageVector = Icons.AutoMirrored.Default.ArrowBack,
contentDescription = stringResource(id = R.string.back) contentDescription = stringResource(id = R.string.back)
) )
} }
@ -134,7 +134,7 @@ fun ChangelogsSettingsScreen(
) )
} }
) )
Divider() HorizontalDivider()
} }
} }
} }

4
app/src/main/java/chat/revolt/screens/settings/ChatSettingsScreen.kt
View File

@ -8,7 +8,7 @@ import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.selection.selectableGroup import androidx.compose.foundation.selection.selectableGroup
import androidx.compose.foundation.verticalScroll import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons 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.ExperimentalMaterial3Api
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton import androidx.compose.material3.IconButton
@ -67,7 +67,7 @@ fun ChatSettingsScreen(
navController.popBackStack() navController.popBackStack()
}) { }) {
Icon( Icon(
imageVector = Icons.Default.ArrowBack, imageVector = Icons.AutoMirrored.Default.ArrowBack,
contentDescription = stringResource(id = R.string.back) contentDescription = stringResource(id = R.string.back)
) )
} }

4
app/src/main/java/chat/revolt/screens/settings/DebugSettingsScreen.kt
View File

@ -8,7 +8,7 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons 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.ElevatedButton
import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
@ -81,7 +81,7 @@ fun DebugSettingsScreen(
navController.popBackStack() navController.popBackStack()
}) { }) {
Icon( Icon(
imageVector = Icons.Default.ArrowBack, imageVector = Icons.AutoMirrored.Default.ArrowBack,
contentDescription = stringResource(id = R.string.back) contentDescription = stringResource(id = R.string.back)
) )
} }

9
app/src/main/java/chat/revolt/screens/settings/ProfileSettngsScreen.kt
View File

@ -19,7 +19,7 @@ import androidx.compose.foundation.layout.width
import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons 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.Check
import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExperimentalMaterial3Api
@ -259,7 +259,7 @@ fun ProfileSettingsScreen(
navController.popBackStack() navController.popBackStack()
}) { }) {
Icon( Icon(
imageVector = Icons.Default.ArrowBack, imageVector = Icons.AutoMirrored.Default.ArrowBack,
contentDescription = stringResource(id = R.string.back) contentDescription = stringResource(id = R.string.back)
) )
} }
@ -270,7 +270,8 @@ fun ProfileSettingsScreen(
Box( Box(
Modifier Modifier
.padding(pv) .padding(pv)
.imePadding()) { .imePadding()
) {
val scrollState = rememberScrollState() val scrollState = rememberScrollState()
Column( Column(
modifier = Modifier modifier = Modifier
@ -310,7 +311,7 @@ fun ProfileSettingsScreen(
AnimatedVisibility(visible = viewModel.uploadProgress > 0f) { AnimatedVisibility(visible = viewModel.uploadProgress > 0f) {
LinearProgressIndicator( LinearProgressIndicator(
progress = viewModel.uploadProgress, progress = { viewModel.uploadProgress },
modifier = Modifier modifier = Modifier
.fillMaxSize() .fillMaxSize()
.padding(start = 20.dp, end = 20.dp, top = 20.dp, bottom = 0.dp) .padding(start = 20.dp, end = 20.dp, top = 20.dp, bottom = 0.dp)

4
app/src/main/java/chat/revolt/screens/settings/SessionSettngsScreen.kt
View File

@ -15,7 +15,7 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.material.icons.Icons 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.AlertDialog
import androidx.compose.material3.Button import androidx.compose.material3.Button
import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.CircularProgressIndicator
@ -155,7 +155,7 @@ fun SessionSettingsScreen(
navController.popBackStack() navController.popBackStack()
}) { }) {
Icon( Icon(
imageVector = Icons.Default.ArrowBack, imageVector = Icons.AutoMirrored.Default.ArrowBack,
contentDescription = stringResource(id = R.string.back) contentDescription = stringResource(id = R.string.back)
) )
} }

8
app/src/main/java/chat/revolt/screens/settings/SettingsScreen.kt
View File

@ -9,8 +9,8 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons 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.ArrowForward import androidx.compose.material.icons.automirrored.filled.ArrowForward
import androidx.compose.material.icons.filled.Close import androidx.compose.material.icons.filled.Close
import androidx.compose.material.icons.filled.DateRange import androidx.compose.material.icons.filled.DateRange
import androidx.compose.material.icons.filled.Info import androidx.compose.material.icons.filled.Info
@ -92,7 +92,7 @@ fun SettingsScreen(
navController.popBackStack() navController.popBackStack()
}) { }) {
Icon( Icon(
imageVector = Icons.Default.ArrowBack, imageVector = Icons.AutoMirrored.Default.ArrowBack,
contentDescription = stringResource(id = R.string.back) contentDescription = stringResource(id = R.string.back)
) )
} }
@ -252,7 +252,7 @@ fun SettingsScreen(
}, },
leadingContent = { leadingContent = {
Icon( Icon(
imageVector = Icons.Default.ArrowForward, imageVector = Icons.AutoMirrored.Default.ArrowForward,
contentDescription = null, contentDescription = null,
) )
}, },

4
app/src/main/java/chat/revolt/screens/settings/channel/ChannelSettingsHome.kt
View File

@ -8,7 +8,7 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons 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.Delete
import androidx.compose.material.icons.filled.Info import androidx.compose.material.icons.filled.Info
import androidx.compose.material3.AlertDialog import androidx.compose.material3.AlertDialog
@ -114,7 +114,7 @@ fun ChannelSettingsHome(navController: NavController, channelId: String) {
navController.popBackStack() navController.popBackStack()
}) { }) {
Icon( Icon(
imageVector = Icons.Default.ArrowBack, imageVector = Icons.AutoMirrored.Default.ArrowBack,
contentDescription = stringResource(id = R.string.back) contentDescription = stringResource(id = R.string.back)
) )
} }

6
app/src/main/java/chat/revolt/screens/settings/channel/ChannelSettingsOverview.kt
View File

@ -15,7 +15,7 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons 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.Check
import androidx.compose.material3.AlertDialog import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Button import androidx.compose.material3.Button
@ -300,7 +300,7 @@ fun ChannelSettingsOverview(
navController.popBackStack() navController.popBackStack()
}) { }) {
Icon( Icon(
imageVector = Icons.Default.ArrowBack, imageVector = Icons.AutoMirrored.Default.ArrowBack,
contentDescription = stringResource(id = R.string.back) contentDescription = stringResource(id = R.string.back)
) )
} }
@ -355,7 +355,7 @@ fun ChannelSettingsOverview(
AnimatedVisibility(visible = viewModel.iconIsUploading) { AnimatedVisibility(visible = viewModel.iconIsUploading) {
LinearProgressIndicator( LinearProgressIndicator(
progress = viewModel.iconUploadProgress, progress = { viewModel.iconUploadProgress },
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.padding(vertical = 8.dp, horizontal = 16.dp) .padding(vertical = 8.dp, horizontal = 16.dp)

4
app/src/main/java/chat/revolt/screens/settings/channel/ChannelSettingsPermissions.kt
View File

@ -8,7 +8,7 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons 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.CircularProgressIndicator
import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
@ -50,7 +50,7 @@ fun ChannelSettingsPermissions(navController: NavController, channelId: String)
navController.popBackStack() navController.popBackStack()
}) { }) {
Icon( Icon(
imageVector = Icons.Default.ArrowBack, imageVector = Icons.AutoMirrored.Default.ArrowBack,
contentDescription = stringResource(id = R.string.back) contentDescription = stringResource(id = R.string.back)
) )
} }

4
app/src/main/java/chat/revolt/sheets/AddServerSheet.kt
View File

@ -12,8 +12,8 @@ import androidx.compose.foundation.layout.height
import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons 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.Build
import androidx.compose.material.icons.filled.ExitToApp
import androidx.compose.material3.AlertDialog import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.ListItem import androidx.compose.material3.ListItem
@ -67,7 +67,7 @@ fun AddServerSheet() {
}, },
leadingContent = { leadingContent = {
Icon( Icon(
imageVector = Icons.Default.ExitToApp, imageVector = Icons.AutoMirrored.Default.ExitToApp,
contentDescription = null contentDescription = null
) )
}, },

4
app/src/main/java/chat/revolt/sheets/ChannelInfoSheet.kt
View File

@ -9,8 +9,8 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons 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.Add
import androidx.compose.material.icons.filled.List
import androidx.compose.material.icons.filled.Notifications import androidx.compose.material.icons.filled.Notifications
import androidx.compose.material.icons.filled.Settings import androidx.compose.material.icons.filled.Settings
import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.CircularProgressIndicator
@ -152,7 +152,7 @@ fun ChannelInfoSheet(channelId: String, onHideSheet: suspend () -> Unit) {
SheetClickable( SheetClickable(
icon = { modifier -> icon = { modifier ->
Icon( Icon(
imageVector = Icons.Default.List, imageVector = Icons.AutoMirrored.Default.List,
contentDescription = null, contentDescription = null,
modifier = modifier modifier = modifier
) )

4
app/src/main/java/chat/revolt/sheets/ReactionInfoSheet.kt
View File

@ -10,7 +10,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.LazyColumn 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.MaterialTheme
import androidx.compose.material3.ScrollableTabRow import androidx.compose.material3.ScrollableTabRow
import androidx.compose.material3.Tab import androidx.compose.material3.Tab
@ -105,7 +105,7 @@ fun ReactionInfoSheet(messageId: String, emoji: String, onDismiss: () -> Unit) {
) )
} }
} }
Divider() HorizontalDivider()
} }
if (reactionEmoji?.isNotEmpty() == true) { if (reactionEmoji?.isNotEmpty() == true) {