Merge pull request #6489 from grzesiek2010/COLLECT-6362

Fixed the bug with linearlayout's divider in RTL
getodk · Nov 5, 2024 · 8b72cd6 · 8b72cd6
2 parents 700594f + fd487eb
commit 8b72cd6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/collect_app/src/main/java/org/odk/collect/android/formentry/FormEndView.kt b/collect_app/src/main/java/org/odk/collect/android/formentry/FormEndView.kt
@@ -42,6 +42,8 @@ class FormEndView(
             listener.onSaveClicked(true)
         }
 
+        binding.divider.isVisible = binding.saveAsDraft.isVisible && binding.finalize.isVisible
+
         val shouldFormBeSentAutomatically = formEndViewModel.shouldFormBeSentAutomatically()
         if (shouldFormBeSentAutomatically) {
             binding.finalize.text = context.getString(org.odk.collect.strings.R.string.send)

diff --git a/collect_app/src/main/res/drawable/margin_standard_list_divider.xml b/collect_app/src/main/res/drawable/margin_standard_list_divider.xml
diff --git a/collect_app/src/main/res/layout/form_entry_end.xml b/collect_app/src/main/res/layout/form_entry_end.xml
@@ -95,8 +95,6 @@ the specific language governing permissions and limitations under the License.
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="64dp"
-            android:divider="@drawable/margin_standard_list_divider"
-            android:showDividers="middle"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -114,6 +112,11 @@ the specific language governing permissions and limitations under the License.
                 app:iconGravity="textStart"
                 app:screenName="@string/form_end_screen" />
 
+            <Space
+                android:id="@+id/divider"
+                android:layout_width="@dimen/margin_standard"
+                android:layout_height="match_parent" />
+
             <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
                 android:id="@+id/finalize"
                 style="?materialButtonIconStyle"