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

chore: make app compile again 

Signed-off-by: Infi <infi@infi.sh>
This commit is contained in:
Infi 2024-10-16 21:06:01 +02:00
parent e709220463
commit 19fc4abd52
12 changed files with 44 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -127,7 +127,7 @@ fun AttachmentManager(
ModalBottomSheet( ModalBottomSheet(
onDismissRequest = { onDismissRequest = {
showPreviewSheet = false showPreviewSheet = false
}, sheetState = sheetState, windowInsets = BottomSheetInsets }, sheetState = sheetState
) { ) {
previewingAttachment?.let { previewingAttachment?.let {
FilePreviewSheet(args = it, canRemove = canRemove, onRemove = { FilePreviewSheet(args = it, canRemove = canRemove, onRemove = {

3
app/src/main/java/chat/revolt/components/screens/chat/drawer/ChannelSideDrawer.kt
View File

@ -179,8 +179,7 @@ fun ChannelSideDrawer(
sheetState = channelContextSheetState, sheetState = channelContextSheetState,
onDismissRequest = { onDismissRequest = {
channelContextSheetTarget = null channelContextSheetTarget = null
}, }
windowInsets = BottomSheetInsets
) { ) {
ChannelContextSheet( ChannelContextSheet(
channelId = channelContextSheetTarget!!, channelId = channelContextSheetTarget!!,

6
app/src/main/java/chat/revolt/internals/extensions/Insets.kt
View File

@ -12,9 +12,3 @@ val WindowInsets.Companion.zero: WindowInsets
@Composable @Composable
@NonRestartableComposable @NonRestartableComposable
get() = WindowInsets(left = 0, right = 0, top = 0, bottom = 0) get() = WindowInsets(left = 0, right = 0, top = 0, bottom = 0)
val BottomSheetInsets: WindowInsets
@OptIn(ExperimentalMaterial3Api::class)
@Composable
@NonRestartableComposable
get() = BottomSheetDefaults.windowInsets.exclude(WindowInsets.navigationBars)

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

@ -128,8 +128,7 @@ fun AttributionScreen(navController: NavController) {
sheetState = licenceSheetState, sheetState = licenceSheetState,
onDismissRequest = { onDismissRequest = {
licenceSheetOpen = false licenceSheetOpen = false
}, }
windowInsets = BottomSheetInsets
) { ) {
Column( Column(
modifier = Modifier modifier = Modifier

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

@ -482,8 +482,7 @@ fun ChatRouterScreen(
sheetState = statusSheetState, sheetState = statusSheetState,
onDismissRequest = { onDismissRequest = {
showStatusSheet = false showStatusSheet = false
}, }
windowInsets = BottomSheetInsets
) { ) {
StatusSheet( StatusSheet(
onBeforeNavigation = { onBeforeNavigation = {
@ -506,8 +505,7 @@ fun ChatRouterScreen(
sheetState = addServerSheetState, sheetState = addServerSheetState,
onDismissRequest = { onDismissRequest = {
showAddServerSheet = false showAddServerSheet = false
}, }
windowInsets = BottomSheetInsets
) { ) {
AddServerSheet() AddServerSheet()
} }
@ -520,8 +518,7 @@ fun ChatRouterScreen(
sheetState = serverContextSheetState, sheetState = serverContextSheetState,
onDismissRequest = { onDismissRequest = {
showServerContextSheet = false showServerContextSheet = false
}, }
windowInsets = BottomSheetInsets
) { ) {
ServerContextSheet( ServerContextSheet(
serverId = serverContextSheetTarget, serverId = serverContextSheetTarget,
@ -544,8 +541,7 @@ fun ChatRouterScreen(
sheetState = userContextSheetState, sheetState = userContextSheetState,
onDismissRequest = { onDismissRequest = {
showUserContextSheet = false showUserContextSheet = false
}, }
windowInsets = BottomSheetInsets
) { ) {
UserInfoSheet( UserInfoSheet(
userId = userContextSheetTarget, userId = userContextSheetTarget,
@ -622,8 +618,7 @@ fun ChatRouterScreen(
sheetState = linkInfoSheetState, sheetState = linkInfoSheetState,
onDismissRequest = { onDismissRequest = {
showLinkInfoSheet = false showLinkInfoSheet = false
}, }
windowInsets = BottomSheetInsets
) { ) {
LinkInfoSheet( LinkInfoSheet(
url = linkInfoSheetUrl, url = linkInfoSheetUrl,
@ -641,8 +636,7 @@ fun ChatRouterScreen(
sheetState = emoteInfoSheetState, sheetState = emoteInfoSheetState,
onDismissRequest = { onDismissRequest = {
showEmoteInfoSheet = false showEmoteInfoSheet = false
}, }
windowInsets = BottomSheetInsets
) { ) {
EmoteInfoSheet( EmoteInfoSheet(
id = emoteInfoSheetTarget, id = emoteInfoSheetTarget,
@ -660,8 +654,7 @@ fun ChatRouterScreen(
sheetState = reactionInfoSheetState, sheetState = reactionInfoSheetState,
onDismissRequest = { onDismissRequest = {
showReactionInfoSheet = false showReactionInfoSheet = false
}, }
windowInsets = BottomSheetInsets
) { ) {
ReactionInfoSheet( ReactionInfoSheet(
messageId = reactionInfoSheetMessageId, messageId = reactionInfoSheetMessageId,

9
app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreen.kt
View File

@ -341,8 +341,7 @@ fun ChannelScreen(
sheetState = channelInfoSheetState, sheetState = channelInfoSheetState,
onDismissRequest = { onDismissRequest = {
channelInfoSheetShown = false channelInfoSheetShown = false
}, }
windowInsets = BottomSheetInsets
) { ) {
ChannelInfoSheet( ChannelInfoSheet(
channelId = channelId, channelId = channelId,
@ -363,8 +362,7 @@ fun ChannelScreen(
sheetState = messageContextSheetState, sheetState = messageContextSheetState,
onDismissRequest = { onDismissRequest = {
messageContextSheetShown = false messageContextSheetShown = false
}, }
windowInsets = BottomSheetInsets
) { ) {
MessageContextSheet( MessageContextSheet(
messageId = messageContextSheetTarget, messageId = messageContextSheetTarget,
@ -390,8 +388,7 @@ fun ChannelScreen(
sheetState = reactSheetState, sheetState = reactSheetState,
onDismissRequest = { onDismissRequest = {
reactSheetShown = false reactSheetShown = false
}, }
windowInsets = BottomSheetInsets
) { ) {
ReactSheet(reactSheetTarget) { ReactSheet(reactSheetTarget) {
if (it == null) return@ReactSheet if (it == null) return@ReactSheet

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

@ -240,8 +240,7 @@ fun AppearanceSettingsScreen(
sheetState = sheetState, sheetState = sheetState,
onDismissRequest = { onDismissRequest = {
viewModel.overridePickerSheetVisible = false viewModel.overridePickerSheetVisible = false
}, }
windowInsets = BottomSheetInsets
) { ) {
ColourPickerSheet( ColourPickerSheet(
initialValue = viewModel.selectedOverrideInitialValue ?: 0, initialValue = viewModel.selectedOverrideInitialValue ?: 0,

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

@ -41,7 +41,6 @@ import chat.revolt.callbacks.ActionChannel
import chat.revolt.components.generic.SheetButton import chat.revolt.components.generic.SheetButton
import chat.revolt.components.generic.SheetEnd import chat.revolt.components.generic.SheetEnd
import chat.revolt.components.screens.chat.ChannelSheetHeader import chat.revolt.components.screens.chat.ChannelSheetHeader
import chat.revolt.internals.extensions.BottomSheetInsets
import chat.revolt.internals.extensions.rememberChannelPermissions import chat.revolt.internals.extensions.rememberChannelPermissions
import chat.revolt.screens.chat.dialogs.InviteDialog import chat.revolt.screens.chat.dialogs.InviteDialog
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
@ -63,8 +62,7 @@ fun ChannelInfoSheet(channelId: String, onHideSheet: suspend () -> Unit) {
sheetState = memberListSheetState, sheetState = memberListSheetState,
onDismissRequest = { onDismissRequest = {
memberListSheetShown = false memberListSheetShown = false
}, }
windowInsets = BottomSheetInsets
) { ) {
MemberListSheet( MemberListSheet(
channelId = channelId, channelId = channelId,

30
app/src/main/java/chat/revolt/sheets/LinkInfoSheet.kt
View File

@ -4,6 +4,7 @@ import android.net.Uri
import android.widget.Toast import android.widget.Toast
import androidx.browser.customtabs.CustomTabsIntent import androidx.browser.customtabs.CustomTabsIntent
import androidx.compose.foundation.clickable import androidx.compose.foundation.clickable
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
@ -11,13 +12,12 @@ import androidx.compose.foundation.layout.fillMaxWidth
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.automirrored.filled.ExitToApp import androidx.compose.material.icons.automirrored.filled.ExitToApp
import androidx.compose.material.ripple.LocalRippleTheme
import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalClipboardManager import androidx.compose.ui.platform.LocalClipboardManager
@ -30,7 +30,6 @@ import chat.revolt.R
import chat.revolt.components.generic.SheetButton import chat.revolt.components.generic.SheetButton
import chat.revolt.components.generic.SheetEnd import chat.revolt.components.generic.SheetEnd
import chat.revolt.internals.Platform import chat.revolt.internals.Platform
import chat.revolt.ui.theme.ClearRippleTheme
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
@Composable @Composable
@ -43,11 +42,13 @@ fun LinkInfoSheet(url: String, onDismiss: () -> Unit) {
verticalArrangement = Arrangement.spacedBy(16.dp), verticalArrangement = Arrangement.spacedBy(16.dp),
modifier = Modifier.padding(top = 16.dp, start = 16.dp, end = 16.dp, bottom = 4.dp), modifier = Modifier.padding(top = 16.dp, start = 16.dp, end = 16.dp, bottom = 4.dp),
) { ) {
CompositionLocalProvider(value = LocalRippleTheme provides ClearRippleTheme) { Box(
Box( modifier = Modifier
modifier = Modifier .fillMaxWidth()
.fillMaxWidth() .clickable(
.clickable(onClick = { interactionSource = remember(::MutableInteractionSource),
indication = null,
onClick = {
val customTab = CustomTabsIntent val customTab = CustomTabsIntent
.Builder() .Builder()
.setShowTitle(true) .setShowTitle(true)
@ -65,12 +66,11 @@ fun LinkInfoSheet(url: String, onDismiss: () -> Unit) {
.show() .show()
} }
}) })
) { ) {
Text( Text(
text = url, text = url,
color = MaterialTheme.colorScheme.primary color = MaterialTheme.colorScheme.primary
) )
}
} }
HorizontalDivider() HorizontalDivider()
@ -133,6 +133,6 @@ fun LinkInfoSheet(url: String, onDismiss: () -> Unit) {
onDismiss() onDismiss()
} }
) )
SheetEnd() SheetEnd()
} }

6
app/src/main/java/chat/revolt/sheets/MemberListSheet.kt
View File

@ -235,8 +235,7 @@ fun MemberListSheet(
sheetState = userContextSheetState, sheetState = userContextSheetState,
onDismissRequest = { onDismissRequest = {
showUserInfoSheet = false showUserInfoSheet = false
}, }
windowInsets = BottomSheetInsets
) { ) {
UserInfoSheet( UserInfoSheet(
userId = userInfoSheetTarget, userId = userInfoSheetTarget,
@ -256,8 +255,7 @@ fun MemberListSheet(
sheetState = memberContextSheetState, sheetState = memberContextSheetState,
onDismissRequest = { onDismissRequest = {
showMemberContextSheet = false showMemberContextSheet = false
}, }
windowInsets = BottomSheetInsets
) { ) {
if (serverId != null) { if (serverId != null) {
ServerMemberContextSheet( ServerMemberContextSheet(

32
app/src/main/java/chat/revolt/sheets/MessageContextSheet.kt
View File

@ -12,7 +12,6 @@ import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Delete import androidx.compose.material.icons.filled.Delete
import androidx.compose.material.icons.filled.Edit import androidx.compose.material.icons.filled.Edit
import androidx.compose.material.ripple.LocalRippleTheme
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
@ -24,7 +23,6 @@ import androidx.compose.material3.Text
import androidx.compose.material3.TextButton import androidx.compose.material3.TextButton
import androidx.compose.material3.rememberModalBottomSheetState import androidx.compose.material3.rememberModalBottomSheetState
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
@ -51,8 +49,6 @@ import chat.revolt.components.chat.Message
import chat.revolt.components.generic.SheetButton import chat.revolt.components.generic.SheetButton
import chat.revolt.components.generic.SheetEnd import chat.revolt.components.generic.SheetEnd
import chat.revolt.internals.Platform import chat.revolt.internals.Platform
import chat.revolt.internals.extensions.BottomSheetInsets
import chat.revolt.ui.theme.ClearRippleTheme
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
@OptIn(ExperimentalMaterial3Api::class) @OptIn(ExperimentalMaterial3Api::class)
@ -89,8 +85,7 @@ fun MessageContextSheet(
sheetState = shareSheetState, sheetState = shareSheetState,
onDismissRequest = { onDismissRequest = {
showShareSheet = false showShareSheet = false
}, }
windowInsets = BottomSheetInsets
) { ) {
Column( Column(
modifier = Modifier modifier = Modifier
@ -252,8 +247,7 @@ fun MessageContextSheet(
sheetState = reactSheetState, sheetState = reactSheetState,
onDismissRequest = { onDismissRequest = {
showReactSheet = false showReactSheet = false
}, }
windowInsets = BottomSheetInsets
) { ) {
ReactSheet(messageId) { ReactSheet(messageId) {
if (it == null) return@ReactSheet if (it == null) return@ReactSheet
@ -316,20 +310,18 @@ fun MessageContextSheet(
modifier = Modifier modifier = Modifier
.verticalScroll(rememberScrollState()) .verticalScroll(rememberScrollState())
) { ) {
CompositionLocalProvider(value = LocalRippleTheme provides ClearRippleTheme) { Column(
Column( verticalArrangement = Arrangement.spacedBy(16.dp),
verticalArrangement = Arrangement.spacedBy(16.dp), modifier = Modifier.padding(top = 8.dp, start = 16.dp, end = 16.dp, bottom = 4.dp),
modifier = Modifier.padding(top = 8.dp, start = 16.dp, end = 16.dp, bottom = 4.dp), ) {
) { Message(
Message( message = message.copy(
message = message.copy( tail = false,
tail = false, masquerade = null
masquerade = null
)
) )
)
HorizontalDivider() HorizontalDivider()
}
} }
SheetButton( SheetButton(

14
app/src/main/java/chat/revolt/ui/theme/Theme.kt
View File

@ -5,7 +5,6 @@ import android.app.Activity
import android.os.Build import android.os.Build
import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.material.ripple.RippleAlpha import androidx.compose.material.ripple.RippleAlpha
import androidx.compose.material.ripple.RippleTheme
import androidx.compose.material3.ColorScheme import androidx.compose.material3.ColorScheme
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.darkColorScheme import androidx.compose.material3.darkColorScheme
@ -160,19 +159,6 @@ fun getDefaultTheme(): Theme {
} }
} }
object ClearRippleTheme : RippleTheme {
@Composable
override fun defaultColor(): Color = Color.Transparent
@Composable
override fun rippleAlpha() = RippleAlpha(
draggedAlpha = 0.0f,
focusedAlpha = 0.0f,
hoveredAlpha = 0.0f,
pressedAlpha = 0.0f,
)
}
fun isThemeDark(theme: Theme, systemIsDark: Boolean): Boolean { fun isThemeDark(theme: Theme, systemIsDark: Boolean): Boolean {
return when (theme) { return when (theme) {
Theme.Revolt, Theme.Amoled -> true Theme.Revolt, Theme.Amoled -> true