Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chore: Replace three column with two column conversation layout for large screens #279

Merged
merged 3 commits into from
Jan 10, 2025
Merged

Chore: Replace three column with two column conversation layout for large screens #279

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d629f0a
WIP
FelberMartin Jan 6, 2025
f1c7d28
Fix TwoColumnLayout
FelberMartin Jan 9, 2025
edbdcc7
Merge branch 'develop' into chore/two-column-conversation-layout
FelberMartin Jan 9, 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
148 changes: 62 additions & 86 deletions ...m/informatics/www1/artemis/native_app/feature/metis/conversation/ui/ConversationScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
package de.tum.informatics.www1.artemis.native_app.feature.metis.conversation.ui

import androidx.compose.animation.AnimatedContent
import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.SizeTransform
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.widthIn
import androidx.compose.material3.VerticalDivider
import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass
import androidx.compose.runtime.Composable
Expand All @@ -28,9 +26,6 @@ import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.content.S
import org.koin.androidx.compose.koinViewModel
import org.koin.core.parameter.parametersOf

private const val ConversationOverviewMaxWeight = 0.3f
private val ConversationOverviewMaxWidth = 600.dp

/**
* Displays a conversation. Uses [ConversationChatListScreen] and [ConversationThreadScreen] to show the conversations.
* @param conversationId the conversation that should be displayed
Expand Down Expand Up @@ -73,7 +68,6 @@ fun ConversationScreen(
viewModel.updateOpenedThread(threadPostId)
}

val widthSizeClass = getWindowSizeClass().widthSizeClass
var showThread by remember { mutableStateOf(threadPostId != null) }

val onNavigateUp = {
Expand All @@ -85,102 +79,84 @@ fun ConversationScreen(
showThread = true
}

WindowSizeAwareTwoColumnLayout(
modifier = modifier,
optionalColumn = conversationsOverview,
) { innerModifier ->
AnimatedContent(
modifier = innerModifier,
targetState = showThread,
transitionSpec = {
if (targetState) {
DefaultTransition.navigateForward
} else {
DefaultTransition.navigateBack
}.using(
SizeTransform(clip = false)
)
},
label = "ConversationScreen chatList thread navigation animation"
) { _showThread ->
if (_showThread) {
ConversationThreadScreen(
modifier = Modifier.fillMaxSize(),
viewModel = viewModel,
onNavigateUp = onNavigateUp
)
} else {
ConversationChatListScreen(
modifier = Modifier.fillMaxSize(),
viewModel = viewModel,
courseId = courseId,
conversationId = conversationId,
onNavigateBack = onCloseConversation,
onNavigateToSettings = onNavigateToSettings,
onClickViewPost = onClickViewPost
)
}
}
}
}


@Composable
fun WindowSizeAwareTwoColumnLayout(
modifier: Modifier = Modifier,
optionalColumnWeight: Float = 1f,
priorityColumnWeight: Float = 2f,
optionalColumn: @Composable (Modifier) -> Unit,
priorityColumn: @Composable (Modifier) -> Unit
) {
val widthSizeClass = getWindowSizeClass().widthSizeClass

when {
widthSizeClass <= WindowWidthSizeClass.Compact -> {
Box(modifier = modifier) {
AnimatedContent(
targetState = showThread,
transitionSpec = {
if (targetState) {
DefaultTransition.navigateForward
} else {
DefaultTransition.navigateBack
}.using(
SizeTransform(clip = false)
)
},
label = "ConversationScreen chatList thread navigation animation"
) { _showThread ->
if (_showThread) {
ConversationThreadScreen(
modifier = Modifier.fillMaxSize(),
viewModel = viewModel,
onNavigateUp = onNavigateUp
)
} else {
ConversationChatListScreen(
modifier = Modifier.fillMaxSize(),
viewModel = viewModel,
courseId = courseId,
conversationId = conversationId,
onNavigateBack = onCloseConversation,
onNavigateToSettings = onNavigateToSettings,
onClickViewPost = onClickViewPost
)
}
}
priorityColumn(Modifier.fillMaxSize())
}
}

else -> {
val arrangement = Arrangement.spacedBy(8.dp)

Row(
modifier = modifier,
horizontalArrangement = arrangement
horizontalArrangement = Arrangement.spacedBy(8.dp)
) {
val isOverviewVisible = !showThread || widthSizeClass >= WindowWidthSizeClass.Expanded
AnimatedVisibility(
Box(
modifier = Modifier
.weight(ConversationOverviewMaxWeight)
.widthIn(max = ConversationOverviewMaxWidth)
.fillMaxHeight(),
visible = isOverviewVisible
.weight(optionalColumnWeight)
.fillMaxHeight()
) {
Row(
modifier = Modifier.fillMaxSize(),
horizontalArrangement = arrangement
) {
conversationsOverview(
Modifier
.weight(1f)
.fillMaxHeight()
)

VerticalDivider()
}
}

val otherWeight = when {
isOverviewVisible && showThread -> 0.35f
isOverviewVisible && !showThread -> 0.7f
else -> 0.5f
optionalColumn(Modifier.fillMaxSize())
}

val otherModifier = Modifier
.weight(otherWeight)
.fillMaxHeight()
VerticalDivider()

ConversationChatListScreen(
Box(
modifier = Modifier
.weight(1f)
.fillMaxHeight(),
viewModel = viewModel,
courseId = courseId,
conversationId = conversationId,
onNavigateBack = onCloseConversation,
onNavigateToSettings = onNavigateToSettings,
onClickViewPost = onClickViewPost
)

if (showThread) {
VerticalDivider()

ConversationThreadScreen(
modifier = otherModifier,
viewModel = viewModel,
onNavigateUp = onNavigateUp
)
.weight(priorityColumnWeight)
.fillMaxHeight()
) {
priorityColumn(Modifier.fillMaxSize())
}
}
}
Expand Down
Loading