Fix list view heights for delete lists

collect_app/src/main/res/layout/delete_blank_form_layout.xml

@@ -7,7 +7,7 @@
     <org.odk.collect.android.formlists.FormListRecyclerView
         android:id="@+id/list"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="0dp"
         app:layout_constraintBottom_toTopOf="@id/buttons"
         app:layout_constraintTop_toTopOf="parent" />
 

collect_app/src/main/res/layout/file_manager_list.xml

@@ -22,7 +22,7 @@ the License.
     <ListView
         android:id="@android:id/list"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="0dp"
         app:layout_constraintBottom_toTopOf="@id/buttons"
         app:layout_constraintTop_toTopOf="parent" />
 

collect_app/src/test/java/org/odk/collect/android/formlists/DeleteBlankFormFragmentTest.kt

@@ -42,7 +42,9 @@ import org.odk.collect.android.formlists.blankformlist.DeleteBlankFormFragment
 import org.odk.collect.androidshared.ui.FragmentFactoryBuilder
 import org.odk.collect.androidshared.ui.MultiSelectViewModel
 import org.odk.collect.fragmentstest.FragmentScenarioLauncherRule
-import org.odk.collect.testshared.RecyclerViewMatcher
+import org.odk.collect.testshared.RecyclerViewMatcher.Companion.withRecyclerView
+import org.odk.collect.testshared.ViewActions.clickOnItemWith
+import org.odk.collect.testshared.ViewMatchers.recyclerView
 
 @RunWith(AndroidJUnit4::class)
 class DeleteBlankFormFragmentTest {
@@ -88,8 +90,8 @@ class DeleteBlankFormFragmentTest {
 
         multiSelectViewModel.select(2)
 
-        onView(RecyclerViewMatcher.withRecyclerView(R.id.list).atPositionOnView(1, R.id.form_title)).check(matches(withText("Form 2")))
-        onView(RecyclerViewMatcher.withRecyclerView(R.id.list).atPositionOnView(1, R.id.checkbox)).check(matches(isChecked()))
+        onView(withRecyclerView(R.id.list).atPositionOnView(1, R.id.form_title)).check(matches(withText("Form 2")))
+        onView(withRecyclerView(R.id.list).atPositionOnView(1, R.id.checkbox)).check(matches(isChecked()))
     }
 
     @Test
@@ -101,8 +103,8 @@ class DeleteBlankFormFragmentTest {
             blankFormListItem(databaseId = 3, formName = "Form 3")
         )
 
-        onView(withText("Form 1")).perform(click())
-        onView(withText("Form 3")).perform(click())
+        onView(recyclerView()).perform(clickOnItemWith(withText("Form 1")))
+        onView(recyclerView()).perform(clickOnItemWith(withText("Form 3")))
 
         assertThat(multiSelectViewModel.getSelected().value, equalTo(setOf<Long>(1, 3)))
     }
@@ -115,10 +117,10 @@ class DeleteBlankFormFragmentTest {
             blankFormListItem(databaseId = 2, formName = "Form 2")
         )
 
-        onView(withText("Form 1")).perform(click())
-        onView(withText("Form 2")).perform(click())
+        onView(recyclerView()).perform(clickOnItemWith(withText("Form 1")))
+        onView(recyclerView()).perform(clickOnItemWith(withText("Form 2")))
 
-        onView(withText("Form 2")).perform(click())
+        onView(recyclerView()).perform(clickOnItemWith(withText("Form 2")))
 
         assertThat(multiSelectViewModel.getSelected().value, equalTo(setOf<Long>(1)))
     }

testshared/build.gradle

@@ -48,6 +48,7 @@ dependencies {
     implementation Dependencies.robolectric
     implementation Dependencies.junit
     implementation Dependencies.androidx_test_espresso_intents
+    implementation Dependencies.androidx_test_espresso_contrib
     implementation Dependencies.android_material
     implementation Dependencies.danlew_android_joda
     implementation(Dependencies.androidx_fragment_testing) {

testshared/src/main/java/org/odk/collect/testshared/ViewActions.kt

@@ -5,8 +5,13 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.StringRes
 import androidx.core.view.allViews
+import androidx.recyclerview.widget.RecyclerView.ViewHolder
 import androidx.test.espresso.UiController
 import androidx.test.espresso.ViewAction
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.contrib.RecyclerViewActions.actionOnItem
+import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
+import org.hamcrest.Matcher
 
 object ViewActions {
 
@@ -25,4 +30,9 @@ object ViewActions {
             }
         }
     }
+
+    @JvmStatic
+    fun clickOnItemWith(matcher: Matcher<View>): ViewAction {
+        return actionOnItem<ViewHolder>(hasDescendant(matcher), click())
+    }
 }

testshared/src/main/java/org/odk/collect/testshared/ViewMatchers.kt

@@ -0,0 +1,14 @@
+package org.odk.collect.testshared
+
+import android.view.View
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.espresso.matcher.ViewMatchers
+import org.hamcrest.Matcher
+
+object ViewMatchers {
+
+    @JvmStatic
+    fun recyclerView(): Matcher<View> {
+        return ViewMatchers.isAssignableFrom(RecyclerView::class.java)
+    }
+}