Skip to content
Open
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
aa1d90d
Create devcontainer.json
alexjyong Jul 17, 2025
1658e9f
feat: Adding support for long press on server icon should bring up co…
alexjyong Jul 17, 2025
579d3c7
Merge branch 'revoltchat:dev' into feature-add-server-context-menu-lo…
alexjyong Jul 23, 2025
3320cea
Merge branch 'revoltchat:dev' into feature-add-server-context-menu-lo…
alexjyong Jul 28, 2025
ac2abf7
Merge remote-tracking branch 'upstream/dev' into feature-add-server-c…
alexjyong Aug 6, 2025
6f7f18d
Removing unneeded files, updating documentation and devcontainer setup.
alexjyong Aug 6, 2025
85ad6b5
stashing changes
alexjyong Aug 6, 2025
7ffd14e
Saving more changes
alexjyong Aug 6, 2025
e2fe8b2
chore: cleaning up some code
alexjyong Aug 6, 2025
976d8c0
chore: removing gitmodule i added in by mistake
alexjyong Aug 6, 2025
a46a483
adding in missing string reference from invite button
alexjyong Aug 6, 2025
db9dace
adding in missing string reference for invite button
alexjyong Aug 6, 2025
ae21da7
adding clarification for deno script in codespaces.
alexjyong Aug 7, 2025
75e94f0
feat: givingvthe deno scriptvan auto confirm option so it works in de…
alexjyong Aug 7, 2025
bf3c72d
feature: Adding support for Github codespaces (#25)
alexjyong Aug 11, 2025
fb12b9c
Merge branch 'dev' into feature-add-server-context-menu-long-press
alexjyong Aug 11, 2025
e664688
Adjusting UI per feedback on official Revolt server. long press will …
alexjyong Aug 13, 2025
95d0263
Merge branch 'dev' into feature-add-server-context-menu-long-press
alexjyong Aug 24, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,9 @@ import chat.revolt.composables.generic.presenceFromStatus
import chat.revolt.composables.screens.chat.ChannelIcon
import chat.revolt.screens.chat.ChatRouterDestination
import chat.revolt.screens.chat.LocalIsConnected
import chat.revolt.screens.chat.dialogs.safety.ReportServerDialog
import chat.revolt.sheets.ChannelContextSheet
import chat.revolt.sheets.ServerContextSheet
import kotlinx.coroutines.launch

@OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class)
Expand Down Expand Up @@ -183,6 +185,10 @@ fun ChannelSideDrawer(
}.sortedBy { it.id }))

var channelContextSheetTarget by remember { mutableStateOf<String?>(null) }
var serverContextSheetTarget by remember { mutableStateOf<String?>(null) }

var showReportServer by remember { mutableStateOf(false) }
var reportServerTarget by remember { mutableStateOf("") }

if (channelContextSheetTarget != null) {
val channelContextSheetState = rememberModalBottomSheetState()
Expand All @@ -203,6 +209,29 @@ fun ChannelSideDrawer(
}
}

if (serverContextSheetTarget != null) {
val serverContextSheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)

ModalBottomSheet(
sheetState = serverContextSheetState,
onDismissRequest = {
serverContextSheetTarget = null
}
) {
ServerContextSheet(
serverId = serverContextSheetTarget!!,
onReportServer = {
reportServerTarget = serverContextSheetTarget!!
showReportServer = true
},
onHideSheet = {
serverContextSheetState.hide()
serverContextSheetTarget = null
}
)
}
}

val scope = rememberCoroutineScope()

Row(modifier.fillMaxSize()) {
Expand Down Expand Up @@ -355,12 +384,19 @@ fun ChannelSideDrawer(
Modifier
.padding(8.dp)
.clip(CircleShape)
.clickable {
serverInList.id?.let { srvId -> navigateToServer(srvId) }
scope.launch {
drawerState?.close()
.combinedClickable(
onClick = {
serverInList.id?.let { srvId -> navigateToServer(srvId) }
scope.launch {
drawerState?.close()
}
},
onLongClick = {
serverInList.id?.let { srvId ->
serverContextSheetTarget = srvId
}
}
}) {
)) {
val icon = serverInList.icon?.id?.let { iconId ->
"$REVOLT_FILES/icons/$iconId"
}
Expand Down Expand Up @@ -594,6 +630,15 @@ fun ChannelSideDrawer(
}
}
}

if (showReportServer) {
ReportServerDialog(
onDismiss = {
showReportServer = false
},
serverId = reportServerTarget
)
}
}

@Composable
Expand Down Expand Up @@ -1085,4 +1130,4 @@ fun DMOrGroupItem(
}
}
}
}
}