From a60d77585933328063aedb527cc319735ebb19ff Mon Sep 17 00:00:00 2001
From: Callum Stott <callum@seadowg.com>
Date: Wed, 13 Nov 2024 14:50:27 +0000
Subject: [PATCH 01/18] Add tests for view only behaviour

---
 .../feature/formentry/AddRepeatTest.java      | 18 ++++++++-
 .../feature/formentry/FormHierarchyTest.java  | 37 +++++++++++++++++--
 .../odk/collect/android/support/pages/Page.kt |  5 +++
 .../android/support/pages/ViewFormPage.kt     | 17 +++++++++
 4 files changed, 73 insertions(+), 4 deletions(-)

diff --git a/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/AddRepeatTest.java b/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/AddRepeatTest.java
index ab26c8291ac..3ae7abe25ac 100644
--- a/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/AddRepeatTest.java
+++ b/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/AddRepeatTest.java
@@ -12,6 +12,7 @@
 import org.junit.runner.RunWith;
 import org.odk.collect.android.R;
 import org.odk.collect.android.support.pages.EndOfFormPage;
+import org.odk.collect.android.support.pages.FormEndPage;
 import org.odk.collect.android.support.pages.FormEntryPage;
 import org.odk.collect.android.support.rules.CollectTestRule;
 import org.odk.collect.android.support.rules.TestRuleChain;
@@ -106,7 +107,7 @@ public void whenInRepeatWithFixedCount_noPlusButtonAppears() {
     }
 
     @Test
-    public void whenInHierarchyForRepeat_clickingPlus_addsRepeatAtEndOfSeries() {
+    public void whenInHierarchyForRepeatGroup_clickingPlus_addsRepeatAtEndOfSeries() {
         rule.startAtMainMenu()
                 .copyForm(ONE_QUESTION_REPEAT)
                 .startBlankForm("One Question Repeat")
@@ -130,4 +131,19 @@ public void whenInRepeatWithoutLabel_swipingNext_andClickingAdd_addsAnotherRepea
                 .clickOnAdd(new FormEntryPage("Repeat without label"))
                 .assertText("> 2");
     }
+
+    @Test
+    public void whenViewFormInHierarchyForRepeatGroup_noAddButtonAppears() {
+        rule.startAtMainMenu()
+                .copyForm(ONE_QUESTION_REPEAT)
+                .startBlankForm("One Question Repeat")
+                .swipeToNextQuestionWithRepeatGroup("Person")
+                .clickOnDoNotAdd(new FormEndPage("One Question Repeat"))
+                .clickFinalize()
+
+                .clickSendFinalizedForm(1)
+                .clickOnForm("One Question Repeat")
+                .clickOnGroup("Person")
+                .assertNoId(R.id.menu_add_repeat);
+    }
 }
diff --git a/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/FormHierarchyTest.java b/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/FormHierarchyTest.java
index 73d7cf8f1cb..51f515f1859 100644
--- a/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/FormHierarchyTest.java
+++ b/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/FormHierarchyTest.java
@@ -10,12 +10,14 @@
 import org.junit.Test;
 import org.junit.rules.RuleChain;
 import org.odk.collect.android.R;
-import org.odk.collect.android.support.rules.CollectTestRule;
-import org.odk.collect.android.support.rules.TestRuleChain;
-import org.odk.collect.testshared.RecyclerViewMatcher;
 import org.odk.collect.android.support.pages.AddNewRepeatDialog;
+import org.odk.collect.android.support.pages.FormEndPage;
 import org.odk.collect.android.support.pages.FormEntryPage;
 import org.odk.collect.android.support.pages.FormHierarchyPage;
+import org.odk.collect.android.support.pages.ViewFormPage;
+import org.odk.collect.android.support.rules.CollectTestRule;
+import org.odk.collect.android.support.rules.TestRuleChain;
+import org.odk.collect.testshared.RecyclerViewMatcher;
 
 public class FormHierarchyTest {
 
@@ -238,4 +240,33 @@ public void theListOfQuestionsShouldBeScrolledToTheLastDisplayedQuestionAfterOpe
                 .assertTextDoesNotExist("t1")
                 .assertTextDoesNotExist("t2");
     }
+
+    @Test
+    public void whenViewFormInHierarchyForRepeat_noDeleteButtonAppears() {
+        rule.startAtMainMenu()
+                .copyForm("one-question-repeat.xml")
+                .startBlankForm("One Question Repeat")
+                .swipeToNextQuestionWithRepeatGroup("Person")
+                .clickOnDoNotAdd(new FormEndPage("One Question Repeat"))
+                .clickFinalize()
+
+                .clickSendFinalizedForm(1)
+                .clickOnForm("One Question Repeat")
+                .clickOnGroup("Person")
+                .clickOnGroup("Person > 1")
+                .assertNoId(R.id.menu_delete_child);
+    }
+
+    @Test
+    public void whenViewFormInHierarchy_clickingOnQuestion_doesNothing() {
+        rule.startAtMainMenu()
+                .copyForm("one-question.xml")
+                .startBlankForm("One Question")
+                .fillOutAndFinalize()
+
+                .clickSendFinalizedForm(1)
+                .clickOnForm("One Question")
+                .clickOnText("what is your age")
+                .assertOnPage(new ViewFormPage("One Question"));
+    }
 }
diff --git a/collect_app/src/androidTest/java/org/odk/collect/android/support/pages/Page.kt b/collect_app/src/androidTest/java/org/odk/collect/android/support/pages/Page.kt
index 3ca7476d672..5ed0938ccf5 100644
--- a/collect_app/src/androidTest/java/org/odk/collect/android/support/pages/Page.kt
+++ b/collect_app/src/androidTest/java/org/odk/collect/android/support/pages/Page.kt
@@ -574,6 +574,11 @@ abstract class Page<T : Page<T>> {
         return destination
     }
 
