Improvement: Redesign & restructure chat textfield

core/ui/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/core/ui/exercise/ExerciseIcons.kt

@@ -13,6 +13,7 @@ import de.tum.informatics.www1.artemis.native_app.core.model.exercise.ModelingEx
 import de.tum.informatics.www1.artemis.native_app.core.model.exercise.ProgrammingExercise
 import de.tum.informatics.www1.artemis.native_app.core.model.exercise.QuizExercise
 import de.tum.informatics.www1.artemis.native_app.core.model.exercise.TextExercise
+import de.tum.informatics.www1.artemis.native_app.core.model.exercise.UnknownExercise
 import de.tum.informatics.www1.artemis.native_app.core.ui.R
 
 @Composable
@@ -27,3 +28,15 @@ fun getExerciseTypeIconPainter(exercise: Exercise?): Painter {
         else -> rememberVectorPainter(image = Icons.Default.QuestionMark)
     }
 }
+
+fun getExerciseTypeIconId(exercise: Exercise?): Int? {
+    return when (exercise) {
+        is TextExercise -> R.drawable.font
+        is ModelingExercise -> R.drawable.diagram_project
+        is FileUploadExercise -> R.drawable.file_arrow_up
+        is ProgrammingExercise -> R.drawable.keyboard
+        is QuizExercise -> R.drawable.check_double
+        is UnknownExercise -> null
+        null -> null
+    }
+}

feature/core-modules-test/src/test/kotlin/de/tum/informatics/www1/artemis/native_app/feature/coremodulestest/AppModuleTest.kt

@@ -8,8 +8,8 @@ import de.tum.informatics.www1.artemis.native_app.android.appModule
 import de.tum.informatics.www1.artemis.native_app.core.common.CurrentActivityListener
 import de.tum.informatics.www1.artemis.native_app.core.common.test.UnitTest
 import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.content.StandalonePostId
-import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.content.dto.SavedPostStatus
 import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.content.UserIdentifier
+import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.content.dto.SavedPostStatus
 import de.tum.informatics.www1.artemis.native_app.feature.quiz.QuizType
 import org.junit.Test
 import org.junit.experimental.categories.Category

feature/metis/conversation/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/feature/metis/conversation/ui/ConversationThreadScreen.kt

@@ -30,7 +30,6 @@ import androidx.compose.ui.unit.dp
 import de.tum.informatics.www1.artemis.native_app.core.data.DataState
 import de.tum.informatics.www1.artemis.native_app.core.data.isSuccess
 import de.tum.informatics.www1.artemis.native_app.core.ui.BuildConfig
-import de.tum.informatics.www1.artemis.native_app.core.ui.Spacings
 import de.tum.informatics.www1.artemis.native_app.core.ui.compose.NavigationBackButton
 import de.tum.informatics.www1.artemis.native_app.feature.metis.conversation.R
 import de.tum.informatics.www1.artemis.native_app.feature.metis.conversation.ui.reply.LocalReplyAutoCompleteHintProvider
@@ -94,8 +93,7 @@ internal fun ConversationThreadScreen(
                         .fillMaxWidth()
                         .weight(1f)
                         .padding(top = padding.calculateTopPadding())
-                        .consumeWindowInsets(WindowInsets.systemBars.only(WindowInsetsSides.Top))
-                        .padding(horizontal = Spacings.ScreenHorizontalSpacing),
+                        .consumeWindowInsets(WindowInsets.systemBars.only(WindowInsetsSides.Top)),
                     viewModel = viewModel
                 )
             }

feature/metis/conversation/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/feature/metis/conversation/ui/ConversationViewModel.kt

@@ -33,6 +33,7 @@ import de.tum.informatics.www1.artemis.native_app.core.model.exercise.Programmin
 import de.tum.informatics.www1.artemis.native_app.core.model.exercise.QuizExercise
 import de.tum.informatics.www1.artemis.native_app.core.model.exercise.TextExercise
 import de.tum.informatics.www1.artemis.native_app.core.model.exercise.UnknownExercise
+import de.tum.informatics.www1.artemis.native_app.core.ui.exercise.getExerciseTypeIconId
 import de.tum.informatics.www1.artemis.native_app.core.ui.serverUrlStateFlow
 import de.tum.informatics.www1.artemis.native_app.core.websocket.WebsocketProvider
 import de.tum.informatics.www1.artemis.native_app.feature.metis.conversation.R
