Merge pull request #16 from mrtry/fix/todo-to-task

rename ToDo to Task

Author: mrtry

app/src/main/java/io/github/mrtry/todolist/app/todo/viewmodel/TaskViewModel.kt

@@ -9,8 +9,8 @@ import io.github.mrtry.todolist.R
 import io.github.mrtry.todolist.app.todo.ui.navigator.ToDoNavigator
 import io.github.mrtry.todolist.di.scope.ActivityScope
 import io.github.mrtry.todolist.misc.extension.requireValue
-import io.github.mrtry.todolist.todo.domainservice.ToDoDomainService
-import io.github.mrtry.todolist.todo.entity.ToDo
+import io.github.mrtry.todolist.task.domainservice.TaskDomainService
+import io.github.mrtry.todolist.task.entity.Task
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
@@ -21,7 +21,7 @@ import javax.inject.Inject
 class TaskViewModel
 @Inject constructor(
     private val navigator: ToDoNavigator,
-    private val domainService: ToDoDomainService,
+    private val domainService: TaskDomainService,
     private val coroutineScope: CoroutineScope
 ) : TextView.OnEditorActionListener {
     val taskName: MutableLiveData<String> = MutableLiveData("")
@@ -32,7 +32,7 @@ class TaskViewModel
             if (taskName.requireValue().isEmpty()) return@launch
 
             isSaving.value = true
-            val todo = ToDo(title = taskName.value.orEmpty())
+            val todo = Task(title = taskName.value.orEmpty())
 
             try {
                 domainService.saveToRepository(todo)

app/src/main/java/io/github/mrtry/todolist/app/todo/viewmodel/ToDoListItemViewModel.kt

@@ -6,21 +6,21 @@ import io.github.mrtry.todolist.R
 import io.github.mrtry.todolist.app.todo.ui.navigator.ToDoNavigator
 import io.github.mrtry.todolist.misc.extension.observeNonNull
 import io.github.mrtry.todolist.misc.extension.requireValue
-import io.github.mrtry.todolist.todo.domainservice.ToDoDomainService
-import io.github.mrtry.todolist.todo.entity.ToDo
+import io.github.mrtry.todolist.task.domainservice.TaskDomainService
+import io.github.mrtry.todolist.task.entity.Task
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import timber.log.Timber
 
 class ToDoListItemViewModel(
-    todo: ToDo,
+    todo: Task,
     lifecycleOwner: LifecycleOwner,
     private val navigator: ToDoNavigator,
-    private val domainService: ToDoDomainService,
+    private val domainService: TaskDomainService,
     private val coroutineScope: CoroutineScope
 ) {
-    val todo: MutableLiveData<ToDo> = MutableLiveData(todo)
+    val todo: MutableLiveData<Task> = MutableLiveData(todo)
     val isComplete: MutableLiveData<Boolean> = MutableLiveData(todo.isComplete)
     val isSaving: MutableLiveData<Boolean> = MutableLiveData(false)
 

app/src/main/java/io/github/mrtry/todolist/app/todo/viewmodel/ToDoViewModel.kt

@@ -9,7 +9,7 @@ import io.github.mrtry.todolist.app.todo.ui.navigator.ToDoNavigator
 import io.github.mrtry.todolist.app.todo.viewmodel.converter.ToDoListItemViewModelConverter
 import io.github.mrtry.todolist.di.scope.ActivityScope
 import io.github.mrtry.todolist.misc.ui.viewmodel.ToolbarViewModel
-import io.github.mrtry.todolist.todo.domainservice.ToDoDomainService
+import io.github.mrtry.todolist.task.domainservice.TaskDomainService
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.collect
@@ -23,7 +23,7 @@ class ToDoViewModel
     val toolbarViewModel: ToolbarViewModel,
     val taskViewModel: TaskViewModel,
     private val navigator: ToDoNavigator,
-    private val toDoDomainService: ToDoDomainService,
+    private val taskDomainService: TaskDomainService,
     private val converter: ToDoListItemViewModelConverter,
     private val coroutineScope: CoroutineScope
 ) : SwipeRefreshLayout.OnRefreshListener {
@@ -40,7 +40,7 @@ class ToDoViewModel
     fun load() {
         coroutineScope.launch {
             try {
-                toDoDomainService.connectToRepository().collect { todos ->
+                taskDomainService.connectToRepository().collect { todos ->
                     items.clear()
                     todos.map {
                         items.add(

app/src/main/java/io/github/mrtry/todolist/app/todo/viewmodel/converter/ToDoListItemViewModelConverter.kt

@@ -4,8 +4,8 @@ import androidx.lifecycle.LifecycleOwner
 import io.github.mrtry.todolist.app.todo.ui.navigator.ToDoNavigator
 import io.github.mrtry.todolist.app.todo.viewmodel.ToDoListItemViewModel
 import io.github.mrtry.todolist.di.scope.ActivityScope
-import io.github.mrtry.todolist.todo.domainservice.ToDoDomainService
-import io.github.mrtry.todolist.todo.entity.ToDo
+import io.github.mrtry.todolist.task.domainservice.TaskDomainService
+import io.github.mrtry.todolist.task.entity.Task
 import kotlinx.coroutines.CoroutineScope
 import javax.inject.Inject
 
@@ -14,10 +14,10 @@ class ToDoListItemViewModelConverter
 @Inject constructor(
     private val lifecycleOwner: LifecycleOwner,
     private val navigator: ToDoNavigator,
-    private val domainService: ToDoDomainService,
+    private val domainService: TaskDomainService,
     private val coroutineScope: CoroutineScope
 ) {
-    fun convert(entity: ToDo): ToDoListItemViewModel =
+    fun convert(entity: Task): ToDoListItemViewModel =
         ToDoListItemViewModel(
             entity,
             lifecycleOwner,

app/src/main/java/io/github/mrtry/todolist/todo/domainservice/ToDoDomainService.kt app/src/main/java/io/github/mrtry/todolist/task/domainservice/TaskDomainService.kt

@@ -1,20 +1,20 @@
-package io.github.mrtry.todolist.todo.domainservice
+package io.github.mrtry.todolist.task.domainservice
 
 import com.google.firebase.firestore.FirebaseFirestoreException
-import io.github.mrtry.todolist.todo.entity.ToDo
-import io.github.mrtry.todolist.todo.repository.ToDoRepository
+import io.github.mrtry.todolist.task.entity.Task
+import io.github.mrtry.todolist.task.repository.ToDoRepository
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class ToDoDomainService
+class TaskDomainService
 @Inject constructor(
     private val repository: ToDoRepository
 ) {
     @Throws(FirebaseFirestoreException::class, IllegalArgumentException::class, IllegalStateException::class)
-    suspend fun saveToRepository(entity: ToDo) = withContext(Dispatchers.IO) {
+    suspend fun saveToRepository(entity: Task) = withContext(Dispatchers.IO) {
         repository.save(entity)
     }
 

app/src/main/java/io/github/mrtry/todolist/todo/entity/ToDo.kt app/src/main/java/io/github/mrtry/todolist/task/entity/Task.kt

@@ -1,8 +1,8 @@
-package io.github.mrtry.todolist.todo.entity
+package io.github.mrtry.todolist.task.entity
 
 import com.google.firebase.Timestamp
 
-data class ToDo(
+data class Task(
     val id: String? = null,
     var title: String = "",
     var description: String = "",

app/src/main/java/io/github/mrtry/todolist/todo/repository/ToDoRepository.kt app/src/main/java/io/github/mrtry/todolist/task/repository/TaskRepository.kt

@@ -1,10 +1,10 @@
-package io.github.mrtry.todolist.todo.repository
+package io.github.mrtry.todolist.task.repository
 
 import com.google.firebase.Timestamp
 import com.google.firebase.firestore.FirebaseFirestore
 import io.github.mrtry.todolist.misc.extension.await
 import io.github.mrtry.todolist.misc.extension.getDataFlow
-import io.github.mrtry.todolist.todo.entity.ToDo
+import io.github.mrtry.todolist.task.entity.Task
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.withContext
@@ -19,7 +19,7 @@ class ToDoRepository
 @Inject constructor() {
     private val db = FirebaseFirestore.getInstance()
 
-    suspend fun save(entity: ToDo) = withContext(Dispatchers.IO) {
+    suspend fun save(entity: Task) = withContext(Dispatchers.IO) {
         val id = entity.id ?: db.collection(COLLECTION_PATH).document().id
         val timestamp = entity.createdAt ?: Timestamp(Date())
 
@@ -34,11 +34,11 @@ class ToDoRepository
             .await()
     }
 
-    fun connect(): Flow<List<ToDo>> =
+    fun connect(): Flow<List<Task>> =
         db.collection(COLLECTION_PATH)
             .getDataFlow { querySnapshot ->
                 querySnapshot?.documents?.mapNotNull {
-                    it.toObject(ToDo::class.java)
+                    it.toObject(Task::class.java)
                 }
                     ?.toMutableList()
                     .also { list -> list?.sortBy { it.createdAt } }

app/src/test/java/io/github/mrtry/todolist/app/todo/viewmodel/TaskViewModelTest.kt

@@ -5,7 +5,7 @@ import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.*
 import io.github.mrtry.todolist.app.todo.ui.navigator.ToDoNavigator
 import io.github.mrtry.todolist.misc.extension.requireValue
-import io.github.mrtry.todolist.todo.domainservice.ToDoDomainService
+import io.github.mrtry.todolist.task.domainservice.TaskDomainService
 import kotlinx.coroutines.test.TestCoroutineScope
 import kotlinx.coroutines.test.runBlockingTest
 import org.junit.Before
@@ -21,7 +21,7 @@ class TaskViewModelTest {
     private lateinit var viewModel: TaskViewModel
 
     private lateinit var mockNavigator: ToDoNavigator
-    private lateinit var mockDomainService: ToDoDomainService
+    private lateinit var mockDomainService: TaskDomainService
 
     @Before
     fun setUp() {

app/src/test/java/io/github/mrtry/todolist/app/todo/viewmodel/ToDoViewModelTest.kt

@@ -8,8 +8,8 @@ import io.github.mrtry.todolist.app.todo.ui.navigator.ToDoNavigator
 import io.github.mrtry.todolist.app.todo.viewmodel.converter.ToDoListItemViewModelConverter
 import io.github.mrtry.todolist.misc.extension.requireValue
 import io.github.mrtry.todolist.misc.ui.viewmodel.ToolbarViewModel
-import io.github.mrtry.todolist.todo.domainservice.ToDoDomainService
-import io.github.mrtry.todolist.todo.entity.ToDo
+import io.github.mrtry.todolist.task.domainservice.TaskDomainService
+import io.github.mrtry.todolist.task.entity.Task
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.test.TestCoroutineScope
@@ -27,7 +27,7 @@ class ToDoViewModelTest {
     private lateinit var viewModel: ToDoViewModel
 
     private lateinit var mockNavigator: ToDoNavigator
-    private lateinit var mockDomainService: ToDoDomainService
+    private lateinit var mockDomainService: TaskDomainService
     private lateinit var mockConverter: ToDoListItemViewModelConverter
 
     @Before
@@ -50,7 +50,7 @@ class ToDoViewModelTest {
 
     @Test
     fun load_success() = runBlockingTest {
-        val mockFlow: Flow<List<ToDo>> = flow { emit(listOf(mock())) }
+        val mockFlow: Flow<List<Task>> = flow { emit(listOf(mock())) }
         whenever(mockDomainService.connectToRepository()).thenReturn(mockFlow)
         whenever(mockConverter.convert(any())).thenReturn(mock())
 
@@ -70,7 +70,7 @@ class ToDoViewModelTest {
 
     @Test
     fun load_empty() = runBlockingTest {
-        val mockFlow: Flow<List<ToDo>> = flow { emit(listOf()) }
+        val mockFlow: Flow<List<Task>> = flow { emit(listOf()) }
         whenever(mockDomainService.connectToRepository()).thenReturn(mockFlow)
 
         viewModel.load()