+    fun assertNoId(id: Int): T {
+        onView(withId(id)).check(doesNotExist())
+        return this as T
+    }
+
     companion object {
         private fun rotateToLandscape(): ViewAction {
             return RotateAction(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE)
diff --git a/collect_app/src/androidTest/java/org/odk/collect/android/support/pages/ViewFormPage.kt b/collect_app/src/androidTest/java/org/odk/collect/android/support/pages/ViewFormPage.kt
index 5001409fe6a..aef51f38f0f 100644
--- a/collect_app/src/androidTest/java/org/odk/collect/android/support/pages/ViewFormPage.kt
+++ b/collect_app/src/androidTest/java/org/odk/collect/android/support/pages/ViewFormPage.kt
@@ -1,5 +1,13 @@
 package org.odk.collect.android.support.pages
 
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.contrib.RecyclerViewActions.scrollTo
+import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import org.odk.collect.android.R
+
 class ViewFormPage(private val formName: String) : Page<ViewFormPage>() {
 
     override fun assertOnPage(): ViewFormPage {
@@ -7,4 +15,13 @@ class ViewFormPage(private val formName: String) : Page<ViewFormPage>() {
         assertText(org.odk.collect.strings.R.string.exit)
         return this
     }
+
+    fun clickOnGroup(groupLabel: String): ViewFormPage {
+        onView(withId(R.id.list)).perform(scrollTo<RecyclerView.ViewHolder>(
+            hasDescendant(withText(groupLabel)))
+        )
+
+        clickOnText(groupLabel)
+        return this
+    }
 }

From c6754ea4f5e4d1f452c9b4128b6f1c8383dea18d Mon Sep 17 00:00:00 2001
From: Callum Stott <callum@seadowg.com>
Date: Thu, 14 Nov 2024 09:17:30 +0000
Subject: [PATCH 02/18] Remove ViewOnlyHierarchyActivity

---
 collect_app/src/main/AndroidManifest.xml      |  1 -
 .../activities/FormFillingActivity.java       |  4 +-
 .../formhierarchy/FormHierarchyActivity.java  | 57 ++++++++++++++-----
 .../ViewOnlyFormHierarchyActivity.kt          | 56 ------------------
 4 files changed, 44 insertions(+), 74 deletions(-)
 delete mode 100644 collect_app/src/main/java/org/odk/collect/android/formhierarchy/ViewOnlyFormHierarchyActivity.kt

diff --git a/collect_app/src/main/AndroidManifest.xml b/collect_app/src/main/AndroidManifest.xml
index ea728bd55ee..ff0cf6e26f1 100644
--- a/collect_app/src/main/AndroidManifest.xml
+++ b/collect_app/src/main/AndroidManifest.xml
@@ -144,7 +144,6 @@ the specific language governing permissions and limitations under the License.
             android:name=".preferences.screens.ProjectPreferencesActivity"
             android:theme="@style/Theme.Collect.Settings" />
         <activity android:name=".formhierarchy.FormHierarchyActivity" />
-        <activity android:name=".formhierarchy.ViewOnlyFormHierarchyActivity" />
         <activity
             android:name="org.odk.collect.geo.geopoint.GeoPointActivity"
             android:theme="@style/Theme.Collect"
diff --git a/collect_app/src/main/java/org/odk/collect/android/activities/FormFillingActivity.java b/collect_app/src/main/java/org/odk/collect/android/activities/FormFillingActivity.java
index fbd1d390763..3512fed22e2 100644
--- a/collect_app/src/main/java/org/odk/collect/android/activities/FormFillingActivity.java
+++ b/collect_app/src/main/java/org/odk/collect/android/activities/FormFillingActivity.java
@@ -125,7 +125,6 @@
 import org.odk.collect.android.formentry.saving.SaveAnswerFileProgressDialogFragment;
 import org.odk.collect.android.formentry.saving.SaveFormProgressDialogFragment;
 import org.odk.collect.android.formhierarchy.FormHierarchyActivity;
-import org.odk.collect.android.formhierarchy.ViewOnlyFormHierarchyActivity;
 import org.odk.collect.android.fragments.MediaLoadingFragment;
 import org.odk.collect.android.fragments.dialogs.LocationProvidersDisabledDialog;
 import org.odk.collect.android.fragments.dialogs.NumberPickerDialog;
@@ -2039,8 +2038,9 @@ && new PlayServicesChecker().isGooglePlayServicesAvailable(this)) {
                 } else {
                     formControllerAvailable(formController, form, instance);
                     if (ApplicationConstants.FormModes.VIEW_SENT.equalsIgnoreCase(formMode)) {
-                        Intent intent = new Intent(this, ViewOnlyFormHierarchyActivity.class);
+                        Intent intent = new Intent(this, FormHierarchyActivity.class);
                         intent.putExtra(FormHierarchyActivity.EXTRA_SESSION_ID, sessionId);
+                        intent.putExtra(FormHierarchyActivity.EXTRA_VIEW_ONLY, true);
                         startActivity(intent);
                     }
 
diff --git a/collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyActivity.java b/collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyActivity.java
index 92e2eeefe2a..b595a78a56d 100644
--- a/collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyActivity.java
+++ b/collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyActivity.java
@@ -93,6 +93,7 @@ public class FormHierarchyActivity extends LocalizedActivity implements DeleteRe
 
     public static final int RESULT_ADD_REPEAT = 2;
     public static final String EXTRA_SESSION_ID = "session_id";
+    public static final String EXTRA_VIEW_ONLY = "view_only";
     /**
      * The questions and repeats at the current level.
      * Recreated every time {@link #refreshView()} is called.
@@ -214,6 +215,7 @@ public void handleOnBackPressed() {
             finish();
         }
     };
+    private boolean viewOnly;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -221,6 +223,7 @@ public void onCreate(Bundle savedInstanceState) {
 
         DaggerUtils.getComponent(this).inject(this);
 
+        viewOnly = getIntent().getBooleanExtra(EXTRA_VIEW_ONLY, false);
         String sessionId = getIntent().getStringExtra(EXTRA_SESSION_ID);
         FormEntryViewModelFactory viewModelFactory = new FormEntryViewModelFactory(this,
                 ApplicationConstants.FormModes.EDIT_SAVED,
@@ -305,7 +308,18 @@ public void onCreate(Bundle savedInstanceState) {
             });
         }
 
-        getOnBackPressedDispatcher().addCallback(onBackPressedCallback);
+        if (viewOnly) {
+            getOnBackPressedDispatcher().addCallback(new OnBackPressedCallback(true) {
+                @Override
+                public void handleOnBackPressed() {
+                    setResult(RESULT_OK);
+                    finish();
+                    formSessionRepository.clear(getIntent().getStringExtra(EXTRA_SESSION_ID));
+                }
+            });
+        } else {
+            getOnBackPressedDispatcher().addCallback(onBackPressedCallback);
+        }
     }
 
     @Override
@@ -349,10 +363,10 @@ private void updateOptionsMenu() {
         boolean isGroupSizeLocked = shouldShowPicker
                 ? isGroupSizeLocked(repeatGroupPickerIndex) : isGroupSizeLocked(screenIndex);
 
-        boolean shouldShowDelete = isInRepeat && !shouldShowPicker && !isGroupSizeLocked;
+        boolean shouldShowDelete = isInRepeat && !shouldShowPicker && !isGroupSizeLocked && !viewOnly;
         showDeleteButton(shouldShowDelete);
 
-        boolean shouldShowAdd = shouldShowPicker && !isGroupSizeLocked;
+        boolean shouldShowAdd = shouldShowPicker && !isGroupSizeLocked && !viewOnly;
         showAddButton(shouldShowAdd);
 
         boolean shouldShowGoUp = !isAtBeginning;
@@ -418,21 +432,30 @@ public boolean onOptionsItemSelected(MenuItem item) {
      * Configure the navigation buttons at the bottom of the screen.
      */
     void configureButtons(FormController formController) {
-        jumpBeginningButton.setOnClickListener(v -> {
-            formController.getAuditEventLogger().flush();
-            formController.jumpToIndex(FormIndex.createBeginningOfFormIndex());
+        if (viewOnly) {
+            Button exitButton = findViewById(R.id.exitButton);
+            exitButton.setOnClickListener(v -> getOnBackPressedDispatcher().onBackPressed());
+            exitButton.setVisibility(View.VISIBLE);
+            jumpBeginningButton.setVisibility(View.GONE);
+            jumpEndButton.setVisibility(View.GONE);
+        } else {
+            jumpBeginningButton.setOnClickListener(v -> {
+                formController.getAuditEventLogger().flush();
+                formController.jumpToIndex(FormIndex.createBeginningOfFormIndex());
 
-            setResult(RESULT_OK);
-            finish();
-        });
+                setResult(RESULT_OK);
+                finish();
+            });
 
-        jumpEndButton.setOnClickListener(v -> {
-            formController.getAuditEventLogger().flush();
-            formController.jumpToIndex(FormIndex.createEndOfFormIndex());
+            jumpEndButton.setOnClickListener(v -> {
+                formController.getAuditEventLogger().flush();
+                formController.jumpToIndex(FormIndex.createEndOfFormIndex());
+
+                setResult(RESULT_OK);
+                finish();
+            });
+        }
 
-            setResult(RESULT_OK);
-            finish();
-        });
     }
 
     /**
@@ -854,6 +877,10 @@ public void onElementClick(HierarchyItem item) {
      * If the selected question is in a field list, show the entire field list.
      */
     void onQuestionClicked(FormIndex index) {
+        if (viewOnly) {
+            return;
+        }
+
         formEntryViewModel.getFormController().jumpToIndex(index);
         if (formEntryViewModel.getFormController().indexIsInFieldList()) {
             try {
diff --git a/collect_app/src/main/java/org/odk/collect/android/formhierarchy/ViewOnlyFormHierarchyActivity.kt b/collect_app/src/main/java/org/odk/collect/android/formhierarchy/ViewOnlyFormHierarchyActivity.kt
deleted file mode 100644
index d1647b15460..00000000000
--- a/collect_app/src/main/java/org/odk/collect/android/formhierarchy/ViewOnlyFormHierarchyActivity.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.odk.collect.android.formhierarchy
-
-import android.os.Bundle
-import android.view.View
-import android.widget.Button
-import androidx.activity.OnBackPressedCallback
-import org.javarosa.core.model.FormIndex
-import org.odk.collect.android.R
-import org.odk.collect.android.javarosawrapper.FormController
-
-/**
- * Displays the structure of a form along with the answers for the current instance. Disables all
- * features that allow the user to edit the form instance.
- */
-class ViewOnlyFormHierarchyActivity : FormHierarchyActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        onBackPressedCallback.remove()
-        onBackPressedDispatcher.addCallback(object : OnBackPressedCallback(true) {
-            override fun handleOnBackPressed() {
-                setResult(RESULT_OK)
-                finish()
-                val sessionId = intent.getStringExtra(EXTRA_SESSION_ID)!!
-                formSessionRepository.clear(sessionId)
-            }
-        })
-    }
-
-    /**
-     * Hides buttons to jump to the beginning and to the end of the form instance to edit it. Adds
-     * an extra exit button that exits this activity.
-     */
-    public override fun configureButtons(formController: FormController) {
-        val exitButton = findViewById<Button>(R.id.exitButton)
-        exitButton.setOnClickListener { onBackPressedDispatcher.onBackPressed() }
-        exitButton.visibility = View.VISIBLE
-        jumpBeginningButton.visibility = View.GONE
-        jumpEndButton.visibility = View.GONE
-    }
-
-    override fun showDeleteButton(shouldShow: Boolean) {
-        // Disabled.
-    }
-
-    override fun showAddButton(shouldShow: Boolean) {
-        // Disabled.
-    }
-
-    /**
-     * Prevents the user from clicking on individual questions to jump into the form-filling view.
-     */
-    public override fun onQuestionClicked(index: FormIndex) {
-        // Do nothing
-    }
-}

From 76040da5e2f9489e6e01de28a2cba0ab10e4a5f8 Mon Sep 17 00:00:00 2001
From: Callum Stott <callum@seadowg.com>
Date: Thu, 14 Nov 2024 13:50:52 +0000
Subject: [PATCH 03/18] Spike out empty form hierarchy Fragment

---
 collect_app/src/main/AndroidManifest.xml      |   2 +-
 .../activities/FormFillingActivity.java       |   5 +-
 .../formentry/FormEntryMenuProvider.kt        |   3 +-
 .../formhierarchy/FormHierarchyFragment.java  |  29 +++++
 .../FormHierarchyFragmentHostActivity.kt      | 121 ++++++++++++++++++
 .../config/AppDependencyComponent.java        |   3 +
 .../main/res/layout/form_hierarchy_layout.xml | 101 +++++++++++++++
 .../main/res/layout/hierarchy_host_layout.xml |  16 +++
 8 files changed, 276 insertions(+), 4 deletions(-)
 create mode 100644 collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyFragment.java
 create mode 100644 collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyFragmentHostActivity.kt
 create mode 100644 collect_app/src/main/res/layout/form_hierarchy_layout.xml
 create mode 100644 collect_app/src/main/res/layout/hierarchy_host_layout.xml

diff --git a/collect_app/src/main/AndroidManifest.xml b/collect_app/src/main/AndroidManifest.xml
index ff0cf6e26f1..ce76aab4a2b 100644
--- a/collect_app/src/main/AndroidManifest.xml
+++ b/collect_app/src/main/AndroidManifest.xml
@@ -143,7 +143,6 @@ the specific language governing permissions and limitations under the License.
         <activity
             android:name=".preferences.screens.ProjectPreferencesActivity"
             android:theme="@style/Theme.Collect.Settings" />
-        <activity android:name=".formhierarchy.FormHierarchyActivity" />
         <activity
             android:name="org.odk.collect.geo.geopoint.GeoPointActivity"
             android:theme="@style/Theme.Collect"
@@ -327,6 +326,7 @@ the specific language governing permissions and limitations under the License.
                 <data android:mimeType="vnd.android.cursor.item/vnd.odk.instance" />
             </intent-filter>
         </activity>
+        <activity android:name="org.odk.collect.android.formhierarchy.FormHierarchyFragmentHostActivity" />
 
     </application>
 
diff --git a/collect_app/src/main/java/org/odk/collect/android/activities/FormFillingActivity.java b/collect_app/src/main/java/org/odk/collect/android/activities/FormFillingActivity.java
index 3512fed22e2..7736fef2bfc 100644
--- a/collect_app/src/main/java/org/odk/collect/android/activities/FormFillingActivity.java
+++ b/collect_app/src/main/java/org/odk/collect/android/activities/FormFillingActivity.java
@@ -125,6 +125,7 @@
 import org.odk.collect.android.formentry.saving.SaveAnswerFileProgressDialogFragment;
 import org.odk.collect.android.formentry.saving.SaveFormProgressDialogFragment;
 import org.odk.collect.android.formhierarchy.FormHierarchyActivity;
+import org.odk.collect.android.formhierarchy.FormHierarchyFragmentHostActivity;
 import org.odk.collect.android.fragments.MediaLoadingFragment;
 import org.odk.collect.android.fragments.dialogs.LocationProvidersDisabledDialog;
 import org.odk.collect.android.fragments.dialogs.NumberPickerDialog;
@@ -2029,7 +2030,7 @@ && new PlayServicesChecker().isGooglePlayServicesAvailable(this)) {
                             } else {
                                 formController.getAuditEventLogger().logEvent(AuditEvent.AuditEventType.HIERARCHY, true, System.currentTimeMillis());
                                 formControllerAvailable(formController, form, instance);
-                                Intent intent = new Intent(this, FormHierarchyActivity.class);
+                                Intent intent = new Intent(this, FormHierarchyFragmentHostActivity.class);
                                 intent.putExtra(FormHierarchyActivity.EXTRA_SESSION_ID, sessionId);
                                 startActivityForResult(intent, RequestCodes.HIERARCHY_ACTIVITY);
                             }
@@ -2038,7 +2039,7 @@ && new PlayServicesChecker().isGooglePlayServicesAvailable(this)) {
                 } else {
                     formControllerAvailable(formController, form, instance);
                     if (ApplicationConstants.FormModes.VIEW_SENT.equalsIgnoreCase(formMode)) {
-                        Intent intent = new Intent(this, FormHierarchyActivity.class);
+                        Intent intent = new Intent(this, FormHierarchyFragmentHostActivity.class);
                         intent.putExtra(FormHierarchyActivity.EXTRA_SESSION_ID, sessionId);
                         intent.putExtra(FormHierarchyActivity.EXTRA_VIEW_ONLY, true);
                         startActivity(intent);
diff --git a/collect_app/src/main/java/org/odk/collect/android/formentry/FormEntryMenuProvider.kt b/collect_app/src/main/java/org/odk/collect/android/formentry/FormEntryMenuProvider.kt
index 8f76e1971a6..3d5d3eb5968 100644
--- a/collect_app/src/main/java/org/odk/collect/android/formentry/FormEntryMenuProvider.kt
+++ b/collect_app/src/main/java/org/odk/collect/android/formentry/FormEntryMenuProvider.kt
@@ -13,6 +13,7 @@ import org.odk.collect.android.R
 import org.odk.collect.android.formentry.backgroundlocation.BackgroundLocationViewModel
 import org.odk.collect.android.formentry.questions.AnswersProvider
 import org.odk.collect.android.formhierarchy.FormHierarchyActivity
+import org.odk.collect.android.formhierarchy.FormHierarchyFragmentHostActivity
 import org.odk.collect.android.preferences.screens.ProjectPreferencesActivity
 import org.odk.collect.android.utilities.ApplicationConstants
 import org.odk.collect.androidshared.system.PlayServicesChecker
@@ -126,7 +127,7 @@ class FormEntryMenuProvider(
                 } else {
                     formEntryViewModel.updateAnswersForScreen(answersProvider.answers, false)
                     formEntryViewModel.openHierarchy()
-                    val i = Intent(activity, FormHierarchyActivity::class.java)
+                    val i = Intent(activity, FormHierarchyFragmentHostActivity::class.java)
                     i.putExtra(FormHierarchyActivity.EXTRA_SESSION_ID, formEntryViewModel.sessionId)
                     activity.startActivityForResult(i, ApplicationConstants.RequestCodes.HIERARCHY_ACTIVITY)
                 }
diff --git a/collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyFragment.java b/collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyFragment.java
new file mode 100644
index 00000000000..327a045e394
--- /dev/null
+++ b/collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyFragment.java
@@ -0,0 +1,29 @@
+package org.odk.collect.android.formhierarchy;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.lifecycle.ViewModelProvider;
+
+import org.odk.collect.android.R;
+import org.odk.collect.android.formentry.FormEntryViewModel;
+
+public class FormHierarchyFragment extends Fragment {
+
+    private final ViewModelProvider.Factory viewModelFactory;
+
+    public FormHierarchyFragment(ViewModelProvider.Factory viewModelFactory) {
+        super(R.layout.form_hierarchy_layout);
+
+        this.viewModelFactory = viewModelFactory;
+    }
+
+    @Override
+    public void onAttach(@NonNull Context context) {
+        super.onAttach(context);
+
+        FormEntryViewModel formEntryViewModel = viewModelFactory.create(FormEntryViewModel.class);
+        requireActivity().setTitle(formEntryViewModel.getFormController().getFormTitle());
+    }
+}
diff --git a/collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyFragmentHostActivity.kt b/collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyFragmentHostActivity.kt
new file mode 100644
index 00000000000..90cf9a04ee7
--- /dev/null
+++ b/collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyFragmentHostActivity.kt
@@ -0,0 +1,121 @@
+package org.odk.collect.android.formhierarchy
+
+import android.os.Bundle
+import org.odk.collect.analytics.Analytics
+import org.odk.collect.android.R
+import org.odk.collect.android.activities.FormEntryViewModelFactory
+import org.odk.collect.android.entities.EntitiesRepositoryProvider
+import org.odk.collect.android.formentry.FormSessionRepository
+import org.odk.collect.android.injection.DaggerUtils
+import org.odk.collect.android.instancemanagement.InstancesDataService
+import org.odk.collect.android.instancemanagement.autosend.AutoSendSettingsProvider
+import org.odk.collect.android.projects.ProjectsDataService
+import org.odk.collect.android.utilities.ApplicationConstants
+import org.odk.collect.android.utilities.ChangeLockProvider
+import org.odk.collect.android.utilities.FormsRepositoryProvider
+import org.odk.collect.android.utilities.InstancesRepositoryProvider
+import org.odk.collect.android.utilities.MediaUtils
+import org.odk.collect.android.utilities.SavepointsRepositoryProvider
+import org.odk.collect.androidshared.ui.FragmentFactoryBuilder
+import org.odk.collect.async.Scheduler
+import org.odk.collect.audiorecorder.recording.AudioRecorder
+import org.odk.collect.location.LocationClient
+import org.odk.collect.permissions.PermissionsChecker
+import org.odk.collect.permissions.PermissionsProvider
+import org.odk.collect.printer.HtmlPrinter
+import org.odk.collect.qrcode.QRCodeCreatorImpl
+import org.odk.collect.settings.SettingsProvider
+import org.odk.collect.strings.localization.LocalizedActivity
+import javax.inject.Inject
+
+class FormHierarchyFragmentHostActivity : LocalizedActivity() {
+
+    @Inject
+    lateinit var scheduler: Scheduler
+
+    @Inject
+    lateinit var formSessionRepository: FormSessionRepository
+
+    @Inject
+    lateinit var mediaUtils: MediaUtils
+
+    @Inject
+    lateinit var analytics: Analytics
+
+    @Inject
+    lateinit var audioRecorder: AudioRecorder
+
+    @Inject
+    lateinit var projectsDataService: ProjectsDataService
+
+    @Inject
+    lateinit var entitiesRepositoryProvider: EntitiesRepositoryProvider
+
+    @Inject
+    lateinit var permissionsChecker: PermissionsChecker
+
+    @Inject
+    lateinit var fusedLocationClient: LocationClient
+
+    @Inject
+    lateinit var settingsProvider: SettingsProvider
+
+    @Inject
+    lateinit var permissionsProvider: PermissionsProvider
+
+    @Inject
+    lateinit var autoSendSettingsProvider: AutoSendSettingsProvider
+
+    @Inject
+    lateinit var instancesRepositoryProvider: InstancesRepositoryProvider
+
+    @Inject
+    lateinit var formsRepositoryProvider: FormsRepositoryProvider
+
+    @Inject
+    lateinit var savepointsRepositoryProvider: SavepointsRepositoryProvider
+
+    @Inject
+    lateinit var instancesDataService: InstancesDataService
+
+    @Inject
+    lateinit var changeLockProvider: ChangeLockProvider
+
+    private val sessionId by lazy { intent.getStringExtra(FormHierarchyActivity.EXTRA_SESSION_ID)!! }
+    private val viewModelFactory by lazy {
+        FormEntryViewModelFactory(
+            this,
+            ApplicationConstants.FormModes.EDIT_SAVED,
+            sessionId,
+            scheduler,
+            formSessionRepository,
+            mediaUtils,
+            audioRecorder,
+            projectsDataService,
+            entitiesRepositoryProvider,
+            settingsProvider,
+            permissionsChecker,
+            fusedLocationClient,
+            permissionsProvider,
+            autoSendSettingsProvider,
+            formsRepositoryProvider,
+            instancesRepositoryProvider,
+            savepointsRepositoryProvider,
+            QRCodeCreatorImpl(),
+            HtmlPrinter(),
+            instancesDataService,
+            changeLockProvider
+        )
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        DaggerUtils.getComponent(this).inject(this)
+        supportFragmentManager.fragmentFactory = FragmentFactoryBuilder()
+            .forClass(FormHierarchyFragment::class) { FormHierarchyFragment(viewModelFactory) }
+            .build()
+
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.hierarchy_host_layout)
+        setSupportActionBar(findViewById(org.odk.collect.androidshared.R.id.toolbar))
+    }
+}
diff --git a/collect_app/src/main/java/org/odk/collect/android/injection/config/AppDependencyComponent.java b/collect_app/src/main/java/org/odk/collect/android/injection/config/AppDependencyComponent.java
index a1512e95923..fb3c7ce8d0f 100644
--- a/collect_app/src/main/java/org/odk/collect/android/injection/config/AppDependencyComponent.java
+++ b/collect_app/src/main/java/org/odk/collect/android/injection/config/AppDependencyComponent.java
@@ -33,6 +33,7 @@
 import org.odk.collect.android.formentry.saving.SaveAnswerFileErrorDialogFragment;
 import org.odk.collect.android.formentry.saving.SaveFormProgressDialogFragment;
 import org.odk.collect.android.formhierarchy.FormHierarchyActivity;
+import org.odk.collect.android.formhierarchy.FormHierarchyFragmentHostActivity;
 import org.odk.collect.android.formlists.blankformlist.BlankFormListActivity;
 import org.odk.collect.android.formmanagement.FormSourceProvider;
 import org.odk.collect.android.formmanagement.FormsDataService;
@@ -257,6 +258,8 @@ interface Builder {
 
     void inject(DownloadFormListTask downloadFormListTask);
 
+    void inject(FormHierarchyFragmentHostActivity formHierarchyFragmentHostActivity);
+
     OpenRosaHttpInterface openRosaHttpInterface();
 
     ReferenceManager referenceManager();
diff --git a/collect_app/src/main/res/layout/form_hierarchy_layout.xml b/collect_app/src/main/res/layout/form_hierarchy_layout.xml
new file mode 100644
index 00000000000..79844e38880
--- /dev/null
+++ b/collect_app/src/main/res/layout/form_hierarchy_layout.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ImageView
+        android:id="@+id/group_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/margin_standard"
+        android:layout_marginTop="@dimen/margin_extra_small"
+        android:visibility="gone"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:srcCompat="@drawable/ic_folder_open"
+        tools:visibility="visible" />
+
+    <TextView
+        android:id="@+id/pathtext"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/margin_extra_small"
+        android:layout_marginEnd="@dimen/margin_standard"
+        app:layout_constraintBottom_toBottomOf="@+id/group_icon"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/group_icon"
+        app:layout_constraintTop_toTopOf="@id/group_icon"
+        tools:text="Text widgets" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/list"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginTop="@dimen/margin_extra_small"
+        app:layout_constraintBottom_toTopOf="@id/buttonholder"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/pathtext"
+        app:layout_goneMarginTop="0dp" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/buttonholder"
+        style="@style/Widget.AndroidShared.ButtonBar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
+        <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
+            android:id="@+id/jumpBeginningButton"
+            style="?materialButtonOutlinedStyle"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_marginStart="@dimen/margin_standard"
+            android:text="@string/jump_to_beginning"
+            android:visibility="gone"
+            app:layout_constraintEnd_toStartOf="@+id/jumpEndButton"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
+            android:id="@+id/jumpEndButton"
+            style="?materialButtonOutlinedStyle"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_marginStart="@dimen/margin_standard"
+            android:layout_marginEnd="@dimen/margin_standard"
+            android:text="@string/jump_to_end"
+            android:visibility="gone"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/jumpBeginningButton"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
+            android:id="@+id/exitButton"
+            style="?materialButtonOutlinedStyle"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_marginStart="@dimen/margin_standard"
+            android:layout_marginEnd="@dimen/margin_standard"
+            android:text="@string/exit"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <org.odk.collect.lists.EmptyListView
+        android:id="@android:id/empty"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/pathtext"
+        app:title="@string/empty_list_of_questions" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/collect_app/src/main/res/layout/hierarchy_host_layout.xml b/collect_app/src/main/res/layout/hierarchy_host_layout.xml
new file mode 100644
index 00000000000..1365ae09b9d
--- /dev/null
+++ b/collect_app/src/main/res/layout/hierarchy_host_layout.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include layout="@layout/app_bar_layout" />
+
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/fragment_container"
+        android:name="org.odk.collect.android.formhierarchy.FormHierarchyFragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

From 94785c9c1a53b50d0f1e8c3553dbe193f864fb7d Mon Sep 17 00:00:00 2001
From: Callum Stott <callum@seadowg.com>
Date: Fri, 15 Nov 2024 18:03:38 +0000
Subject: [PATCH 04/18] Create fragemnt for hierarchy

---
 .../repeats/DeleteRepeatDialogFragment.java   |   7 +-
 .../formhierarchy/FormHierarchyFragment.java  | 704 +++++++++++++++++-
 .../FormHierarchyFragmentHostActivity.kt      |  10 +-
 .../main/res/layout/form_hierarchy_layout.xml |   3 +-
 4 files changed, 718 insertions(+), 6 deletions(-)

diff --git a/collect_app/src/main/java/org/odk/collect/android/formentry/repeats/DeleteRepeatDialogFragment.java b/collect_app/src/main/java/org/odk/collect/android/formentry/repeats/DeleteRepeatDialogFragment.java
index 246c1f7d28c..79b4df7b85b 100644
--- a/collect_app/src/main/java/org/odk/collect/android/formentry/repeats/DeleteRepeatDialogFragment.java
+++ b/collect_app/src/main/java/org/odk/collect/android/formentry/repeats/DeleteRepeatDialogFragment.java
@@ -64,7 +64,12 @@ public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
             if (i == BUTTON_POSITIVE) { // yes
                 formController.getAuditEventLogger().logEvent(AuditEvent.AuditEventType.DELETE_REPEAT, true, System.currentTimeMillis());
                 formController.deleteRepeat();
-                callback.deleteGroup();
+
+                if (callback != null) {
+                    callback.deleteGroup();
+                } else {
+                    getParentFragmentManager().setFragmentResult("REPEAT_DELETED", new Bundle());
+                }
             }
             alertDialog.cancel();
             dismiss();
diff --git a/collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyFragment.java b/collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyFragment.java
index 327a045e394..ca7c64bfa2c 100644
--- a/collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyFragment.java
+++ b/collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyFragment.java
@@ -1,29 +1,729 @@
 package org.odk.collect.android.formhierarchy;
 
+import static android.app.Activity.RESULT_OK;
+import static org.odk.collect.android.javarosawrapper.FormIndexUtils.getPreviousLevel;
+
 import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.core.content.ContextCompat;
+import androidx.core.view.MenuHost;
+import androidx.core.view.MenuProvider;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
+import org.javarosa.core.model.FormIndex;
+import org.javarosa.core.model.GroupDef;
+import org.javarosa.core.model.IFormElement;
+import org.javarosa.core.model.instance.TreeReference;
+import org.javarosa.form.api.FormEntryCaption;
+import org.javarosa.form.api.FormEntryController;
+import org.javarosa.form.api.FormEntryPrompt;
 import org.odk.collect.android.R;
+import org.odk.collect.android.databinding.FormHierarchyLayoutBinding;
+import org.odk.collect.android.exception.JavaRosaException;
 import org.odk.collect.android.formentry.FormEntryViewModel;
+import org.odk.collect.android.formentry.ODKView;
+import org.odk.collect.android.formentry.repeats.DeleteRepeatDialogFragment;
+import org.odk.collect.android.javarosawrapper.FormController;
+import org.odk.collect.android.javarosawrapper.JavaRosaFormController;
+import org.odk.collect.android.utilities.FormEntryPromptUtils;
+import org.odk.collect.android.utilities.HtmlUtils;
+import org.odk.collect.androidshared.ui.DialogFragmentUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import timber.log.Timber;
 
 public class FormHierarchyFragment extends Fragment {
 
+    private final boolean viewOnly;
     private final ViewModelProvider.Factory viewModelFactory;
+    private final MenuHost menuHost;
+    private final FormHiearchyMenuProvider menuProvider = new FormHiearchyMenuProvider(new FormHiearchyMenuProvider.OnClickListener() {
+        @Override
+        public void onGoUpClicked() {
+            FormController formController = formEntryViewModel.getFormController();
+
+            // If `repeatGroupPickerIndex` is set it means we're currently displaying
+            // a list of repeat instances. If we unset `repeatGroupPickerIndex`,
+            // we will go back up to the previous screen.
+            if (shouldShowRepeatGroupPicker()) {
+                // Exit the picker.
+                repeatGroupPickerIndex = null;
+            } else {
+                // Enter the picker if coming from a repeat group.
+                int event = formController.getEvent(screenIndex);
+                if (event == FormEntryController.EVENT_REPEAT || event == FormEntryController.EVENT_PROMPT_NEW_REPEAT) {
+                    repeatGroupPickerIndex = screenIndex;
+                }
+
+                formController.stepToOuterScreenEvent();
+            }
+
+            refreshView(true);
+        }
+
+        @Override
+        public void onAddRepeatClicked() {
+            formEntryViewModel.getFormController().jumpToIndex(repeatGroupPickerIndex);
+            formEntryViewModel.jumpToNewRepeat();
+            formEntryViewModel.addRepeat();
 
-    public FormHierarchyFragment(ViewModelProvider.Factory viewModelFactory) {
+            requireActivity().finish();
+        }
+
+        @Override
+        public void onDeleteRepeatClicked() {
+            DialogFragmentUtils.showIfNotShowing(DeleteRepeatDialogFragment.class, getChildFragmentManager());
+        }
+    });
+    private FormEntryViewModel formEntryViewModel;
+    private TreeReference contextGroupRef;
+    private FormIndex screenIndex;
+    private FormIndex repeatGroupPickerIndex;
+    private FormIndex currentIndex;
+    private List<HierarchyItem> elementsToDisplay;
+    private FormIndex startIndex;
+
+    public FormHierarchyFragment(boolean viewOnly, ViewModelProvider.Factory viewModelFactory, MenuHost menuHost) {
         super(R.layout.form_hierarchy_layout);
+        this.viewOnly = viewOnly;
 
         this.viewModelFactory = viewModelFactory;
+        this.menuHost = menuHost;
     }
 
     @Override
     public void onAttach(@NonNull Context context) {
         super.onAttach(context);
 
-        FormEntryViewModel formEntryViewModel = viewModelFactory.create(FormEntryViewModel.class);
+        formEntryViewModel = new ViewModelProvider(requireActivity(), viewModelFactory).get(FormEntryViewModel.class);
         requireActivity().setTitle(formEntryViewModel.getFormController().getFormTitle());
     }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        startIndex = formEntryViewModel.getFormController().getFormIndex();
+
+        menuHost.addMenuProvider(menuProvider, getViewLifecycleOwner());
+
+        FormHierarchyLayoutBinding binding = FormHierarchyLayoutBinding.bind(view);
+
+        RecyclerView recyclerView = binding.list;
+        recyclerView.setHasFixedSize(true);
+        recyclerView.setLayoutManager(new LinearLayoutManager(requireContext()));
+        recyclerView.addItemDecoration(new DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL));
+
+        configureButtons(binding, formEntryViewModel.getFormController());
+        refreshView();
+
+        // Scroll to the last question the user was looking at
+        // TODO: avoid another iteration through all displayed elements
+        if (recyclerView != null && recyclerView.getAdapter() != null && recyclerView.getAdapter().getItemCount() > 0) {
+            binding.empty.setVisibility(View.GONE);
+            recyclerView.post(() -> {
+                int position = 0;
+                // Iterate over all the elements currently displayed looking for a match with the
+                // startIndex which can either represent a question or a field list.
+                for (HierarchyItem hierarchyItem : elementsToDisplay) {
+                    FormIndex indexToCheck = hierarchyItem.getFormIndex();
+                    boolean indexIsInFieldList = formEntryViewModel.getFormController().indexIsInFieldList(startIndex);
+                    if (startIndex.equals(indexToCheck)
+                            || (indexIsInFieldList && indexToCheck.toString().startsWith(startIndex.toString()))) {
+                        position = elementsToDisplay.indexOf(hierarchyItem);
+                        break;
+                    }
+                }
+                ((LinearLayoutManager) recyclerView.getLayoutManager()).scrollToPositionWithOffset(position, 0);
+            });
+        }
+
+        getChildFragmentManager().setFragmentResultListener("REPEAT_DELETED", getViewLifecycleOwner(), (requestKey, result) -> onRepeatDeleted());
+    }
+
+    public void refreshView() {
+        refreshView(false);
+    }
+
+    /**
+     * @see #refreshView()
+     */
+    private void refreshView(boolean isGoingUp) {
+        FormHierarchyLayoutBinding binding = FormHierarchyLayoutBinding.bind(requireView());
+        ImageView groupIcon = binding.groupIcon;
+        TextView groupPathTextView = binding.pathtext;
+        RecyclerView recyclerView = binding.list;
+
+        try {
+            FormController formController = formEntryViewModel.getFormController();
+
+            // Save the current index so we can return to the problematic question
+            // in the event of an error.
+            currentIndex = formController.getFormIndex();
+
+            elementsToDisplay = new ArrayList<>();
+
+            jumpToHierarchyStartIndex();
+
+            int event = formController.getEvent();
+
+            if (event == FormEntryController.EVENT_BEGINNING_OF_FORM && !shouldShowRepeatGroupPicker()) {
+                // The beginning of form has no valid prompt to display.
+                groupIcon.setVisibility(View.GONE);
+                groupPathTextView.setVisibility(View.GONE);
+            } else {
+                groupIcon.setVisibility(View.VISIBLE);
+                groupPathTextView.setVisibility(View.VISIBLE);
+                groupPathTextView.setText(getCurrentPath());
+
+                if (formController.indexContainsRepeatableGroup(screenIndex) || shouldShowRepeatGroupPicker()) {
+                    groupIcon.setImageDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.ic_repeat));
+                } else {
+                    groupIcon.setImageDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.ic_folder_open));
+                }
+            }
+
+            // Refresh the current event in case we did step forward.
+            event = formController.getEvent();
+
+            // Ref to the parent group that's currently being displayed.
+            //
+            // Because of the guard conditions below, we will skip
+            // everything until we exit this group.
+            TreeReference visibleGroupRef = null;
+
+            while (event != FormEntryController.EVENT_END_OF_FORM) {
+                // get the ref to this element
+                TreeReference currentRef = formController.getFormIndex().getReference();
+
+                // retrieve the current group
+                TreeReference curGroup = (visibleGroupRef == null) ? contextGroupRef : visibleGroupRef;
+
+                if (curGroup != null && !curGroup.isParentOf(currentRef, false)) {
+                    // We have left the current group
+                    if (visibleGroupRef == null) {
+                        // We are done.
+                        break;
+                    } else {
+                        // exit the inner group
+                        visibleGroupRef = null;
+                    }
+                }
+
+                if (visibleGroupRef != null) {
+                    // We're in a group within the one we want to list
+                    // skip this question/group/repeat and move to the next index.
+                    event =
+                            formController.stepToNextEvent(JavaRosaFormController.STEP_INTO_GROUP);
+                    continue;
+                }
+
+                switch (event) {
+                    case FormEntryController.EVENT_QUESTION: {
+                        // Nothing but repeat group instances should show up in the picker.
+                        if (shouldShowRepeatGroupPicker()) {
+                            break;
+                        }
+
+                        FormEntryPrompt fp = formController.getQuestionPrompt();
+                        String label = fp.getShortText();
+                        String answerDisplay = QuestionAnswerProcessor.getQuestionAnswer(fp, requireContext(), formController);
+                        elementsToDisplay.add(
+                                new HierarchyItem(
+                                        fp.getIndex(),
+                                        HierarchyItemType.QUESTION,
+                                        FormEntryPromptUtils.styledQuestionText(label, fp.isRequired()),
+                                        answerDisplay
+                                )
+                        );
+                        break;
+                    }
+                    case FormEntryController.EVENT_GROUP: {
+                        if (!formController.isGroupRelevant()) {
+                            break;
+                        }
+                        // Nothing but repeat group instances should show up in the picker.
+                        if (shouldShowRepeatGroupPicker()) {
+                            break;
+                        }
+
+                        FormIndex index = formController.getFormIndex();
+
+                        // Only display groups with a specific appearance attribute.
+                        if (!formController.isDisplayableGroup(index)) {
+                            break;
+                        }
+
+                        // Don't render other groups' children.
+                        if (contextGroupRef != null && !contextGroupRef.isParentOf(currentRef, false)) {
+                            break;
+                        }
+
+                        visibleGroupRef = currentRef;
+
+                        FormEntryCaption caption = formController.getCaptionPrompt();
+
+                        elementsToDisplay.add(
+                                new HierarchyItem(
+                                        caption.getIndex(),
+                                        HierarchyItemType.VISIBLE_GROUP,
+                                        HtmlUtils.textToHtml(caption.getShortText())
+                                )
+                        );
+
+                        // Skip to the next item outside the group.
+                        event = formController.stepOverGroup();
+                        continue;
+                    }
+                    case FormEntryController.EVENT_PROMPT_NEW_REPEAT: {
+                        // this would display the 'add new repeat' dialog
+                        // ignore it.
+                        break;
+                    }
+                    case FormEntryController.EVENT_REPEAT: {
+                        boolean forPicker = shouldShowRepeatGroupPicker();
+                        // Only break to exclude non-relevant repeat from picker
+                        if (!formController.isGroupRelevant() && forPicker) {
+                            break;
+                        }
+
+                        visibleGroupRef = currentRef;
+
+                        // Don't render other groups' children.
+                        if (contextGroupRef != null && !contextGroupRef.isParentOf(currentRef, false)) {
+                            break;
+                        }
+
+                        FormEntryCaption fc = formController.getCaptionPrompt();
+
+                        if (forPicker) {
+                            // Don't render other groups' instances.
+                            String repeatGroupPickerRef = repeatGroupPickerIndex.getReference().toString(false);
+                            if (!currentRef.toString(false).equals(repeatGroupPickerRef)) {
+                                break;
+                            }
+
+                            int itemNumber = fc.getMultiplicity() + 1;
+
+                            // e.g. `friends > 1`
+                            String repeatLabel = fc.getShortText() + " > " + itemNumber;
+
+                            // If the child of the group has a more descriptive label, use that instead.
+                            if (fc.getFormElement().getChildren().size() == 1 && fc.getFormElement().getChild(0) instanceof GroupDef) {
+                                formController.stepToNextEvent(JavaRosaFormController.STEP_INTO_GROUP);
+                                String itemLabel = formController.getCaptionPrompt().getShortText();
+                                if (itemLabel != null) {
+                                    // e.g. `1. Alice`
+                                    repeatLabel = itemNumber + ".\u200E " + itemLabel;
+                                }
+                            }
+
+                            elementsToDisplay.add(
+                                    new HierarchyItem(
+                                            fc.getIndex(),
+                                            HierarchyItemType.REPEAT_INSTANCE,
+                                            HtmlUtils.textToHtml(repeatLabel)
+                                    )
+                            );
+                        } else if (fc.getMultiplicity() == 0) {
+                            elementsToDisplay.add(
+                                    new HierarchyItem(
+                                            fc.getIndex(),
+                                            HierarchyItemType.REPEATABLE_GROUP,
+                                            HtmlUtils.textToHtml(fc.getShortText())
+                                    )
+                            );
+                        }
+
+                        break;
+                    }
+                }
+
+                event = formController.stepToNextEvent(JavaRosaFormController.STEP_INTO_GROUP);
+            }
+
+            recyclerView.setAdapter(new HierarchyListAdapter(elementsToDisplay, this::onElementClick));
+
+            formController.jumpToIndex(currentIndex);
+
+            // Prevent a redundant middle screen (common on many forms
+            // that use presentation groups to display labels).
+            if (isDisplayingSingleGroup() && !screenIndex.isBeginningOfFormIndex()) {
+                if (isGoingUp) {
+                    // Back out once more.
+                    goUpLevel();
+                } else {
+                    // Enter automatically.
+                    formController.jumpToIndex(elementsToDisplay.get(0).getFormIndex());
+                    refreshView();
+                }
+            }
+        } catch (Exception e) {
+            Timber.e(e);
+            createErrorDialog(e.getMessage());
+        }
+    }
+
+    /**
+     * Goes to the start of the hierarchy view based on where the user came from.
+     * Backs out until the index is at the beginning of a repeat group or the beginning of the form.
+     */
+    private void jumpToHierarchyStartIndex() {
+        FormController formController = formEntryViewModel.getFormController();
+        FormIndex startIndex = formController.getFormIndex();
+
+        // If we're not at the first level, we're inside a repeated group so we want to only
+        // display everything enclosed within that group.
+        contextGroupRef = null;
+
+        // Save the index to the screen itself, before potentially moving into it.
+        screenIndex = startIndex;
+
+        // If we're currently at a displayable group, record the name of the node and step to the next
+        // node to display.
+        if (formController.isDisplayableGroup(startIndex)) {
+            contextGroupRef = formController.getFormIndex().getReference();
+            formController.stepToNextEvent(JavaRosaFormController.STEP_INTO_GROUP);
+        } else {
+            FormIndex potentialStartIndex = getPreviousLevel(startIndex);
+            // Step back until we hit a displayable group or the beginning.
+            while (!isScreenEvent(formController, potentialStartIndex)) {
+                potentialStartIndex = getPreviousLevel(potentialStartIndex);
+            }
+
+            screenIndex = potentialStartIndex;
+
+            // Check to see if the question is at the first level of the hierarchy.
+            // If it is, display the root level from the beginning.
+            // Otherwise we're at a displayable group.
+            if (screenIndex == null) {
+                screenIndex = FormIndex.createBeginningOfFormIndex();
+            }
+
+            formController.jumpToIndex(screenIndex);
+
+            // Now test again. This should be true at this point or we're at the beginning.
+            if (formController.isDisplayableGroup(formController.getFormIndex())) {
+                contextGroupRef = formController.getFormIndex().getReference();
+                formController.stepToNextEvent(JavaRosaFormController.STEP_INTO_GROUP);
+            } else {
+                // Let contextGroupRef be null.
+            }
+        }
+
+        menuHost.invalidateMenu();
+    }
+
+    /**
+     * Returns true if the event is a displayable group or the start of the form.
+     * See {@link FormController#stepToOuterScreenEvent} for more context.
+     */
+    private boolean isScreenEvent(FormController formController, FormIndex index) {
+        // Beginning of form.
+        if (index == null) {
+            return true;
+        }
+
+        return formController.isDisplayableGroup(index);
+    }
+
+    private boolean shouldShowRepeatGroupPicker() {
+        return repeatGroupPickerIndex != null;
+    }
+
+    /**
+     * Navigates "up" in the form hierarchy.
+     */
+    protected void goUpLevel() {
+        FormController formController = formEntryViewModel.getFormController();
+
+        // If `repeatGroupPickerIndex` is set it means we're currently displaying
+        // a list of repeat instances. If we unset `repeatGroupPickerIndex`,
+        // we will go back up to the previous screen.
+        if (shouldShowRepeatGroupPicker()) {
+            // Exit the picker.
+            repeatGroupPickerIndex = null;
+        } else {
+            // Enter the picker if coming from a repeat group.
+            int event = formController.getEvent(screenIndex);
+            if (event == FormEntryController.EVENT_REPEAT || event == FormEntryController.EVENT_PROMPT_NEW_REPEAT) {
+                repeatGroupPickerIndex = screenIndex;
+            }
+
+            formController.stepToOuterScreenEvent();
+        }
+
+        refreshView(true);
+    }
+
+    /**
+     * Returns a string representing the 'path' of the current screen.
+     * Each level is separated by `>`.
+     */
+    private CharSequence getCurrentPath() {
+        FormController formController = formEntryViewModel.getFormController();
+        FormIndex index = screenIndex;
+
+        List<FormEntryCaption> groups = new ArrayList<>();
+
+        if (shouldShowRepeatGroupPicker()) {
+            groups.add(formController.getCaptionPrompt(repeatGroupPickerIndex));
+        }
+
+        while (index != null) {
+            groups.add(0, formController.getCaptionPrompt(index));
+            index = getPreviousLevel(index);
+        }
+
+        // If the repeat picker is showing, don't show an item number for the current index.
+        boolean hideLastMultiplicity = shouldShowRepeatGroupPicker();
+
+        return ODKView.getGroupsPath(groups.toArray(new FormEntryCaption[0]), hideLastMultiplicity);
+    }
+
+    /**
+     * Handles clicks on a specific row in the hierarchy view.
+     */
+    private void onElementClick(HierarchyItem item) {
+        FormIndex index = item.getFormIndex();
+
+        switch (item.getHierarchyItemType()) {
+            case QUESTION:
+                onQuestionClicked(index);
+                break;
+            case REPEATABLE_GROUP:
+                // Show the picker.
+                repeatGroupPickerIndex = index;
+                refreshView();
+                break;
+            case VISIBLE_GROUP:
+            case REPEAT_INSTANCE:
+                // Hide the picker.
+                repeatGroupPickerIndex = null;
+                formEntryViewModel.getFormController().jumpToIndex(index);
+                requireActivity().setResult(RESULT_OK);
+                refreshView();
+                break;
+        }
+    }
+
+    /**
+     * Handles clicks on a question. Jumps to the form filling view with the selected question shown.
+     * If the selected question is in a field list, show the entire field list.
+     */
+    void onQuestionClicked(FormIndex index) {
+        if (viewOnly) {
+            return;
+        }
+
+        formEntryViewModel.getFormController().jumpToIndex(index);
+        if (formEntryViewModel.getFormController().indexIsInFieldList()) {
+            try {
+                formEntryViewModel.getFormController().stepToPreviousScreenEvent();
+            } catch (JavaRosaException e) {
+                Timber.d(e);
+                createErrorDialog(e.getCause().getMessage());
+                return;
+            }
+        }
+        requireActivity().setResult(RESULT_OK);
+        requireActivity().finish();
+    }
+
+    /**
+     * Creates and displays dialog with the given errorMsg.
+     */
+    protected void createErrorDialog(String errorMsg) {
+        AlertDialog alertDialog = new MaterialAlertDialogBuilder(requireContext()).create();
+
+        alertDialog.setTitle(getString(org.odk.collect.strings.R.string.error_occured));
+        alertDialog.setMessage(errorMsg);
+        DialogInterface.OnClickListener errorListener = new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int i) {
+                switch (i) {
+                    case DialogInterface.BUTTON_POSITIVE:
+                        FormController formController = formEntryViewModel.getFormController();
+                        formController.jumpToIndex(currentIndex);
+                        break;
+                }
+            }
+        };
+        alertDialog.setCancelable(false);
+        alertDialog.setButton(AlertDialog.BUTTON_POSITIVE, getString(org.odk.collect.strings.R.string.ok), errorListener);
+        alertDialog.show();
+    }
+
+    /**
+     * Returns true if there's only one item being displayed, and it's a group.
+     * Groups like this are often used to display a label in the hierarchy path.
+     */
+    private boolean isDisplayingSingleGroup() {
+        return elementsToDisplay.size() == 1
+                && elementsToDisplay.get(0).getHierarchyItemType() == HierarchyItemType.VISIBLE_GROUP;
+    }
+
+    private void configureButtons(FormHierarchyLayoutBinding binding, FormController formController) {
+        Button exitButton = binding.exitButton;
+        Button jumpBeginningButton = binding.jumpBeginningButton;
+        Button jumpEndButton = binding.jumpEndButton;
+
+        if (viewOnly) {
+            exitButton.setOnClickListener(v -> requireActivity().getOnBackPressedDispatcher().onBackPressed());
+            exitButton.setVisibility(View.VISIBLE);
+            jumpBeginningButton.setVisibility(View.GONE);
+            jumpEndButton.setVisibility(View.GONE);
+        } else {
+            jumpBeginningButton.setOnClickListener(v -> {
+                formController.getAuditEventLogger().flush();
+                formController.jumpToIndex(FormIndex.createBeginningOfFormIndex());
+
+                requireActivity().setResult(RESULT_OK);
+                requireActivity().finish();
+            });
+
+            jumpEndButton.setOnClickListener(v -> {
+                formController.getAuditEventLogger().flush();
+                formController.jumpToIndex(FormIndex.createEndOfFormIndex());
+
+                requireActivity().setResult(RESULT_OK);
+                requireActivity().finish();
+            });
+        }
+
+    }
+
+    /**
+     * After having deleted the current index,
+     * returns true if the current index was the only item in the repeat group.
+     */
+    private boolean didDeleteLastRepeatItem() {
+        FormController formController = formEntryViewModel.getFormController();
+        FormIndex index = formController.getFormIndex();
+        int event = formController.getEvent(index);
+
+        // If we're on item 0, but we will be prompted to add another item next,
+        // it must be the last remaining item.
+        return event == FormEntryController.EVENT_PROMPT_NEW_REPEAT
+                && index.getElementMultiplicity() == 0;
+    }
+
+    private boolean didDeleteFirstRepeatItem() {
+        return formEntryViewModel
+                .getFormController()
+                .getFormIndex()
+                .getElementMultiplicity() == 0;
+    }
+
+    private void onRepeatDeleted() {
+        if (didDeleteLastRepeatItem()) {
+            // goUpLevel would put us in a weird state after deleting the last item;
+            // just go back one event instead.
+            //
+            // TODO: This works well in most cases, but if there are 2 repeats in a row,
+            //   and you delete an item from the second repeat, it will send you into the
+            //   first repeat instead of going back a level as expected.
+            goToPreviousEvent();
+        } else if (didDeleteFirstRepeatItem()) {
+            goUpLevel();
+        } else {
+            goToPreviousEvent();
+            goUpLevel();
+        }
+    }
+
+    /**
+     * Similar to {@link #goUpLevel}, but makes a less significant step backward.
+     * This is only used when the caller knows where to go back to,
+     * e.g. after deleting the final remaining item in a repeat group.
+     */
+    private void goToPreviousEvent() {
+        FormController formController = formEntryViewModel.getFormController();
+        try {
+            formController.stepToPreviousScreenEvent();
+        } catch (JavaRosaException e) {
+            Timber.d(e);
+            createErrorDialog(e.getCause().getMessage());
+            return;
+        }
+
+        refreshView();
+    }
+
+    private class FormHiearchyMenuProvider implements MenuProvider {
+
+        private final OnClickListener onClickListener;
+
+        FormHiearchyMenuProvider(OnClickListener goUpClicked) {
+            this.onClickListener = goUpClicked;
+        }
+
+        @Override
+        public void onCreateMenu(@NonNull Menu menu, @NonNull MenuInflater menuInflater) {
+            menuInflater.inflate(R.menu.form_hierarchy_menu, menu);
+        }
+
+        @Override
+        public void onPrepareMenu(@NonNull Menu menu) {
+            boolean isAtBeginning = screenIndex.isBeginningOfFormIndex() && !shouldShowRepeatGroupPicker();
+            boolean shouldShowPicker = shouldShowRepeatGroupPicker();
+            boolean isInRepeat = formEntryViewModel.getFormController().indexContainsRepeatableGroup(screenIndex);
+            boolean isGroupSizeLocked = shouldShowPicker
+                    ? isGroupSizeLocked(repeatGroupPickerIndex) : isGroupSizeLocked(screenIndex);
+
+            menu.findItem(R.id.menu_add_repeat).setVisible(shouldShowPicker && !isGroupSizeLocked && !viewOnly);
+            menu.findItem(R.id.menu_delete_child).setVisible(isInRepeat && !shouldShowPicker && !isGroupSizeLocked && !viewOnly);
+            menu.findItem(R.id.menu_go_up).setVisible(!isAtBeginning);
+        }
+
+        @Override
+        public boolean onMenuItemSelected(@NonNull MenuItem menuItem) {
+            if (menuItem.getItemId() == R.id.menu_delete_child) {
+                onClickListener.onDeleteRepeatClicked();
+                return true;
+            } else if (menuItem.getItemId() == R.id.menu_add_repeat) {
+                onClickListener.onAddRepeatClicked();
+                return true;
+            } else if (menuItem.getItemId() == R.id.menu_go_up) {
+                onClickListener.onGoUpClicked();
+                return true;
+            } else {
+                return false;
+            }
+        }
+
+        private boolean isGroupSizeLocked(FormIndex index) {
+            FormController formController = formEntryViewModel.getFormController();
+            IFormElement element = formController.getCaptionPrompt(index).getFormElement();
+            return element instanceof GroupDef && ((GroupDef) element).noAddRemove;
+        }
+
+        interface OnClickListener {
+            void onGoUpClicked();
+
+            void onAddRepeatClicked();
+
+            void onDeleteRepeatClicked();
+        }
+    }
 }
