Feature/mark tasks as done

.gitignore

@@ -1,4 +1,5 @@
 *.iml
+.idea/
 .gradle
 /local.properties
 /.idea/workspace.xml
@@ -7,4 +8,4 @@
 /build
 /captures
 .externalNativeBuild
-/app/google-services.json
+/app/google-services.json

app/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 apply plugin: 'com.google.gms.google-services'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'io.fabric'
 
@@ -39,7 +39,7 @@ dependencies {
     // UI
     implementation "androidx.appcompat:appcompat:$rootProject.appcompatVersion"
     implementation "com.google.android.material:material:$rootProject.materialVersion"
-    implementation "androidx.cardview:cardview:$rootProject.androidxVersion"
+    implementation "androidx.cardview:cardview:$rootProject.cardViewVersion"
     implementation "androidx.preference:preference:$rootProject.androidxVersion"
     implementation "com.github.XunMengWinter:CircularAnim:$rootProject.circularAnimVersion"
     implementation "com.github.Daio-io:dresscode:$rootProject.dresscodeVersion"
@@ -66,8 +66,18 @@ dependencies {
 
     // Lifecycle components
     implementation "android.arch.lifecycle:extensions:$rootProject.lifecycleVersion"
-    annotationProcessor "android.arch.lifecycle:compiler:$rootProject.lifecycleVersion"
+    kapt "android.arch.lifecycle:compiler:$rootProject.lifecycleVersion"
 
     // Tests
     testImplementation "junit:junit:$rootProject.junitVersion"
+
+    // Core library
+    androidTestImplementation 'androidx.test:core:1.1.0'
+
+    // AndroidJUnitRunner and JUnit Rules
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test:rules:1.1.1'
+
+    // Assertions
+    androidTestImplementation 'androidx.test.ext:junit:1.1.0'
 }

app/src/androidTest/java/apps/jizzu/simpletodo/TaskDAOTest.kt

@@ -0,0 +1,126 @@
+package apps.jizzu.simpletodo
+
+import android.content.Context
+import androidx.room.Room
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import apps.jizzu.simpletodo.data.database.TaskDao
+import apps.jizzu.simpletodo.data.database.TasksDatabase
+import apps.jizzu.simpletodo.data.models.Task
+import org.junit.After
+import org.junit.Assert.*
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import java.io.IOException
+import java.util.*
+
+@RunWith(AndroidJUnit4::class)
+class TaskDAOTest {
+
+    private lateinit var taskDao: TaskDao
+    private lateinit var tasksDatabase: TasksDatabase
+
+    @Before
+    fun createDb() {
+        val context = ApplicationProvider.getApplicationContext<Context>()
+        tasksDatabase = Room.inMemoryDatabaseBuilder(
+                context, TasksDatabase::class.java
+        ).build()
+        taskDao = tasksDatabase.taskDAO()
+    }
+
+    @Test
+    fun testSaveTask() {
+        val task = Task(1, "", "", Date().time, 1, Date().time)
+        taskDao.saveTask(task)
+
+        val tasks = taskDao.getAllTasks()
+        assertEquals(1, tasks.size)
+    }
+
+    @Test
+    fun testGetAllTasks() {
+        var task = Task(1, "", "", Date().time, 1, Date().time)
+        taskDao.saveTask(task)
+
+        var tasks = taskDao.getAllTasks()
+        assertEquals(1, tasks.size)
+
+        task = Task(2, "", "", Date().time, 2, Date().time, false)
+        taskDao.saveTask(task)
+
+        tasks = taskDao.getAllTasks()
+        assertEquals(2, tasks.size)
+
+        task = Task(3, "", "", Date().time, 2, Date().time, true)
+        taskDao.saveTask(task)
+
+        tasks = taskDao.getAllTasks()
+        assertEquals(3, tasks.size)
+    }
+
+    @Test
+    fun testGetAllOpenTasks() {
+        var task = Task(1, "", "", Date().time, 1, Date().time)
+        taskDao.saveTask(task)
+
+        var tasks = taskDao.getAllOpenTasks()
+        assertEquals(1, tasks.size)
+
+        task = Task(2, "", "", Date().time, 2, Date().time, false)
+        taskDao.saveTask(task)
+
+        tasks = taskDao.getAllOpenTasks()
+        assertEquals(2, tasks.size)
+
+        task = Task(3, "", "", Date().time, 2, Date().time, true)
+        taskDao.saveTask(task)
+
+        tasks = taskDao.getAllOpenTasks()
+        assertEquals(2, tasks.size)
+    }
+
+    @Test
+    fun testUpdateTask() {
+        var tasks = taskDao.getAllTasks()
+        assertEquals(0, tasks.size)
+
+        val task = Task(1, "", "", Date().time, 1, Date().time)
+        taskDao.saveTask(task)
+
+        tasks = taskDao.getAllOpenTasks()
+        assertEquals("", tasks[0].title)
+
+        tasks[0].title = "Test"
+        taskDao.updateTask(tasks[0])
+
+        tasks = taskDao.getAllTasks()
+        assertEquals(1, tasks.size)
+        assertEquals("Test", tasks[0].title)
+    }
+
+    @Test
+    fun testUpdateStatusTask() {
+        var tasks = taskDao.getAllTasks()
+        assertEquals(0, tasks.size)
+
+        val task = Task(1, "Test Me", "Task to Complete", Date().time, 1, Date().time)
+        taskDao.saveTask(task)
+
+        tasks = taskDao.getAllOpenTasks()
+        assertFalse(tasks[0].taskStatus)
+
+        tasks[0].taskStatus = tasks[0].taskStatus.not()
+        taskDao.updateTask(tasks[0])
+
+        tasks = taskDao.getAllOpenTasks()
+        assertEquals(0, tasks.size)
+    }
+
+    @After
+    @Throws(IOException::class)
+    fun closeDb() {
+        tasksDatabase.close()
+    }
+}

app/src/main/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="apps.jizzu.simpletodo">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
@@ -12,7 +13,8 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme.Light">
+        android:theme="@style/AppTheme.Light"
+        tools:ignore="AllowBackup,GoogleAppIndexingWarning">
         <activity
             android:name=".ui.view.MainActivity"
             android:launchMode="singleTop"
@@ -47,6 +49,10 @@
             android:name=".ui.view.SearchActivity"
             android:screenOrientation="portrait" />
 
+        <activity
+            android:name=".ui.view.CompletedTasksActivity"
+            android:screenOrientation="portrait" />
+
         <service
             android:name=".service.widget.WidgetService"
             android:permission="android.permission.BIND_REMOTEVIEWS" />

app/src/main/java/apps/jizzu/simpletodo/data/database/TaskDao.kt

@@ -21,12 +21,21 @@ interface TaskDao {
     @Query("DELETE FROM tasks_table")
     fun deleteAllTasks()
 
+    @Query("SELECT * FROM tasks_table where task_status=0 ORDER BY task_position")
+    fun getAllOpenTasksLiveData(): LiveData<List<Task>>
+
+    @Query("SELECT * FROM tasks_table where task_status=1 ORDER BY task_position")
+    fun getAllCompletedTasksLiveData(): LiveData<List<Task>>
+
     @Query("SELECT * FROM tasks_table ORDER BY task_position")
     fun getAllTasksLiveData(): LiveData<List<Task>>
 
     @Query("SELECT * FROM tasks_table ORDER BY task_position")
     fun getAllTasks(): List<Task>
 
+    @Query("SELECT * FROM tasks_table where task_status=0 ORDER BY task_position")
+    fun getAllOpenTasks(): List<Task>
+
     @Query("SELECT * FROM tasks_table WHERE task_title LIKE '%' || :searchText || '%'")
     fun getTasksForSearch(searchText: String): LiveData<List<Task>>
 }

app/src/main/java/apps/jizzu/simpletodo/data/database/TaskListRepository.kt

@@ -9,9 +9,11 @@ import io.reactivex.schedulers.Schedulers
 
 class TaskListRepository(app: Application) {
     private val mTaskDao = TasksDatabase.getInstance(app).taskDAO()
-    private val mAllTasksLiveData = mTaskDao.getAllTasksLiveData()
+    private val mAllOpenTasksLiveData = mTaskDao.getAllOpenTasksLiveData()
+    private val mAllCompletedTasksLiveData = mTaskDao.getAllCompletedTasksLiveData()
 
-    fun getAllTasksLiveData() = mAllTasksLiveData
+    fun getAllOpenTasksLiveData() = mAllOpenTasksLiveData
+    fun getAllCompletedTasksLiveData() = mAllCompletedTasksLiveData
 
     fun deleteAllTasks() = Completable.fromCallable { mTaskDao.deleteAllTasks() }.subscribeOn(Schedulers.io()).subscribe()!!
 
@@ -32,4 +34,12 @@ class TaskListRepository(app: Application) {
                 .subscribeBy(onNext = { task -> taskList.add(task) })
         return taskList
     }
+
+    fun getAllOpenTasks(): ArrayList<Task> {
+        val taskList = arrayListOf<Task>()
+        Observable.fromCallable { mTaskDao.getAllOpenTasks() }.subscribeOn(Schedulers.io())
+                .flatMap { tasks -> Observable.fromIterable(tasks) }
+                .subscribeBy(onNext = { task -> taskList.add(task) })
+        return taskList
+    }
 }