Skip to content

Commit bc2b89c

Browse files
codinginflowFlorian Walther
authored andcommitted
Formatting code + small corrections after finishing the tutorial
1 parent 4517c20 commit bc2b89c

9 files changed

Lines changed: 34 additions & 19 deletions

File tree

app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
android:roundIcon="@mipmap/ic_launcher_round"
1111
android:supportsRtl="true"
1212
android:theme="@style/Theme.MVVMTodo">
13-
<activity android:name="com.codinginflow.mvvmtodo.ui.MainActivity"
13+
<activity
14+
android:name="com.codinginflow.mvvmtodo.ui.MainActivity"
1415
android:windowSoftInputMode="adjustResize">
1516
<intent-filter>
1617
<action android:name="android.intent.action.MAIN" />

app/src/main/java/com/codinginflow/mvvmtodo/data/PreferencesManager.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package com.codinginflow.mvvmtodo.data
22

33
import android.content.Context
44
import android.util.Log
5-
import androidx.datastore.createDataStore
65
import androidx.datastore.preferences.createDataStore
76
import androidx.datastore.preferences.edit
87
import androidx.datastore.preferences.emptyPreferences

app/src/main/java/com/codinginflow/mvvmtodo/data/TaskDao.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import kotlinx.coroutines.flow.Flow
77
interface TaskDao {
88

99
fun getTasks(query: String, sortOrder: SortOrder, hideCompleted: Boolean): Flow<List<Task>> =
10-
when(sortOrder) {
10+
when (sortOrder) {
1111
SortOrder.BY_DATE -> getTasksSortedByDateCreated(query, hideCompleted)
1212
SortOrder.BY_NAME -> getTasksSortedByName(query, hideCompleted)
1313
}

app/src/main/java/com/codinginflow/mvvmtodo/ui/MainActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.codinginflow.mvvmtodo.ui
22

33
import android.app.Activity
4-
import androidx.appcompat.app.AppCompatActivity
54
import android.os.Bundle
5+
import androidx.appcompat.app.AppCompatActivity
66
import androidx.navigation.NavController
77
import androidx.navigation.fragment.NavHostFragment
88
import androidx.navigation.fragment.findNavController

app/src/main/java/com/codinginflow/mvvmtodo/ui/tasks/TasksAdapter.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ import androidx.recyclerview.widget.RecyclerView
99
import com.codinginflow.mvvmtodo.data.Task
1010
import com.codinginflow.mvvmtodo.databinding.ItemTaskBinding
1111

12-
class TasksAdapter(private val listener: OnItemClickListener) : ListAdapter<Task, TasksAdapter.TasksViewHolder>(DiffCallback()) {
12+
class TasksAdapter(private val listener: OnItemClickListener) :
13+
ListAdapter<Task, TasksAdapter.TasksViewHolder>(DiffCallback()) {
1314

1415
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): TasksViewHolder {
1516
val binding = ItemTaskBinding.inflate(LayoutInflater.from(parent.context), parent, false)
@@ -21,7 +22,8 @@ class TasksAdapter(private val listener: OnItemClickListener) : ListAdapter<Task
2122
holder.bind(currentItem)
2223
}
2324

24-
inner class TasksViewHolder(private val binding: ItemTaskBinding) : RecyclerView.ViewHolder(binding.root) {
25+
inner class TasksViewHolder(private val binding: ItemTaskBinding) :
26+
RecyclerView.ViewHolder(binding.root) {
2527

2628
init {
2729
binding.apply {

app/src/main/java/com/codinginflow/mvvmtodo/ui/tasks/TasksFragment.kt

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,10 @@ class TasksFragment : Fragment(R.layout.fragment_tasks), TasksAdapter.OnItemClic
4747
setHasFixedSize(true)
4848
}
4949

50-
ItemTouchHelper(object : ItemTouchHelper.SimpleCallback(0,
51-
ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT) {
50+
ItemTouchHelper(object : ItemTouchHelper.SimpleCallback(
51+
0,
52+
ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT
53+
) {
5254
override fun onMove(
5355
recyclerView: RecyclerView,
5456
viewHolder: RecyclerView.ViewHolder,
@@ -87,18 +89,27 @@ class TasksFragment : Fragment(R.layout.fragment_tasks), TasksAdapter.OnItemClic
8789
}.show()
8890
}
8991
is TasksViewModel.TasksEvent.NavigateToAddTaskScreen -> {
90-
val action = TasksFragmentDirections.actionTasksFragmentToAddEditTaskFragment(null, "New Task")
92+
val action =
93+
TasksFragmentDirections.actionTasksFragmentToAddEditTaskFragment(
94+
null,
95+
"New Task"
96+
)
9197
findNavController().navigate(action)
9298
}
9399
is TasksViewModel.TasksEvent.NavigateToEditTaskScreen -> {
94-
val action = TasksFragmentDirections.actionTasksFragmentToAddEditTaskFragment(event.task, "Edit Task")
100+
val action =
101+
TasksFragmentDirections.actionTasksFragmentToAddEditTaskFragment(
102+
event.task,
103+
"Edit Task"
104+
)
95105
findNavController().navigate(action)
96106
}
97107
is TasksViewModel.TasksEvent.ShowTaskSavedConfirmationMessage -> {
98108
Snackbar.make(requireView(), event.msg, Snackbar.LENGTH_SHORT).show()
99109
}
100-
TasksViewModel.TasksEvent.NavigateToDeleteAllCompletedScreen -> {
101-
val action = TasksFragmentDirections.actionGlobalDeleteAllCompletedDialogFragment()
110+
is TasksViewModel.TasksEvent.NavigateToDeleteAllCompletedScreen -> {
111+
val action =
112+
TasksFragmentDirections.actionGlobalDeleteAllCompletedDialogFragment()
102113
findNavController().navigate(action)
103114
}
104115
}.exhaustive
@@ -139,7 +150,7 @@ class TasksFragment : Fragment(R.layout.fragment_tasks), TasksAdapter.OnItemClic
139150
}
140151

141152
override fun onOptionsItemSelected(item: MenuItem): Boolean {
142-
return when(item.itemId) {
153+
return when (item.itemId) {
143154
R.id.action_sort_by_name -> {
144155
viewModel.onSortOrderSelected(SortOrder.BY_NAME)
145156
true

app/src/main/java/com/codinginflow/mvvmtodo/ui/tasks/TasksViewModel.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import com.codinginflow.mvvmtodo.data.TaskDao
1010
import com.codinginflow.mvvmtodo.ui.ADD_TASK_RESULT_OK
1111
import com.codinginflow.mvvmtodo.ui.EDIT_TASK_RESULT_OK
1212
import kotlinx.coroutines.channels.Channel
13-
import kotlinx.coroutines.flow.MutableStateFlow
1413
import kotlinx.coroutines.flow.combine
1514
import kotlinx.coroutines.flow.flatMapLatest
1615
import kotlinx.coroutines.flow.receiveAsFlow

app/src/main/res/layout/fragment_tasks.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools"
34
android:layout_width="match_parent"
45
android:layout_height="match_parent"
5-
xmlns:tools="http://schemas.android.com/tools"
66
tools:context=".ui.tasks.TasksFragment">
77

88
<androidx.recyclerview.widget.RecyclerView

app/src/main/res/navigation/nav_graph.xml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,21 @@
1818
android:id="@+id/addEditTaskFragment"
1919
android:name="com.codinginflow.mvvmtodo.ui.addedittask.AddEditTaskFragment"
2020
android:label="{title}"
21-
tools:layout="@layout/fragment_add_edit_task" >
21+
tools:layout="@layout/fragment_add_edit_task">
2222
<argument
2323
android:name="task"
24+
android:defaultValue="@null"
2425
app:argType="com.codinginflow.mvvmtodo.data.Task"
25-
app:nullable="true"
26-
android:defaultValue="@null" />
26+
app:nullable="true" />
2727
<argument
2828
android:name="title"
2929
app:argType="string" />
3030
</fragment>
3131
<dialog
3232
android:id="@+id/deleteAllCompletedDialogFragment"
3333
android:name="com.codinginflow.mvvmtodo.ui.deleteallcompleted.DeleteAllCompletedDialogFragment"
34-
android:label="DeleteAllCompletedDialogFragment" /><action android:id="@+id/action_global_deleteAllCompletedDialogFragment" app:destination="@id/deleteAllCompletedDialogFragment"/>
34+
android:label="DeleteAllCompletedDialogFragment" />
35+
<action
36+
android:id="@+id/action_global_deleteAllCompletedDialogFragment"
37+
app:destination="@id/deleteAllCompletedDialogFragment" />
3538
</navigation>

0 commit comments

Comments
 (0)