File tree Expand file tree Collapse file tree 7 files changed +49
-31
lines changed
app/src/main/java/com/example/android/architecture/blueprints/todoapp Expand file tree Collapse file tree 7 files changed +49
-31
lines changed Original file line number Diff line number Diff line change @@ -70,10 +70,13 @@ class AddEditTaskFragment : Fragment() {
70
70
}
71
71
72
72
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
+ )
78
81
}
79
82
}
Original file line number Diff line number Diff line change @@ -46,7 +46,8 @@ class StatisticsViewModel(
46
46
}
47
47
48
48
val activeTasksPercent = stats.map {
49
- it?.activeTasksPercent ? : 0f }
49
+ it?.activeTasksPercent ? : 0f
50
+ }
50
51
val completedTasksPercent: LiveData <Float > = stats.map { it?.completedTasksPercent ? : 0f }
51
52
val dataLoading: LiveData <Boolean > = _dataLoading
52
53
val error: LiveData <Boolean > = tasks.map { it is Error }
Original file line number Diff line number Diff line change @@ -54,19 +54,25 @@ class TaskDetailFragment : Fragment() {
54
54
}
55
55
56
56
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
+ )
70
76
}
71
77
72
78
private fun setupFab () {
Original file line number Diff line number Diff line change @@ -98,12 +98,18 @@ class TasksFragment : Fragment() {
98
98
}
99
99
100
100
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
+ )
107
113
}
108
114
109
115
private fun setupSnackbar () {
Original file line number Diff line number Diff line change @@ -232,7 +232,7 @@ class TasksViewModel(
232
232
}
233
233
}
234
234
return tasksToShow
235
- }
235
+ }
236
236
237
237
fun refresh () {
238
238
_forceUpdate .value = true
Original file line number Diff line number Diff line change 16
16
package com.example.android.architecture.blueprints.todoapp.util
17
17
18
18
import androidx.test.espresso.IdlingResource
19
-
20
19
import java.util.concurrent.atomic.AtomicInteger
21
20
22
21
/* *
Original file line number Diff line number Diff line change @@ -57,11 +57,14 @@ fun View.setupSnackbar(
57
57
timeLength : Int
58
58
) {
59
59
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
+ }
63
66
}
64
- } )
67
+ )
65
68
}
66
69
67
70
fun Fragment.setupRefreshLayout (
You can’t perform that action at this time.
0 commit comments