Fix select_one/multiple list height

collect_app/src/main/java/org/odk/collect/android/fragments/dialogs/SelectMinimalDialog.java

@@ -152,7 +152,7 @@ private void initRecyclerView() {
         viewModel.getSelectListAdapter().setContext(getActivity());
         AudioPlayer audioPlayer = audioPlayerFactory.create(requireActivity(), getViewLifecycleOwner());
         viewModel.getSelectListAdapter().setAudioPlayer(audioPlayer);
-        binding.choicesRecyclerView.initRecyclerView(viewModel.getSelectListAdapter(), viewModel.isFlex());
+        binding.choicesRecyclerView.initRecyclerView(viewModel.getSelectListAdapter(), viewModel.isFlex(), 0);
     }
 
     public void setListener(SelectMinimalDialogListener listener) {

collect_app/src/main/java/org/odk/collect/android/views/ChoicesRecyclerView.kt

@@ -0,0 +1,70 @@
+package org.odk.collect.android.views
+
+import android.content.Context
+import android.graphics.Rect
+import android.util.AttributeSet
+import android.view.View
+import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.flexbox.FlexboxLayoutManager
+import org.odk.collect.android.R
+import org.odk.collect.android.adapters.AbstractSelectListAdapter
+
+class ChoicesRecyclerView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null
+) : RecyclerView(context, attrs) {
+
+    private var maxHeight = 0
+
+    fun initRecyclerView(adapter: AbstractSelectListAdapter, isFlex: Boolean, maxHeight: Int) {
+        this.maxHeight = maxHeight
+        if (isFlex) {
+            enableFlexboxLayout()
+        } else {
+            enableGridLayout(adapter.numColumns)
+        }
+        setAdapter(adapter)
+    }
+
+    override fun onMeasure(widthSpec: Int, heightSpec: Int) {
+        val boundedHeightSpec = if (maxHeight > 0) {
+            MeasureSpec.makeMeasureSpec(maxHeight, MeasureSpec.AT_MOST)
+        } else {
+            heightSpec
+        }
+        super.onMeasure(widthSpec, boundedHeightSpec)
+    }
+
+    private fun enableFlexboxLayout() {
+        layoutManager = FlexboxLayoutManager(context)
+        val marginBetweenItems = resources.getDimensionPixelSize(org.odk.collect.androidshared.R.dimen.margin_standard)
+        addItemDecoration(FlexItemDecoration(marginBetweenItems))
+    }
+
+    private fun enableGridLayout(numColumns: Int) {
+        if (numColumns == 1) {
+            enableDivider()
+        }
+
+        layoutManager = GridLayoutManager(context, numColumns)
+    }
+
+    private fun enableDivider() {
+        val divider = DividerItemDecoration(context, DividerItemDecoration.VERTICAL)
+        val drawable = ContextCompat.getDrawable(context, R.drawable.inset_divider_64dp)
+        if (drawable != null) {
+            divider.setDrawable(drawable)
+        }
+        addItemDecoration(divider)
+    }
+
+    internal class FlexItemDecoration(private val margin: Int) : ItemDecoration() {
+        override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: State) {
+            outRect.bottom = margin
+            outRect.right = margin
+        }
+    }
+}

collect_app/src/main/java/org/odk/collect/android/widgets/items/BaseSelectListWidget.java

@@ -22,6 +22,7 @@
 import org.odk.collect.android.widgets.interfaces.SelectChoiceLoader;
 import org.odk.collect.android.widgets.utilities.QuestionFontSizeUtils;
 import org.odk.collect.android.widgets.utilities.SearchQueryViewModel;
+import org.odk.collect.androidshared.utils.ScreenUtils;
 
 import static org.odk.collect.android.formentry.media.FormMediaUtils.getPlayableAudioURI;
 
@@ -41,7 +42,11 @@ public BaseSelectListWidget(Context context, QuestionDetails questionDetails, Se
         items = ItemsWidgetUtils.loadItemsAndHandleErrors(this, questionDetails.getPrompt(), selectChoiceLoader);
 
         logAnalytics(questionDetails);
-        binding.choicesRecyclerView.initRecyclerView(setUpAdapter(), Appearances.isFlexAppearance(getQuestionDetails().getPrompt()));
+        // Only let the list take up 90% of the screen height in order to speed up loading if there
+        // are many items, and so that when shown inline in a field-list group the user can still
+        // scroll to the questions below it.
+        int maxHeight = (int) (ScreenUtils.getScreenHeight(getContext()) * 0.9);
+        binding.choicesRecyclerView.initRecyclerView(setUpAdapter(), Appearances.isFlexAppearance(getQuestionDetails().getPrompt()), maxHeight);
         if (Appearances.isAutocomplete(getQuestionDetails().getPrompt())) {
             setUpSearchBox();
         }

collect_app/src/test/java/org/odk/collect/android/views/ChoicesRecyclerViewTest.java

@@ -573,7 +573,7 @@ private boolean isButtonItemSelected(int index) {
     }
 
     private void initRecyclerView(AbstractSelectListAdapter adapter, boolean isFlex) {
-        recyclerView.initRecyclerView(adapter, isFlex);
+        recyclerView.initRecyclerView(adapter, isFlex, 0);
         RobolectricHelpers.runLooper();
     }