Feature/archive

base/notepad/.gitignore

@@ -0,0 +1 @@
+/build

base/notepad/build.gradle

@@ -0,0 +1,49 @@
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-kapt'
+    id 'kotlin-android-extensions'
+}
+
+apply from: rootProject.file('dependencies.gradle')
+apply from: rootProject.file('versions.gradle')
+
+android {
+    compileSdkVersion versions.compileSdk
+
+    defaultConfig {
+        minSdkVersion versions.minSdk
+        targetSdkVersion versions.targetSdk
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        // Because of error More than one file was found with OS independent path 'META-INF/notepad_debug.kotlin_module'.
+        freeCompilerArgs = ["-module-name", project.path.substring(1).replace(':', '-')]
+        jvmTarget = '1.8'
+    }
+    sourceSets {
+        main.java.srcDirs += 'src/main/kotlin'
+        test.java.srcDirs += 'src/test/kotlin'
+        androidTest.java.srcDirs += 'src/androidTest/kotlin'
+    }
+    androidExtensions {
+        experimental = true
+    }
+}
+
+dependencies {
+    implementation project(":core")
+
+    implementation(
+            deps.kotlin.stdlib,
+            deps.dagger.dagger,
+            deps.material.material,
+            deps.constraint.constraint
+    )
+    kapt(
+            deps.dagger.processor
+    )
+}

base/notepad/proguard-rules.pro

@@ -0,0 +1 @@
+

base/notepad/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest package="com.dvinc.base.notepad"/>

features/notepad/src/main/kotlin/com/dvinc/notepad/data/mapper/note/NoteDataMapper.kt → base/notepad/src/main/kotlin/com/dvinc/base/notepad/data/mapper/note/NoteDataMapper.kt

@@ -3,10 +3,10 @@
  * All rights reserved.
  */
 
-package com.dvinc.notepad.data.mapper.note
+package com.dvinc.base.notepad.data.mapper.note
 
 import com.dvinc.core.database.entity.note.NoteEntity