@@ -49,6 +50,7 @@ import de.tum.informatics.www1.artemis.native_app.feature.metis.conversation.ui.
 import de.tum.informatics.www1.artemis.native_app.feature.metis.conversation.ui.post.post_actions.PostActionFlags
 import de.tum.informatics.www1.artemis.native_app.feature.metis.conversation.ui.reply.AutoCompleteCategory
 import de.tum.informatics.www1.artemis.native_app.feature.metis.conversation.ui.reply.AutoCompleteHint
+import de.tum.informatics.www1.artemis.native_app.feature.metis.conversation.ui.reply.AutoCompleteIcon
 import de.tum.informatics.www1.artemis.native_app.feature.metis.conversation.ui.reply.InitialReplyTextProvider
 import de.tum.informatics.www1.artemis.native_app.feature.metis.conversation.ui.reply.ReplyAutoCompleteHintProvider
 import de.tum.informatics.www1.artemis.native_app.feature.metis.conversation.ui.thread.ConversationThreadUseCase
@@ -76,6 +78,7 @@ import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.service.n
 import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.service.network.getConversation
 import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.service.network.subscribeToConversationUpdates
 import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.ui.MetisViewModel
+import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.ui.getChannelIconImageVector
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.Dispatchers
@@ -659,7 +662,8 @@ internal open class ConversationViewModel(
                             AutoCompleteHint(
                                 hint = exerciseTitle,
                                 replacementText = "[$exerciseTag]${exercise.title}(/courses/${metisContext.courseId}/exercises/${exercise.id})[/$exerciseTag]",
-                                id = "Exercise:${exercise.id ?: return@mapNotNull null}"
+                                id = "Exercise:${exercise.id ?: return@mapNotNull null}",
+                                icon = AutoCompleteIcon.DrawableFromId(getExerciseTypeIconId(exercise))
                             )
                         }
 
@@ -698,7 +702,8 @@ internal open class ConversationViewModel(
                         AutoCompleteHint(
                             hint = channel.name,
                             replacementText = "[channel]${channel.name}(${channel.id})[/channel]",
-                            id = "Channel:${channel.id}"
+                            id = "Channel:${channel.id}",
+                            icon = AutoCompleteIcon.DrawableFromImageVector(getChannelIconImageVector(channel))
                         )
                     }
 

feature/metis/conversation/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/feature/metis/conversation/ui/chatlist/MetisChatList.kt

@@ -4,6 +4,7 @@ import android.net.Uri
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
@@ -217,8 +218,7 @@ fun MetisChatList(
             if (isReplyEnabled) {
                 ReplyTextField(
                     modifier = Modifier
-                        .fillMaxWidth()
-                        .padding(horizontal = Spacings.ReplyTextFieldHorizontalSpacing),
+                        .fillMaxWidth(),
                     replyMode = replyMode,
                     updateFailureState = updateFailureStateDelegate,
                     conversationName = conversationName,
@@ -235,8 +235,8 @@ private fun ChatList(
     state: LazyListState,
     posts: PostsDataState.Loaded,
     postActionFlags: PostActionFlags,
-    clientId: Long,
     isMarkedAsDeleteList: SnapshotStateList<IBasePost>,
+    clientId: Long,
     onClickViewPost: (StandalonePostId) -> Unit,
     onRequestEdit: (IStandalonePost) -> Unit,
     onRequestDelete: (IStandalonePost) -> Unit,
@@ -249,6 +249,7 @@ private fun ChatList(
     LazyColumn(
         modifier = modifier,
         state = state,
+        contentPadding = PaddingValues(bottom = 4.dp),
         reverseLayout = true
     ) {
         items(

feature/metis/conversation/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/feature/metis/conversation/ui/reply/AutoCompleteHint.kt

@@ -1,3 +1,18 @@
 package de.tum.informatics.www1.artemis.native_app.feature.metis.conversation.ui.reply
 
-data class AutoCompleteHint(val hint: String, val replacementText: String, val id: String)
+import androidx.compose.ui.graphics.vector.ImageVector
+import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.ui.profile_picture.ProfilePictureData
+
+data class AutoCompleteHint(
+    val hint: String,
+    val replacementText: String,
+    val id: String,
+    val icon: AutoCompleteIcon? = null
+)
+
+sealed class AutoCompleteIcon {
+    data class ProfilePicture(val pictureData: ProfilePictureData) : AutoCompleteIcon()
+    data class DrawableFromId(val id: Int?) : AutoCompleteIcon()
+    data class DrawableFromImageVector(val imageVector: ImageVector) : AutoCompleteIcon()
+}
+