+
+
diff --git a/collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyFragmentHostActivity.kt b/collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyFragmentHostActivity.kt
index 90cf9a04ee7..3304d1e6691 100644
--- a/collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyFragmentHostActivity.kt
+++ b/collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyFragmentHostActivity.kt
@@ -6,6 +6,7 @@ import org.odk.collect.android.R
 import org.odk.collect.android.activities.FormEntryViewModelFactory
 import org.odk.collect.android.entities.EntitiesRepositoryProvider
 import org.odk.collect.android.formentry.FormSessionRepository
+import org.odk.collect.android.formentry.repeats.DeleteRepeatDialogFragment
 import org.odk.collect.android.injection.DaggerUtils
 import org.odk.collect.android.instancemanagement.InstancesDataService
 import org.odk.collect.android.instancemanagement.autosend.AutoSendSettingsProvider
@@ -110,8 +111,15 @@ class FormHierarchyFragmentHostActivity : LocalizedActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         DaggerUtils.getComponent(this).inject(this)
+
+        val viewOnly = intent.getBooleanExtra(FormHierarchyActivity.EXTRA_VIEW_ONLY, false)
         supportFragmentManager.fragmentFactory = FragmentFactoryBuilder()
-            .forClass(FormHierarchyFragment::class) { FormHierarchyFragment(viewModelFactory) }
+            .forClass(FormHierarchyFragment::class) {
+                FormHierarchyFragment(viewOnly, viewModelFactory, this)
+            }
+            .forClass(DeleteRepeatDialogFragment::class) {
+                DeleteRepeatDialogFragment(viewModelFactory)
+            }
             .build()
 
         super.onCreate(savedInstanceState)
diff --git a/collect_app/src/main/res/layout/form_hierarchy_layout.xml b/collect_app/src/main/res/layout/form_hierarchy_layout.xml
index 79844e38880..d51d405005b 100644
--- a/collect_app/src/main/res/layout/form_hierarchy_layout.xml
+++ b/collect_app/src/main/res/layout/form_hierarchy_layout.xml
@@ -57,7 +57,6 @@
             android:layout_height="match_parent"
             android:layout_marginStart="@dimen/margin_standard"
             android:text="@string/jump_to_beginning"
-            android:visibility="gone"
             app:layout_constraintEnd_toStartOf="@+id/jumpEndButton"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -70,7 +69,6 @@
             android:layout_marginStart="@dimen/margin_standard"
             android:layout_marginEnd="@dimen/margin_standard"
             android:text="@string/jump_to_end"
-            android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/jumpBeginningButton"
             app:layout_constraintTop_toTopOf="parent" />
@@ -83,6 +81,7 @@
             android:layout_marginStart="@dimen/margin_standard"
             android:layout_marginEnd="@dimen/margin_standard"
             android:text="@string/exit"
+            android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />

From e169db59926a9fac7fb2c6d7d3a28b224645fd30 Mon Sep 17 00:00:00 2001
From: Callum Stott <callum@seadowg.com>
Date: Tue, 19 Nov 2024 15:24:17 +0000
Subject: [PATCH 05/18] Update test Activity references

---
 .../android/activities/FormFillingActivityTest.kt      | 10 +++++-----
 .../android/formentry/FormEntryMenuProviderTest.kt     |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/collect_app/src/test/java/org/odk/collect/android/activities/FormFillingActivityTest.kt b/collect_app/src/test/java/org/odk/collect/android/activities/FormFillingActivityTest.kt
index 88b898e5902..45d4fdeb0bd 100644
--- a/collect_app/src/test/java/org/odk/collect/android/activities/FormFillingActivityTest.kt
+++ b/collect_app/src/test/java/org/odk/collect/android/activities/FormFillingActivityTest.kt
@@ -20,7 +20,7 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.odk.collect.android.external.FormUriActivity
 import org.odk.collect.android.external.FormsContract
-import org.odk.collect.android.formhierarchy.FormHierarchyActivity
+import org.odk.collect.android.formhierarchy.FormHierarchyFragmentHostActivity
 import org.odk.collect.android.formmanagement.FormFillingIntentFactory
 import org.odk.collect.android.injection.config.AppDependencyComponent
 import org.odk.collect.android.injection.config.AppDependencyModule
@@ -105,7 +105,7 @@ class FormFillingActivityTest {
         }
 
         scheduler.flush()
-        assertIntentsHelper.assertNewIntent(FormHierarchyActivity::class)
+        assertIntentsHelper.assertNewIntent(FormHierarchyFragmentHostActivity::class)
 
         // Return to FormFillingActivity from FormHierarchyActivity
         val hierarchyIntent = shadowOf(recreated.get()).nextStartedActivityForResult.intent
