Migrate Tasks to Compose (#826)

Author: manuelvicnt

app/src/androidTestMock/java/com/example/android/architecture/blueprints/todoapp/tasks/AppNavigationTest.kt

@@ -125,7 +125,7 @@ class AppNavigationTest {
             .perform(navigateTo(R.id.tasks_fragment_dest))
 
         // Check that tasks screen was opened.
-        onView(withId(R.id.tasks_container_layout)).check(matches(isDisplayed()))
+        composeTestRule.onNodeWithText("You have no tasks!").assertIsDisplayed()
     }
 
     @Test
@@ -203,7 +203,7 @@ class AppNavigationTest {
                 composeTestRule.activityRule.scenario.getToolbarNavigationContentDescription()
             )
         ).perform(click())
-        onView(withId(R.id.tasks_container_layout)).check(matches(isDisplayed()))
+        composeTestRule.onNodeWithText("All tasks").assertIsDisplayed()
     }
 
     @Test
@@ -226,6 +226,6 @@ class AppNavigationTest {
 
         // Confirm that if we click back a second time, we end up back at the home screen
         pressBack()
-        onView(withId(R.id.tasks_container_layout)).check(matches(isDisplayed()))
+        composeTestRule.onNodeWithText("All tasks").assertIsDisplayed()
     }
 }

app/src/androidTestMock/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksActivityTest.kt

@@ -27,14 +27,13 @@ import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import androidx.compose.ui.test.performTextInput
 import androidx.compose.ui.test.performTextReplacement
+import androidx.compose.ui.test.assertIsOn
 import androidx.test.core.app.ApplicationProvider.getApplicationContext
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.IdlingRegistry
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions.doesNotExist
 import androidx.test.espresso.assertion.ViewAssertions.matches
-import androidx.test.espresso.matcher.ViewMatchers.hasSibling
-import androidx.test.espresso.matcher.ViewMatchers.isChecked
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withContentDescription
 import androidx.test.espresso.matcher.ViewMatchers.withId
@@ -51,8 +50,6 @@ import com.example.android.architecture.blueprints.todoapp.util.EspressoIdlingRe
 import com.example.android.architecture.blueprints.todoapp.util.deleteAllTasksBlocking
 import com.example.android.architecture.blueprints.todoapp.util.monitorActivity
 import com.example.android.architecture.blueprints.todoapp.util.saveTaskBlocking
-import org.hamcrest.Matchers.allOf
-import org.hamcrest.core.IsNot.not
 import org.junit.After
 import org.junit.Before
 import org.junit.Rule
@@ -127,7 +124,6 @@ class TasksActivityTest {
         // Click on the edit button, edit, and save
         composeTestRule.onNodeWithContentDescription(activity.getString(R.string.edit_task))
             .performClick()
-        onView(withId(R.id.edit_task_fab)).perform(click())
         findTextField("TITLE1").performTextReplacement("NEW TITLE")
         findTextField("DESCRIPTION").performTextReplacement("NEW DESCRIPTION")
         composeTestRule.onNodeWithContentDescription(activity.getString(R.string.cd_save_task))
@@ -144,7 +140,8 @@ class TasksActivityTest {
         dataBindingIdlingResource.monitorActivity(composeTestRule.activityRule.scenario)
 
         // Add active task
-        onView(withId(R.id.add_task_fab)).perform(click())
+        composeTestRule.onNodeWithContentDescription(activity.getString(R.string.edit_task))
+            .performClick()
         findTextField(R.string.title_hint).performTextInput("TITLE1")
         findTextField(R.string.description_hint).performTextInput("DESCRIPTION")
         composeTestRule.onNodeWithContentDescription(activity.getString(R.string.cd_save_task))
@@ -204,8 +201,7 @@ class TasksActivityTest {
         ).perform(click())
 
         // Check that the task is marked as completed
-        onView(allOf(withId(R.id.complete_checkbox), hasSibling(withText(taskTitle))))
-            .check(matches(isChecked()))
+        composeTestRule.onNode(isToggleable()).assertIsOn()
     }
 
     @Test
@@ -230,8 +226,7 @@ class TasksActivityTest {
         ).perform(click())
 
         // Check that the task is marked as active
-        onView(allOf(withId(R.id.complete_checkbox), hasSibling(withText(taskTitle))))
-            .check(matches(not(isChecked())))
+        composeTestRule.onNode(isToggleable()).assertIsOff()
     }
 
     @Test
@@ -258,8 +253,7 @@ class TasksActivityTest {
         ).perform(click())
 
         // Check that the task is marked as active
-        onView(allOf(withId(R.id.complete_checkbox), hasSibling(withText(taskTitle))))
-            .check(matches(not(isChecked())))
+        composeTestRule.onNode(isToggleable()).assertIsOff()
     }
 
     @Test
