Feature: Save messages for later

app/src/main/java/de/tum/informatics/www1/artemis/native_app/android/db/AppDatabase.kt

@@ -29,7 +29,7 @@ import de.tum.informatics.www1.artemis.native_app.feature.push.communication_not
         CommunicationMessageEntity::class
     ],
     exportSchema = true,
-    version = 12,
+    version = 13,
 )
 @TypeConverters(RoomTypeConverters::class)
 abstract class AppDatabase : RoomDatabase() {

core/data/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/core/data/service/EnumAsIntSerializer.kt

@@ -0,0 +1,35 @@
+package de.tum.informatics.www1.artemis.native_app.core.data.service
+
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.descriptors.PrimitiveKind
+import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+// Copied from https://stackoverflow.com/a/75644603/13366254
+open class EnumAsIntSerializer<T:Enum<*>>(
+    serialName: String,
+    val serialize: (v: T) -> Int,
+    val deserialize: (v: Int) -> T
+) : KSerializer<T> {
+    override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor(serialName, PrimitiveKind.INT)
+
+    override fun serialize(encoder: Encoder, value: T) {
+        encoder.encodeInt(serialize(value))
+    }
+
+    override fun deserialize(decoder: Decoder): T {
+        val v = decoder.decodeInt()
+        return deserialize(v)
+    }
+}
+
+open class EnumOrdinalSerializer<T:Enum<*>>(
+    serialName: String,
+    val values: Array<T>
+) : EnumAsIntSerializer<T>(
+    serialName,
+    { it.ordinal },
+    { values[it] }
+)

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

@@ -12,8 +12,6 @@ import androidx.compose.ui.unit.dp
 
 object Spacings {
     val ScreenHorizontalSpacing = 16.dp
-    val ScreenHorizontalInnerSpacing = 8.dp
-
     val EndOfScrollablePageSpacing = ScreenHorizontalSpacing
 
     object Post {
@@ -29,6 +27,12 @@ object Spacings {
     fun calculateEndOfPagePaddingValues() = PaddingValues(
         bottom = WindowInsets.navigationBars.asPaddingValues().calculateBottomPadding() + EndOfScrollablePageSpacing
     )
+
+    val BottomSheetContentPadding = PaddingValues(
+        bottom = 40.dp,
+        start = ScreenHorizontalSpacing,
+        end = ScreenHorizontalSpacing
+    )
 }
 
 fun Modifier.endOfPagePadding() = padding(bottom = Spacings.EndOfScrollablePageSpacing).navigationBarsPadding()

core/ui/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/core/ui/common/EmptyListHint.kt

@@ -0,0 +1,44 @@
+package de.tum.informatics.www1.artemis.native_app.core.ui.common
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun EmptyListHint(
+    modifier: Modifier,
+    hint: String,
+    icon: ImageVector,
+) {
+    Column(
+        modifier = modifier.fillMaxWidth(0.8f),
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.Center
+    ) {
+        Icon(
+            modifier = Modifier.size(64.dp),
+            imageVector = icon,
+            tint = MaterialTheme.colorScheme.onSurfaceVariant,
+            contentDescription = null
+        )
+
+        Spacer(modifier = Modifier.size(8.dp))
+
+        Text(
+            text = hint,
+            textAlign = TextAlign.Center,
+            color = MaterialTheme.colorScheme.onSurfaceVariant,
+        )
+    }
+}

core/ui/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/core/ui/common/InfoMessageCard.kt

@@ -0,0 +1,51 @@
+package de.tum.informatics.www1.artemis.native_app.core.ui.common
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Info
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import de.tum.informatics.www1.artemis.native_app.core.ui.material.colors.InfoMessageCardColors
+
+@Composable
+fun InfoMessageCard(
+    modifier: Modifier = Modifier,
+    infoText: String,
+) {
+    Box(
+        modifier = modifier
+            .border(
+                width = 1.dp,
+                color = InfoMessageCardColors.border,
+                shape = MaterialTheme.shapes.extraSmall
+            )
+            .background(InfoMessageCardColors.background)
+            .padding(8.dp)
+            .fillMaxWidth()
+    ) {
+        Row(verticalAlignment = Alignment.CenterVertically) {
+            Icon(
+                imageVector = Icons.Outlined.Info,
+                contentDescription = null,
+                modifier = Modifier.padding(end = 8.dp),
+                tint = InfoMessageCardColors.text
+            )
+            Text(
+                text = infoText,
+                fontSize = 16.sp,
+                color = InfoMessageCardColors.text
+            )
+        }
+    }
+}

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

@@ -1,24 +1,14 @@
 package de.tum.informatics.www1.artemis.native_app.core.ui.exercise
 
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Info
 import androidx.compose.material3.Button
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import de.tum.informatics.www1.artemis.native_app.core.model.exercise.Exercise
 import de.tum.informatics.www1.artemis.native_app.core.model.exercise.ProgrammingExercise
 import de.tum.informatics.www1.artemis.native_app.core.model.exercise.QuizExercise
@@ -28,8 +18,8 @@ import de.tum.informatics.www1.artemis.native_app.core.model.exercise.isStartExe
 import de.tum.informatics.www1.artemis.native_app.core.model.exercise.latestParticipation
 import de.tum.informatics.www1.artemis.native_app.core.model.exercise.participation.Participation
 import de.tum.informatics.www1.artemis.native_app.core.ui.R
+import de.tum.informatics.www1.artemis.native_app.core.ui.common.InfoMessageCard
 import de.tum.informatics.www1.artemis.native_app.core.ui.date.hasPassed
-import de.tum.informatics.www1.artemis.native_app.core.ui.material.colors.ParticipationNotPossibleInfoMessageCardColors
 
 /**
  * This composable composes up to two buttons. The modifier parameter is applied to every button
@@ -139,7 +129,9 @@ fun ExerciseActionButtons(
             //}
             else -> {
                 Row(modifier=Modifier.padding(top=2.dp, bottom = 2.dp)) {
-                    ParticipationNotPossibleInfoMessageCard()
+                    InfoMessageCard(
+                        infoText = stringResource(id = R.string.exercise_participation_not_possible),
+                    )
                 }
             }
         }
@@ -214,33 +206,3 @@ class BoundExerciseActions(
         onClickViewQuizResults = { onClickViewQuizResults(exerciseId) }
     )
 }
-
-
-@Composable
-fun ParticipationNotPossibleInfoMessageCard() {
-    Box(
-        modifier = Modifier
-            .border(
-                width = 1.dp,
-                color = ParticipationNotPossibleInfoMessageCardColors.border,
-                shape = MaterialTheme.shapes.extraSmall
-            )
-            .background(ParticipationNotPossibleInfoMessageCardColors.background)
-            .padding(8.dp)
-            .fillMaxWidth()
-    ) {
-        Row(verticalAlignment = Alignment.CenterVertically) {
-            Icon(
-                imageVector = Icons.Outlined.Info,
-                contentDescription = null,
-                modifier = Modifier.padding(end = 8.dp),
-                tint = ParticipationNotPossibleInfoMessageCardColors.text
-            )
-            Text(
-                text = stringResource(id = R.string.exercise_participation_not_possible),
-                fontSize = 16.sp,
-                color = ParticipationNotPossibleInfoMessageCardColors.text
-            )
-        }
-    }
-}

core/ui/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/core/ui/markdown/rememberPostArtemisMarkdownTransformer.kt

@@ -0,0 +1,21 @@
+package de.tum.informatics.www1.artemis.native_app.core.ui.markdown
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import de.tum.informatics.www1.artemis.native_app.core.common.markdown.PostArtemisMarkdownTransformer
+
+@Composable
+fun rememberPostArtemisMarkdownTransformer(
+    serverUrl: String,
+    courseId: Long
+): PostArtemisMarkdownTransformer {
+    return remember(serverUrl, courseId) {
+        val strippedServerUrl =
+            if (serverUrl.endsWith("/")) serverUrl.substring(
+                0,
+                serverUrl.length - 1
+            ) else serverUrl
+
+        PostArtemisMarkdownTransformer(serverUrl = strippedServerUrl, courseId = courseId)
+    }
+}

core/ui/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/core/ui/material/colors/ParticipationNotPossibleInfoMessageCardColors.kt → core/ui/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/core/ui/material/colors/InfoMessageCardColors.kt

@@ -4,7 +4,7 @@ import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
 
-object ParticipationNotPossibleInfoMessageCardColors {
+object InfoMessageCardColors {
     val background: Color
         @Composable get() = if(isSystemInDarkTheme()) Color(0xFF062A30) else Color(0xFFD1ECF1)
     val border: Color

core/ui/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/core/ui/material/colors/PostColors.kt

@@ -25,6 +25,8 @@ object PostColors {
             @Composable get() = Color(0xFF28A745).copy(alpha = 0.2f)
         val pinned: Color
             @Composable get() = Color(0xFFFFA500).copy(alpha = 0.25f)
+        val saved: Color
+            @Composable get() = Color(0xFF007BFF).copy(alpha = 0.2f)
     }
 
     object EmojiChipColors {

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

@@ -8,6 +8,7 @@ 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.quiz.QuizType
 import org.junit.Test
 import org.junit.experimental.categories.Category
@@ -39,6 +40,7 @@ class AppModuleTest {
                 WorkerParameters::class,
                 QuizType.WorkableQuizType::class,
                 QuizType.ViewableQuizType::class,
+                SavedPostStatus::class,
             )
         )
     }

feature/course-view/src/debug/kotlin/de/tum/informatics/www1/artemis/native_app/feature/courseview/MessagingScreenshots.kt

@@ -110,6 +110,7 @@ fun `Metis - Conversation Overview`() {
                     examsExpanded = true,
                     exercisesExpanded = true,
                     lecturesExpanded = true,
+                    savedPostsExpanded = false
                 )
             )
 
@@ -139,6 +140,7 @@ fun `Metis - Conversation Overview`() {
                     modifier = Modifier.fillMaxSize(),
                     viewModel = viewModel,
                     onNavigateToConversation = {},
+                    onNavigateToSavedPosts = {},
                     onRequestCreatePersonalConversation = {},
                     onRequestAddChannel = {},
                     onRequestBrowseChannel = {},
@@ -252,6 +254,7 @@ fun `Metis - Conversation Channel`() {
                                 onEditPost = { _, _ -> CompletableDeferred() },
                                 onDeletePost = { CompletableDeferred() },
                                 onPinPost = { CompletableDeferred() },
+                                onSavePost = { CompletableDeferred() },
                                 onRequestReactWithEmoji = { _, _, _ -> CompletableDeferred() },
                                 bottomItem = null,
                                 onClickViewPost = {},
@@ -289,6 +292,7 @@ private fun generateMessage(
             creationDate = time,
             updatedDate = null,
             resolved = false,
+            isSaved = false,
             courseWideContext = null,
             tags = emptyList(),
             answers = emptyList(),

feature/course-view/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/feature/courseview/ui/course_overview/CourseUiScreen.kt

@@ -255,19 +255,23 @@ internal fun CourseUiScreen(
                 val initialConfiguration = remember(conversationId, postId) {
                     when {
                         conversationId != DEFAULT_CONVERSATION_ID && postId != DEFAULT_POST_ID -> OpenedConversation(
-                            conversationId,
-                            OpenedThread(
-                                conversationId,
+                            _prevConfiguration = NothingOpened,
+                            conversationId = conversationId,
+                            openedThread = OpenedThread(
                                 StandalonePostId.ServerSideId(postId)
                             )
                         )
 
                         conversationId != DEFAULT_CONVERSATION_ID -> OpenedConversation(
-                            conversationId,
-                            null
+                            _prevConfiguration = NothingOpened,
+                            conversationId = conversationId,
+                            openedThread = null
                         )
 
-                        username.isNotBlank() -> NavigateToUserConversation(username)
+                        username.isNotBlank() -> NavigateToUserConversation(
+                            _prevConfiguration = NothingOpened,
+                            username = username
+                        )
 
                         else -> NothingOpened
                     }