From ee59923376ab61119b9931ee2081c627014c019b Mon Sep 17 00:00:00 2001 From: mahdi Date: Thu, 14 Apr 2022 14:27:08 +0430 Subject: [PATCH 1/2] change add task fab's visibility base on tasksAddViewVisible --- app/src/main/res/layout/tasks_frag.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/src/main/res/layout/tasks_frag.xml b/app/src/main/res/layout/tasks_frag.xml index 4241da823..c895cb83c 100644 --- a/app/src/main/res/layout/tasks_frag.xml +++ b/app/src/main/res/layout/tasks_frag.xml @@ -72,8 +72,8 @@ android:id="@+id/tasks_list" android:layout_width="match_parent" android:layout_height="wrap_content" - app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" - app:items="@{viewmodel.items}" /> + app:items="@{viewmodel.items}" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:contentDescription="@string/no_tasks_image_content_description" + android:src="@{ContextCompat.getDrawable(context, viewmodel.noTaskIconRes)}" /> From de5f0867e38f722c0d14e2e003825ea7f49ff37c Mon Sep 17 00:00:00 2001 From: mahdi Date: Thu, 14 Apr 2022 14:33:16 +0430 Subject: [PATCH 2/2] move add task fab's onclick to databinding --- .../blueprints/todoapp/tasks/TasksFragment.kt | 10 ---------- app/src/main/res/layout/tasks_frag.xml | 1 + 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksFragment.kt b/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksFragment.kt index 953eb443b..118cd4b59 100644 --- a/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksFragment.kt +++ b/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksFragment.kt @@ -94,7 +94,6 @@ class TasksFragment : Fragment() { setupListAdapter() setupRefreshLayout(viewDataBinding.refreshLayout, viewDataBinding.tasksList) setupNavigation() - setupFab() } private fun setupNavigation() { @@ -138,15 +137,6 @@ class TasksFragment : Fragment() { } } - // TODO: Move this to databinding - private fun setupFab() { - requireView().findViewById(R.id.add_task_fab)?.let { - it.setOnClickListener { - navigateToAddNewTask() - } - } - } - private fun navigateToAddNewTask() { val action = TasksFragmentDirections .actionTasksFragmentToAddEditTaskFragment( diff --git a/app/src/main/res/layout/tasks_frag.xml b/app/src/main/res/layout/tasks_frag.xml index c895cb83c..3bc4dfe7c 100644 --- a/app/src/main/res/layout/tasks_frag.xml +++ b/app/src/main/res/layout/tasks_frag.xml @@ -109,6 +109,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="@dimen/fab_margin" + android:onClick="@{() -> viewmodel.addNewTask()}" android:src="@drawable/ic_add" android:visibility="@{viewmodel.tasksAddViewVisible ? View.VISIBLE : View.GONE}" app:fabSize="normal"