@@ -138,7 +138,7 @@ class FormFillingActivityTest {
         assertText(withText("What is your age?"))
 
         Interactions.clickOn(withContentDescription(R.string.view_hierarchy))
-        assertIntentsHelper.assertNewIntent(FormHierarchyActivity::class)
+        assertIntentsHelper.assertNewIntent(FormHierarchyFragmentHostActivity::class)
 
         // Recreate and assert we start FormHierarchyActivity
         val recreated = activityControllerRule.add {
@@ -146,7 +146,7 @@ class FormFillingActivityTest {
         }
 
         scheduler.flush()
-        assertIntentsHelper.assertNewIntent(FormHierarchyActivity::class)
+        assertIntentsHelper.assertNewIntent(FormHierarchyFragmentHostActivity::class)
 
         // Return to FormFillingActivity from FormHierarchyActivity
         val hierarchyIntent = shadowOf(recreated.get()).nextStartedActivityForResult.intent
@@ -191,7 +191,7 @@ class FormFillingActivityTest {
         }
 
         scheduler.flush()
-        assertIntentsHelper.assertNewIntent(FormHierarchyActivity::class)
+        assertIntentsHelper.assertNewIntent(FormHierarchyFragmentHostActivity::class)
 
         // Return to FormFillingActivity from FormHierarchyActivity
         val hierarchyIntent = shadowOf(recreated.get()).nextStartedActivityForResult.intent
diff --git a/collect_app/src/test/java/org/odk/collect/android/formentry/FormEntryMenuProviderTest.kt b/collect_app/src/test/java/org/odk/collect/android/formentry/FormEntryMenuProviderTest.kt
index 016a0e62153..d122fe54fc2 100644
--- a/collect_app/src/test/java/org/odk/collect/android/formentry/FormEntryMenuProviderTest.kt
+++ b/collect_app/src/test/java/org/odk/collect/android/formentry/FormEntryMenuProviderTest.kt
@@ -20,7 +20,7 @@ import org.odk.collect.android.TestSettingsProvider.getSettingsProvider
 import org.odk.collect.android.formentry.FormEntryMenuProvider.FormEntryMenuClickListener
 import org.odk.collect.android.formentry.backgroundlocation.BackgroundLocationViewModel
 import org.odk.collect.android.formentry.questions.AnswersProvider
-import org.odk.collect.android.formhierarchy.FormHierarchyActivity
+import org.odk.collect.android.formhierarchy.FormHierarchyFragmentHostActivity
 import org.odk.collect.android.javarosawrapper.FormController
 import org.odk.collect.android.preferences.screens.ProjectPreferencesActivity
 import org.odk.collect.android.utilities.ApplicationConstants
@@ -275,7 +275,7 @@ class FormEntryMenuProviderTest {
         val nextStartedActivity = Shadows.shadowOf(activity).nextStartedActivityForResult
 
         assertThat(nextStartedActivity, notNullValue())
-        assertThat(nextStartedActivity.intent.component!!.className, equalTo(FormHierarchyActivity::class.java.name))
+        assertThat(nextStartedActivity.intent.component!!.className, equalTo(FormHierarchyFragmentHostActivity::class.java.name))
         assertThat(nextStartedActivity.requestCode, equalTo(ApplicationConstants.RequestCodes.HIERARCHY_ACTIVITY))
     }
 

From 4e4c01b2db3dec4c649497fd4d6a4bc1cfe81950 Mon Sep 17 00:00:00 2001
From: Callum Stott <callum@seadowg.com>
Date: Thu, 21 Nov 2024 14:42:20 +0000
Subject: [PATCH 06/18] Make sure FormHiearchyActivity is still available for
 tests

---
 collect_app/src/main/AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/collect_app/src/main/AndroidManifest.xml b/collect_app/src/main/AndroidManifest.xml
index ce76aab4a2b..a05dc2268f3 100644
--- a/collect_app/src/main/AndroidManifest.xml
+++ b/collect_app/src/main/AndroidManifest.xml
@@ -327,6 +327,7 @@ the specific language governing permissions and limitations under the License.
             </intent-filter>
         </activity>
         <activity android:name="org.odk.collect.android.formhierarchy.FormHierarchyFragmentHostActivity" />
+        <activity android:name="org.odk.collect.android.formhierarchy.FormHierarchyActivity" />
 
     </application>
 

From be59efb20feab51bbc9b30f72a035aa65318afaf Mon Sep 17 00:00:00 2001
From: Callum Stott <callum@seadowg.com>
Date: Thu, 21 Nov 2024 17:27:31 +0000
Subject: [PATCH 07/18] Move form hierarchy state to viewmodel

---
 .../formhierarchy/FormHierarchyFragment.java  | 249 ++++++++++++------
 1 file changed, 162 insertions(+), 87 deletions(-)

diff --git a/collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyFragment.java b/collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyFragment.java
index ca7c64bfa2c..e42d4f7c0d3 100644
--- a/collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyFragment.java
+++ b/collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyFragment.java
@@ -21,6 +21,7 @@
 import androidx.core.view.MenuHost;
 import androidx.core.view.MenuProvider;
 import androidx.fragment.app.Fragment;
+import androidx.lifecycle.ViewModel;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -57,51 +58,9 @@ public class FormHierarchyFragment extends Fragment {
     private final boolean viewOnly;
     private final ViewModelProvider.Factory viewModelFactory;
     private final MenuHost menuHost;
-    private final FormHiearchyMenuProvider menuProvider = new FormHiearchyMenuProvider(new FormHiearchyMenuProvider.OnClickListener() {
-        @Override
-        public void onGoUpClicked() {
-            FormController formController = formEntryViewModel.getFormController();
-
-            // If `repeatGroupPickerIndex` is set it means we're currently displaying
-            // a list of repeat instances. If we unset `repeatGroupPickerIndex`,
-            // we will go back up to the previous screen.
-            if (shouldShowRepeatGroupPicker()) {
-                // Exit the picker.
-                repeatGroupPickerIndex = null;
-            } else {
-                // Enter the picker if coming from a repeat group.
-                int event = formController.getEvent(screenIndex);
-                if (event == FormEntryController.EVENT_REPEAT || event == FormEntryController.EVENT_PROMPT_NEW_REPEAT) {
-                    repeatGroupPickerIndex = screenIndex;
-                }
-
-                formController.stepToOuterScreenEvent();
-            }
-
-            refreshView(true);
-        }
-
-        @Override
-        public void onAddRepeatClicked() {
-            formEntryViewModel.getFormController().jumpToIndex(repeatGroupPickerIndex);
-            formEntryViewModel.jumpToNewRepeat();
-            formEntryViewModel.addRepeat();
-
-            requireActivity().finish();
-        }
-
-        @Override
-        public void onDeleteRepeatClicked() {
-            DialogFragmentUtils.showIfNotShowing(DeleteRepeatDialogFragment.class, getChildFragmentManager());
-        }
-    });
+    private FormHiearchyMenuProvider menuProvider;
     private FormEntryViewModel formEntryViewModel;
-    private TreeReference contextGroupRef;
-    private FormIndex screenIndex;
-    private FormIndex repeatGroupPickerIndex;
-    private FormIndex currentIndex;
-    private List<HierarchyItem> elementsToDisplay;
-    private FormIndex startIndex;
+    private FormHierarchyViewModel formHierarchyViewModel;
 
     public FormHierarchyFragment(boolean viewOnly, ViewModelProvider.Factory viewModelFactory, MenuHost menuHost) {
         super(R.layout.form_hierarchy_layout);
@@ -116,12 +75,59 @@ public void onAttach(@NonNull Context context) {
         super.onAttach(context);
 
         formEntryViewModel = new ViewModelProvider(requireActivity(), viewModelFactory).get(FormEntryViewModel.class);
+        formHierarchyViewModel = new ViewModelProvider(this, new ViewModelProvider.Factory() {
+            @NonNull
+            @Override
+            public <T extends ViewModel> T create(@NonNull Class<T> modelClass) {
+                return (T) new FormHierarchyViewModel();
+            }
+        }).get(FormHierarchyViewModel.class);
         requireActivity().setTitle(formEntryViewModel.getFormController().getFormTitle());
+
+        menuProvider = new FormHiearchyMenuProvider(formEntryViewModel, formHierarchyViewModel, viewOnly, new FormHiearchyMenuProvider.OnClickListener() {
+            @Override
+            public void onGoUpClicked() {
+                FormController formController = formEntryViewModel.getFormController();
+
+                // If `repeatGroupPickerIndex` is set it means we're currently displaying
+                // a list of repeat instances. If we unset `repeatGroupPickerIndex`,
+                // we will go back up to the previous screen.
+                if (formHierarchyViewModel.shouldShowRepeatGroupPicker()) {
+                    // Exit the picker.
+                    formHierarchyViewModel.setRepeatGroupPickerIndex(null);
+                } else {
+                    // Enter the picker if coming from a repeat group.
+                    FormIndex screenIndex = formHierarchyViewModel.getScreenIndex();
+                    int event = formController.getEvent(screenIndex);
+                    if (event == FormEntryController.EVENT_REPEAT || event == FormEntryController.EVENT_PROMPT_NEW_REPEAT) {
+                        formHierarchyViewModel.setRepeatGroupPickerIndex(screenIndex);
+                    }
+
+                    formController.stepToOuterScreenEvent();
+                }
+
+                refreshView(true);
+            }
+
+            @Override
+            public void onAddRepeatClicked() {
+                formEntryViewModel.getFormController().jumpToIndex(formHierarchyViewModel.getRepeatGroupPickerIndex());
+                formEntryViewModel.jumpToNewRepeat();
+                formEntryViewModel.addRepeat();
+
+                requireActivity().finish();
+            }
+
+            @Override
+            public void onDeleteRepeatClicked() {
+                DialogFragmentUtils.showIfNotShowing(DeleteRepeatDialogFragment.class, getChildFragmentManager());
+            }
+        });
     }
 
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        startIndex = formEntryViewModel.getFormController().getFormIndex();
+        formHierarchyViewModel.setStartIndex(formEntryViewModel.getFormController().getFormIndex());
 
         menuHost.addMenuProvider(menuProvider, getViewLifecycleOwner());
 
@@ -143,7 +149,9 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
                 int position = 0;
                 // Iterate over all the elements currently displayed looking for a match with the
                 // startIndex which can either represent a question or a field list.
+                List<HierarchyItem> elementsToDisplay = formHierarchyViewModel.getElementsToDisplay();
                 for (HierarchyItem hierarchyItem : elementsToDisplay) {
+                    FormIndex startIndex = formHierarchyViewModel.getStartIndex();
                     FormIndex indexToCheck = hierarchyItem.getFormIndex();
                     boolean indexIsInFieldList = formEntryViewModel.getFormController().indexIsInFieldList(startIndex);
                     if (startIndex.equals(indexToCheck)
@@ -177,15 +185,15 @@ private void refreshView(boolean isGoingUp) {
 
             // Save the current index so we can return to the problematic question
             // in the event of an error.
-            currentIndex = formController.getFormIndex();
+            formHierarchyViewModel.setCurrentIndex(formController.getFormIndex());
 
-            elementsToDisplay = new ArrayList<>();
+            ArrayList<HierarchyItem> elementsToDisplay = new ArrayList<>();
 
             jumpToHierarchyStartIndex();
 
             int event = formController.getEvent();
 
-            if (event == FormEntryController.EVENT_BEGINNING_OF_FORM && !shouldShowRepeatGroupPicker()) {
+            if (event == FormEntryController.EVENT_BEGINNING_OF_FORM && !formHierarchyViewModel.shouldShowRepeatGroupPicker()) {
                 // The beginning of form has no valid prompt to display.
                 groupIcon.setVisibility(View.GONE);
                 groupPathTextView.setVisibility(View.GONE);
@@ -194,7 +202,7 @@ private void refreshView(boolean isGoingUp) {
                 groupPathTextView.setVisibility(View.VISIBLE);
                 groupPathTextView.setText(getCurrentPath());
 
-                if (formController.indexContainsRepeatableGroup(screenIndex) || shouldShowRepeatGroupPicker()) {
+                if (formController.indexContainsRepeatableGroup(formHierarchyViewModel.getScreenIndex()) || formHierarchyViewModel.shouldShowRepeatGroupPicker()) {
                     groupIcon.setImageDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.ic_repeat));
                 } else {
                     groupIcon.setImageDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.ic_folder_open));
@@ -215,7 +223,7 @@ private void refreshView(boolean isGoingUp) {
                 TreeReference currentRef = formController.getFormIndex().getReference();
 
                 // retrieve the current group
-                TreeReference curGroup = (visibleGroupRef == null) ? contextGroupRef : visibleGroupRef;
+                TreeReference curGroup = (visibleGroupRef == null) ? formHierarchyViewModel.getContextGroupRef() : visibleGroupRef;
 
                 if (curGroup != null && !curGroup.isParentOf(currentRef, false)) {
                     // We have left the current group
@@ -239,7 +247,7 @@ private void refreshView(boolean isGoingUp) {
                 switch (event) {
                     case FormEntryController.EVENT_QUESTION: {
                         // Nothing but repeat group instances should show up in the picker.
-                        if (shouldShowRepeatGroupPicker()) {
+                        if (formHierarchyViewModel.shouldShowRepeatGroupPicker()) {
                             break;
                         }
 
@@ -261,7 +269,7 @@ private void refreshView(boolean isGoingUp) {
                             break;
                         }
                         // Nothing but repeat group instances should show up in the picker.
-                        if (shouldShowRepeatGroupPicker()) {
+                        if (formHierarchyViewModel.shouldShowRepeatGroupPicker()) {
                             break;
                         }
 
@@ -273,6 +281,7 @@ private void refreshView(boolean isGoingUp) {
                         }
 
                         // Don't render other groups' children.
+                        TreeReference contextGroupRef = formHierarchyViewModel.getContextGroupRef();
                         if (contextGroupRef != null && !contextGroupRef.isParentOf(currentRef, false)) {
                             break;
                         }
@@ -299,7 +308,7 @@ private void refreshView(boolean isGoingUp) {
                         break;
                     }
                     case FormEntryController.EVENT_REPEAT: {
-                        boolean forPicker = shouldShowRepeatGroupPicker();
+                        boolean forPicker = formHierarchyViewModel.shouldShowRepeatGroupPicker();
                         // Only break to exclude non-relevant repeat from picker
                         if (!formController.isGroupRelevant() && forPicker) {
                             break;
@@ -308,6 +317,7 @@ private void refreshView(boolean isGoingUp) {
                         visibleGroupRef = currentRef;
 
                         // Don't render other groups' children.
+                        TreeReference contextGroupRef = formHierarchyViewModel.getContextGroupRef();
                         if (contextGroupRef != null && !contextGroupRef.isParentOf(currentRef, false)) {
                             break;
                         }
@@ -316,7 +326,7 @@ private void refreshView(boolean isGoingUp) {
 
                         if (forPicker) {
                             // Don't render other groups' instances.
-                            String repeatGroupPickerRef = repeatGroupPickerIndex.getReference().toString(false);
+                            String repeatGroupPickerRef = formHierarchyViewModel.getRepeatGroupPickerIndex().getReference().toString(false);
                             if (!currentRef.toString(false).equals(repeatGroupPickerRef)) {
                                 break;
                             }
@@ -360,13 +370,14 @@ private void refreshView(boolean isGoingUp) {
                 event = formController.stepToNextEvent(JavaRosaFormController.STEP_INTO_GROUP);
             }
 
-            recyclerView.setAdapter(new HierarchyListAdapter(elementsToDisplay, this::onElementClick));
+            formHierarchyViewModel.setElementsToDisplay(elementsToDisplay);
+            recyclerView.setAdapter(new HierarchyListAdapter(formHierarchyViewModel.getElementsToDisplay(), this::onElementClick));
 
-            formController.jumpToIndex(currentIndex);
+            formController.jumpToIndex(formHierarchyViewModel.getCurrentIndex());
 
             // Prevent a redundant middle screen (common on many forms
             // that use presentation groups to display labels).
-            if (isDisplayingSingleGroup() && !screenIndex.isBeginningOfFormIndex()) {
+            if (isDisplayingSingleGroup() && !formHierarchyViewModel.getScreenIndex().isBeginningOfFormIndex()) {
                 if (isGoingUp) {
                     // Back out once more.
                     goUpLevel();
@@ -392,15 +403,15 @@ private void jumpToHierarchyStartIndex() {
 
         // If we're not at the first level, we're inside a repeated group so we want to only
         // display everything enclosed within that group.
-        contextGroupRef = null;
+        formHierarchyViewModel.setContextGroupRef(null);
 
         // Save the index to the screen itself, before potentially moving into it.
-        screenIndex = startIndex;
+        formHierarchyViewModel.setScreenIndex(startIndex);
 
         // If we're currently at a displayable group, record the name of the node and step to the next
         // node to display.
         if (formController.isDisplayableGroup(startIndex)) {
-            contextGroupRef = formController.getFormIndex().getReference();
+            formHierarchyViewModel.setContextGroupRef(formController.getFormIndex().getReference());
             formController.stepToNextEvent(JavaRosaFormController.STEP_INTO_GROUP);
         } else {
             FormIndex potentialStartIndex = getPreviousLevel(startIndex);
@@ -409,20 +420,20 @@ private void jumpToHierarchyStartIndex() {
                 potentialStartIndex = getPreviousLevel(potentialStartIndex);
             }
 
-            screenIndex = potentialStartIndex;
+            formHierarchyViewModel.setScreenIndex(potentialStartIndex);
 
             // Check to see if the question is at the first level of the hierarchy.
             // If it is, display the root level from the beginning.
             // Otherwise we're at a displayable group.
-            if (screenIndex == null) {
-                screenIndex = FormIndex.createBeginningOfFormIndex();
+            if (formHierarchyViewModel.getScreenIndex() == null) {
+                formHierarchyViewModel.setScreenIndex(FormIndex.createBeginningOfFormIndex());
             }
 
-            formController.jumpToIndex(screenIndex);
+            formController.jumpToIndex(formHierarchyViewModel.getScreenIndex());
 
             // Now test again. This should be true at this point or we're at the beginning.
             if (formController.isDisplayableGroup(formController.getFormIndex())) {
-                contextGroupRef = formController.getFormIndex().getReference();
+                formHierarchyViewModel.setContextGroupRef(formController.getFormIndex().getReference());
                 formController.stepToNextEvent(JavaRosaFormController.STEP_INTO_GROUP);
             } else {
                 // Let contextGroupRef be null.
@@ -445,10 +456,6 @@ private boolean isScreenEvent(FormController formController, FormIndex index) {
         return formController.isDisplayableGroup(index);
     }
 
-    private boolean shouldShowRepeatGroupPicker() {
-        return repeatGroupPickerIndex != null;
-    }
-
     /**
      * Navigates "up" in the form hierarchy.
      */
@@ -458,14 +465,14 @@ protected void goUpLevel() {
         // If `repeatGroupPickerIndex` is set it means we're currently displaying
         // a list of repeat instances. If we unset `repeatGroupPickerIndex`,
         // we will go back up to the previous screen.
-        if (shouldShowRepeatGroupPicker()) {
+        if (formHierarchyViewModel.shouldShowRepeatGroupPicker()) {
             // Exit the picker.
-            repeatGroupPickerIndex = null;
+            formHierarchyViewModel.setRepeatGroupPickerIndex(null);
         } else {
             // Enter the picker if coming from a repeat group.
-            int event = formController.getEvent(screenIndex);
+            int event = formController.getEvent(formHierarchyViewModel.getScreenIndex());
             if (event == FormEntryController.EVENT_REPEAT || event == FormEntryController.EVENT_PROMPT_NEW_REPEAT) {
-                repeatGroupPickerIndex = screenIndex;
+                formHierarchyViewModel.setRepeatGroupPickerIndex(formHierarchyViewModel.getScreenIndex());
             }
 
             formController.stepToOuterScreenEvent();
@@ -480,12 +487,12 @@ protected void goUpLevel() {
      */
     private CharSequence getCurrentPath() {
         FormController formController = formEntryViewModel.getFormController();
-        FormIndex index = screenIndex;
+        FormIndex index = formHierarchyViewModel.getScreenIndex();
 
         List<FormEntryCaption> groups = new ArrayList<>();
 
-        if (shouldShowRepeatGroupPicker()) {
-            groups.add(formController.getCaptionPrompt(repeatGroupPickerIndex));
+        if (formHierarchyViewModel.shouldShowRepeatGroupPicker()) {
+            groups.add(formController.getCaptionPrompt(formHierarchyViewModel.getRepeatGroupPickerIndex()));
         }
 
         while (index != null) {
@@ -494,7 +501,7 @@ private CharSequence getCurrentPath() {
         }
 
         // If the repeat picker is showing, don't show an item number for the current index.
-        boolean hideLastMultiplicity = shouldShowRepeatGroupPicker();
+        boolean hideLastMultiplicity = formHierarchyViewModel.shouldShowRepeatGroupPicker();
 
         return ODKView.getGroupsPath(groups.toArray(new FormEntryCaption[0]), hideLastMultiplicity);
     }
@@ -511,13 +518,13 @@ private void onElementClick(HierarchyItem item) {
                 break;
             case REPEATABLE_GROUP:
                 // Show the picker.
-                repeatGroupPickerIndex = index;
+                formHierarchyViewModel.setRepeatGroupPickerIndex(index);
                 refreshView();
                 break;
             case VISIBLE_GROUP:
             case REPEAT_INSTANCE:
                 // Hide the picker.
-                repeatGroupPickerIndex = null;
+                formHierarchyViewModel.setRepeatGroupPickerIndex(null);
                 formEntryViewModel.getFormController().jumpToIndex(index);
                 requireActivity().setResult(RESULT_OK);
                 refreshView();
@@ -562,7 +569,7 @@ public void onClick(DialogInterface dialog, int i) {
                 switch (i) {
                     case DialogInterface.BUTTON_POSITIVE:
                         FormController formController = formEntryViewModel.getFormController();
-                        formController.jumpToIndex(currentIndex);
+                        formController.jumpToIndex(formHierarchyViewModel.getCurrentIndex());
                         break;
                 }
             }
@@ -577,8 +584,8 @@ public void onClick(DialogInterface dialog, int i) {
      * Groups like this are often used to display a label in the hierarchy path.
      */
     private boolean isDisplayingSingleGroup() {
-        return elementsToDisplay.size() == 1
-                && elementsToDisplay.get(0).getHierarchyItemType() == HierarchyItemType.VISIBLE_GROUP;
+        return formHierarchyViewModel.getElementsToDisplay().size() == 1
+                && formHierarchyViewModel.getElementsToDisplay().get(0).getHierarchyItemType() == HierarchyItemType.VISIBLE_GROUP;
     }
 
     private void configureButtons(FormHierarchyLayoutBinding binding, FormController formController) {
@@ -668,11 +675,17 @@ private void goToPreviousEvent() {
         refreshView();
     }
 
-    private class FormHiearchyMenuProvider implements MenuProvider {
+    private static class FormHiearchyMenuProvider implements MenuProvider {
 
+        private final FormEntryViewModel formEntryViewModel;
+        private final FormHierarchyViewModel formHierarchyViewModel;
+        private final boolean viewOnly;
         private final OnClickListener onClickListener;
 
-        FormHiearchyMenuProvider(OnClickListener goUpClicked) {
+        FormHiearchyMenuProvider(FormEntryViewModel formEntryViewModel, FormHierarchyViewModel formHierarchyViewModel, boolean viewOnly, OnClickListener goUpClicked) {
+            this.formEntryViewModel = formEntryViewModel;
+            this.formHierarchyViewModel = formHierarchyViewModel;
+            this.viewOnly = viewOnly;
             this.onClickListener = goUpClicked;
         }
 
@@ -683,11 +696,12 @@ public void onCreateMenu(@NonNull Menu menu, @NonNull MenuInflater menuInflater)
 
         @Override
         public void onPrepareMenu(@NonNull Menu menu) {
-            boolean isAtBeginning = screenIndex.isBeginningOfFormIndex() && !shouldShowRepeatGroupPicker();
-            boolean shouldShowPicker = shouldShowRepeatGroupPicker();
+            FormIndex screenIndex = formHierarchyViewModel.getScreenIndex();
+            boolean isAtBeginning = screenIndex.isBeginningOfFormIndex() && !formHierarchyViewModel.shouldShowRepeatGroupPicker();
+            boolean shouldShowPicker = formHierarchyViewModel.shouldShowRepeatGroupPicker();
             boolean isInRepeat = formEntryViewModel.getFormController().indexContainsRepeatableGroup(screenIndex);
             boolean isGroupSizeLocked = shouldShowPicker
-                    ? isGroupSizeLocked(repeatGroupPickerIndex) : isGroupSizeLocked(screenIndex);
+                    ? isGroupSizeLocked(formHierarchyViewModel.getRepeatGroupPickerIndex()) : isGroupSizeLocked(screenIndex);
 
             menu.findItem(R.id.menu_add_repeat).setVisible(shouldShowPicker && !isGroupSizeLocked && !viewOnly);
             menu.findItem(R.id.menu_delete_child).setVisible(isInRepeat && !shouldShowPicker && !isGroupSizeLocked && !viewOnly);
@@ -724,6 +738,67 @@ interface OnClickListener {
             void onDeleteRepeatClicked();
         }
     }
+
+    private static class FormHierarchyViewModel extends ViewModel {
+        private TreeReference contextGroupRef;
+        private FormIndex screenIndex;
+        private FormIndex repeatGroupPickerIndex;
+        private FormIndex currentIndex;
+        private List<HierarchyItem> elementsToDisplay;
+        private FormIndex startIndex;
+
+        public TreeReference getContextGroupRef() {
+            return contextGroupRef;
+        }
+
+        public void setContextGroupRef(TreeReference contextGroupRef) {
+            this.contextGroupRef = contextGroupRef;
+        }
+
+        public FormIndex getScreenIndex() {
+            return screenIndex;
+        }
+
+        public void setScreenIndex(FormIndex screenIndex) {
+            this.screenIndex = screenIndex;
+        }
+
+        public FormIndex getRepeatGroupPickerIndex() {
+            return repeatGroupPickerIndex;
+        }
+
+        public void setRepeatGroupPickerIndex(FormIndex repeatGroupPickerIndex) {
+            this.repeatGroupPickerIndex = repeatGroupPickerIndex;
+        }
+
+        public FormIndex getCurrentIndex() {
+            return currentIndex;
+        }
+
+        public void setCurrentIndex(FormIndex currentIndex) {
+            this.currentIndex = currentIndex;
+        }
+
+        public List<HierarchyItem> getElementsToDisplay() {
+            return elementsToDisplay;
+        }
+
+        public void setElementsToDisplay(List<HierarchyItem> elementsToDisplay) {
+            this.elementsToDisplay = elementsToDisplay;
+        }
+
+        public FormIndex getStartIndex() {
+            return startIndex;
+        }
+
+        public void setStartIndex(FormIndex startIndex) {
+            this.startIndex = startIndex;
+        }
+
+        public boolean shouldShowRepeatGroupPicker() {
+            return repeatGroupPickerIndex != null;
+        }
+    }
 }
 
 

From c8c10edbd92f0e715529329af2bc2207c9e070db Mon Sep 17 00:00:00 2001
From: Callum Stott <callum@seadowg.com>
Date: Fri, 22 Nov 2024 15:40:38 +0000
Subject: [PATCH 08/18] Update test target

---
 .../formhierarchy/FormHierarchyFragmentHostActivity.kt | 10 ++++++++++
 ...est.kt => FormHierarchyFragmentHostActivityTest.kt} |  5 +++--
 2 files changed, 13 insertions(+), 2 deletions(-)
 rename collect_app/src/test/java/org/odk/collect/android/activities/{FormHierarchyActivityTest.kt => FormHierarchyFragmentHostActivityTest.kt} (84%)

diff --git a/collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyFragmentHostActivity.kt b/collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyFragmentHostActivity.kt
index 3304d1e6691..d40d6e8d067 100644
--- a/collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyFragmentHostActivity.kt
+++ b/collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyFragmentHostActivity.kt
@@ -1,10 +1,12 @@
 package org.odk.collect.android.formhierarchy
 
 import android.os.Bundle
+import androidx.lifecycle.ViewModelProvider
 import org.odk.collect.analytics.Analytics
 import org.odk.collect.android.R
 import org.odk.collect.android.activities.FormEntryViewModelFactory
 import org.odk.collect.android.entities.EntitiesRepositoryProvider
+import org.odk.collect.android.formentry.FormEntryViewModel
 import org.odk.collect.android.formentry.FormSessionRepository
 import org.odk.collect.android.formentry.repeats.DeleteRepeatDialogFragment
 import org.odk.collect.android.injection.DaggerUtils
@@ -123,6 +125,14 @@ class FormHierarchyFragmentHostActivity : LocalizedActivity() {
             .build()
 
         super.onCreate(savedInstanceState)
+
+        val formEntryViewModel =
+            ViewModelProvider(this, viewModelFactory)[FormEntryViewModel::class.java]
+        if (formEntryViewModel.formController == null) {
+            finish()
+            return
+        }
+
         setContentView(R.layout.hierarchy_host_layout)
         setSupportActionBar(findViewById(org.odk.collect.androidshared.R.id.toolbar))
     }
diff --git a/collect_app/src/test/java/org/odk/collect/android/activities/FormHierarchyActivityTest.kt b/collect_app/src/test/java/org/odk/collect/android/activities/FormHierarchyFragmentHostActivityTest.kt
similarity index 84%
rename from collect_app/src/test/java/org/odk/collect/android/activities/FormHierarchyActivityTest.kt
rename to collect_app/src/test/java/org/odk/collect/android/activities/FormHierarchyFragmentHostActivityTest.kt
index f3043d16f02..9a605703605 100644
--- a/collect_app/src/test/java/org/odk/collect/android/activities/FormHierarchyActivityTest.kt
+++ b/collect_app/src/test/java/org/odk/collect/android/activities/FormHierarchyFragmentHostActivityTest.kt
@@ -12,10 +12,11 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.odk.collect.android.formhierarchy.FormHierarchyActivity
+import org.odk.collect.android.formhierarchy.FormHierarchyFragmentHostActivity
 import org.odk.collect.android.support.CollectHelpers
 
 @RunWith(AndroidJUnit4::class)
-class FormHierarchyActivityTest {
+class FormHierarchyFragmentHostActivityTest {
 
     @Before
     fun setup() {
@@ -28,7 +29,7 @@ class FormHierarchyActivityTest {
     @Test
     fun whenFormHasNotLoadedYet_finishes() {
         val context = ApplicationProvider.getApplicationContext<Context>()
-        val intent = Intent(context, FormHierarchyActivity::class.java).also {
+        val intent = Intent(context, FormHierarchyFragmentHostActivity::class.java).also {
             it.putExtra(FormHierarchyActivity.EXTRA_SESSION_ID, "blah")
         }
 

From 3a9bc6f02a6342ca48817659322a6d45dc21de59 Mon Sep 17 00:00:00 2001
From: Callum Stott <callum@seadowg.com>
Date: Fri, 22 Nov 2024 15:53:06 +0000
Subject: [PATCH 09/18] Delete FormHierarchyActivity

---
 .../activities/FormFillingActivity.java       |   9 +-
 .../formentry/FormEntryMenuProvider.kt        |   3 +-
 .../formhierarchy/FormHierarchyActivity.java  | 968 ------------------
 .../FormHierarchyFragmentHostActivity.kt      |   9 +-
 .../config/AppDependencyComponent.java        |   3 -
 .../FormHierarchyFragmentHostActivityTest.kt  |   5 +-
 6 files changed, 14 insertions(+), 983 deletions(-)
 delete mode 100644 collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyActivity.java

diff --git a/collect_app/src/main/java/org/odk/collect/android/activities/FormFillingActivity.java b/collect_app/src/main/java/org/odk/collect/android/activities/FormFillingActivity.java
index 7736fef2bfc..2ac195d7f8d 100644
--- a/collect_app/src/main/java/org/odk/collect/android/activities/FormFillingActivity.java
+++ b/collect_app/src/main/java/org/odk/collect/android/activities/FormFillingActivity.java
@@ -124,7 +124,6 @@
 import org.odk.collect.android.formentry.saving.SaveAnswerFileErrorDialogFragment;
 import org.odk.collect.android.formentry.saving.SaveAnswerFileProgressDialogFragment;
 import org.odk.collect.android.formentry.saving.SaveFormProgressDialogFragment;
-import org.odk.collect.android.formhierarchy.FormHierarchyActivity;
 import org.odk.collect.android.formhierarchy.FormHierarchyFragmentHostActivity;
 import org.odk.collect.android.fragments.MediaLoadingFragment;
 import org.odk.collect.android.fragments.dialogs.LocationProvidersDisabledDialog;
@@ -1899,7 +1898,7 @@ public void onAnimationStart(Animation animation) {
 
     /**
      * Given a {@link FormLoaderTask} which has created a {@link FormController} for either a new or
-     * existing instance, shows that instance to the user. Either launches {@link FormHierarchyActivity}
+     * existing instance, shows that instance to the user. Either launches {@link FormHierarchyFragmentHostActivity}
      * if an existing instance is being edited or builds the view for the current question(s) if a
      * new instance is being created.
      * <p>
@@ -2031,7 +2030,7 @@ && new PlayServicesChecker().isGooglePlayServicesAvailable(this)) {
                                 formController.getAuditEventLogger().logEvent(AuditEvent.AuditEventType.HIERARCHY, true, System.currentTimeMillis());
                                 formControllerAvailable(formController, form, instance);
                                 Intent intent = new Intent(this, FormHierarchyFragmentHostActivity.class);
-                                intent.putExtra(FormHierarchyActivity.EXTRA_SESSION_ID, sessionId);
+                                intent.putExtra(FormHierarchyFragmentHostActivity.EXTRA_SESSION_ID, sessionId);
                                 startActivityForResult(intent, RequestCodes.HIERARCHY_ACTIVITY);
                             }
                         }
@@ -2040,8 +2039,8 @@ && new PlayServicesChecker().isGooglePlayServicesAvailable(this)) {
                     formControllerAvailable(formController, form, instance);
                     if (ApplicationConstants.FormModes.VIEW_SENT.equalsIgnoreCase(formMode)) {
                         Intent intent = new Intent(this, FormHierarchyFragmentHostActivity.class);
-                        intent.putExtra(FormHierarchyActivity.EXTRA_SESSION_ID, sessionId);
-                        intent.putExtra(FormHierarchyActivity.EXTRA_VIEW_ONLY, true);
+                        intent.putExtra(FormHierarchyFragmentHostActivity.EXTRA_SESSION_ID, sessionId);
+                        intent.putExtra(FormHierarchyFragmentHostActivity.EXTRA_VIEW_ONLY, true);
                         startActivity(intent);
                     }
 
diff --git a/collect_app/src/main/java/org/odk/collect/android/formentry/FormEntryMenuProvider.kt b/collect_app/src/main/java/org/odk/collect/android/formentry/FormEntryMenuProvider.kt
index 3d5d3eb5968..a8ffd4f9853 100644
--- a/collect_app/src/main/java/org/odk/collect/android/formentry/FormEntryMenuProvider.kt
+++ b/collect_app/src/main/java/org/odk/collect/android/formentry/FormEntryMenuProvider.kt
@@ -12,7 +12,6 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.odk.collect.android.R
 import org.odk.collect.android.formentry.backgroundlocation.BackgroundLocationViewModel
 import org.odk.collect.android.formentry.questions.AnswersProvider
-import org.odk.collect.android.formhierarchy.FormHierarchyActivity
 import org.odk.collect.android.formhierarchy.FormHierarchyFragmentHostActivity
 import org.odk.collect.android.preferences.screens.ProjectPreferencesActivity
 import org.odk.collect.android.utilities.ApplicationConstants
@@ -128,7 +127,7 @@ class FormEntryMenuProvider(
                     formEntryViewModel.updateAnswersForScreen(answersProvider.answers, false)
                     formEntryViewModel.openHierarchy()
                     val i = Intent(activity, FormHierarchyFragmentHostActivity::class.java)
-                    i.putExtra(FormHierarchyActivity.EXTRA_SESSION_ID, formEntryViewModel.sessionId)
+                    i.putExtra(FormHierarchyFragmentHostActivity.EXTRA_SESSION_ID, formEntryViewModel.sessionId)
                     activity.startActivityForResult(i, ApplicationConstants.RequestCodes.HIERARCHY_ACTIVITY)
                 }
                 true
diff --git a/collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyActivity.java b/collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyActivity.java
deleted file mode 100644
index b595a78a56d..00000000000
--- a/collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyActivity.java
+++ /dev/null
@@ -1,968 +0,0 @@
-/*
- * Copyright (C) 2009 University of Washington
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package org.odk.collect.android.formhierarchy;
-
-import static org.odk.collect.android.javarosawrapper.FormIndexUtils.getPreviousLevel;
-
-import android.content.DialogInterface;
-import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import androidx.activity.OnBackPressedCallback;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.widget.Toolbar;
-import androidx.core.content.ContextCompat;
-import androidx.lifecycle.ViewModelProvider;
-import androidx.recyclerview.widget.DividerItemDecoration;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-
-import org.javarosa.core.model.FormIndex;
-import org.javarosa.core.model.GroupDef;
-import org.javarosa.core.model.IFormElement;
-import org.javarosa.core.model.instance.TreeReference;
-import org.javarosa.form.api.FormEntryCaption;
-import org.javarosa.form.api.FormEntryController;
-import org.javarosa.form.api.FormEntryModel;
-import org.javarosa.form.api.FormEntryPrompt;
-import org.odk.collect.analytics.Analytics;
-import org.odk.collect.android.R;
-import org.odk.collect.android.activities.FormEntryViewModelFactory;
-import org.odk.collect.android.entities.EntitiesRepositoryProvider;
-import org.odk.collect.android.exception.JavaRosaException;
-import org.odk.collect.android.formentry.FormEntryViewModel;
-import org.odk.collect.android.formentry.FormSessionRepository;
-import org.odk.collect.android.formentry.ODKView;
-import org.odk.collect.android.formentry.repeats.DeleteRepeatDialogFragment;
-import org.odk.collect.android.injection.DaggerUtils;
-import org.odk.collect.android.instancemanagement.InstancesDataService;
-import org.odk.collect.android.instancemanagement.autosend.AutoSendSettingsProvider;
-import org.odk.collect.android.javarosawrapper.FormController;
-import org.odk.collect.android.javarosawrapper.JavaRosaFormController;
-import org.odk.collect.android.projects.ProjectsDataService;
-import org.odk.collect.android.utilities.ApplicationConstants;
-import org.odk.collect.android.utilities.ChangeLockProvider;
-import org.odk.collect.android.utilities.CollectStrictMode;
-import org.odk.collect.android.utilities.FormEntryPromptUtils;
-import org.odk.collect.android.utilities.FormsRepositoryProvider;
-import org.odk.collect.android.utilities.HtmlUtils;
-import org.odk.collect.android.utilities.InstancesRepositoryProvider;
-import org.odk.collect.android.utilities.MediaUtils;
-import org.odk.collect.android.utilities.SavepointsRepositoryProvider;
-import org.odk.collect.androidshared.ui.DialogFragmentUtils;
-import org.odk.collect.androidshared.ui.FragmentFactoryBuilder;
-import org.odk.collect.androidshared.ui.multiclicksafe.MultiClickGuard;
-import org.odk.collect.async.Scheduler;
-import org.odk.collect.audiorecorder.recording.AudioRecorder;
-import org.odk.collect.lists.EmptyListView;
-import org.odk.collect.location.LocationClient;
-import org.odk.collect.permissions.PermissionsChecker;
-import org.odk.collect.permissions.PermissionsProvider;
-import org.odk.collect.printer.HtmlPrinter;
-import org.odk.collect.qrcode.QRCodeCreatorImpl;
-import org.odk.collect.settings.SettingsProvider;
-import org.odk.collect.strings.localization.LocalizedActivity;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import timber.log.Timber;
-
-public class FormHierarchyActivity extends LocalizedActivity implements DeleteRepeatDialogFragment.DeleteRepeatDialogCallback {
-
-    public static final int RESULT_ADD_REPEAT = 2;
-    public static final String EXTRA_SESSION_ID = "session_id";
-    public static final String EXTRA_VIEW_ONLY = "view_only";
-    /**
-     * The questions and repeats at the current level.
-     * Recreated every time {@link #refreshView()} is called.
-     */
-    private List<HierarchyItem> elementsToDisplay;
-
-    /**
-     * The icon shown at the top of a hierarchy screen for groups of questions.
-     */
-    private ImageView groupIcon;
-
-    /**
-     * The label shown at the top of a hierarchy screen for groups of questions. Set by
-     * {@link #getCurrentPath()}.
-     */
-    private TextView groupPathTextView;
-
-    /**
-     * A ref to the current context group.
-     * Useful to make sure we only render items inside of the group.
-     */
-    private TreeReference contextGroupRef;
-
-    /**
-     * If this index is non-null, we will render an intermediary "picker" view
-     * showing the instances of the given repeat group.
-     */
-    private FormIndex repeatGroupPickerIndex;
-    private static final String REPEAT_GROUP_PICKER_INDEX_KEY = "REPEAT_GROUP_PICKER_INDEX_KEY";
-
-    /**
-     * The index of the question or the field list the FormController was set to when the hierarchy
-     * was accessed. Used to jump the user back to where they were if applicable.
-     */
-    private FormIndex startIndex;
-
-    /**
-     * The index of the question that is being displayed in the hierarchy. On first launch, it is
-     * the same as {@link #startIndex}. It can then become the index of a repeat instance.
-     */
-    private FormIndex currentIndex;
-
-    /**
-     * The index of the screen that is being displayed in the hierarchy
-     * (either the root of the form or a repeat group).
-     */
-    private FormIndex screenIndex;
-
-    /**
-     * The toolbar menu.
-     */
-    private Menu optionsMenu;
-
-    protected Button jumpBeginningButton;
-    protected Button jumpEndButton;
-    protected RecyclerView recyclerView;
-
-    private FormEntryViewModel formEntryViewModel;
-
-    @Inject
-    Scheduler scheduler;
-
-    @Inject
-    FormSessionRepository formSessionRepository;
-
-    @Inject
-    MediaUtils mediaUtils;
-
-    @Inject
-    Analytics analytics;
-
-    @Inject
-    AudioRecorder audioRecorder;
-
-    @Inject
-    ProjectsDataService projectsDataService;
-
-    @Inject
-    EntitiesRepositoryProvider entitiesRepositoryProvider;
-
-    @Inject
-    PermissionsChecker permissionsChecker;
-
-    @Inject
-    LocationClient fusedLocationClient;
-
-    @Inject
-    SettingsProvider settingsProvider;
-
-    @Inject
-    PermissionsProvider permissionsProvider;
-
-    @Inject
-    public AutoSendSettingsProvider autoSendSettingsProvider;
-
-    @Inject
-    public InstancesRepositoryProvider instancesRepositoryProvider;
-
-    @Inject
-    public FormsRepositoryProvider formsRepositoryProvider;
-
-    @Inject
-    public SavepointsRepositoryProvider savepointsRepositoryProvider;
-
-    @Inject
-    public InstancesDataService instancesDataService;
-
-    @Inject
-    public ChangeLockProvider changeLockProvider;
-
-    protected final OnBackPressedCallback onBackPressedCallback = new OnBackPressedCallback(true) {
-        @Override
-        public void handleOnBackPressed() {
-            FormController formController = formEntryViewModel.getFormController();
-            if (formController != null) {
-                formController.getAuditEventLogger().flush();
-                navigateToTheLastRelevantIndex(formController);
-            }
-            finish();
-        }
-    };
-    private boolean viewOnly;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        CollectStrictMode.disable();
-
-        DaggerUtils.getComponent(this).inject(this);
-
-        viewOnly = getIntent().getBooleanExtra(EXTRA_VIEW_ONLY, false);
-        String sessionId = getIntent().getStringExtra(EXTRA_SESSION_ID);
-        FormEntryViewModelFactory viewModelFactory = new FormEntryViewModelFactory(this,
-                ApplicationConstants.FormModes.EDIT_SAVED,
-                sessionId,
-                scheduler,
-                formSessionRepository,
-                mediaUtils,
-                audioRecorder,
-                projectsDataService,
-                entitiesRepositoryProvider,
-                settingsProvider,
-                permissionsChecker,
-                fusedLocationClient,
-                permissionsProvider,
-                autoSendSettingsProvider,
-                formsRepositoryProvider,
-                instancesRepositoryProvider,
-                savepointsRepositoryProvider,
-                new QRCodeCreatorImpl(),
-                new HtmlPrinter(),
-                instancesDataService,
-                changeLockProvider
-        );
-
-        this.getSupportFragmentManager().setFragmentFactory(new FragmentFactoryBuilder()
-                .forClass(DeleteRepeatDialogFragment.class, () -> new DeleteRepeatDialogFragment(viewModelFactory))
-                .build());
-
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.hierarchy_layout);
-
-        recyclerView = findViewById(R.id.list);
-        recyclerView.setHasFixedSize(true);
-        recyclerView.setLayoutManager(new LinearLayoutManager(this));
-        recyclerView.addItemDecoration(new DividerItemDecoration(this, DividerItemDecoration.VERTICAL));
-
-        EmptyListView emptyView = findViewById(android.R.id.empty);
-        Toolbar toolbar = findViewById(org.odk.collect.androidshared.R.id.toolbar);
-        setSupportActionBar(toolbar);
-
-        formEntryViewModel = new ViewModelProvider(this, viewModelFactory).get(FormEntryViewModel.class);
-
-        FormController formController = formEntryViewModel.getFormController();
-        if (formController == null) {
-            finish();
-            return;
-        }
-
-        startIndex = formController.getFormIndex();
-
-        setTitle(formController.getFormTitle());
-
-        groupIcon = findViewById(R.id.group_icon);
-        groupPathTextView = findViewById(R.id.pathtext);
-
-        jumpBeginningButton = findViewById(R.id.jumpBeginningButton);
-        jumpEndButton = findViewById(R.id.jumpEndButton);
-
-        configureButtons(formController);
-
-        restoreInstanceState(savedInstanceState);
-
-        refreshView();
-
-        // Scroll to the last question the user was looking at
-        // TODO: avoid another iteration through all displayed elements
-        if (recyclerView != null && recyclerView.getAdapter() != null && recyclerView.getAdapter().getItemCount() > 0) {
-            emptyView.setVisibility(View.GONE);
-            recyclerView.post(() -> {
-                int position = 0;
-                // Iterate over all the elements currently displayed looking for a match with the
-                // startIndex which can either represent a question or a field list.
-                for (HierarchyItem hierarchyItem : elementsToDisplay) {
-                    FormIndex indexToCheck = hierarchyItem.getFormIndex();
-                    if (startIndex.equals(indexToCheck)
-                            || (formController.indexIsInFieldList(startIndex) && indexToCheck.toString().startsWith(startIndex.toString()))) {
-                        position = elementsToDisplay.indexOf(hierarchyItem);
-                        break;
-                    }
-                }
-                ((LinearLayoutManager) recyclerView.getLayoutManager()).scrollToPositionWithOffset(position, 0);
-            });
-        }
-
-        if (viewOnly) {
-            getOnBackPressedDispatcher().addCallback(new OnBackPressedCallback(true) {
-                @Override
-                public void handleOnBackPressed() {
-                    setResult(RESULT_OK);
-                    finish();
-                    formSessionRepository.clear(getIntent().getStringExtra(EXTRA_SESSION_ID));
-                }
-            });
-        } else {
-            getOnBackPressedDispatcher().addCallback(onBackPressedCallback);
-        }
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        outState.putSerializable(REPEAT_GROUP_PICKER_INDEX_KEY, repeatGroupPickerIndex);
-        super.onSaveInstanceState(outState);
-    }
-
-    private void restoreInstanceState(Bundle state) {
-        if (state != null) {
-            repeatGroupPickerIndex = (FormIndex) state.getSerializable(REPEAT_GROUP_PICKER_INDEX_KEY);
-        }
-    }
-
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.form_hierarchy_menu, menu);
-        return super.onCreateOptionsMenu(menu);
-    }
-
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        super.onPrepareOptionsMenu(menu);
-
-        optionsMenu = menu;
-        updateOptionsMenu();
-
-        return true;
-    }
-
-    private void updateOptionsMenu() {
-        FormController formController = formEntryViewModel.getFormController();
-
-        // Not ready yet. Menu will be updated automatically once it's been prepared.
-        if (optionsMenu == null || formController == null) {
-            return;
-        }
-
-        boolean isAtBeginning = screenIndex.isBeginningOfFormIndex() && !shouldShowRepeatGroupPicker();
-        boolean shouldShowPicker = shouldShowRepeatGroupPicker();
-        boolean isInRepeat = formController.indexContainsRepeatableGroup(screenIndex);
-        boolean isGroupSizeLocked = shouldShowPicker
-                ? isGroupSizeLocked(repeatGroupPickerIndex) : isGroupSizeLocked(screenIndex);
-
-        boolean shouldShowDelete = isInRepeat && !shouldShowPicker && !isGroupSizeLocked && !viewOnly;
-        showDeleteButton(shouldShowDelete);
-
-        boolean shouldShowAdd = shouldShowPicker && !isGroupSizeLocked && !viewOnly;
-        showAddButton(shouldShowAdd);
-
-        boolean shouldShowGoUp = !isAtBeginning;
-        showGoUpButton(shouldShowGoUp);
-    }
-
-    /**
-     * Returns true if the current index is a group that's designated as `noAddRemove`
-     * (e.g. if `jr:count` is explicitly set).
-     */
-    private boolean isGroupSizeLocked(FormIndex index) {
-        FormController formController = formEntryViewModel.getFormController();
-        IFormElement element = formController.getCaptionPrompt(index).getFormElement();
-        return element instanceof GroupDef && ((GroupDef) element).noAddRemove;
-    }
-
-    /**
-     * Override to disable this button.
-     */
-    protected void showDeleteButton(boolean shouldShow) {
-        optionsMenu.findItem(R.id.menu_delete_child).setVisible(shouldShow);
-    }
-
-    /**
-     * Override to disable this button.
-     */
-    protected void showAddButton(boolean shouldShow) {
-        optionsMenu.findItem(R.id.menu_add_repeat).setVisible(shouldShow);
-    }
-
-    /**
-     * Override to disable this button.
-     */
-    protected void showGoUpButton(boolean shouldShow) {
-        optionsMenu.findItem(R.id.menu_go_up).setVisible(shouldShow);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (!MultiClickGuard.allowClickFast(item.toString())) {
-            return true;
-        }
-
-        if (item.getItemId() == R.id.menu_delete_child) {
-            DialogFragmentUtils.showIfNotShowing(DeleteRepeatDialogFragment.class, getSupportFragmentManager());
-            return true;
-        } else if (item.getItemId() == R.id.menu_add_repeat) {
-            formEntryViewModel.getFormController().jumpToIndex(repeatGroupPickerIndex);
-            formEntryViewModel.jumpToNewRepeat();
-            formEntryViewModel.addRepeat();
-
-            finish();
-            return true;
-        } else if (item.getItemId() == R.id.menu_go_up) {
-            goUpLevel();
-            return true;
-        } else {
-            return super.onOptionsItemSelected(item);
-        }
-    }
-
-    /**
-     * Configure the navigation buttons at the bottom of the screen.
-     */
-    void configureButtons(FormController formController) {
-        if (viewOnly) {
-            Button exitButton = findViewById(R.id.exitButton);
-            exitButton.setOnClickListener(v -> getOnBackPressedDispatcher().onBackPressed());
-            exitButton.setVisibility(View.VISIBLE);
-            jumpBeginningButton.setVisibility(View.GONE);
-            jumpEndButton.setVisibility(View.GONE);
-        } else {
-            jumpBeginningButton.setOnClickListener(v -> {
-                formController.getAuditEventLogger().flush();
-                formController.jumpToIndex(FormIndex.createBeginningOfFormIndex());
-
-                setResult(RESULT_OK);
-                finish();
-            });
-
-            jumpEndButton.setOnClickListener(v -> {
-                formController.getAuditEventLogger().flush();
-                formController.jumpToIndex(FormIndex.createEndOfFormIndex());
-
-                setResult(RESULT_OK);
-                finish();
-            });
-        }
-
-    }
-
-    /**
-     * After having deleted the current index,
-     * returns true if the current index was the only item in the repeat group.
-     */
-    private boolean didDeleteLastRepeatItem() {
-        FormController formController = formEntryViewModel.getFormController();
-        FormIndex index = formController.getFormIndex();
-        int event = formController.getEvent(index);
-
-        // If we're on item 0, but we will be prompted to add another item next,
-        // it must be the last remaining item.
-        return event == FormEntryController.EVENT_PROMPT_NEW_REPEAT
-                && index.getElementMultiplicity() == 0;
-    }
-
-    private boolean didDeleteFirstRepeatItem() {
-        return formEntryViewModel
-                .getFormController()
-                .getFormIndex()
-                .getElementMultiplicity() == 0;
-    }
-
-    /**
-     * Similar to {@link #goUpLevel}, but makes a less significant step backward.
-     * This is only used when the caller knows where to go back to,
-     * e.g. after deleting the final remaining item in a repeat group.
-     */
-    private void goToPreviousEvent() {
-        FormController formController = formEntryViewModel.getFormController();
-        try {
-            formController.stepToPreviousScreenEvent();
-        } catch (JavaRosaException e) {
-            Timber.d(e);
-            createErrorDialog(e.getCause().getMessage());
-            return;
-        }
-
-        refreshView();
-    }
-
-    /**
-     * Navigates "up" in the form hierarchy.
-     */
-    protected void goUpLevel() {
-        FormController formController = formEntryViewModel.getFormController();
-
-        // If `repeatGroupPickerIndex` is set it means we're currently displaying
-        // a list of repeat instances. If we unset `repeatGroupPickerIndex`,
-        // we will go back up to the previous screen.
-        if (shouldShowRepeatGroupPicker()) {
-            // Exit the picker.
-            repeatGroupPickerIndex = null;
-        } else {
-            // Enter the picker if coming from a repeat group.
-            int event = formController.getEvent(screenIndex);
-            if (event == FormEntryController.EVENT_REPEAT || event == FormEntryController.EVENT_PROMPT_NEW_REPEAT) {
-                repeatGroupPickerIndex = screenIndex;
-            }
-
-            formController.stepToOuterScreenEvent();
-        }
-
-        refreshView(true);
-    }
-
-    /**
-     * Returns a string representing the 'path' of the current screen.
-     * Each level is separated by `>`.
-     */
-    private CharSequence getCurrentPath() {
-        FormController formController = formEntryViewModel.getFormController();
-        FormIndex index = screenIndex;
-
-        List<FormEntryCaption> groups = new ArrayList<>();
-
-        if (shouldShowRepeatGroupPicker()) {
-            groups.add(formController.getCaptionPrompt(repeatGroupPickerIndex));
-        }
-
-        while (index != null) {
-            groups.add(0, formController.getCaptionPrompt(index));
-            index = getPreviousLevel(index);
-        }
-
-        // If the repeat picker is showing, don't show an item number for the current index.
-        boolean hideLastMultiplicity = shouldShowRepeatGroupPicker();
-
-        return ODKView.getGroupsPath(groups.toArray(new FormEntryCaption[0]), hideLastMultiplicity);
-    }
-
-    /**
-     * Goes to the start of the hierarchy view based on where the user came from.
-     * Backs out until the index is at the beginning of a repeat group or the beginning of the form.
-     */
-    private void jumpToHierarchyStartIndex() {
-        FormController formController = formEntryViewModel.getFormController();
-        FormIndex startIndex = formController.getFormIndex();
-
-        // If we're not at the first level, we're inside a repeated group so we want to only
-        // display everything enclosed within that group.
-        contextGroupRef = null;
-
-        // Save the index to the screen itself, before potentially moving into it.
-        screenIndex = startIndex;
-
-        // If we're currently at a displayable group, record the name of the node and step to the next
-        // node to display.
-        if (formController.isDisplayableGroup(startIndex)) {
-            contextGroupRef = formController.getFormIndex().getReference();
-            formController.stepToNextEvent(JavaRosaFormController.STEP_INTO_GROUP);
-        } else {
-            FormIndex potentialStartIndex = getPreviousLevel(startIndex);
-            // Step back until we hit a displayable group or the beginning.
-            while (!isScreenEvent(formController, potentialStartIndex)) {
-                potentialStartIndex = getPreviousLevel(potentialStartIndex);
-            }
-
-            screenIndex = potentialStartIndex;
-
-            // Check to see if the question is at the first level of the hierarchy.
-            // If it is, display the root level from the beginning.
-            // Otherwise we're at a displayable group.
-            if (screenIndex == null) {
-                screenIndex = FormIndex.createBeginningOfFormIndex();
-            }
-
-            formController.jumpToIndex(screenIndex);
-
-            // Now test again. This should be true at this point or we're at the beginning.
-            if (formController.isDisplayableGroup(formController.getFormIndex())) {
-                contextGroupRef = formController.getFormIndex().getReference();
-                formController.stepToNextEvent(JavaRosaFormController.STEP_INTO_GROUP);
-            } else {
-                // Let contextGroupRef be null.
-            }
-        }
-    }
-
-    /**
-     * Returns true if the event is a displayable group or the start of the form.
-     * See {@link FormController#stepToOuterScreenEvent} for more context.
-     */
-    private boolean isScreenEvent(FormController formController, FormIndex index) {
-        // Beginning of form.
-        if (index == null) {
-            return true;
-        }
-
-        return formController.isDisplayableGroup(index);
-    }
-
-    private boolean shouldShowRepeatGroupPicker() {
-        return repeatGroupPickerIndex != null;
-    }
-
-    /**
-     * Rebuilds the view to reflect the elements that should be displayed based on the
-     * FormController's current index. This index is either set prior to the activity opening or
-     * mutated by {@link #onElementClick(HierarchyItem)} if a repeat instance was tapped.
-     */
-    public void refreshView() {
-        refreshView(false);
-    }
-
-    /**
-     * @see #refreshView()
-     */
-    private void refreshView(boolean isGoingUp) {
-        try {
-            FormController formController = formEntryViewModel.getFormController();
-
-            // Save the current index so we can return to the problematic question
-            // in the event of an error.
-            currentIndex = formController.getFormIndex();
-
-            elementsToDisplay = new ArrayList<>();
-
-            jumpToHierarchyStartIndex();
-            updateOptionsMenu();
-
-            int event = formController.getEvent();
-
-            if (event == FormEntryController.EVENT_BEGINNING_OF_FORM && !shouldShowRepeatGroupPicker()) {
-                // The beginning of form has no valid prompt to display.
-                groupIcon.setVisibility(View.GONE);
-                groupPathTextView.setVisibility(View.GONE);
-            } else {
-                groupIcon.setVisibility(View.VISIBLE);
-                groupPathTextView.setVisibility(View.VISIBLE);
-                groupPathTextView.setText(getCurrentPath());
-
-                if (formController.indexContainsRepeatableGroup(screenIndex) || shouldShowRepeatGroupPicker()) {
-                    groupIcon.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_repeat));
-                } else {
-                    groupIcon.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_folder_open));
-                }
-            }
-
-            // Refresh the current event in case we did step forward.
-            event = formController.getEvent();
-
-            // Ref to the parent group that's currently being displayed.
-            //
-            // Because of the guard conditions below, we will skip
-            // everything until we exit this group.
-            TreeReference visibleGroupRef = null;
-
-            while (event != FormEntryController.EVENT_END_OF_FORM) {
-                // get the ref to this element
-                TreeReference currentRef = formController.getFormIndex().getReference();
-
-                // retrieve the current group
-                TreeReference curGroup = (visibleGroupRef == null) ? contextGroupRef : visibleGroupRef;
-
-                if (curGroup != null && !curGroup.isParentOf(currentRef, false)) {
-                    // We have left the current group
-                    if (visibleGroupRef == null) {
-                        // We are done.
-                        break;
-                    } else {
-                        // exit the inner group
-                        visibleGroupRef = null;
-                    }
-                }
-
-                if (visibleGroupRef != null) {
-                    // We're in a group within the one we want to list
-                    // skip this question/group/repeat and move to the next index.
-                    event =
-                            formController.stepToNextEvent(JavaRosaFormController.STEP_INTO_GROUP);
-                    continue;
-                }
-
-                switch (event) {
-                    case FormEntryController.EVENT_QUESTION: {
-                        // Nothing but repeat group instances should show up in the picker.
-                        if (shouldShowRepeatGroupPicker()) {
-                            break;
-                        }
-
-                        FormEntryPrompt fp = formController.getQuestionPrompt();
-                        String label = fp.getShortText();
-                        String answerDisplay = QuestionAnswerProcessor.getQuestionAnswer(fp, this, formController);
-                        elementsToDisplay.add(
-                            new HierarchyItem(
-                                fp.getIndex(),
-                                HierarchyItemType.QUESTION,
-                                FormEntryPromptUtils.styledQuestionText(label, fp.isRequired()),
-                                answerDisplay
-                            )
-                        );
-                        break;
-                    }
-                    case FormEntryController.EVENT_GROUP: {
-                        if (!formController.isGroupRelevant()) {
-                            break;
-                        }
-                        // Nothing but repeat group instances should show up in the picker.
-                        if (shouldShowRepeatGroupPicker()) {
-                            break;
-                        }
-
-                        FormIndex index = formController.getFormIndex();
-
-                        // Only display groups with a specific appearance attribute.
-                        if (!formController.isDisplayableGroup(index)) {
-                            break;
-                        }
-
-                        // Don't render other groups' children.
-                        if (contextGroupRef != null && !contextGroupRef.isParentOf(currentRef, false)) {
-                            break;
-                        }
-
-                        visibleGroupRef = currentRef;
-
-                        FormEntryCaption caption = formController.getCaptionPrompt();
-
-                        elementsToDisplay.add(
-                            new HierarchyItem(
-                                caption.getIndex(),
-                                HierarchyItemType.VISIBLE_GROUP,
-                                HtmlUtils.textToHtml(caption.getShortText())
-                            )
-                        );
-
-                        // Skip to the next item outside the group.
-                        event = formController.stepOverGroup();
-                        continue;
-                    }
-                    case FormEntryController.EVENT_PROMPT_NEW_REPEAT: {
-                        // this would display the 'add new repeat' dialog
-                        // ignore it.
-                        break;
-                    }
-                    case FormEntryController.EVENT_REPEAT: {
-                        boolean forPicker = shouldShowRepeatGroupPicker();
-                        // Only break to exclude non-relevant repeat from picker
-                        if (!formController.isGroupRelevant() && forPicker) {
-                            break;
-                        }
-
-                        visibleGroupRef = currentRef;
-
-                        // Don't render other groups' children.
-                        if (contextGroupRef != null && !contextGroupRef.isParentOf(currentRef, false)) {
-                            break;
-                        }
-
-                        FormEntryCaption fc = formController.getCaptionPrompt();
-
-                        if (forPicker) {
-                            // Don't render other groups' instances.
-                            String repeatGroupPickerRef = repeatGroupPickerIndex.getReference().toString(false);
-                            if (!currentRef.toString(false).equals(repeatGroupPickerRef)) {
-                                break;
-                            }
-
-                            int itemNumber = fc.getMultiplicity() + 1;
-
-                            // e.g. `friends > 1`
-                            String repeatLabel = fc.getShortText() + " > " + itemNumber;
-
-                            // If the child of the group has a more descriptive label, use that instead.
-                            if (fc.getFormElement().getChildren().size() == 1 && fc.getFormElement().getChild(0) instanceof GroupDef) {
-                                formController.stepToNextEvent(JavaRosaFormController.STEP_INTO_GROUP);
-                                String itemLabel = formController.getCaptionPrompt().getShortText();
-                                if (itemLabel != null) {
-                                    // e.g. `1. Alice`
-                                    repeatLabel = itemNumber + ".\u200E " + itemLabel;
-                                }
-                            }
-
-                            elementsToDisplay.add(
-                                new HierarchyItem(
-                                    fc.getIndex(),
-                                    HierarchyItemType.REPEAT_INSTANCE,
-                                    HtmlUtils.textToHtml(repeatLabel)
-                                )
-                            );
-                        } else if (fc.getMultiplicity() == 0) {
-                            elementsToDisplay.add(
-                                new HierarchyItem(
-                                    fc.getIndex(),
-                                    HierarchyItemType.REPEATABLE_GROUP,
-                                    HtmlUtils.textToHtml(fc.getShortText())
-                                )
-                            );
-                        }
-
-                        break;
-                    }
-                }
-
-                event = formController.stepToNextEvent(JavaRosaFormController.STEP_INTO_GROUP);
-            }
-
-            recyclerView.setAdapter(new HierarchyListAdapter(elementsToDisplay, this::onElementClick));
-
-            formController.jumpToIndex(currentIndex);
-
-            // Prevent a redundant middle screen (common on many forms
-            // that use presentation groups to display labels).
-            if (isDisplayingSingleGroup() && !screenIndex.isBeginningOfFormIndex()) {
-                if (isGoingUp) {
-                    // Back out once more.
-                    goUpLevel();
-                } else {
-                    // Enter automatically.
-                    formController.jumpToIndex(elementsToDisplay.get(0).getFormIndex());
-                    refreshView();
-                }
-            }
-        } catch (Exception e) {
-            Timber.e(e);
-            createErrorDialog(e.getMessage());
-        }
-    }
-
-    /**
-     * Returns true if there's only one item being displayed, and it's a group.
-     * Groups like this are often used to display a label in the hierarchy path.
-     */
-    private boolean isDisplayingSingleGroup() {
-        return elementsToDisplay.size() == 1
-                && elementsToDisplay.get(0).getHierarchyItemType() == HierarchyItemType.VISIBLE_GROUP;
-    }
-
-    /**
-     * Handles clicks on a specific row in the hierarchy view.
-     */
-    public void onElementClick(HierarchyItem item) {
-        FormIndex index = item.getFormIndex();
-
-        switch (item.getHierarchyItemType()) {
-            case QUESTION:
-                onQuestionClicked(index);
-                break;
-            case REPEATABLE_GROUP:
-                // Show the picker.
-                repeatGroupPickerIndex = index;
-                refreshView();
-                break;
-            case VISIBLE_GROUP:
-            case REPEAT_INSTANCE:
-                // Hide the picker.
-                repeatGroupPickerIndex = null;
-                formEntryViewModel.getFormController().jumpToIndex(index);
-                setResult(RESULT_OK);
-                refreshView();
-                break;
-        }
-    }
-
-    /**
-     * Handles clicks on a question. Jumps to the form filling view with the selected question shown.
-     * If the selected question is in a field list, show the entire field list.
-     */
-    void onQuestionClicked(FormIndex index) {
-        if (viewOnly) {
-            return;
-        }
-
-        formEntryViewModel.getFormController().jumpToIndex(index);
-        if (formEntryViewModel.getFormController().indexIsInFieldList()) {
-            try {
-                formEntryViewModel.getFormController().stepToPreviousScreenEvent();
-            } catch (JavaRosaException e) {
-                Timber.d(e);
-                createErrorDialog(e.getCause().getMessage());
-                return;
-            }
-        }
-        setResult(RESULT_OK);
-        finish();
-    }
-
-    private void navigateToTheLastRelevantIndex(FormController formController) {
-        FormEntryController fec = new FormEntryController(new FormEntryModel(formController.getFormDef()));
-        formController.jumpToIndex(startIndex);
-
-        // startIndex might no longer exist if it was a part of repeat group that has been removed
-        while (true) {
-            boolean isBeginningOfFormIndex = formController.getFormIndex().isBeginningOfFormIndex();
-            boolean isEndOfFormIndex = formController.getFormIndex().isEndOfFormIndex();
-            boolean isIndexRelevant = isBeginningOfFormIndex
-                    || isEndOfFormIndex
-                    || fec.getModel().isIndexRelevant(formController.getFormIndex());
-            boolean isPromptNewRepeatEvent = formController.getEvent() == FormEntryController.EVENT_PROMPT_NEW_REPEAT;
-
-            boolean shouldNavigateBack = !isIndexRelevant || isPromptNewRepeatEvent;
-
-            if (shouldNavigateBack) {
-                formController.stepToPreviousEvent();
-            } else {
-                break;
-            }
-        }
-    }
-
-    /**
-     * Creates and displays dialog with the given errorMsg.
-     */
-    protected void createErrorDialog(String errorMsg) {
-        AlertDialog alertDialog = new MaterialAlertDialogBuilder(this).create();
-
-        alertDialog.setTitle(getString(org.odk.collect.strings.R.string.error_occured));
-        alertDialog.setMessage(errorMsg);
-        DialogInterface.OnClickListener errorListener = new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int i) {
-                switch (i) {
-                    case DialogInterface.BUTTON_POSITIVE:
-                        FormController formController = formEntryViewModel.getFormController();
-                        formController.jumpToIndex(currentIndex);
-                        break;
-                }
-            }
-        };
-        alertDialog.setCancelable(false);
-        alertDialog.setButton(AlertDialog.BUTTON_POSITIVE, getString(org.odk.collect.strings.R.string.ok), errorListener);
-        alertDialog.show();
-    }
-
-    @Override
-    public void deleteGroup() {
-        if (didDeleteLastRepeatItem()) {
-            // goUpLevel would put us in a weird state after deleting the last item;
-            // just go back one event instead.
-            //
-            // TODO: This works well in most cases, but if there are 2 repeats in a row,
-            //   and you delete an item from the second repeat, it will send you into the
-            //   first repeat instead of going back a level as expected.
-            goToPreviousEvent();
-        } else if (didDeleteFirstRepeatItem()) {
-            goUpLevel();
-        } else {
-            goToPreviousEvent();
-            goUpLevel();
-        }
-    }
-
-    @Override
-    protected void onDestroy() {
-        CollectStrictMode.enable();
-        super.onDestroy();
-    }
-}
diff --git a/collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyFragmentHostActivity.kt b/collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyFragmentHostActivity.kt
index d40d6e8d067..5bc8ad6eb9f 100644
--- a/collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyFragmentHostActivity.kt
+++ b/collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyFragmentHostActivity.kt
@@ -84,7 +84,7 @@ class FormHierarchyFragmentHostActivity : LocalizedActivity() {
     @Inject
     lateinit var changeLockProvider: ChangeLockProvider
 
-    private val sessionId by lazy { intent.getStringExtra(FormHierarchyActivity.EXTRA_SESSION_ID)!! }
+    private val sessionId by lazy { intent.getStringExtra(EXTRA_SESSION_ID)!! }
     private val viewModelFactory by lazy {
         FormEntryViewModelFactory(
             this,
@@ -114,7 +114,7 @@ class FormHierarchyFragmentHostActivity : LocalizedActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         DaggerUtils.getComponent(this).inject(this)
 
-        val viewOnly = intent.getBooleanExtra(FormHierarchyActivity.EXTRA_VIEW_ONLY, false)
+        val viewOnly = intent.getBooleanExtra(EXTRA_VIEW_ONLY, false)
         supportFragmentManager.fragmentFactory = FragmentFactoryBuilder()
             .forClass(FormHierarchyFragment::class) {
                 FormHierarchyFragment(viewOnly, viewModelFactory, this)
@@ -136,4 +136,9 @@ class FormHierarchyFragmentHostActivity : LocalizedActivity() {
         setContentView(R.layout.hierarchy_host_layout)
         setSupportActionBar(findViewById(org.odk.collect.androidshared.R.id.toolbar))
     }
+
+    companion object {
+        const val EXTRA_SESSION_ID = "session_id"
+        const val EXTRA_VIEW_ONLY = "view_only"
+    }
 }
diff --git a/collect_app/src/main/java/org/odk/collect/android/injection/config/AppDependencyComponent.java b/collect_app/src/main/java/org/odk/collect/android/injection/config/AppDependencyComponent.java
index fb3c7ce8d0f..3bbc9f6e296 100644
--- a/collect_app/src/main/java/org/odk/collect/android/injection/config/AppDependencyComponent.java
+++ b/collect_app/src/main/java/org/odk/collect/android/injection/config/AppDependencyComponent.java
@@ -32,7 +32,6 @@
 import org.odk.collect.android.formentry.repeats.DeleteRepeatDialogFragment;
 import org.odk.collect.android.formentry.saving.SaveAnswerFileErrorDialogFragment;
 import org.odk.collect.android.formentry.saving.SaveFormProgressDialogFragment;
-import org.odk.collect.android.formhierarchy.FormHierarchyActivity;
 import org.odk.collect.android.formhierarchy.FormHierarchyFragmentHostActivity;
 import org.odk.collect.android.formlists.blankformlist.BlankFormListActivity;
 import org.odk.collect.android.formmanagement.FormSourceProvider;
@@ -172,8 +171,6 @@ interface Builder {
 
     void inject(AdminPasswordDialogFragment adminPasswordDialogFragment);
 
-    void inject(FormHierarchyActivity formHierarchyActivity);
-
     void inject(FormManagementPreferencesFragment formManagementPreferencesFragment);
 
     void inject(IdentityPreferencesFragment identityPreferencesFragment);
diff --git a/collect_app/src/test/java/org/odk/collect/android/activities/FormHierarchyFragmentHostActivityTest.kt b/collect_app/src/test/java/org/odk/collect/android/activities/FormHierarchyFragmentHostActivityTest.kt
index 9a605703605..4af2b6b0c92 100644
--- a/collect_app/src/test/java/org/odk/collect/android/activities/FormHierarchyFragmentHostActivityTest.kt
+++ b/collect_app/src/test/java/org/odk/collect/android/activities/FormHierarchyFragmentHostActivityTest.kt
@@ -11,7 +11,6 @@ import org.hamcrest.Matchers.equalTo
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.odk.collect.android.formhierarchy.FormHierarchyActivity
 import org.odk.collect.android.formhierarchy.FormHierarchyFragmentHostActivity
 import org.odk.collect.android.support.CollectHelpers
 
@@ -30,10 +29,10 @@ class FormHierarchyFragmentHostActivityTest {
     fun whenFormHasNotLoadedYet_finishes() {
         val context = ApplicationProvider.getApplicationContext<Context>()
         val intent = Intent(context, FormHierarchyFragmentHostActivity::class.java).also {
-            it.putExtra(FormHierarchyActivity.EXTRA_SESSION_ID, "blah")
+            it.putExtra(FormHierarchyFragmentHostActivity.EXTRA_SESSION_ID, "blah")
         }
 
-        ActivityScenario.launch<FormHierarchyActivity>(intent).use { scenario ->
+        ActivityScenario.launch<FormHierarchyFragmentHostActivity>(intent).use { scenario ->
             assertThat(scenario.state, equalTo(Lifecycle.State.DESTROYED))
         }
     }

From 546336ab5072c5ae042b14f707e2698c1d1c0204 Mon Sep 17 00:00:00 2001
From: Callum Stott <callum@seadowg.com>
Date: Wed, 11 Dec 2024 11:53:57 +0000
Subject: [PATCH 10/18] Replace hierarchy icon

---
 .../src/main/res/drawable/ic_menu_goto_24.xml      | 14 --------------
 collect_app/src/main/res/menu/form_menu.xml        |  2 +-
 .../src/main/res/drawable/ic_baseline_list_24.xml  | 12 ++++++++++++
 3 files changed, 13 insertions(+), 15 deletions(-)
 delete mode 100644 collect_app/src/main/res/drawable/ic_menu_goto_24.xml
 create mode 100644 icons/src/main/res/drawable/ic_baseline_list_24.xml

diff --git a/collect_app/src/main/res/drawable/ic_menu_goto_24.xml b/collect_app/src/main/res/drawable/ic_menu_goto_24.xml
deleted file mode 100644
index 4060b53b5ab..00000000000
--- a/collect_app/src/main/res/drawable/ic_menu_goto_24.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0"
-    android:tint="?colorOnSurface"
-    android:autoMirrored="true">
-    <path
-        android:fillColor="?colorOnSurface"
-        android:pathData="M17.164,20.342A2.248,2.248 129.812,0 0,20.342 20.342,2.248 2.248,50.188 0,0 20.342,17.164 2.248,2.248 0,0 0,17.164 17.164,2.248 2.248,0 0,0 17.164,20.342Z" />
-    <path
-        android:fillColor="?colorOnSurface"
-        android:pathData="m6.943,15.423a0.317,0.3 45,0 0,0.216 0.09l8.22,0.164a0.3,0.317 134.998,0 0,0.297 -0.297l-0.163,-8.221a0.317,0.3 45,0 0,-0.533 -0.235L12.933,8.971L7.059,3.097a0.3,0.317 134.999,0 0,-0.436 -0.012l-3.539,3.539a0.3,0.317 134.999,0 0,0.012 0.436L8.971,12.933l-2.048,2.048a0.3,0.317 134.998,0 0,0.019 0.443z" />
-</vector>
diff --git a/collect_app/src/main/res/menu/form_menu.xml b/collect_app/src/main/res/menu/form_menu.xml
index 2552b0effa7..e10168b360d 100644
--- a/collect_app/src/main/res/menu/form_menu.xml
+++ b/collect_app/src/main/res/menu/form_menu.xml
@@ -28,7 +28,7 @@
 
     <item
         android:id="@+id/menu_goto"
-        android:icon="@drawable/ic_menu_goto_24"
+        android:icon="@drawable/ic_baseline_list_24"
         android:title="@string/view_hierarchy"
         app:showAsAction="always" />
 
diff --git a/icons/src/main/res/drawable/ic_baseline_list_24.xml b/icons/src/main/res/drawable/ic_baseline_list_24.xml
new file mode 100644
index 00000000000..468eee49b05
--- /dev/null
+++ b/icons/src/main/res/drawable/ic_baseline_list_24.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:tint="?colorOnSurface"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="?colorSurface"
+        android:pathData="M3,13h2v-2L3,11v2zM3,17h2v-2L3,15v2zM3,9h2L5,7L3,7v2zM7,13h14v-2L7,11v2zM7,17h14v-2L7,15v2zM7,7v2h14L21,7L7,7z" />
+
+</vector>

From 0153f6b1cc0968218b3dfef48361de3ed8dc6e57 Mon Sep 17 00:00:00 2001
From: Callum Stott <callum@seadowg.com>
Date: Wed, 8 Jan 2025 08:59:45 +0000
Subject: [PATCH 11/18] Make test names consistent

---
 .../collect/android/feature/formentry/FormHierarchyTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/FormHierarchyTest.java b/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/FormHierarchyTest.java
index 51f515f1859..c1b327a39ff 100644
--- a/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/FormHierarchyTest.java
+++ b/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/FormHierarchyTest.java
@@ -242,7 +242,7 @@ public void theListOfQuestionsShouldBeScrolledToTheLastDisplayedQuestionAfterOpe
     }
 
     @Test
-    public void whenViewFormInHierarchyForRepeat_noDeleteButtonAppears() {
+    public void whenViewFormInHierarchyForRepeatGroup_noDeleteButtonAppears() {
         rule.startAtMainMenu()
                 .copyForm("one-question-repeat.xml")
                 .startBlankForm("One Question Repeat")

From 156a1ceaa8b222cd54a861537371956a53221e11 Mon Sep 17 00:00:00 2001
From: Callum Stott <callum@seadowg.com>
Date: Wed, 8 Jan 2025 09:01:59 +0000
Subject: [PATCH 12/18] Remove redundant code

---
 collect_app/src/main/AndroidManifest.xml      |   1 -
 .../src/main/res/layout/hierarchy_layout.xml  | 109 ------------------
 2 files changed, 110 deletions(-)
 delete mode 100644 collect_app/src/main/res/layout/hierarchy_layout.xml

diff --git a/collect_app/src/main/AndroidManifest.xml b/collect_app/src/main/AndroidManifest.xml
index a05dc2268f3..ce76aab4a2b 100644
--- a/collect_app/src/main/AndroidManifest.xml
+++ b/collect_app/src/main/AndroidManifest.xml
@@ -327,7 +327,6 @@ the specific language governing permissions and limitations under the License.
             </intent-filter>
         </activity>
         <activity android:name="org.odk.collect.android.formhierarchy.FormHierarchyFragmentHostActivity" />
-        <activity android:name="org.odk.collect.android.formhierarchy.FormHierarchyActivity" />
 
     </application>
 
diff --git a/collect_app/src/main/res/layout/hierarchy_layout.xml b/collect_app/src/main/res/layout/hierarchy_layout.xml
deleted file mode 100644
index 54548b54747..00000000000
--- a/collect_app/src/main/res/layout/hierarchy_layout.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <include layout="@layout/app_bar_layout" />
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-        <ImageView
-            android:id="@+id/group_icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/margin_standard"
-            android:layout_marginTop="@dimen/margin_extra_small"
-            android:visibility="gone"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:srcCompat="@drawable/ic_folder_open"
-            tools:visibility="visible" />
-
-        <TextView
-            android:id="@+id/pathtext"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/margin_extra_small"
-            android:layout_marginEnd="@dimen/margin_standard"
-            app:layout_constraintBottom_toBottomOf="@+id/group_icon"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/group_icon"
-            app:layout_constraintTop_toTopOf="@id/group_icon"
-            tools:text="Text widgets" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/list"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginTop="@dimen/margin_extra_small"
-            app:layout_goneMarginTop="0dp"
-            app:layout_constraintTop_toBottomOf="@id/pathtext"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toTopOf="@id/buttonholder" />
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/buttonholder"
-            style="@style/Widget.AndroidShared.ButtonBar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            android:layout_alignParentBottom="true">
-
-            <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
-                android:id="@+id/jumpBeginningButton"
-                style="?materialButtonOutlinedStyle"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_marginStart="@dimen/margin_standard"
-                android:text="@string/jump_to_beginning"
-                app:layout_constraintEnd_toStartOf="@+id/jumpEndButton"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
-                android:id="@+id/jumpEndButton"
-                style="?materialButtonOutlinedStyle"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_marginStart="@dimen/margin_standard"
-                android:layout_marginEnd="@dimen/margin_standard"
-                android:text="@string/jump_to_end"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/jumpBeginningButton"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
-                android:id="@+id/exitButton"
-                style="?materialButtonOutlinedStyle"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_marginStart="@dimen/margin_standard"
-                android:layout_marginEnd="@dimen/margin_standard"
-                android:text="@string/exit"
-                android:visibility="gone"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <org.odk.collect.lists.EmptyListView
-            android:id="@android:id/empty"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            app:title="@string/empty_list_of_questions"
-            app:layout_constraintTop_toBottomOf="@id/pathtext"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</androidx.coordinatorlayout.widget.CoordinatorLayout>

From 5507ef7980dee3b48f18f4f7d6bfb222c6f0c4cd Mon Sep 17 00:00:00 2001
From: Callum Stott <callum@seadowg.com>
Date: Wed, 8 Jan 2025 09:04:24 +0000
Subject: [PATCH 13/18] Update comment references

---
 .../android/activities/FormFillingActivityTest.kt    | 12 ++++++------
 docs/STATE.md                                        |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/collect_app/src/test/java/org/odk/collect/android/activities/FormFillingActivityTest.kt b/collect_app/src/test/java/org/odk/collect/android/activities/FormFillingActivityTest.kt
index 45d4fdeb0bd..3ec393e867c 100644
--- a/collect_app/src/test/java/org/odk/collect/android/activities/FormFillingActivityTest.kt
+++ b/collect_app/src/test/java/org/odk/collect/android/activities/FormFillingActivityTest.kt
@@ -99,7 +99,7 @@ class FormFillingActivityTest {
         scheduler.flush()
         assertText(withText("What is your age?"))
 
-        // Recreate and assert we start FormHierarchyActivity
+        // Recreate and assert we start FormHierarchyFragmentHostActivity
         val recreated = activityControllerRule.add {
             initial.recreateWithProcessRestore { resetProcess(dependencies) }
         }
@@ -107,7 +107,7 @@ class FormFillingActivityTest {
         scheduler.flush()
         assertIntentsHelper.assertNewIntent(FormHierarchyFragmentHostActivity::class)
 
-        // Return to FormFillingActivity from FormHierarchyActivity
+        // Return to FormFillingActivity from FormHierarchyFragmentHostActivity
         val hierarchyIntent = shadowOf(recreated.get()).nextStartedActivityForResult.intent
         shadowOf(recreated.get()).receiveResult(hierarchyIntent, Activity.RESULT_CANCELED, null)
         scheduler.flush()
@@ -140,7 +140,7 @@ class FormFillingActivityTest {
         Interactions.clickOn(withContentDescription(R.string.view_hierarchy))
         assertIntentsHelper.assertNewIntent(FormHierarchyFragmentHostActivity::class)
 
-        // Recreate and assert we start FormHierarchyActivity
+        // Recreate and assert we start FormHierarchyFragmentHostActivity
         val recreated = activityControllerRule.add {
             initial.recreateWithProcessRestore { resetProcess(dependencies) }
         }
@@ -148,7 +148,7 @@ class FormFillingActivityTest {
         scheduler.flush()
         assertIntentsHelper.assertNewIntent(FormHierarchyFragmentHostActivity::class)
 
-        // Return to FormFillingActivity from FormHierarchyActivity
+        // Return to FormFillingActivity from FormHierarchyFragmentHostActivity
         val hierarchyIntent = shadowOf(recreated.get()).nextStartedActivityForResult.intent
         shadowOf(recreated.get()).receiveResult(hierarchyIntent, Activity.RESULT_CANCELED, null)
         scheduler.flush()
@@ -185,7 +185,7 @@ class FormFillingActivityTest {
             equalTo(true)
         )
 
-        // Recreate and assert we start FormHierarchyActivity
+        // Recreate and assert we start FormHierarchyFragmentHostActivity
         val recreated = activityControllerRule.add {
             initial.recreateWithProcessRestore { resetProcess(dependencies) }
         }
@@ -193,7 +193,7 @@ class FormFillingActivityTest {
         scheduler.flush()
         assertIntentsHelper.assertNewIntent(FormHierarchyFragmentHostActivity::class)
 
-        // Return to FormFillingActivity from FormHierarchyActivity
+        // Return to FormFillingActivity from FormHierarchyFragmentHostActivity
         val hierarchyIntent = shadowOf(recreated.get()).nextStartedActivityForResult.intent
         shadowOf(recreated.get()).receiveResult(hierarchyIntent, Activity.RESULT_CANCELED, null)
         scheduler.flush()
diff --git a/docs/STATE.md b/docs/STATE.md
index dd1c3d99fb9..e575fe5073a 100644
--- a/docs/STATE.md
+++ b/docs/STATE.md
@@ -31,7 +31,7 @@ The purpose of this document is to give anyone who reads it a quick overview  of
 * Forms get into the app from two different sources (Open Rosa servers and disk) but the logic for this is disparate and they don't sit behind a common interface
 * Instances are linked to the forms they are instances of through formid and version. However, the same formid and version combination could represent multiple forms in storage
 * `SharedPreferences` is wrapped in app's own `Settings` abstraction
-* The form hierarchy is rendered using `FormHierarchyActivity`, which hasn't been seriously touched (at a code or design) level for a few years
+* The form hierarchy is rendered using `FormHierarchyFragment`, which hasn't been seriously touched (at a code or design) level for a few years
 
 ## Where we're going
 

From c1c459f5a08bf84dddd0835d9e662a0abc1d9c33 Mon Sep 17 00:00:00 2001
From: Callum Stott <callum@seadowg.com>
Date: Wed, 8 Jan 2025 09:17:01 +0000
Subject: [PATCH 14/18] Remove callback approach from
 DeleteRepeatDialogFragment

---
 .../android/activities/FormFillingActivity.java |  4 ++--
 .../repeats/DeleteRepeatDialogFragment.java     | 17 +----------------
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/collect_app/src/main/java/org/odk/collect/android/activities/FormFillingActivity.java b/collect_app/src/main/java/org/odk/collect/android/activities/FormFillingActivity.java
index 2ac195d7f8d..d507733ed32 100644
--- a/collect_app/src/main/java/org/odk/collect/android/activities/FormFillingActivity.java
+++ b/collect_app/src/main/java/org/odk/collect/android/activities/FormFillingActivity.java
@@ -228,7 +228,6 @@ public class FormFillingActivity extends LocalizedActivity implements AnimationL
         RankingWidgetDialog.RankingListener, SaveFormIndexTask.SaveFormIndexListener,
         WidgetValueChangedListener, ScreenContext, FormLoadingDialogFragment.FormLoadingDialogFragmentListener,
         AudioControllerView.SwipableParent, FormIndexAnimationHandler.Listener,
-        DeleteRepeatDialogFragment.DeleteRepeatDialogCallback,
         SelectMinimalDialog.SelectMinimalDialogListener, CustomDatePickerDialog.DateChangeListener,
         CustomTimePickerDialog.TimeChangeListener {
 
@@ -448,6 +447,8 @@ public void onCreate(Bundle savedInstanceState) {
                 .forClass(SelectOneFromMapDialogFragment.class, () -> new SelectOneFromMapDialogFragment(viewModelFactory))
                 .build());
 
+        getSupportFragmentManager().setFragmentResultListener("REPEAT_DELETED", this, (requestKey, result) -> deleteGroup());
+
         if (ProcessRestoreDetector.isProcessRestoring(this, savedInstanceState)) {
             if (savedInstanceState.containsKey(KEY_XPATH)) {
                 startingXPath = savedInstanceState.getString(KEY_XPATH);
@@ -1056,7 +1057,6 @@ public boolean onContextItemSelected(MenuItem item) {
         return super.onContextItemSelected(item);
     }
 
-    @Override
     public void deleteGroup() {
         FormController formController = getFormController();
         if (formController != null && !formController.indexIsInFieldList()) {
diff --git a/collect_app/src/main/java/org/odk/collect/android/formentry/repeats/DeleteRepeatDialogFragment.java b/collect_app/src/main/java/org/odk/collect/android/formentry/repeats/DeleteRepeatDialogFragment.java
index 79b4df7b85b..832a3b039d4 100644
--- a/collect_app/src/main/java/org/odk/collect/android/formentry/repeats/DeleteRepeatDialogFragment.java
+++ b/collect_app/src/main/java/org/odk/collect/android/formentry/repeats/DeleteRepeatDialogFragment.java
@@ -26,8 +26,6 @@ public class DeleteRepeatDialogFragment extends DialogFragment {
     private final ViewModelProvider.Factory viewModelFactory;
     private FormEntryViewModel formEntryViewModel;
 
-    private DeleteRepeatDialogCallback callback;
-
     public DeleteRepeatDialogFragment(ViewModelProvider.Factory viewModelFactory) {
         this.viewModelFactory = viewModelFactory;
     }
@@ -38,10 +36,6 @@ public void onAttach(@NonNull Context context) {
         DaggerUtils.getComponent(context).inject(this);
 
         formEntryViewModel = new ViewModelProvider(requireActivity(), viewModelFactory).get(FormEntryViewModel.class);
-
-        if (context instanceof DeleteRepeatDialogCallback) {
-            callback = (DeleteRepeatDialogCallback) context;
-        }
     }
 
     @NonNull
@@ -64,12 +58,7 @@ public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
             if (i == BUTTON_POSITIVE) { // yes
                 formController.getAuditEventLogger().logEvent(AuditEvent.AuditEventType.DELETE_REPEAT, true, System.currentTimeMillis());
                 formController.deleteRepeat();
-
-                if (callback != null) {
-                    callback.deleteGroup();
-                } else {
-                    getParentFragmentManager().setFragmentResult("REPEAT_DELETED", new Bundle());
-                }
+                getParentFragmentManager().setFragmentResult("REPEAT_DELETED", new Bundle());
             }
             alertDialog.cancel();
             dismiss();
@@ -81,8 +70,4 @@ public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
 
         return alertDialog;
     }
-
-    public interface DeleteRepeatDialogCallback {
-        void deleteGroup();
-    }
 }

From 5873c0e433ab76970a357db37e80f5be4283f6da Mon Sep 17 00:00:00 2001
From: Callum Stott <callum@seadowg.com>
Date: Wed, 8 Jan 2025 09:20:10 +0000
Subject: [PATCH 15/18] Extract constant for fragment request

---
 .../odk/collect/android/activities/FormFillingActivity.java   | 3 ++-
 .../android/formentry/repeats/DeleteRepeatDialogFragment.java | 4 +++-
 .../collect/android/formhierarchy/FormHierarchyFragment.java  | 3 ++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/collect_app/src/main/java/org/odk/collect/android/activities/FormFillingActivity.java b/collect_app/src/main/java/org/odk/collect/android/activities/FormFillingActivity.java
index d507733ed32..f83cfc49b68 100644
--- a/collect_app/src/main/java/org/odk/collect/android/activities/FormFillingActivity.java
+++ b/collect_app/src/main/java/org/odk/collect/android/activities/FormFillingActivity.java
@@ -20,6 +20,7 @@
 import static org.javarosa.form.api.FormEntryController.EVENT_PROMPT_NEW_REPEAT;
 import static org.odk.collect.android.formentry.FormIndexAnimationHandler.Direction.BACKWARDS;
 import static org.odk.collect.android.formentry.FormIndexAnimationHandler.Direction.FORWARDS;
+import static org.odk.collect.android.formentry.repeats.DeleteRepeatDialogFragment.REQUEST_DELETE_REPEAT;
 import static org.odk.collect.android.utilities.AnimationUtils.areAnimationsEnabled;
 import static org.odk.collect.android.utilities.ApplicationConstants.RequestCodes;
 import static org.odk.collect.android.utilities.DialogUtils.getDialog;
@@ -447,7 +448,7 @@ public void onCreate(Bundle savedInstanceState) {
                 .forClass(SelectOneFromMapDialogFragment.class, () -> new SelectOneFromMapDialogFragment(viewModelFactory))
                 .build());
 
-        getSupportFragmentManager().setFragmentResultListener("REPEAT_DELETED", this, (requestKey, result) -> deleteGroup());
+        getSupportFragmentManager().setFragmentResultListener(REQUEST_DELETE_REPEAT, this, (requestKey, result) -> deleteGroup());
 
         if (ProcessRestoreDetector.isProcessRestoring(this, savedInstanceState)) {
             if (savedInstanceState.containsKey(KEY_XPATH)) {
diff --git a/collect_app/src/main/java/org/odk/collect/android/formentry/repeats/DeleteRepeatDialogFragment.java b/collect_app/src/main/java/org/odk/collect/android/formentry/repeats/DeleteRepeatDialogFragment.java
index 832a3b039d4..2e3ea0d306b 100644
--- a/collect_app/src/main/java/org/odk/collect/android/formentry/repeats/DeleteRepeatDialogFragment.java
+++ b/collect_app/src/main/java/org/odk/collect/android/formentry/repeats/DeleteRepeatDialogFragment.java
@@ -23,6 +23,8 @@
 
 public class DeleteRepeatDialogFragment extends DialogFragment {
 
+    public static final String REQUEST_DELETE_REPEAT = "DELETE_REPEAT";
+
     private final ViewModelProvider.Factory viewModelFactory;
     private FormEntryViewModel formEntryViewModel;
 
@@ -58,7 +60,7 @@ public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
             if (i == BUTTON_POSITIVE) { // yes
                 formController.getAuditEventLogger().logEvent(AuditEvent.AuditEventType.DELETE_REPEAT, true, System.currentTimeMillis());
                 formController.deleteRepeat();
-                getParentFragmentManager().setFragmentResult("REPEAT_DELETED", new Bundle());
+                getParentFragmentManager().setFragmentResult(REQUEST_DELETE_REPEAT, new Bundle());
             }
             alertDialog.cancel();
             dismiss();
diff --git a/collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyFragment.java b/collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyFragment.java
index e42d4f7c0d3..1af8776e436 100644
--- a/collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyFragment.java
+++ b/collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyFragment.java
@@ -1,6 +1,7 @@
 package org.odk.collect.android.formhierarchy;
 
 import static android.app.Activity.RESULT_OK;
+import static org.odk.collect.android.formentry.repeats.DeleteRepeatDialogFragment.REQUEST_DELETE_REPEAT;
 import static org.odk.collect.android.javarosawrapper.FormIndexUtils.getPreviousLevel;
 
 import android.content.Context;
@@ -164,7 +165,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
             });
         }
 
-        getChildFragmentManager().setFragmentResultListener("REPEAT_DELETED", getViewLifecycleOwner(), (requestKey, result) -> onRepeatDeleted());
+        getChildFragmentManager().setFragmentResultListener(REQUEST_DELETE_REPEAT, getViewLifecycleOwner(), (requestKey, result) -> onRepeatDeleted());
     }
 
     public void refreshView() {

From 23243063a3256d2f56fad9103b36660cd66daf62 Mon Sep 17 00:00:00 2001
From: Callum Stott <callum@seadowg.com>
Date: Wed, 8 Jan 2025 09:42:23 +0000
Subject: [PATCH 16/18] Isolate elements to display logic

---
 .../formhierarchy/FormHierarchyFragment.java  | 328 +++++++++---------
 1 file changed, 166 insertions(+), 162 deletions(-)

diff --git a/collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyFragment.java b/collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyFragment.java
index 1af8776e436..a1f0ad15dcc 100644
--- a/collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyFragment.java
+++ b/collect_app/src/main/java/org/odk/collect/android/formhierarchy/FormHierarchyFragment.java
@@ -188,210 +188,214 @@ private void refreshView(boolean isGoingUp) {
             // in the event of an error.
             formHierarchyViewModel.setCurrentIndex(formController.getFormIndex());
 
-            ArrayList<HierarchyItem> elementsToDisplay = new ArrayList<>();
-
-            jumpToHierarchyStartIndex();
-
-            int event = formController.getEvent();
+            calculateElementsToDisplay(formController, groupIcon, groupPathTextView);
+            recyclerView.setAdapter(new HierarchyListAdapter(formHierarchyViewModel.getElementsToDisplay(), this::onElementClick));
 
-            if (event == FormEntryController.EVENT_BEGINNING_OF_FORM && !formHierarchyViewModel.shouldShowRepeatGroupPicker()) {
-                // The beginning of form has no valid prompt to display.
-                groupIcon.setVisibility(View.GONE);
-                groupPathTextView.setVisibility(View.GONE);
-            } else {
-                groupIcon.setVisibility(View.VISIBLE);
-                groupPathTextView.setVisibility(View.VISIBLE);
-                groupPathTextView.setText(getCurrentPath());
+            formController.jumpToIndex(formHierarchyViewModel.getCurrentIndex());
 
-                if (formController.indexContainsRepeatableGroup(formHierarchyViewModel.getScreenIndex()) || formHierarchyViewModel.shouldShowRepeatGroupPicker()) {
-                    groupIcon.setImageDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.ic_repeat));
+            // Prevent a redundant middle screen (common on many forms
+            // that use presentation groups to display labels).
+            if (isDisplayingSingleGroup() && !formHierarchyViewModel.getScreenIndex().isBeginningOfFormIndex()) {
+                if (isGoingUp) {
+                    // Back out once more.
+                    goUpLevel();
                 } else {
-                    groupIcon.setImageDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.ic_folder_open));
+                    // Enter automatically.
+                    formController.jumpToIndex(formHierarchyViewModel.getElementsToDisplay().get(0).getFormIndex());
+                    refreshView();
                 }
             }
+        } catch (Exception e) {
+            Timber.e(e);
+            createErrorDialog(e.getMessage());
+        }
+    }
 
-            // Refresh the current event in case we did step forward.
-            event = formController.getEvent();
+    private void calculateElementsToDisplay(FormController formController, ImageView groupIcon, TextView groupPathTextView) {
+        List<HierarchyItem> elementsToDisplay = new ArrayList<>();
 
-            // Ref to the parent group that's currently being displayed.
-            //
-            // Because of the guard conditions below, we will skip
-            // everything until we exit this group.
-            TreeReference visibleGroupRef = null;
+        jumpToHierarchyStartIndex();
+
+        int event = formController.getEvent();
+
+        if (event == FormEntryController.EVENT_BEGINNING_OF_FORM && !formHierarchyViewModel.shouldShowRepeatGroupPicker()) {
+            // The beginning of form has no valid prompt to display.
+            groupIcon.setVisibility(View.GONE);
+            groupPathTextView.setVisibility(View.GONE);
+        } else {
+            groupIcon.setVisibility(View.VISIBLE);
+            groupPathTextView.setVisibility(View.VISIBLE);
+            groupPathTextView.setText(getCurrentPath());
+
+            if (formController.indexContainsRepeatableGroup(formHierarchyViewModel.getScreenIndex()) || formHierarchyViewModel.shouldShowRepeatGroupPicker()) {
+                groupIcon.setImageDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.ic_repeat));
+            } else {
+                groupIcon.setImageDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.ic_folder_open));
+            }
+        }
 
-            while (event != FormEntryController.EVENT_END_OF_FORM) {
-                // get the ref to this element
-                TreeReference currentRef = formController.getFormIndex().getReference();
+        // Refresh the current event in case we did step forward.
+        event = formController.getEvent();
 
-                // retrieve the current group
-                TreeReference curGroup = (visibleGroupRef == null) ? formHierarchyViewModel.getContextGroupRef() : visibleGroupRef;
+        // Ref to the parent group that's currently being displayed.
+        //
+        // Because of the guard conditions below, we will skip
+        // everything until we exit this group.
+        TreeReference visibleGroupRef = null;
 
-                if (curGroup != null && !curGroup.isParentOf(currentRef, false)) {
-                    // We have left the current group
-                    if (visibleGroupRef == null) {
-                        // We are done.
+        while (event != FormEntryController.EVENT_END_OF_FORM) {
+            // get the ref to this element
+            TreeReference currentRef = formController.getFormIndex().getReference();
+
+            // retrieve the current group
+            TreeReference curGroup = (visibleGroupRef == null) ? formHierarchyViewModel.getContextGroupRef() : visibleGroupRef;
+
+            if (curGroup != null && !curGroup.isParentOf(currentRef, false)) {
+                // We have left the current group
+                if (visibleGroupRef == null) {
+                    // We are done.
+                    break;
+                } else {
+                    // exit the inner group
+                    visibleGroupRef = null;
+                }
+            }
+
+            if (visibleGroupRef != null) {
+                // We're in a group within the one we want to list
+                // skip this question/group/repeat and move to the next index.
+                event =
+                        formController.stepToNextEvent(JavaRosaFormController.STEP_INTO_GROUP);
+                continue;
+            }
+
+            switch (event) {
+                case FormEntryController.EVENT_QUESTION: {
+                    // Nothing but repeat group instances should show up in the picker.
+                    if (formHierarchyViewModel.shouldShowRepeatGroupPicker()) {
                         break;
-                    } else {
-                        // exit the inner group
-                        visibleGroupRef = null;
                     }
-                }
 
-                if (visibleGroupRef != null) {
-                    // We're in a group within the one we want to list
-                    // skip this question/group/repeat and move to the next index.
-                    event =
-                            formController.stepToNextEvent(JavaRosaFormController.STEP_INTO_GROUP);
-                    continue;
+                    FormEntryPrompt fp = formController.getQuestionPrompt();
+                    String label = fp.getShortText();
+                    String answerDisplay = QuestionAnswerProcessor.getQuestionAnswer(fp, requireContext(), formController);
+                    elementsToDisplay.add(
+                            new HierarchyItem(
+                                    fp.getIndex(),
+                                    HierarchyItemType.QUESTION,
+                                    FormEntryPromptUtils.styledQuestionText(label, fp.isRequired()),
+                                    answerDisplay
+                            )
+                    );
+                    break;
                 }
+                case FormEntryController.EVENT_GROUP: {
+                    if (!formController.isGroupRelevant()) {
+                        break;
+                    }
+                    // Nothing but repeat group instances should show up in the picker.
+                    if (formHierarchyViewModel.shouldShowRepeatGroupPicker()) {
+                        break;
+                    }
 
-                switch (event) {
-                    case FormEntryController.EVENT_QUESTION: {
-                        // Nothing but repeat group instances should show up in the picker.
-                        if (formHierarchyViewModel.shouldShowRepeatGroupPicker()) {
-                            break;
-                        }
+                    FormIndex index = formController.getFormIndex();
 
-                        FormEntryPrompt fp = formController.getQuestionPrompt();
-                        String label = fp.getShortText();
-                        String answerDisplay = QuestionAnswerProcessor.getQuestionAnswer(fp, requireContext(), formController);
-                        elementsToDisplay.add(
-                                new HierarchyItem(
-                                        fp.getIndex(),
-                                        HierarchyItemType.QUESTION,
-                                        FormEntryPromptUtils.styledQuestionText(label, fp.isRequired()),
-                                        answerDisplay
-                                )
-                        );
+                    // Only display groups with a specific appearance attribute.
+                    if (!formController.isDisplayableGroup(index)) {
                         break;
                     }
-                    case FormEntryController.EVENT_GROUP: {
-                        if (!formController.isGroupRelevant()) {
-                            break;
-                        }
-                        // Nothing but repeat group instances should show up in the picker.
-                        if (formHierarchyViewModel.shouldShowRepeatGroupPicker()) {
-                            break;
-                        }
 
-                        FormIndex index = formController.getFormIndex();
+                    // Don't render other groups' children.
+                    TreeReference contextGroupRef = formHierarchyViewModel.getContextGroupRef();
+                    if (contextGroupRef != null && !contextGroupRef.isParentOf(currentRef, false)) {
+                        break;
+                    }
 
-                        // Only display groups with a specific appearance attribute.
-                        if (!formController.isDisplayableGroup(index)) {
-                            break;
-                        }
+                    visibleGroupRef = currentRef;
 
-                        // Don't render other groups' children.
-                        TreeReference contextGroupRef = formHierarchyViewModel.getContextGroupRef();
-                        if (contextGroupRef != null && !contextGroupRef.isParentOf(currentRef, false)) {
-                            break;
-                        }
+                    FormEntryCaption caption = formController.getCaptionPrompt();
 
-                        visibleGroupRef = currentRef;
+                    elementsToDisplay.add(
+                            new HierarchyItem(
+                                    caption.getIndex(),
+                                    HierarchyItemType.VISIBLE_GROUP,
+                                    HtmlUtils.textToHtml(caption.getShortText())
+                            )
+                    );
 
-                        FormEntryCaption caption = formController.getCaptionPrompt();
+                    // Skip to the next item outside the group.
+                    event = formController.stepOverGroup();
+                    continue;
+                }
+                case FormEntryController.EVENT_PROMPT_NEW_REPEAT: {
+                    // this would display the 'add new repeat' dialog
+                    // ignore it.
+                    break;
+                }
+                case FormEntryController.EVENT_REPEAT: {
+                    boolean forPicker = formHierarchyViewModel.shouldShowRepeatGroupPicker();
+                    // Only break to exclude non-relevant repeat from picker
+                    if (!formController.isGroupRelevant() && forPicker) {
+                        break;
+                    }
 
-                        elementsToDisplay.add(
-                                new HierarchyItem(
-                                        caption.getIndex(),
-                                        HierarchyItemType.VISIBLE_GROUP,
-                                        HtmlUtils.textToHtml(caption.getShortText())
-                                )
-                        );
+                    visibleGroupRef = currentRef;
 
-                        // Skip to the next item outside the group.
-                        event = formController.stepOverGroup();
-                        continue;
-                    }
-                    case FormEntryController.EVENT_PROMPT_NEW_REPEAT: {
-                        // this would display the 'add new repeat' dialog
-                        // ignore it.
+                    // Don't render other groups' children.
+                    TreeReference contextGroupRef = formHierarchyViewModel.getContextGroupRef();
+                    if (contextGroupRef != null && !contextGroupRef.isParentOf(currentRef, false)) {
                         break;
                     }
-                    case FormEntryController.EVENT_REPEAT: {
-                        boolean forPicker = formHierarchyViewModel.shouldShowRepeatGroupPicker();
-                        // Only break to exclude non-relevant repeat from picker
-                        if (!formController.isGroupRelevant() && forPicker) {
-                            break;
-                        }
 
-                        visibleGroupRef = currentRef;
+                    FormEntryCaption fc = formController.getCaptionPrompt();
 
-                        // Don't render other groups' children.
-                        TreeReference contextGroupRef = formHierarchyViewModel.getContextGroupRef();
-                        if (contextGroupRef != null && !contextGroupRef.isParentOf(currentRef, false)) {
+                    if (forPicker) {
+                        // Don't render other groups' instances.
+                        String repeatGroupPickerRef = formHierarchyViewModel.getRepeatGroupPickerIndex().getReference().toString(false);
+                        if (!currentRef.toString(false).equals(repeatGroupPickerRef)) {
                             break;
                         }
 
-                        FormEntryCaption fc = formController.getCaptionPrompt();
-
-                        if (forPicker) {
-                            // Don't render other groups' instances.
-                            String repeatGroupPickerRef = formHierarchyViewModel.getRepeatGroupPickerIndex().getReference().toString(false);
-                            if (!currentRef.toString(false).equals(repeatGroupPickerRef)) {
-                                break;
-                            }
-
-                            int itemNumber = fc.getMultiplicity() + 1;
+                        int itemNumber = fc.getMultiplicity() + 1;
 
-                            // e.g. `friends > 1`
-                            String repeatLabel = fc.getShortText() + " > " + itemNumber;
+                        // e.g. `friends > 1`
+                        String repeatLabel = fc.getShortText() + " > " + itemNumber;
 
-                            // If the child of the group has a more descriptive label, use that instead.
-                            if (fc.getFormElement().getChildren().size() == 1 && fc.getFormElement().getChild(0) instanceof GroupDef) {
-                                formController.stepToNextEvent(JavaRosaFormController.STEP_INTO_GROUP);
-                                String itemLabel = formController.getCaptionPrompt().getShortText();
-                                if (itemLabel != null) {
-                                    // e.g. `1. Alice`
-                                    repeatLabel = itemNumber + ".\u200E " + itemLabel;
-                                }
+                        // If the child of the group has a more descriptive label, use that instead.
+                        if (fc.getFormElement().getChildren().size() == 1 && fc.getFormElement().getChild(0) instanceof GroupDef) {
+                            formController.stepToNextEvent(JavaRosaFormController.STEP_INTO_GROUP);
+                            String itemLabel = formController.getCaptionPrompt().getShortText();
+                            if (itemLabel != null) {
+                                // e.g. `1. Alice`
+                                repeatLabel = itemNumber + ".\u200E " + itemLabel;
                             }
-
-                            elementsToDisplay.add(
-                                    new HierarchyItem(
-                                            fc.getIndex(),
-                                            HierarchyItemType.REPEAT_INSTANCE,
-                                            HtmlUtils.textToHtml(repeatLabel)
-                                    )
-                            );
-                        } else if (fc.getMultiplicity() == 0) {
-                            elementsToDisplay.add(
-                                    new HierarchyItem(
-                                            fc.getIndex(),
-                                            HierarchyItemType.REPEATABLE_GROUP,
-                                            HtmlUtils.textToHtml(fc.getShortText())
-                                    )
-                            );
                         }
 
-                        break;
+                        elementsToDisplay.add(
+                                new HierarchyItem(
+                                        fc.getIndex(),
+                                        HierarchyItemType.REPEAT_INSTANCE,
+                                        HtmlUtils.textToHtml(repeatLabel)
+                                )
+                        );
+                    } else if (fc.getMultiplicity() == 0) {
+                        elementsToDisplay.add(
+                                new HierarchyItem(
+                                        fc.getIndex(),
+                                        HierarchyItemType.REPEATABLE_GROUP,
+                                        HtmlUtils.textToHtml(fc.getShortText())
+                                )
+                        );
                     }
-                }
 
-                event = formController.stepToNextEvent(JavaRosaFormController.STEP_INTO_GROUP);
-            }
-
-            formHierarchyViewModel.setElementsToDisplay(elementsToDisplay);
-            recyclerView.setAdapter(new HierarchyListAdapter(formHierarchyViewModel.getElementsToDisplay(), this::onElementClick));
-
-            formController.jumpToIndex(formHierarchyViewModel.getCurrentIndex());
-
-            // Prevent a redundant middle screen (common on many forms
-            // that use presentation groups to display labels).
-            if (isDisplayingSingleGroup() && !formHierarchyViewModel.getScreenIndex().isBeginningOfFormIndex()) {
-                if (isGoingUp) {
-                    // Back out once more.
-                    goUpLevel();
-                } else {
-                    // Enter automatically.
-                    formController.jumpToIndex(elementsToDisplay.get(0).getFormIndex());
-                    refreshView();
+                    break;
                 }
             }
-        } catch (Exception e) {
-            Timber.e(e);
-            createErrorDialog(e.getMessage());
+
+            event = formController.stepToNextEvent(JavaRosaFormController.STEP_INTO_GROUP);
         }
+
+        formHierarchyViewModel.setElementsToDisplay(elementsToDisplay);
     }
 
     /**

From 3e1de99f9eeede0f21e62756a9c3902c9f496a94 Mon Sep 17 00:00:00 2001
From: Callum Stott <callum@seadowg.com>
Date: Wed, 8 Jan 2025 10:35:41 +0000
Subject: [PATCH 17/18] Rework DeleteRepeatDialogFragment tests

---
 .../DeleteRepeatDialogFragmentTest.java       | 38 +++++++++++--------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/collect_app/src/test/java/org/odk/collect/android/formentry/repeats/DeleteRepeatDialogFragmentTest.java b/collect_app/src/test/java/org/odk/collect/android/formentry/repeats/DeleteRepeatDialogFragmentTest.java
index 2da65a9d6e6..54dda2790b2 100644
--- a/collect_app/src/test/java/org/odk/collect/android/formentry/repeats/DeleteRepeatDialogFragmentTest.java
+++ b/collect_app/src/test/java/org/odk/collect/android/formentry/repeats/DeleteRepeatDialogFragmentTest.java
@@ -3,7 +3,7 @@
 import static junit.framework.TestCase.assertTrue;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.notNullValue;
 import static org.junit.Assert.assertFalse;
 import static org.mockito.Mockito.RETURNS_MOCKS;
 import static org.mockito.Mockito.mock;
@@ -12,12 +12,14 @@
 import static org.robolectric.Shadows.shadowOf;
 
 import android.content.DialogInterface;
+import android.os.Bundle;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentResultListener;
 import androidx.lifecycle.ViewModel;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.lifecycle.viewmodel.CreationExtras;
@@ -61,12 +63,6 @@ public <T extends ViewModel> T create(@NonNull Class<T> modelClass, @NonNull Cre
         });
     }
 
-    @Test
-    public void fragmentActivityShouldImplementDeleteRepeatDialogCallback() {
-        launchDialog();
-        assertThat(dialogFragment.getActivity(), instanceOf(DeleteRepeatDialogFragment.DeleteRepeatDialogCallback.class));
-    }
-
     @Test
     public void dialogIsNotCancellable() {
         launchDialog();
@@ -106,14 +102,23 @@ public void clickingRemoveGroup_shouldDismissTheDialog() {
     }
 
     @Test
-    public void clickingRemoveGroup_callsDeleteGroup() {
+    public void clickingRemoveGroup_setsResult() {
         AlertDialog dialog = launchDialog();
-        assertThat(activity.deleteGroupCalled, equalTo(false));
+
+        FragmentResultCapturer fragmentResultCapturer = new FragmentResultCapturer();
+        activity.getSupportFragmentManager().setFragmentResultListener(DeleteRepeatDialogFragment.REQUEST_DELETE_REPEAT, activity, fragmentResultCapturer);
 
         dialog.getButton(DialogInterface.BUTTON_POSITIVE).performClick();
+        RobolectricHelpers.runLooper();
+        assertThat(fragmentResultCapturer.result, notNullValue());
+    }
 
+    @Test
+    public void clickingRemoveGroup_callsDeleteRepeat() {
+        AlertDialog dialog = launchDialog();
+
+        dialog.getButton(DialogInterface.BUTTON_POSITIVE).performClick();
         RobolectricHelpers.runLooper();
-        assertThat(activity.deleteGroupCalled, equalTo(true));
         verify(formController).deleteRepeat();
     }
 
@@ -123,16 +128,17 @@ private AlertDialog launchDialog() {
         return (AlertDialog) ShadowDialog.getLatestDialog();
     }
 
-    public static class TestActivity extends FragmentActivity implements DeleteRepeatDialogFragment.DeleteRepeatDialogCallback {
+    public static class TestActivity extends FragmentActivity {
 
-        private boolean deleteGroupCalled;
+    }
 
-        TestActivity() {
-        }
+    private static class FragmentResultCapturer implements FragmentResultListener {
+
+        public Bundle result;
 
         @Override
-        public void deleteGroup() {
-            deleteGroupCalled = true;
+        public void onFragmentResult(@NonNull String requestKey, @NonNull Bundle result) {
+            this.result = result;
         }
     }
 }

From 9aec9826203720ff63e649393b3db90cf5d430d2 Mon Sep 17 00:00:00 2001
From: Callum Stott <callum@seadowg.com>
Date: Wed, 8 Jan 2025 10:44:39 +0000
Subject: [PATCH 18/18] Fix color declaration

---
 icons/src/main/res/drawable/ic_baseline_list_24.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icons/src/main/res/drawable/ic_baseline_list_24.xml b/icons/src/main/res/drawable/ic_baseline_list_24.xml
index 468eee49b05..f27a4a2aa68 100644
--- a/icons/src/main/res/drawable/ic_baseline_list_24.xml
+++ b/icons/src/main/res/drawable/ic_baseline_list_24.xml
@@ -6,7 +6,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?colorSurface"
+        android:fillColor="?colorOnSurface"
         android:pathData="M3,13h2v-2L3,11v2zM3,17h2v-2L3,15v2zM3,9h2L5,7L3,7v2zM7,13h14v-2L7,11v2zM7,17h14v-2L7,15v2zM7,7v2h14L21,7L7,7z" />
 
 </vector>