Merge pull request #224 from mhss1/dev

Dev
mhss1 · Sep 9, 2024 · 8b68b02 · 8b68b02
2 parents 72ec184 + 0a73589
commit 8b68b02
Show file tree

Hide file tree

Showing 15 changed files with 242 additions and 83 deletions.
diff --git a/ai/presentation/src/main/java/com/mhss/app/presentation/AssistantEvent.kt b/ai/presentation/src/main/java/com/mhss/app/presentation/AssistantEvent.kt
@@ -6,4 +6,8 @@ sealed interface AssistantEvent {
     data class SendMessage(val message: AiMessage): AssistantEvent
     data class SearchNotes(val query: String) : AssistantEvent
     data class SearchTasks(val query: String) : AssistantEvent
+    data class AddAttachmentNote(val id: Int): AssistantEvent
+    data class AddAttachmentTask(val id: Int): AssistantEvent
+    data object AddAttachmentEvents: AssistantEvent
+    data class RemoveAttachment(val index: Int): AssistantEvent
 }
diff --git a/ai/presentation/src/main/java/com/mhss/app/presentation/AssistantScreen.kt b/ai/presentation/src/main/java/com/mhss/app/presentation/AssistantScreen.kt
@@ -28,8 +28,8 @@ import androidx.compose.material3.Text
 import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
