Merge pull request #10 from VladShurakov/fix-issue-2

FIX ISSUE #2

Author: VladShurakov

.idea/deploymentTargetDropDown.xml

@@ -71,6 +71,9 @@ dependencies {
     // Pretty Time
     implementation ("org.ocpsoft.prettytime:prettytime:5.0.4.Final")
 
+    // Gson
+    implementation("com.google.code.gson:gson:2.10.1")
+
     implementation("androidx.core:core-ktx:1.12.0")
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2")
     implementation("androidx.activity:activity-compose:1.8.1")

.idea/gradle.xml

@@ -18,9 +18,9 @@ import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.navArgument
 import com.google.accompanist.systemuicontroller.rememberSystemUiController
-import com.vladshurakov.jetnotesapp.feature_notes.presenter.screen.EditScreen
 import com.vladshurakov.jetnotesapp.feature_notes.presenter.screen.ArchivedScreen
 import com.vladshurakov.jetnotesapp.feature_notes.presenter.screen.DeletedScreen
+import com.vladshurakov.jetnotesapp.feature_notes.presenter.screen.EditScreen
 import com.vladshurakov.jetnotesapp.feature_notes.presenter.screen.NotesScreen
 import com.vladshurakov.jetnotesapp.feature_settings.presenter.screen.SettingsScreen
 import com.vladshurakov.jetnotesapp.feature_settings.presenter.viewmodel.SettingsEvent
@@ -92,7 +92,7 @@ class MainActivity : ComponentActivity() {
                     composable(route = Screen.Settings.route) {
                         SettingsScreen(
                             navController = navController,
-                            settingsBundle = settingsBundle,
+                            settingsViewModel = settingsViewModel,
                             onSettingsChanged = { newSettingsBundle ->
                                 settingsBundle = newSettingsBundle
                                 settingsViewModel.onEvent(SettingsEvent.SaveSettings(settingsBundle))

app/build.gradle.kts

@@ -6,9 +6,11 @@ import com.vladshurakov.jetnotesapp.feature_notes.data.data_source.NoteDatabase
 import com.vladshurakov.jetnotesapp.feature_notes.data.repository.NotesRepositoryImpl
 import com.vladshurakov.jetnotesapp.feature_notes.domain.repository.NotesRepository
 import com.vladshurakov.jetnotesapp.feature_notes.domain.usecase.DeleteNote
+import com.vladshurakov.jetnotesapp.feature_notes.domain.usecase.GetAllNotes
 import com.vladshurakov.jetnotesapp.feature_notes.domain.usecase.GetNote
 import com.vladshurakov.jetnotesapp.feature_notes.domain.usecase.GetNotes
 import com.vladshurakov.jetnotesapp.feature_notes.domain.usecase.InsertNote
+import com.vladshurakov.jetnotesapp.feature_notes.domain.usecase.InsertNotes
 import com.vladshurakov.jetnotesapp.feature_notes.domain.usecase.MoveNoteToFolder
 import com.vladshurakov.jetnotesapp.feature_notes.domain.usecase.NotesUseCases
 import com.vladshurakov.jetnotesapp.feature_notes.domain.usecase.SearchNotes
@@ -36,7 +38,7 @@ object AppModule {
             context = context,
             klass = NoteDatabase::class.java,
             name = "notes-database"
-        ).build()
+        ).allowMainThreadQueries().build()
     }
 
     @Provides
@@ -50,6 +52,8 @@ object AppModule {
     fun provideNotesUseCases(notesRepository: NotesRepository): NotesUseCases {
         return NotesUseCases(
             insertNote = InsertNote(notesRepository),
+            insertNotes = InsertNotes(notesRepository),
+            getAllNotes = GetAllNotes(notesRepository),
             getNote = GetNote(notesRepository),
             deleteNote = DeleteNote(notesRepository),
             moveTo = MoveNoteToFolder(notesRepository),

app/src/main/java/com/vladshurakov/jetnotesapp/MainActivity.kt

@@ -14,6 +14,12 @@ interface NoteDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insert(noteEntity: NoteEntity): Long
 
+    @Insert(onConflict = OnConflictStrategy.IGNORE)
+    suspend fun insert(noteEntities: List<NoteEntity>): List<Long>
+
+    @Query("SELECT * FROM note")
+    fun getAll(): List<NoteEntity>
+
     @Query("SELECT * FROM note WHERE id = :id")
     suspend fun get(id: Long): NoteEntity?
 
@@ -32,9 +38,17 @@ interface NoteDao {
     @Query("SELECT * FROM note WHERE folder = :folder ORDER BY pinned DESC, timestamp ASC")
     fun getAsc(folder: Folder): Flow<List<NoteEntity>>
 
-    @Query("SELECT * FROM note WHERE (title LIKE '%' || :query || '%' OR content LIKE '%' || :query || '%') ORDER BY pinned DESC, timestamp DESC")
+    @Query(
+        "SELECT * FROM note WHERE " +
+        "(title LIKE '%' || :query || '%' OR content LIKE '%' || :query || '%') " +
+        "AND folder = 'NOTES' ORDER BY pinned DESC, timestamp DESC"
+    )
     fun getDesc(query: String): Flow<List<NoteEntity>>
 
-    @Query("SELECT * FROM note WHERE (title LIKE '%' || :query || '%' OR content LIKE '%' || :query || '%') ORDER BY pinned ASC, timestamp ASC")
+    @Query(
+        "SELECT * FROM note WHERE " +
+        "(title LIKE '%' || :query || '%' OR content LIKE '%' || :query || '%') " +
+        "AND folder = 'NOTES' ORDER BY pinned ASC, timestamp ASC"
+    )
     fun getAsc(query: String): Flow<List<NoteEntity>>
 }

app/src/main/java/com/vladshurakov/jetnotesapp/di/AppModule.kt

@@ -11,10 +11,17 @@ import kotlinx.coroutines.flow.map
 
 class NotesRepositoryImpl(private val noteDao: NoteDao) : NotesRepository {
     override suspend fun insert(note: Note): Long {
-
         return noteDao.insert(note.toNoteEntity())
     }
 
+    override suspend fun insert(notes: List<Note>): List<Long> {
+        return noteDao.insert(notes.map { it.toNoteEntity() })
+    }
+
+    override fun getAll(): List<Note> {
+        return noteDao.getAll().map { it.toNote() }
+    }
+
     override suspend fun get(id: Long): Note? {
         return noteDao.get(id)?.toNote()
     }

app/src/main/java/com/vladshurakov/jetnotesapp/feature_notes/data/data_source/NoteDao.kt

@@ -6,6 +6,8 @@ import kotlinx.coroutines.flow.Flow
 
 interface NotesRepository {
     suspend fun insert(note: Note): Long?
+    suspend fun insert(notes: List<Note>): List<Long?>
+    fun getAll(): List<Note>
     suspend fun get(id: Long): Note?
     suspend fun delete(note: Note)
     suspend fun moveTo(id: Long, folder: Folder)

app/src/main/java/com/vladshurakov/jetnotesapp/feature_notes/data/repository/NotesRepositoryImpl.kt

@@ -0,0 +1,10 @@
+package com.vladshurakov.jetnotesapp.feature_notes.domain.usecase
+
+import com.vladshurakov.jetnotesapp.feature_notes.domain.models.Note
+import com.vladshurakov.jetnotesapp.feature_notes.domain.repository.NotesRepository
+
+class GetAllNotes(private val repository: NotesRepository) {
+    operator fun invoke(): List<Note> {
+        return repository.getAll()
+    }
+}

app/src/main/java/com/vladshurakov/jetnotesapp/feature_notes/domain/repository/NotesRepository.kt

@@ -7,7 +7,7 @@ class InsertNote(private val repository: NotesRepository){
 
     suspend operator fun invoke(note: Note): Long?{
         if (note.title.isBlank() && (note.content.isBlank() || note.content.startsWith(' '))){
-            return null
+            return -1
         }
         if (note.title.isBlank() && note.content.isNotBlank()){
             note.title = "Title"