Update Spotless and ktlint, apply rule changes to code

app/src/androidTest/java/com/example/android/architecture/blueprints/todoapp/addedittask/AddEditTaskScreenTest.kt

@@ -76,7 +76,7 @@ class AddEditTaskScreenTest {
                         viewModel = AddEditTaskViewModel(repository, SavedStateHandle()),
                         topBarTitle = R.string.add_task,
                         onTaskUpdate = { },
-                        onBack = { },
+                        onBack = { }
                     )
                 }
             }

app/src/androidTest/java/com/example/android/architecture/blueprints/todoapp/data/source/local/TaskDaoTest.kt

@@ -45,14 +45,15 @@ class TaskDaoTest {
             ToDoDatabase::class.java
         ).allowMainThreadQueries().build()
     }
+
     @Test
     fun insertTaskAndGetById() = runTest {
         // GIVEN - insert a task
         val task = LocalTask(
             title = "title",
             description = "description",
             id = "id",
-            isCompleted = false,
+            isCompleted = false
         )
         database.taskDao().upsert(task)
 
@@ -74,7 +75,7 @@ class TaskDaoTest {
             title = "title",
             description = "description",
             id = "id",
-            isCompleted = false,
+            isCompleted = false
         )
         database.taskDao().upsert(task)
 
@@ -102,7 +103,7 @@ class TaskDaoTest {
             title = "title",
             description = "description",
             id = "id",
-            isCompleted = false,
+            isCompleted = false
         )
         database.taskDao().upsert(task)
 
@@ -124,7 +125,7 @@ class TaskDaoTest {
             title = "title",
             description = "description",
             id = "id",
-            isCompleted = false,
+            isCompleted = false
         )
 
         database.taskDao().upsert(originalTask)
@@ -175,7 +176,7 @@ class TaskDaoTest {
             title = "title",
             description = "description",
             id = "id",
-            isCompleted = false,
+            isCompleted = false
         )
         database.taskDao().upsert(task)
 
@@ -195,7 +196,7 @@ class TaskDaoTest {
                 title = "title",
                 description = "description",
                 id = "id",
-                isCompleted = false,
+                isCompleted = false
             )
         )
 

app/src/androidTest/java/com/example/android/architecture/blueprints/todoapp/taskdetail/TaskDetailScreenTest.kt

@@ -109,7 +109,7 @@ class TaskDetailScreenTest {
                         ),
                         onEditTask = { /*TODO*/ },
                         onBack = { },
-                        onDeleteTask = { },
+                        onDeleteTask = { }
                     )
                 }
             }

app/src/main/java/com/example/android/architecture/blueprints/todoapp/TodoNavGraph.kt