@@ -62,17 +62,15 @@ import org.koin.androidx.compose.koinViewModel
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun AssistantScreen(
-    viewModel: AssistantViewModel = koinViewModel()
+    viewModel: AssistantViewModel = koinViewModel(),
 ) {
     val context = LocalContext.current
     val uiState = viewModel.uiState
     val messages = uiState.messages
     val loading = uiState.loading
     val error = uiState.error
     var text by rememberSaveable { mutableStateOf("") }
-    val attachments = remember {
-        mutableStateListOf<AiMessageAttachment>()
-    }
+    val attachments = viewModel.attachments
     var attachmentsMenuExpanded by remember {
         mutableStateOf(false)
     }
@@ -88,7 +86,7 @@ fun AssistantScreen(
     val keyboardController = LocalSoftwareKeyboardController.current
     Scaffold(
         topBar = {
-           MyBrainAppBar(stringResource(id = R.string.assistant))
+            MyBrainAppBar(stringResource(id = R.string.assistant))
         },
         bottomBar = {
             AiChatBar(
@@ -97,7 +95,11 @@ fun AssistantScreen(
                 attachments = attachments,
                 onTextChange = { text = it },
                 onAttachClick = { attachmentsMenuExpanded = true },
-                onRemoveAttachment = { attachments.removeAt(it) },
+                onRemoveAttachment = {
+                    viewModel.onEvent(
+                        AssistantEvent.RemoveAttachment(it)
+                    )
+                },
                 loading = loading,
                 onSend = {
                     viewModel.onEvent(
@@ -111,28 +113,28 @@ fun AssistantScreen(
                         )
                     )
                     text = ""
-                    attachments.clear()
                     keyboardController?.hide()
                 }
             )
+            val excludedItems by remember {
+                derivedStateOf {
+                    if (attachments.contains(AiMessageAttachment.CalenderEvents)) {
+                        listOf(AttachmentMenuItem.CalendarEvents)
+                    } else {
+                        emptyList()
+                    }
+                }
+            }
             AttachmentDropDownMenu(
                 modifier = Modifier.fillMaxWidth(),
                 expanded = attachmentsMenuExpanded,
                 onDismiss = { attachmentsMenuExpanded = false },
-                excludedItems = attachments.map {
-                    when (it) {
-                        is AiMessageAttachment.Note -> AttachmentMenuItem.Note
-                        is AiMessageAttachment.Task -> AttachmentMenuItem.Task
-                        is AiMessageAttachment.CalenderEvents -> AttachmentMenuItem.CalendarEvents
-                    }
-                },
+                excludedItems = excludedItems,
                 onItemClick = {
                     when (it) {
                         AttachmentMenuItem.Note -> openNoteSheet = true
                         AttachmentMenuItem.Task -> openTaskSheet = true
-                        AttachmentMenuItem.CalendarEvents -> attachments.add(
-                            AiMessageAttachment.CalenderEvents
-                        )
+                        AttachmentMenuItem.CalendarEvents -> viewModel.onEvent(AssistantEvent.AddAttachmentEvents)
                     }
                     attachmentsMenuExpanded = false
                 }
@@ -146,7 +148,7 @@ fun AssistantScreen(
             view = uiState.noteView,
             onQueryChange = { viewModel.onEvent(AssistantEvent.SearchNotes(it)) }
         ) {
-            attachments.add(AiMessageAttachment.Note(it))
+            viewModel.onEvent(AssistantEvent.AddAttachmentNote(it.id))
             openNoteSheet = false
         }
         if (openTaskSheet) AttachTaskSheet(
@@ -155,7 +157,7 @@ fun AssistantScreen(
             tasks = uiState.searchTasks,
             onQueryChange = { viewModel.onEvent(AssistantEvent.SearchTasks(it)) }
         ) {
-            attachments.add(AiMessageAttachment.Task(it))
+            viewModel.onEvent(AssistantEvent.AddAttachmentTask(it.id))
             openTaskSheet = false
         }
         Column(

diff --git a/ai/presentation/src/main/java/com/mhss/app/presentation/AssistantViewModel.kt b/ai/presentation/src/main/java/com/mhss/app/presentation/AssistantViewModel.kt
@@ -1,6 +1,7 @@
 package com.mhss.app.presentation
 
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.lifecycle.ViewModel
@@ -12,6 +13,8 @@ import com.mhss.app.domain.model.CalendarEvent
 import com.mhss.app.domain.model.Note
 import com.mhss.app.domain.model.Task
 import com.mhss.app.domain.use_case.GetAllEventsUseCase
+import com.mhss.app.domain.use_case.GetNoteUseCase
+import com.mhss.app.domain.use_case.GetTaskByIdUseCase
 import com.mhss.app.domain.use_case.SearchNotesUseCase
 import com.mhss.app.domain.use_case.SearchTasksUseCase
 import com.mhss.app.domain.use_case.SendAiMessageUseCase
@@ -49,10 +52,13 @@ class AssistantViewModel(
     private val getPreference: GetPreferenceUseCase,
     private val searchNotes: SearchNotesUseCase,
     private val searchTasks: SearchTasksUseCase,
-    private val getCalendarEvents: GetAllEventsUseCase
+    private val getCalendarEvents: GetAllEventsUseCase,
+    private val getNoteById: GetNoteUseCase,
+    private val getTaskById: GetTaskByIdUseCase,
 ) : ViewModel() {
 
     private val messages = ArrayList<AiMessage>()
+    val attachments = mutableStateListOf<AiMessageAttachment>()
 
     // LinkedList to enable inserting at the beginning of the list efficiently
     // LazyColumn needs the list in reverse order
@@ -132,6 +138,7 @@ class AssistantViewModel(
                 )
                 messages.add(message)
                 uiMessages.addFirst(message)
+                attachments.clear()
 
                 uiState = uiState.copy(
                     messages = uiMessages,
@@ -186,6 +193,25 @@ class AssistantViewModel(
                     }
                 }
             }
+
+            AssistantEvent.AddAttachmentEvents -> {
+                attachments.add(AiMessageAttachment.CalenderEvents)
+            }
+
+            is AssistantEvent.AddAttachmentNote -> viewModelScope.launch {
+                val note = getNoteById(event.id)
+                attachments.add(AiMessageAttachment.Note(note.copy(
+                    title = note.title.ifBlank { "Untitled Note" }
+                )))
+            }
+
+            is AssistantEvent.AddAttachmentTask -> viewModelScope.launch {
+                attachments.add(AiMessageAttachment.Task(getTaskById(event.id)))
+            }
+
+            is AssistantEvent.RemoveAttachment -> {
+                attachments.removeAt(event.index)
+            }
         }
     }
 
@@ -197,12 +223,12 @@ class AssistantViewModel(
         for (attachment in attachments) {
             when (attachment) {
                 is AiMessageAttachment.Note -> {
-                    builder.appendLine("Attached Notes:")
+                    builder.appendLine("Attached Note:")
                     builder.appendLine(Json.encodeToString(attachment.note))
                 }
 
                 is AiMessageAttachment.Task -> {
-                    builder.appendLine("Attached Tasks:")
+                    builder.appendLine("Attached Task:")
                     builder.appendLine(Json.encodeToString(attachment.task))
                 }
 

diff --git a/ai/presentation/src/main/java/com/mhss/app/presentation/components/AiAttachmentCards.kt b/ai/presentation/src/main/java/com/mhss/app/presentation/components/AiAttachmentCards.kt
@@ -4,12 +4,12 @@ import androidx.compose.animation.animateContentSize
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.horizontalScroll
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ContextualFlowRow
 import androidx.compose.foundation.layout.ContextualFlowRowOverflow
 import androidx.compose.foundation.layout.ExperimentalLayoutApi
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
@@ -20,8 +20,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.widthIn
-import androidx.compose.foundation.lazy.LazyRow
-import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
@@ -69,36 +68,34 @@ fun AiAttachmentsSection(
     editable: Boolean = false,
 ) {
     if (editable) {
-        LazyRow(
+        Row(
             modifier = modifier
                 .fillMaxWidth()
-                .padding(top = 5.dp, end = 5.dp),
-            verticalAlignment = Alignment.CenterVertically,
-            contentPadding = PaddingValues(start = 8.dp, bottom = 8.dp)
+                .padding(top = 5.dp, end = 5.dp)
+                .horizontalScroll(rememberScrollState()),
         ) {
-            itemsIndexed(attachments) {i, it ->
-                    when (it) {
-                        is AiMessageAttachment.Note -> NoteAttachmentCard(
-                            note = it.note,
-                            modifier = Modifier.animateItem(),
-                            showRemoveButton = true
-                        ) {
-                            onRemove(i)
-                        }
-                        is AiMessageAttachment.Task -> TaskAttachmentCard(
-                            task = it.task,
-                            modifier = Modifier.animateItem(),
-                            showRemoveButton = true
-                        ) {
-                            onRemove(i)
-                        }
-                        is AiMessageAttachment.CalenderEvents -> CalendarEventsAttachmentCard(
-                            showRemoveButton = true,
-                            modifier = Modifier.animateItem()
-                        ) {
-                            onRemove(i)
-                        }
+            attachments.forEachIndexed { i, it ->
+                when (it) {
+                    is AiMessageAttachment.Note -> NoteAttachmentCard(
+                        note = it.note,
+                        showRemoveButton = true
+                    ) {
+                        onRemove(i)
                     }
+
+                    is AiMessageAttachment.Task -> TaskAttachmentCard(
+                        task = it.task,
+                        showRemoveButton = true
+                    ) {
+                        onRemove(i)
+                    }
+
+                    is AiMessageAttachment.CalenderEvents -> CalendarEventsAttachmentCard(
+                        showRemoveButton = true,
+                    ) {
+                        onRemove(i)
+                    }
+                }
             }
         }
     } else {
@@ -126,10 +123,7 @@ fun AiAttachmentsSection(
                 collapseIndicator = {}
             )
         ) { i ->
-            val attachment = remember {
-                attachments[i]
-            }
-            when (attachment) {
+            when (val attachment = attachments[i]) {
                 is AiMessageAttachment.Note -> NoteAttachmentCard(attachment.note)
                 is AiMessageAttachment.Task -> TaskAttachmentCard(attachment.task)
                 is AiMessageAttachment.CalenderEvents -> CalendarEventsAttachmentCard()

diff --git a/ai/presentation/src/main/java/com/mhss/app/presentation/components/AttachmentDropDownMenu.kt b/ai/presentation/src/main/java/com/mhss/app/presentation/components/AttachmentDropDownMenu.kt
@@ -6,6 +6,7 @@ import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
@@ -18,14 +19,17 @@ fun AttachmentDropDownMenu(
     excludedItems: List<AttachmentMenuItem>,
     onDismiss: () -> Unit,
     onItemClick: (AttachmentMenuItem) -> Unit,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
+    val items = remember(excludedItems) {
+        AttachmentMenuItem.entries.filterNot { it in excludedItems }
+    }
     DropdownMenu(
         modifier = modifier,
         expanded = expanded,
         onDismissRequest = onDismiss
     ) {
-        AttachmentMenuItem.entries.filter { it !in excludedItems }.forEach {
+        items.forEach {
             DropdownMenuItem(
                 text = { Text(stringResource(it.titleRes)) },
                 leadingIcon = {

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -14,8 +14,8 @@ android {
         applicationId = "com.mhss.app.mybrain"
         minSdk = 26
         targetSdk = 35
-        versionCode = 9
-        versionName = "2.0.0"
+        versionCode = 10
+        versionName = "2.0.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

diff --git a/core/database/src/main/java/com/mhss/app/database/converters/DBConverters.kt b/core/database/src/main/java/com/mhss/app/database/converters/DBConverters.kt
@@ -14,7 +14,10 @@ class DBConverters {
     }
     @TypeConverter
     fun toSubTasksList(value: String): List<SubTask> {
-        return Json.decodeFromString<List<SubTask>>(value)
+        val json = Json {
+            ignoreUnknownKeys = true
+        }
+        return json.decodeFromString<List<SubTask>>(value)
     }
 
     @TypeConverter

diff --git a/fastlane/metadata/android/en-US/changelogs/10.txt b/fastlane/metadata/android/en-US/changelogs/10.txt
@@ -0,0 +1,2 @@
+- Added the ability to choose which spaces to export
+- Bug fixes
diff --git a/settings/data/src/main/java/com/mhss/app/data/BackupRepositoryImpl.kt b/settings/data/src/main/java/com/mhss/app/data/BackupRepositoryImpl.kt
@@ -34,6 +34,10 @@ class BackupRepositoryImpl(
     @OptIn(ExperimentalSerializationApi::class)
     override suspend fun exportDatabase(
         directoryUri: String,
+        exportNotes: Boolean,
+        exportTasks: Boolean,
+        exportDiary: Boolean,
+        exportBookmarks: Boolean,
         encrypted: Boolean, // To be added in a future version
         password: String // To be added in a future version
     ): Boolean {
@@ -43,11 +47,11 @@ class BackupRepositoryImpl(
                 val pickedDir = DocumentFile.fromTreeUri(context, directoryUri.toUri())
                 val destination = pickedDir!!.createFile("application/json", fileName)
 
-                val notes = database.noteDao().getAllNotes()
-                val noteFolders = database.noteDao().getAllNoteFolders().first()
-                val tasks = database.taskDao().getAllTasks().first()
-                val diary = database.diaryDao().getAllEntries().first()
-                val bookmarks = database.bookmarkDao().getAllBookmarks().first()
+                val notes = if (exportNotes) database.noteDao().getAllNotes() else emptyList()
+                val noteFolders = if (exportNotes) database.noteDao().getAllNoteFolders().first() else emptyList()
+                val tasks = if (exportTasks) database.taskDao().getAllTasks().first() else emptyList()
+                val diary = if (exportDiary) database.diaryDao().getAllEntries().first() else emptyList()
+                val bookmarks = if (exportBookmarks) database.bookmarkDao().getAllBookmarks().first() else emptyList()
 
                 val backupData = BackupData(notes, noteFolders, tasks, diary, bookmarks)
 
@@ -115,10 +119,10 @@ class BackupRepositoryImpl(
 
     @Serializable
     private data class BackupData(
-        @SerialName("notes") val notes: List<NoteEntity>,
-        @SerialName("noteFolders") val noteFolders: List<NoteFolderEntity>,
-        @SerialName("tasks") val tasks: List<TaskEntity>,
-        @SerialName("diary") val diary: List<DiaryEntryEntity>,
-        @SerialName("bookmarks") val bookmarks: List<BookmarkEntity>
+        @SerialName("notes") val notes: List<NoteEntity> = emptyList(),
+        @SerialName("noteFolders") val noteFolders: List<NoteFolderEntity> = emptyList(),
+        @SerialName("tasks") val tasks: List<TaskEntity> = emptyList(),
+        @SerialName("diary") val diary: List<DiaryEntryEntity> = emptyList(),
+        @SerialName("bookmarks") val bookmarks: List<BookmarkEntity> = emptyList()
     )
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- Added the ability to choose which spaces to export
		- Bug fixes