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: Fix window insets usage #345

Merged
merged 1 commit into from
Jan 28, 2025
Merged

Chore: Fix window insets usage #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion core/ui/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/core/ui/Spacings.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,14 @@ import androidx.compose.ui.unit.dp

object Spacings {
val ScreenHorizontalSpacing = 16.dp
val ReplyTextFieldHorizontalSpacing = ScreenHorizontalSpacing / 2
val EndOfScrollablePageSpacing = ScreenHorizontalSpacing

/**
* The spacing between the FAB and the end of the screen, according to the M3 guidelines:
* https://m3.material.io/components/floating-action-button/specs#09dc2aff-7688-4d3b-9547-bd3ab606bd8b
*/
val FabPaddingValues = PaddingValues(bottom = 16.dp, end = 16.dp)

object Post {
val innerSpacing = 8.dp
}
Expand Down
2 changes: 0 additions & 2 deletions ...atics/www1/artemis/native_app/feature/metis/conversation/ui/ConversationChatListScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import androidx.compose.foundation.layout.WindowInsetsSides
import androidx.compose.foundation.layout.consumeWindowInsets
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.imePadding
import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.layout.only
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.systemBars
Expand Down Expand Up @@ -126,7 +125,6 @@ internal fun ConversationChatListScreen(
modifier = Modifier
.fillMaxSize()
.imePadding()
.navigationBarsPadding()
.padding(top = padding.calculateTopPadding())
.consumeWindowInsets(WindowInsets.systemBars.only(WindowInsetsSides.Top)),
viewModel = viewModel,
Expand Down
4 changes: 1 addition & 3 deletions ...rmatics/www1/artemis/native_app/feature/metis/conversation/ui/ConversationThreadScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import androidx.compose.foundation.layout.consumeWindowInsets
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.imePadding
import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.layout.only
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
Expand Down Expand Up @@ -82,8 +81,7 @@ internal fun ConversationThreadScreen(
Column(
modifier = Modifier
.fillMaxSize()
.imePadding()
.navigationBarsPadding(),
.imePadding(),
) {
CompositionLocalProvider(LocalReplyAutoCompleteHintProvider provides viewModel) {
MetisThreadUi(
Expand Down
46 changes: 21 additions & 25 deletions ...cs/www1/artemis/native_app/feature/metis/conversation/ui/chatlist/MetisPostListHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ArrowDownward
import androidx.compose.material3.FloatingActionButton
import androidx.compose.material3.Icon
import androidx.compose.material3.Scaffold
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.LaunchedEffect
Expand All @@ -18,7 +17,9 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import de.tum.informatics.www1.artemis.native_app.core.ui.Spacings
import de.tum.informatics.www1.artemis.native_app.core.ui.markdown.LocalMarkdownTransformer
import de.tum.informatics.www1.artemis.native_app.core.ui.markdown.rememberPostArtemisMarkdownTransformer
import de.tum.informatics.www1.artemis.native_app.feature.metis.conversation.service.EmojiService
Expand Down Expand Up @@ -85,33 +86,28 @@ internal fun <T : Any> MetisPostListHandler(
}
}

// use scaffold as a way to conveniently place the fab.
Scaffold(
modifier = modifier,
floatingActionButton = {
if (hasNewUnseenPost) {
FloatingActionButton(
onClick = { scope.launch { state.scrollToItem(bottomItemIndex) } }
) {
Icon(
imageVector = Icons.Default.ArrowDownward,
contentDescription = null
)
}
Box(
modifier = modifier.fillMaxSize()
) {
val markdownTransformer = rememberPostArtemisMarkdownTransformer(serverUrl, courseId)

ProvideEmojis(emojiService) {
CompositionLocalProvider(LocalMarkdownTransformer provides markdownTransformer) {
content()
}
}
) { padding ->
Box(
modifier = Modifier
.fillMaxSize()
.padding(padding)
) {
val markdownTransformer = rememberPostArtemisMarkdownTransformer(serverUrl, courseId)

ProvideEmojis(emojiService) {
CompositionLocalProvider(LocalMarkdownTransformer provides markdownTransformer) {
content()
}
if (hasNewUnseenPost) {
FloatingActionButton(
modifier = Modifier
.align(Alignment.BottomEnd)
.padding(Spacings.FabPaddingValues),
onClick = { scope.launch { state.scrollToItem(bottomItemIndex) } }
) {
Icon(
imageVector = Icons.Default.ArrowDownward,
contentDescription = null
)
}
}
}
Expand Down
17 changes: 6 additions & 11 deletions ...informatics/www1/artemis/native_app/feature/metis/conversation/ui/reply/ReplyTextField.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,14 @@ import androidx.compose.foundation.horizontalScroll
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.IntrinsicSize
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.asPaddingValues
import androidx.compose.foundation.layout.defaultMinSize
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.systemBars
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.CircleShape
Expand Down Expand Up @@ -110,10 +106,9 @@ internal fun ReplyTextField(
conversationName: String
) {
val replyState: ReplyState = rememberReplyState(replyMode, updateFailureState)
val systemBarHeight = WindowInsets.systemBars.asPaddingValues().calculateBottomPadding()

Surface(
modifier = modifier.defaultMinSize(minHeight = (59.dp + systemBarHeight)),
modifier = modifier,
border = BorderStroke(
1.dp,
Brush.verticalGradient(
Expand All @@ -132,8 +127,7 @@ internal fun ReplyTextField(
modifier = Modifier
.fillMaxWidth()
.padding(4.dp)
.padding(bottom = systemBarHeight)
.height(IntrinsicSize.Max)
.navigationBarsPadding()
) {
AnimatedContent(
modifier = Modifier
Expand Down Expand Up @@ -370,7 +364,9 @@ private fun CreateReplyUi(
}
} else {
UnfocusedPreviewReplyTextField(
modifier = Modifier.fillMaxWidth(),
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 16.dp, vertical = 8.dp),
hintText = hintText,
filePickerLauncher = filePickerLauncher,
onRequestShowTextField = {
Expand Down Expand Up @@ -774,7 +770,6 @@ private fun UnfocusedPreviewReplyTextField(
Row(
modifier = modifier
.fillMaxWidth()
.padding(horizontal = 16.dp)
.clickable(onClick = onRequestShowTextField)
.testTag(TEST_TAG_UNFOCUSED_TEXT_FIELD),
verticalAlignment = Alignment.CenterVertically
Expand Down
5 changes: 1 addition & 4 deletions ...de/tum/informatics/www1/artemis/native_app/feature/metis/ui/SinglePageConversationBody.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@ package de.tum.informatics.www1.artemis.native_app.feature.metis.ui
import androidx.activity.compose.BackHandler
import androidx.compose.animation.AnimatedContent
import androidx.compose.animation.SizeTransform
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.consumeWindowInsets
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.systemBars
import androidx.compose.runtime.Composable
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
Expand Down Expand Up @@ -125,7 +122,7 @@ internal fun SinglePageConversationBody(

is OpenedConversation -> {
ConversationScreen(
modifier = modifier.consumeWindowInsets(WindowInsets.systemBars),
modifier = modifier,
conversationId = config.conversationId,
threadPostId = config.openedThread?.postId,
courseId = courseId,
Expand Down
Loading