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

Jump to bottom

Communication: Improve auto completion for tagging users and channels #76

Merged
merged 7 commits into from
Nov 15, 2024
Merged

Communication: Improve auto completion for tagging users and channels #76

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
985d173
Fixed AutoCompletionPopup clipping
FelberMartin Oct 25, 2024
221bc89
Fixed confusing behaviour: searching for channels, lectures and exerc…
FelberMartin Oct 25, 2024
66d6413
Added maxHeight and adjusted design
FelberMartin Nov 9, 2024
ebf910e
Reducing minSdk 31 -> 30 as this is not required by any dependencies
FelberMartin Nov 14, 2024
6205e09
Updating dark outlineVariant to be visible against dark surfaceVariant
FelberMartin Nov 14, 2024
3c7f221
Merge branch 'develop' into general/improve-autocompletion
FelberMartin Nov 14, 2024
9e5a5a9
Fix tests
FelberMartin Nov 14, 2024
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
4 changes: 2 additions & 2 deletions ...nformatics/www1/artemis/native_app/feature/metis/conversation/ui/ConversationViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ internal open class ConversationViewModel(
val exerciseAutoCompleteItems =
course
.exercises
.filter { query in it.title.orEmpty() }
.filter { it.title.orEmpty().contains(query, ignoreCase = true) }
.mapNotNull { exercise ->
val exerciseTag = when (exercise) {
is FileUploadExercise -> "file-upload"
Expand Down Expand Up @@ -498,7 +498,7 @@ internal open class ConversationViewModel(
conversationsDataState.bind { conversations ->
val conversationAutoCompleteItems = conversations
.filterIsInstance<ChannelChat>()
.filter { query in it.name }
.filter { it.name.contains(query, ignoreCase = true) }
.map { channel ->
AutoCompleteHint(
hint = channel.name,
Expand Down
4 changes: 3 additions & 1 deletion ...ics/www1/artemis/native_app/feature/metis/conversation/ui/reply/ReplyAutoCompletePopup.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import androidx.compose.ui.window.PopupProperties
import de.tum.informatics.www1.artemis.native_app.feature.metis.conversation.R

private val HintHorizontalPadding = 16.dp
private val PopupTopPadding = 8.dp

@Composable
internal fun ReplyAutoCompletePopup(
Expand All @@ -46,7 +47,8 @@ internal fun ReplyAutoCompletePopup(
) {
ReplyAutoCompletePopupBody(
modifier = Modifier
.heightIn(max = maxHeight)
.padding(top = PopupTopPadding)
.heightIn(max = maxHeight - PopupTopPadding)
.width(targetWidth),
autoCompleteCategories = autoCompleteCategories,
performAutoComplete = performAutoComplete
Expand Down
2 changes: 1 addition & 1 deletion ...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 @@ -202,7 +202,7 @@ private fun CreateReplyUi(
.onSizeChanged { textFieldWidth = it.width }
.padding(vertical = 8.dp, horizontal = 8.dp)
.onGloballyPositioned { coordinates ->
val textFieldWindowTopLeft = coordinates.localToWindow(Offset.Zero)
val textFieldWindowTopLeft = coordinates.localToRoot(Offset.Zero)
popupMaxHeight = textFieldWindowTopLeft.y.toInt()
}
.testTag(TEST_TAG_REPLY_TEXT_FIELD),
Expand Down
Loading