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

feat: add dummy server+member resolve in user sheet 

Signed-off-by: Infi <wingit@geist.ga>
This commit is contained in:
Infi 2023-06-18 02:25:23 +02:00
parent 41ed0fe7aa
commit 6e179d3b49
4 changed files with 55 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/chat/revolt/api/internals/Members.kt Normal file
View File

@ -0,0 +1,15 @@
package chat.revolt.api.internals
import chat.revolt.api.schemas.Member
@RequiresOptIn("Dummy API, does nothing or returns null.")
@Retention(AnnotationRetention.BINARY)
@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
annotation class RvxDummyMemberAPI
object Members {
@RvxDummyMemberAPI
fun getMember(serverId: String, userId: String): Member? {
return null
}
}

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

@ -193,6 +193,7 @@ fun ChatRouterScreen(topNav: NavController, viewModel: ChatRouterViewModel = hil
var showUserContextSheet by remember { mutableStateOf(false) }
var userContextSheetTarget by remember { mutableStateOf("") }
var userContextSheetServer by remember { mutableStateOf<String?>(null) }
BackHandler(enabled = drawerState.isClosed) {
scope.launch {
@ -338,6 +339,7 @@ fun ChatRouterScreen(topNav: NavController, viewModel: ChatRouterViewModel = hil
) {
UserContextSheet(
userId = userContextSheetTarget,
serverId = userContextSheetServer,
onHideSheet = {
userContextSheetState.hide()
}
@ -496,8 +498,10 @@ fun ChatRouterScreen(topNav: NavController, viewModel: ChatRouterViewModel = hil
else drawerState.open()
}
},
onUserSheetOpenFor = { target ->
onUserSheetOpenFor = { target, server ->
userContextSheetTarget = target
userContextSheetServer = server
showUserContextSheet = true
},
)

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

@ -86,7 +86,7 @@ fun ChannelScreen(
navController: NavController,
channelId: String,
onToggleDrawer: () -> Unit,
onUserSheetOpenFor: (String) -> Unit,
onUserSheetOpenFor: (String, String?) -> Unit,
viewModel: ChannelScreenViewModel = viewModel()
) {
val channel = viewModel.activeChannel
@ -285,7 +285,7 @@ fun ChannelScreen(
},
onAvatarClick = {
message.author?.let { author ->
onUserSheetOpenFor(author)
onUserSheetOpenFor(author, channel.server)
}
},
canReply = true,

54
app/src/main/java/chat/revolt/sheets/UserContextSheet.kt
View File

@ -2,9 +2,7 @@ package chat.revolt.sheets
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
@ -23,6 +21,8 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import chat.revolt.R
import chat.revolt.api.RevoltAPI
import chat.revolt.api.internals.Members
import chat.revolt.api.internals.RvxDummyMemberAPI
import chat.revolt.api.routes.user.fetchUserProfile
import chat.revolt.api.schemas.Profile
import chat.revolt.components.generic.UIMarkdown
@ -31,10 +31,16 @@ import chat.revolt.components.screens.settings.RawUserOverview
@Composable
fun UserContextSheet(
userId: String,
serverId: String? = null,
onHideSheet: suspend () -> Unit,
) {
val user = RevoltAPI.userCache[userId]
@OptIn(RvxDummyMemberAPI::class)
val member = serverId?.let { Members.getMember(it, userId) }
val server = RevoltAPI.serverCache[serverId]
var profile by remember { mutableStateOf<Profile?>(null) }
LaunchedEffect(user) {
@ -52,31 +58,37 @@ fun UserContextSheet(
}
Column(
modifier = Modifier.verticalScroll(rememberScrollState())
modifier = Modifier
.verticalScroll(rememberScrollState())
) {
RawUserOverview(user, profile)
Text(
text = stringResource(id = R.string.user_context_sheet_category_bio),
style = MaterialTheme.typography.bodySmall,
modifier = Modifier.padding(bottom = 10.dp, start = 16.dp, top = 20.dp, end = 16.dp)
)
if (profile?.content != null) {
UIMarkdown(
text = profile!!.content!!,
modifier = Modifier.padding(horizontal = 16.dp)
)
} else if (profile != null) {
Column(
modifier = Modifier.padding(16.dp)
) {
Text(
text = stringResource(id = R.string.user_context_sheet_bio_empty),
modifier = Modifier.padding(horizontal = 16.dp)
text = "sheet for ${server?.name ?: "serverless (omg jamstack reference??)"}",
)
} else {
Box(contentAlignment = Alignment.Center, modifier = Modifier.fillMaxWidth()) {
CircularProgressIndicator()
Text(
text = stringResource(id = R.string.user_context_sheet_category_bio),
style = MaterialTheme.typography.bodySmall,
modifier = Modifier.padding(bottom = 10.dp, top = 20.dp)
)
if (profile?.content != null) {
UIMarkdown(
text = profile!!.content!!,
)
} else if (profile != null) {
Text(
text = stringResource(id = R.string.user_context_sheet_bio_empty),
)
} else {
Box(contentAlignment = Alignment.Center, modifier = Modifier.fillMaxWidth()) {
CircularProgressIndicator()
}
}
}
Spacer(modifier = Modifier.height(16.dp))
}
}