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

fix: make whole server overview sheet scrollable, not just info & description 

Signed-off-by: Infi <infi@infi.sh>
This commit is contained in:
Infi 2025-04-25 21:02:25 +02:00
parent b0b7bbad1e
commit ddb010cf55
1 changed files with 82 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

165
app/src/main/java/chat/revolt/sheets/ServerContextSheet.kt
View File

@ -141,119 +141,118 @@ fun ServerContextSheet(
) )
} }
Column( Column(Modifier.verticalScroll(rememberScrollState())) {
verticalArrangement = Arrangement.spacedBy(16.dp), Column(
modifier = Modifier verticalArrangement = Arrangement.spacedBy(16.dp),
.padding(top = 8.dp, start = 16.dp, end = 16.dp, bottom = 4.dp) modifier = Modifier
.verticalScroll(rememberScrollState()), .padding(top = 8.dp, start = 16.dp, end = 16.dp, bottom = 4.dp),
) { ) {
ServerOverview(server) ServerOverview(server)
SelectionContainer { SelectionContainer {
RichMarkdown( RichMarkdown(
input = if (server.description?.isBlank() == false) { input = if (server.description?.isBlank() == false) {
server.description server.description
} else { } else {
stringResource( stringResource(
R.string.server_context_sheet_description_empty R.string.server_context_sheet_description_empty
) )
} }
) )
}
HorizontalDivider()
}
SheetButton(
leadingContent = {
Icon(
painter = painterResource(id = R.drawable.ic_content_copy_id_24dp),
contentDescription = null
)
},
headlineContent = {
Text(
text = stringResource(id = R.string.server_context_sheet_actions_copy_id)
)
},
onClick = {
if (server.id == null) return@SheetButton
clipboardManager.setText(AnnotatedString(server.id))
if (Platform.needsShowClipboardNotification()) {
Toast.makeText(
context,
context.getString(R.string.server_context_sheet_actions_copy_id_copied),
Toast.LENGTH_SHORT
).show()
} }
coroutineScope.launch { HorizontalDivider()
onHideSheet()
}
} }
)
SheetButton(
leadingContent = {
Icon(
painter = painterResource(id = R.drawable.ic_eye_check_24dp),
contentDescription = null
)
},
headlineContent = {
Text(
text = stringResource(id = R.string.server_context_sheet_actions_mark_read)
)
},
onClick = {
coroutineScope.launch {
server.id?.let {
RevoltAPI.unreads.markServerAsRead(it, sync = true)
}
onHideSheet()
}
}
)
if (server.owner != RevoltAPI.selfId) {
SheetButton( SheetButton(
leadingContent = { leadingContent = {
Icon( Icon(
painter = painterResource(id = R.drawable.ic_flag_24dp), painter = painterResource(id = R.drawable.ic_content_copy_id_24dp),
contentDescription = null contentDescription = null
) )
}, },
headlineContent = { headlineContent = {
Text( Text(
text = stringResource(id = R.string.server_context_sheet_actions_report), text = stringResource(id = R.string.server_context_sheet_actions_copy_id)
) )
}, },
dangerous = true,
onClick = { onClick = {
onReportServer() if (server.id == null) return@SheetButton
clipboardManager.setText(AnnotatedString(server.id))
if (Platform.needsShowClipboardNotification()) {
Toast.makeText(
context,
context.getString(R.string.server_context_sheet_actions_copy_id_copied),
Toast.LENGTH_SHORT
).show()
}
coroutineScope.launch {
onHideSheet()
}
} }
) )
SheetButton( SheetButton(
leadingContent = { leadingContent = {
Icon( Icon(
painter = painterResource(id = R.drawable.ic_arrow_left_bold_box_24dp), painter = painterResource(id = R.drawable.ic_eye_check_24dp),
contentDescription = null, contentDescription = null
) )
}, },
headlineContent = { headlineContent = {
Text( Text(
text = stringResource(id = R.string.server_context_sheet_actions_leave) text = stringResource(id = R.string.server_context_sheet_actions_mark_read)
) )
}, },
dangerous = true,
onClick = { onClick = {
showLeaveConfirmation = true coroutineScope.launch {
server.id?.let {
RevoltAPI.unreads.markServerAsRead(it, sync = true)
}
onHideSheet()
}
} }
) )
if (server.owner != RevoltAPI.selfId) {
SheetButton(
leadingContent = {
Icon(
painter = painterResource(id = R.drawable.ic_flag_24dp),
contentDescription = null
)
},
headlineContent = {
Text(
text = stringResource(id = R.string.server_context_sheet_actions_report),
)
},
dangerous = true,
onClick = {
onReportServer()
}
)
SheetButton(
leadingContent = {
Icon(
painter = painterResource(id = R.drawable.ic_arrow_left_bold_box_24dp),
contentDescription = null,
)
},
headlineContent = {
Text(
text = stringResource(id = R.string.server_context_sheet_actions_leave)
)
},
dangerous = true,
onClick = {
showLeaveConfirmation = true
}
)
}
} }
} }