@@ -65,7 +65,10 @@ fun TodoNavGraph(
         composable(
             TodoDestinations.TASKS_ROUTE,
             arguments = listOf(
-                navArgument(USER_MESSAGE_ARG) { type = NavType.IntType; defaultValue = 0 }
+                navArgument(USER_MESSAGE_ARG) {
+                    type = NavType.IntType
+                    defaultValue = 0
+                }
             )
         ) { entry ->
             AppModalDrawer(drawerState, currentRoute, navActions) {
@@ -87,7 +90,10 @@ fun TodoNavGraph(
             TodoDestinations.ADD_EDIT_TASK_ROUTE,
             arguments = listOf(
                 navArgument(TITLE_ARG) { type = NavType.IntType },
-                navArgument(TASK_ID_ARG) { type = NavType.StringType; nullable = true },
+                navArgument(TASK_ID_ARG) {
+                    type = NavType.StringType
+                    nullable = true
+                }
             )
         ) { entry ->
             val taskId = entry.arguments?.getString(TASK_ID_ARG)

app/src/main/java/com/example/android/architecture/blueprints/todoapp/addedittask/AddEditTaskScreen.kt

@@ -114,7 +114,7 @@ private fun AddEditTaskContent(
             // Show the loading spinner—`loading` is `true` in this code path
             state = rememberSwipeRefreshState(true),
             onRefresh = { /* DO NOTHING */ },
-            content = { },
+            content = { }
         )
     } else {
         Column(

app/src/main/java/com/example/android/architecture/blueprints/todoapp/addedittask/AddEditTaskViewModel.kt

@@ -114,7 +114,7 @@ class AddEditTaskViewModel @Inject constructor(
             taskRepository.updateTask(
                 taskId,
                 title = uiState.value.title,
-                description = uiState.value.description,
+                description = uiState.value.description
             )
             _uiState.update {
                 it.copy(isTaskSaved = true)

app/src/main/java/com/example/android/architecture/blueprints/todoapp/data/DefaultTaskRepository.kt

@@ -43,7 +43,7 @@ class DefaultTaskRepository @Inject constructor(
     private val networkDataSource: NetworkDataSource,
     private val localDataSource: TaskDao,
     @DefaultDispatcher private val dispatcher: CoroutineDispatcher,
-    @ApplicationScope private val scope: CoroutineScope,
+    @ApplicationScope private val scope: CoroutineScope
 ) : TaskRepository {
 
     override suspend fun createTask(title: String, description: String): String {
@@ -55,7 +55,7 @@ class DefaultTaskRepository @Inject constructor(
         val task = Task(
             title = title,
             description = description,
-            id = taskId,
+            id = taskId
         )
         localDataSource.upsert(task.toLocal())
         saveTasksToNetwork()

app/src/main/java/com/example/android/architecture/blueprints/todoapp/data/ModelMappingExt.kt

@@ -39,7 +39,7 @@ fun Task.toLocal() = LocalTask(
     id = id,
     title = title,
     description = description,
-    isCompleted = isCompleted,
+    isCompleted = isCompleted
 )
 
 fun List<Task>.toLocal() = map(Task::toLocal)
@@ -49,7 +49,7 @@ fun LocalTask.toExternal() = Task(
     id = id,
     title = title,
     description = description,
-    isCompleted = isCompleted,
+    isCompleted = isCompleted
 )
 
 // Note: JvmName is used to provide a unique name for each extension function with the same name.
@@ -63,7 +63,7 @@ fun NetworkTask.toLocal() = LocalTask(
     id = id,
     title = title,
     description = shortDescription,
-    isCompleted = (status == TaskStatus.COMPLETE),
+    isCompleted = (status == TaskStatus.COMPLETE)
 )
 
 @JvmName("networkToLocal")
@@ -74,7 +74,11 @@ fun LocalTask.toNetwork() = NetworkTask(
     id = id,
     title = title,
     shortDescription = description,
-    status = if (isCompleted) { TaskStatus.COMPLETE } else { TaskStatus.ACTIVE }
+    status = if (isCompleted) {
+        TaskStatus.COMPLETE
+    } else {
+        TaskStatus.ACTIVE
+    }
 )
 
 fun List<LocalTask>.toNetwork() = map(LocalTask::toNetwork)

app/src/main/java/com/example/android/architecture/blueprints/todoapp/data/Task.kt

@@ -31,7 +31,7 @@ data class Task(
     val title: String = "",
     val description: String = "",
     val isCompleted: Boolean = false,
-    val id: String,
+    val id: String
 ) {
 
     val titleForList: String

app/src/main/java/com/example/android/architecture/blueprints/todoapp/data/source/local/LocalTask.kt

@@ -33,5 +33,5 @@ data class LocalTask(
     @PrimaryKey val id: String,
     var title: String,
     var description: String,
-    var isCompleted: Boolean,
+    var isCompleted: Boolean
 )

app/src/main/java/com/example/android/architecture/blueprints/todoapp/di/CoroutinesModule.kt

@@ -54,7 +54,6 @@ object CoroutinesModule {
     @Provides
     @Singleton
     @ApplicationScope
-    fun providesCoroutineScope(
-        @DefaultDispatcher dispatcher: CoroutineDispatcher
-    ): CoroutineScope = CoroutineScope(SupervisorJob() + dispatcher)
+    fun providesCoroutineScope(@DefaultDispatcher dispatcher: CoroutineDispatcher): CoroutineScope =
+        CoroutineScope(SupervisorJob() + dispatcher)
 }

app/src/main/java/com/example/android/architecture/blueprints/todoapp/statistics/StatisticsViewModel.kt

@@ -66,23 +66,22 @@ class StatisticsViewModel @Inject constructor(
         }
     }
 
-    private fun produceStatisticsUiState(taskLoad: Async<List<Task>>) =
-        when (taskLoad) {
-            Async.Loading -> {
-                StatisticsUiState(isLoading = true, isEmpty = true)
-            }
-            is Async.Error -> {
-                // TODO: Show error message?
-                StatisticsUiState(isEmpty = true, isLoading = false)
-            }
-            is Async.Success -> {
-                val stats = getActiveAndCompletedStats(taskLoad.data)
-                StatisticsUiState(
-                    isEmpty = taskLoad.data.isEmpty(),
-                    activeTasksPercent = stats.activeTasksPercent,
-                    completedTasksPercent = stats.completedTasksPercent,
-                    isLoading = false
-                )
-            }
+    private fun produceStatisticsUiState(taskLoad: Async<List<Task>>) = when (taskLoad) {
+        Async.Loading -> {
+            StatisticsUiState(isLoading = true, isEmpty = true)
         }
+        is Async.Error -> {
+            // TODO: Show error message?
+            StatisticsUiState(isEmpty = true, isLoading = false)
+        }
+        is Async.Success -> {
+            val stats = getActiveAndCompletedStats(taskLoad.data)
+            StatisticsUiState(
+                isEmpty = taskLoad.data.isEmpty(),
+                activeTasksPercent = stats.activeTasksPercent,
+                completedTasksPercent = stats.completedTasksPercent,
+                isLoading = false
+            )
+        }
+    }
 }

app/src/main/java/com/example/android/architecture/blueprints/todoapp/statistics/StatisticsUtils.kt → app/src/main/java/com/example/android/architecture/blueprints/todoapp/statistics/StatsResult.kt

@@ -22,7 +22,6 @@ import com.example.android.architecture.blueprints.todoapp.data.Task
  * Function that does some trivial computation. Used to showcase unit tests.
  */
 internal fun getActiveAndCompletedStats(tasks: List<Task>): StatsResult {
-
     return if (tasks.isEmpty()) {
         StatsResult(0f, 0f)
     } else {

app/src/main/java/com/example/android/architecture/blueprints/todoapp/taskdetail/TaskDetailScreen.kt

@@ -110,7 +110,7 @@ private fun EditTaskContent(
 ) {
     val screenPadding = Modifier.padding(
         horizontal = dimensionResource(id = R.dimen.horizontal_margin),
-        vertical = dimensionResource(id = R.dimen.vertical_margin),
+        vertical = dimensionResource(id = R.dimen.vertical_margin)
     )
     val commonModifier = modifier
         .fillMaxWidth()
@@ -131,7 +131,7 @@ private fun EditTaskContent(
             Row(
                 Modifier
                     .fillMaxWidth()
-                    .then(screenPadding),
+                    .then(screenPadding)
 
             ) {
                 if (task != null) {

app/src/main/java/com/example/android/architecture/blueprints/todoapp/taskdetail/TaskDetailViewModel.kt

@@ -56,15 +56,18 @@ class TaskDetailViewModel @Inject constructor(
 
     val taskId: String = savedStateHandle[TodoDestinationsArgs.TASK_ID_ARG]!!
 
-    private val _userMessage: MutableStateFlow<Int?> = MutableStateFlow(null)
-    private val _isLoading = MutableStateFlow(false)
-    private val _isTaskDeleted = MutableStateFlow(false)
-    private val _taskAsync = taskRepository.getTaskStream(taskId)
+    private val userMessage: MutableStateFlow<Int?> = MutableStateFlow(null)
+    private val isLoading = MutableStateFlow(false)
+    private val isTaskDeleted = MutableStateFlow(false)
+    private val taskAsync = taskRepository.getTaskStream(taskId)
         .map { handleTask(it) }
         .catch { emit(Async.Error(R.string.loading_task_error)) }
 
     val uiState: StateFlow<TaskDetailUiState> = combine(
-        _userMessage, _isLoading, _isTaskDeleted, _taskAsync
+        userMessage,
+        isLoading,
+        isTaskDeleted,
+        taskAsync
     ) { userMessage, isLoading, isTaskDeleted, taskAsync ->
         when (taskAsync) {
             Async.Loading -> {
@@ -94,7 +97,7 @@ class TaskDetailViewModel @Inject constructor(
 
     fun deleteTask() = viewModelScope.launch {
         taskRepository.deleteTask(taskId)
-        _isTaskDeleted.value = true
+        isTaskDeleted.value = true
     }
 
     fun setCompleted(completed: Boolean) = viewModelScope.launch {
@@ -109,19 +112,19 @@ class TaskDetailViewModel @Inject constructor(
     }
 
     fun refresh() {
-        _isLoading.value = true
+        isLoading.value = true
         viewModelScope.launch {
             taskRepository.refreshTask(taskId)
-            _isLoading.value = false
+            isLoading.value = false
         }
     }
 
     fun snackbarMessageShown() {
-        _userMessage.value = null
+        userMessage.value = null
     }
 
     private fun showSnackbarMessage(message: Int) {
-        _userMessage.value = message
+        userMessage.value = message
     }
 
     private fun handleTask(task: Task?): Async<Task?> {

app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksScreen.kt

@@ -172,18 +172,14 @@ private fun TasksContent(
 }
 
 @Composable
-private fun TaskItem(
-    task: Task,
-    onCheckedChange: (Boolean) -> Unit,
-    onTaskClick: (Task) -> Unit
-) {
+private fun TaskItem(task: Task, onCheckedChange: (Boolean) -> Unit, onTaskClick: (Task) -> Unit) {
     Row(
         verticalAlignment = Alignment.CenterVertically,
         modifier = Modifier
             .fillMaxWidth()
             .padding(
                 horizontal = dimensionResource(id = R.dimen.horizontal_margin),
-                vertical = dimensionResource(id = R.dimen.list_item_padding),
+                vertical = dimensionResource(id = R.dimen.list_item_padding)
             )
             .clickable { onTaskClick(task) }
     ) {
@@ -263,14 +259,14 @@ private fun TasksContentPreview() {
                         description = "Description 5",
                         isCompleted = true,
                         id = "ID 5"
-                    ),
+                    )
                 ),
                 currentFilteringLabel = R.string.label_all,
                 noTasksLabel = R.string.no_tasks_all,
                 noTasksIconRes = R.drawable.logo_no_fill,
                 onRefresh = { },
                 onTaskClick = { },
-                onTaskCheckedChange = { _, _ -> },
+                onTaskCheckedChange = { _, _ -> }
             )
         }
     }
@@ -289,7 +285,7 @@ private fun TasksContentEmptyPreview() {
                 noTasksIconRes = R.drawable.logo_no_fill,
                 onRefresh = { },
                 onTaskClick = { },
-                onTaskCheckedChange = { _, _ -> },
+                onTaskCheckedChange = { _, _ -> }
             )
         }
     }