Fixed handling repeatable groups wrapped with regular ones

[grzesiek2010]

Closes #6015

Why is this the best possible solution? Were any other approaches considered?

We had at least two issues with this case when a repeatable group was wrapped with a regular one:

1. The fact that the regular group in the hierarchy was visible as a removable one. I've described it in https://github.com/getodk/collect/issues/6015#issuecomment-2068924271
2. A wrong path was displayed in the hierarchy when navigating up.

I think I've fixed both issues using the appropriate form index.

How does this change affect users? Describe intentional changes to behavior and behavior that could have accidentally been affected by code changes. In other words, what are the regression risks?

The pr is not big but I find it risky. We need to test the hierarchy view with nested groups (repeatable and regular ones) to make sure they are displayed in the correct way. @dbemke @srujner @WKobus please be creative and create your own forms ideally with multiple levels of nested groups.

Do we need any specific form for testing your changes? If so, please attach one.

The form I've attached in this comment: https://github.com/getodk/collect/issues/6015#issuecomment-2068924271

Does this change require updates to documentation? If so, please file an issue here and include the link below.

No.

Before submitting this PR, please make sure you have:

• [x] added or modified tests for any new or changed behavior
• [x] run ./gradlew connectedAndroidTest (or ./gradlew testLab) and confirmed all checks still pass
• [x] added a comment above any new strings describing it for translators
• [x] verified that any code or assets from external sources are properly credited in comments and/or in the about file.
• [x] verified that any new UI elements use theme colors. UI Components Style guidelines

[seadowg]

Given that @grzesiek2010 has flagged this as risky, I'll wait to merge until after testing.

[dbemke]

There is a difference between the way group/ repeats are shown in 3231nested-repeats-for-audit.xml.txt. Which one is the expected one? The light mode is the PR version, the dark mode is the master version. A different icon:

Difference in the way outer > inner is shown:

[grzesiek2010]

To me the PR version works correctly and what you see on the master branch and older versions was wrong, for example the duplicate section Inner repeat 2 in the path (the second example) or the Inner repeat 2 > 1 displayed where you are on the outer (regular group) level (the first example).

[dbemke]

Tested with Success!

Verified on a device with Android 10

Verified Cases:

• issue #6015 doesn’t occur
• repeat groups in regular groups (with and without a question in it)
• nested repeats
• removing group in the hierarchy view
• how repeats are shown (paths, icons) in the hierarchy view
• repeat group containing a field-list
• regression checks in repeat forms (forms with indexed repeat, repeat_count, nested repeats)

[WKobus]

Tested with Success!

Verified on a device with Android 14