Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

change add task fab's visibility base on tasksAddViewVisible + move add task fab's onclick to databinding #834

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ class TasksFragment : Fragment() {
setupListAdapter()
setupRefreshLayout(viewDataBinding.refreshLayout, viewDataBinding.tasksList)
setupNavigation()
setupFab()
}

private fun setupNavigation() {
Expand Down Expand Up @@ -138,15 +137,6 @@ class TasksFragment : Fragment() {
}
}

// TODO: Move this to databinding
private fun setupFab() {
requireView().findViewById<FloatingActionButton>(R.id.add_task_fab)?.let {
it.setOnClickListener {
navigateToAddNewTask()
}
}
}

private fun navigateToAddNewTask() {
val action = TasksFragmentDirections
.actionTasksFragmentToAddEditTaskFragment(
Expand Down
10 changes: 6 additions & 4 deletions app/src/main/res/layout/tasks_frag.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
</LinearLayout>

<LinearLayout
Expand All @@ -89,8 +89,8 @@
android:layout_width="96dp"
android:layout_height="96dp"
android:layout_gravity="center"
android:src="@{ContextCompat.getDrawable(context, viewmodel.noTaskIconRes)}"
android:contentDescription="@string/no_tasks_image_content_description" />
android:contentDescription="@string/no_tasks_image_content_description"
android:src="@{ContextCompat.getDrawable(context, viewmodel.noTaskIconRes)}" />

<TextView
android:id="@+id/no_tasks_text"
Expand All @@ -109,7 +109,9 @@
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"
app:layout_anchor="@id/refresh_layout"
app:layout_anchorGravity="bottom|right|end" />
Expand Down