-import com.dvinc.notepad.domain.model.note.Note
+import com.dvinc.base.notepad.domain.model.Note
 import javax.inject.Inject
 
 class NoteDataMapper @Inject constructor() {

features/notepad/src/main/kotlin/com/dvinc/notepad/domain/model/note/Note.kt → base/notepad/src/main/kotlin/com/dvinc/base/notepad/domain/model/Note.kt

@@ -5,7 +5,7 @@
  * All rights reserved.
  */
 
-package com.dvinc.notepad.domain.model.note
+package com.dvinc.base.notepad.domain.model
 
 data class Note(
     val id: Long,

features/notepad/src/main/kotlin/com/dvinc/notepad/presentation/adapter/notepad/NoteViewHolder.kt → base/notepad/src/main/kotlin/com/dvinc/base/notepad/presentation/adapter/notepad/NoteViewHolder.kt

@@ -3,11 +3,11 @@
  * All rights reserved.
  */
 
-package com.dvinc.notepad.presentation.adapter.notepad
+package com.dvinc.base.notepad.presentation.adapter.notepad
 
 import android.view.View
 import com.dvinc.core.ui.BaseViewHolder
-import com.dvinc.notepad.presentation.model.NoteUi
+import com.dvinc.base.notepad.presentation.model.NoteUi
 import kotlinx.android.synthetic.main.item_note.item_note_content as content
 import kotlinx.android.synthetic.main.item_note.item_note_name as name
 import kotlinx.android.synthetic.main.item_note.item_note_updating_time as updateTime

features/notepad/src/main/kotlin/com/dvinc/notepad/presentation/adapter/notepad/NotepadAdapter.kt → base/notepad/src/main/kotlin/com/dvinc/base/notepad/presentation/adapter/notepad/NotepadAdapter.kt

@@ -3,14 +3,14 @@
  * All rights reserved.
  */
 
-package com.dvinc.notepad.presentation.adapter.notepad
+package com.dvinc.base.notepad.presentation.adapter.notepad
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
-import com.dvinc.notepad.R
-import com.dvinc.notepad.presentation.model.NoteUi
+import com.dvinc.base.notepad.R
+import com.dvinc.base.notepad.presentation.model.NoteUi
 
 class NotepadAdapter : RecyclerView.Adapter<NoteViewHolder>() {
 

features/notepad/src/main/kotlin/com/dvinc/notepad/presentation/adapter/notepad/NotepadDiffUtilsCallback.kt → base/notepad/src/main/kotlin/com/dvinc/base/notepad/presentation/adapter/notepad/NotepadDiffUtilsCallback.kt

@@ -3,10 +3,10 @@
  * All rights reserved.
  */
 
-package com.dvinc.notepad.presentation.adapter.notepad
+package com.dvinc.base.notepad.presentation.adapter.notepad
 
 import androidx.recyclerview.widget.DiffUtil
-import com.dvinc.notepad.presentation.model.NoteUi
+import com.dvinc.base.notepad.presentation.model.NoteUi
 
 class NotepadDiffUtilsCallback(
     private val oldNotesList: List<NoteUi>,

features/notepad/src/main/kotlin/com/dvinc/notepad/presentation/adapter/notepad/NotepadSwipeToDeleteCallback.kt → base/notepad/src/main/kotlin/com/dvinc/base/notepad/presentation/adapter/notepad/NotepadSwipeCallback.kt

@@ -3,19 +3,19 @@
  * All rights reserved.
  */
 
-package com.dvinc.notepad.presentation.adapter.notepad
+package com.dvinc.base.notepad.presentation.adapter.notepad
 
 import android.graphics.Canvas
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.RecyclerView
-import com.dvinc.notepad.R
-import com.dvinc.notepad.presentation.model.NoteUi
+import com.dvinc.base.notepad.R
+import com.dvinc.base.notepad.presentation.model.NoteUi
 
-class NotepadSwipeToDeleteCallback(
+class NotepadSwipeCallback(
     private val notesAdapter: NotepadAdapter,
-    private val onItemSwipedListener: (note: NoteUi) -> Unit
+    private val onItemSwipedListener: (note: NoteUi, swipeDirection: NotepadSwipeDirection) -> Unit
 ) : ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT) {
 
     companion object {
@@ -24,6 +24,8 @@ class NotepadSwipeToDeleteCallback(
 
     private val deletedItemBackground = ColorDrawable(Color.RED)
 
+    private val archiveItemBackground = ColorDrawable(Color.GREEN)
+
     override fun onMove(
         recyclerView: RecyclerView,
         viewHolder: RecyclerView.ViewHolder,
@@ -35,7 +37,12 @@ class NotepadSwipeToDeleteCallback(
     override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
         val position = viewHolder.adapterPosition
         val swipedNote = notesAdapter.getItem(position)
-        onItemSwipedListener.invoke(swipedNote)
+        // (!) Be careful about directions
+        if (direction == ItemTouchHelper.RIGHT) {
+            onItemSwipedListener.invoke(swipedNote, NotepadSwipeDirection.LEFT)
+        } else if (direction == ItemTouchHelper.LEFT) {
+            onItemSwipedListener.invoke(swipedNote, NotepadSwipeDirection.RIGHT)
+        }
     }
 
     override fun onChildDraw(
@@ -56,7 +63,7 @@ class NotepadSwipeToDeleteCallback(
 
         when {
             dX > 0 -> {
-                deletedItemBackground.setBounds(
+                archiveItemBackground.setBounds(
                     itemView.left,
                     itemView.top,
                     itemView.left + (dX.toInt() + BACKGROUND_CORNER_OFFSET),
@@ -80,9 +87,11 @@ class NotepadSwipeToDeleteCallback(
             }
             else -> {
                 deletedItemBackground.setBounds(0, 0, 0, 0)
+                archiveItemBackground.setBounds(0, 0, 0, 0)
             }
         }
         deletedItemBackground.draw(c)
+        archiveItemBackground.draw(c)
         deleteIcon.draw(c)
     }
 }

base/notepad/src/main/kotlin/com/dvinc/base/notepad/presentation/adapter/notepad/NotepadSwipeDirection.kt

@@ -0,0 +1,8 @@
+package com.dvinc.base.notepad.presentation.adapter.notepad
+
+enum class NotepadSwipeDirection {
+
+    LEFT,
+
+    RIGHT
+}

features/notepad/src/main/kotlin/com/dvinc/notepad/presentation/mapper/NotePresentationMapper.kt → base/notepad/src/main/kotlin/com/dvinc/base/notepad/presentation/mapper/NotePresentationMapper.kt

@@ -3,10 +3,10 @@
  * All rights reserved.
  */
 
-package com.dvinc.notepad.presentation.mapper
+package com.dvinc.base.notepad.presentation.mapper
 
-import com.dvinc.notepad.domain.model.note.Note
-import com.dvinc.notepad.presentation.model.NoteUi
+import com.dvinc.base.notepad.domain.model.Note
+import com.dvinc.base.notepad.presentation.model.NoteUi
 import java.text.SimpleDateFormat
 import java.util.Calendar
 import java.util.Date

features/notepad/src/main/kotlin/com/dvinc/notepad/presentation/model/NoteUi.kt → base/notepad/src/main/kotlin/com/dvinc/base/notepad/presentation/model/NoteUi.kt

@@ -3,7 +3,7 @@
  * All rights reserved.
  */
 
-package com.dvinc.notepad.presentation.model
+package com.dvinc.base.notepad.presentation.model
 
 data class NoteUi(
     val id: Long,

features/notepad/src/main/res/drawable/bg_item_note.xml → base/notepad/src/main/res/drawable/bg_item_note.xml

@@ -3,7 +3,7 @@
     <item>
         <shape>
             <solid android:color="@color/noteItemBackgroundColor" />
-            <corners android:radius="10.0dp" />
+            <corners android:radius="10dp" />
         </shape>
     </item>
 </ripple>

features/notepad/src/main/res/values-night/colors.xml → base/notepad/src/main/res/values-night/colors.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="noteItemBackgroundColor">@color/darkItemBackgroundColor</color>
+    <color name="noteItemBackgroundColor">@color/darkItemBackground</color>
     <color name="noteTitleTextColor">@color/darkTextColor</color>
     <color name="noteContentTextColor">@color/darkTextColor</color>
-</resources>
+</resources>

features/notepad/src/main/res/values/colors.xml → base/notepad/src/main/res/values/colors.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="darkItemBackgroundColor">#1F1A24</color>
-
     <color name="noteItemBackgroundColor">@color/white</color>
     <color name="noteTitleTextColor">@color/black</color>
     <color name="noteContentTextColor">@color/gray</color>

base/notepad/src/main/res/values/strings.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="error_while_load_data_from_db">An error has occurred while loading from database</string>
+    <string name="error_while_deleting_note">An error has occurred while deleting note</string>
+    <string name="error_while_loading_note">Cannot load note from database</string>
+    <string name="error_while_adding_note">Cannot add note</string>
+    <string name="error_while_archiving_note">An error has occurred while archiving note</string>
+</resources>

features/notepad/src/main/res/values/styles.xml → base/notepad/src/main/res/values/styles.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
     <style name="NoteHeaderStyle">
         <item name="android:textColor">@color/noteTitleTextColor</item>
         <item name="android:textSize">20sp</item>
@@ -10,5 +9,4 @@
         <item name="android:textColor">@color/noteContentTextColor</item>
         <item name="android:textSize">14sp</item>
     </style>
-
 </resources>

core/src/main/kotlin/com/dvinc/core/database/NotepadDatabase.kt

@@ -7,11 +7,19 @@ package com.dvinc.core.database
 
 import androidx.room.Database
 import androidx.room.RoomDatabase
+import com.dvinc.core.database.dao.archive.ArchiveDao
 import com.dvinc.core.database.dao.note.NoteDao
 import com.dvinc.core.database.entity.note.NoteEntity
 
-@Database(entities = [NoteEntity::class], version = 1)
+@Database(
+    entities = [
+        NoteEntity::class
+    ],
+    version = 1
+)
 abstract class NotepadDatabase : RoomDatabase() {
 
     abstract fun notesDao(): NoteDao
+
+    abstract fun archiveDao(): ArchiveDao
 }

core/src/main/kotlin/com/dvinc/core/database/dao/archive/ArchiveDao.kt

@@ -0,0 +1,16 @@
+package com.dvinc.core.database.dao.archive
+
+import androidx.room.Dao
+import androidx.room.Query
+import com.dvinc.core.database.entity.note.NoteEntity
+import kotlinx.coroutines.flow.Flow
+
+@Dao
+interface ArchiveDao {
+
+    @Query("UPDATE Notes SET is_archived = 1 WHERE id =:noteId")
+    suspend fun markNoteAsArchived(noteId: Long)
+
+    @Query("SELECT * FROM Notes WHERE is_archived = 1 ORDER BY id DESC")
+    fun getArchive(): Flow<List<NoteEntity>>
+}

core/src/main/kotlin/com/dvinc/core/database/dao/note/NoteDao.kt

@@ -18,7 +18,7 @@ interface NoteDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun addNote(note: NoteEntity)
 
-    @Query("SELECT * FROM Notes ORDER BY id DESC")
+    @Query("SELECT * FROM Notes WHERE is_archived = 0 ORDER BY id DESC")
     fun getNotes(): Flow<List<NoteEntity>>
 
     @Query("DELETE FROM Notes WHERE id = :id")

core/src/main/kotlin/com/dvinc/core/database/entity/note/NoteEntity.kt

@@ -22,5 +22,8 @@ data class NoteEntity(
     val content: String,
 
     @ColumnInfo(name = "update_time")
-    val updateTime: Long
+    val updateTime: Long,
+
+    @ColumnInfo(name = "is_archived")
+    val isArchived: Boolean = false
 )

core/src/main/kotlin/com/dvinc/core/ui/BaseViewModel.kt

@@ -1,13 +1,20 @@
 package com.dvinc.core.ui
 
 import androidx.annotation.StringRes
+import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.navigation.NavDirections
 
-abstract class BaseViewModel : ViewModel() {
+abstract class BaseViewModel<State : ViewState>(initialViewState: State? = null) : ViewModel() {
+
+    val viewState = MutableLiveData<State>()
 
     val viewCommands = CommandsLiveData<ViewCommand>()
 
+    init {
+        setInitialViewState(initialViewState)
+    }
+
     protected fun showMessage(@StringRes messageResId: Int) {
         val showMessageCommand = ShowMessage(messageResId)
         viewCommands.onNext(showMessageCommand)
@@ -26,4 +33,10 @@ abstract class BaseViewModel : ViewModel() {
     protected fun navigateBack() {
         viewCommands.onNext(NavigateUp)
     }
+
+    private fun setInitialViewState(initialViewState: State?) {
+        initialViewState?.let {
+            viewState.value = it
+        }
+    }
 }

core/src/main/kotlin/com/dvinc/core/ui/ViewState.kt

@@ -0,0 +1,3 @@
+package com.dvinc.core.ui
+
+interface ViewState

core/src/main/res/values/colors.xml

@@ -14,6 +14,7 @@
     <color name="darkScreenBackgroundColor">#121212</color>
     <color name="darkTextColor">#888888</color>
     <color name="darkTextHintColor">#AAAAAA</color>
+    <color name="darkItemBackground">#1F1A24</color>
 
     <color name="screenBackgroundColor">@color/white</color>
     <color name="editTextColor">@color/black</color>

features/archive/.gitignore

@@ -0,0 +1 @@
+/build