Skip to content

Commit 095ad68

Browse files
committed
mvivo Spotless fixes
1 parent f0d38e5 commit 095ad68

File tree

7 files changed

+49
-31
lines changed

7 files changed

+49
-31
lines changed

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,13 @@ class AddEditTaskFragment : Fragment() {
7070
}
7171

7272
private fun setupNavigation() {
73-
viewModel.taskUpdatedEvent.observe(viewLifecycleOwner, EventObserver {
74-
val action = AddEditTaskFragmentDirections
75-
.actionAddEditTaskFragmentToTasksFragment(ADD_EDIT_RESULT_OK)
76-
findNavController().navigate(action)
77-
})
73+
viewModel.taskUpdatedEvent.observe(
74+
viewLifecycleOwner,
75+
EventObserver {
76+
val action = AddEditTaskFragmentDirections
77+
.actionAddEditTaskFragmentToTasksFragment(ADD_EDIT_RESULT_OK)
78+
findNavController().navigate(action)
79+
}
80+
)
7881
}
7982
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ class StatisticsViewModel(
4646
}
4747

4848
val activeTasksPercent = stats.map {
49-
it?.activeTasksPercent ?: 0f }
49+
it?.activeTasksPercent ?: 0f
50+
}
5051
val completedTasksPercent: LiveData<Float> = stats.map { it?.completedTasksPercent ?: 0f }
5152
val dataLoading: LiveData<Boolean> = _dataLoading
5253
val error: LiveData<Boolean> = tasks.map { it is Error }

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

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -54,19 +54,25 @@ class TaskDetailFragment : Fragment() {
5454
}
5555

5656
private fun setupNavigation() {
57-
viewModel.deleteTaskEvent.observe(this, EventObserver {
58-
val action = TaskDetailFragmentDirections
59-
.actionTaskDetailFragmentToTasksFragment(DELETE_RESULT_OK)
60-
findNavController().navigate(action)
61-
})
62-
viewModel.editTaskEvent.observe(this, EventObserver {
63-
val action = TaskDetailFragmentDirections
64-
.actionTaskDetailFragmentToAddEditTaskFragment(
65-
args.taskId,
66-
resources.getString(R.string.edit_task)
67-
)
68-
findNavController().navigate(action)
69-
})
57+
viewModel.deleteTaskEvent.observe(
58+
this,
59+
EventObserver {
60+
val action = TaskDetailFragmentDirections
61+
.actionTaskDetailFragmentToTasksFragment(DELETE_RESULT_OK)
62+
findNavController().navigate(action)
63+
}
64+
)
65+
viewModel.editTaskEvent.observe(
66+
this,
67+
EventObserver {
68+
val action = TaskDetailFragmentDirections
69+
.actionTaskDetailFragmentToAddEditTaskFragment(
70+
args.taskId,
71+
resources.getString(R.string.edit_task)
72+
)
73+
findNavController().navigate(action)
74+
}
75+
)
7076
}
7177

7278
private fun setupFab() {

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

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,18 @@ class TasksFragment : Fragment() {
9898
}
9999

100100
private fun setupNavigation() {
101-
viewModel.openTaskEvent.observe(viewLifecycleOwner, EventObserver {
102-
openTaskDetails(it)
103-
})
104-
viewModel.newTaskEvent.observe(viewLifecycleOwner, EventObserver {
105-
navigateToAddNewTask()
106-
})
101+
viewModel.openTaskEvent.observe(
102+
viewLifecycleOwner,
103+
EventObserver {
104+
openTaskDetails(it)
105+
}
106+
)
107+
viewModel.newTaskEvent.observe(
108+
viewLifecycleOwner,
109+
EventObserver {
110+
navigateToAddNewTask()
111+
}
112+
)
107113
}
108114

109115
private fun setupSnackbar() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ class TasksViewModel(
232232
}
233233
}
234234
return tasksToShow
235-
}
235+
}
236236

237237
fun refresh() {
238238
_forceUpdate.value = true

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package com.example.android.architecture.blueprints.todoapp.util
1717

1818
import androidx.test.espresso.IdlingResource
19-
2019
import java.util.concurrent.atomic.AtomicInteger
2120

2221
/**

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,14 @@ fun View.setupSnackbar(
5757
timeLength: Int
5858
) {
5959

60-
snackbarEvent.observe(lifecycleOwner, Observer { event ->
61-
event.getContentIfNotHandled()?.let {
62-
showSnackbar(context.getString(it), timeLength)
60+
snackbarEvent.observe(
61+
lifecycleOwner,
62+
Observer { event ->
63+
event.getContentIfNotHandled()?.let {
64+
showSnackbar(context.getString(it), timeLength)
65+
}
6366
}
64-
})
67+
)
6568
}
6669

6770
fun Fragment.setupRefreshLayout(

0 commit comments

Comments
 (0)