@@ -286,16 +280,16 @@ class TasksActivityTest {
         ).perform(click())
 
         // Check that the task is marked as active
-        onView(allOf(withId(R.id.complete_checkbox), hasSibling(withText(taskTitle))))
-            .check(matches(isChecked()))
+        composeTestRule.onNode(isToggleable()).assertIsOn()
     }
 
     @Test
     fun createTask() {
         dataBindingIdlingResource.monitorActivity(composeTestRule.activityRule.scenario)
 
         // Click on the "+" button, add details, and save
-        onView(withId(R.id.add_task_fab)).perform(click())
+        composeTestRule.onNodeWithContentDescription(activity.getString(R.string.add_task))
+            .performClick()
         findTextField(R.string.title_hint).performTextInput("title")
         findTextField(R.string.description_hint).performTextInput("description")
         composeTestRule.onNodeWithContentDescription(activity.getString(R.string.cd_save_task))

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 The Android Open Source Project
+ * Copyright (C) 2022 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,20 +24,18 @@ import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.widget.PopupMenu
+import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
-import com.example.android.architecture.blueprints.todoapp.EventObserver
 import com.example.android.architecture.blueprints.todoapp.R
 import com.example.android.architecture.blueprints.todoapp.data.Task
-import com.example.android.architecture.blueprints.todoapp.databinding.TasksFragBinding
 import com.example.android.architecture.blueprints.todoapp.util.getViewModelFactory
-import com.example.android.architecture.blueprints.todoapp.util.setupRefreshLayout
 import com.example.android.architecture.blueprints.todoapp.util.setupSnackbar
-import com.google.android.material.floatingactionbutton.FloatingActionButton
+import com.google.accompanist.appcompattheme.AppCompatTheme
 import com.google.android.material.snackbar.Snackbar
-import timber.log.Timber
 
 /**
  * Display a grid of [Task]s. User can choose to view all, active or completed tasks.
@@ -48,20 +46,31 @@ class TasksFragment : Fragment() {
 
     private val args: TasksFragmentArgs by navArgs()
 
-    private lateinit var viewDataBinding: TasksFragBinding
-
-    private lateinit var listAdapter: TasksAdapter
-
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-        viewDataBinding = TasksFragBinding.inflate(inflater, container, false).apply {
-            viewmodel = viewModel
-        }
         setHasOptionsMenu(true)
-        return viewDataBinding.root
+
+        return ComposeView(requireContext()).apply {
+            // Dispose of the Composition when the view's LifecycleOwner is destroyed
+            setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
+            setContent {
+                AppCompatTheme {
+                    TasksScreen(
+                        viewModel = viewModel,
+                        onAddTask = { navigateToAddNewTask() },
+                        onTaskClick = { openTaskDetails(it.id) }
+                    )
+                }
+            }
+        }
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setupSnackbar()
     }
 
     override fun onOptionsItemSelected(item: MenuItem) =
@@ -85,33 +94,6 @@ class TasksFragment : Fragment() {
         inflater.inflate(R.menu.tasks_fragment_menu, menu)
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        // Set the lifecycle owner to the lifecycle of the view
-        viewDataBinding.lifecycleOwner = this.viewLifecycleOwner
-        setupSnackbar()
-        setupListAdapter()
-        setupRefreshLayout(viewDataBinding.refreshLayout, viewDataBinding.tasksList)
-        setupNavigation()
-        setupFab()
-    }
-
-    private fun setupNavigation() {
-        viewModel.openTaskEvent.observe(
-            viewLifecycleOwner,
-            EventObserver {
-                openTaskDetails(it)
-            }
-        )
-        viewModel.newTaskEvent.observe(
-            viewLifecycleOwner,
-            EventObserver {
-                navigateToAddNewTask()
-            }
-        )
-    }
-
     private fun setupSnackbar() {
         view?.setupSnackbar(viewLifecycleOwner, viewModel.snackbarText, Snackbar.LENGTH_SHORT)
         arguments?.let {
@@ -138,15 +120,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(
@@ -160,14 +133,4 @@ class TasksFragment : Fragment() {
         val action = TasksFragmentDirections.actionTasksFragmentToTaskDetailFragment(taskId)
         findNavController().navigate(action)
     }
-
-    private fun setupListAdapter() {
-        val viewModel = viewDataBinding.viewmodel
-        if (viewModel != null) {
-            listAdapter = TasksAdapter(viewModel)
-            viewDataBinding.tasksList.adapter = listAdapter
-        } else {
-            Timber.w("ViewModel not initialized when attempting to set up adapter.")
-        }
-    }
 }