From f1bc39953b02ff83c6d0d64e59252747e46cc0a5 Mon Sep 17 00:00:00 2001
From: Rohit Verma <rv17837@outlook.com>
Date: Sat, 6 Sep 2025 21:56:34 +0530
Subject: [PATCH] fix(upload): handle keyboard insets for bottom buttons at
 Depicts step

---
 .../commons/upload/depicts/DepictsFragment.kt |  2 +
 .../res/layout/upload_depicts_fragment.xml    | 57 +++++++++----------
 app/src/main/res/values/dimens.xml            |  3 +
 3 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsFragment.kt b/app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsFragment.kt
index 39bcabb46..484750410 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsFragment.kt
+++ b/app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsFragment.kt
@@ -27,6 +27,7 @@ import fr.free.nrw.commons.upload.UploadActivity
 import fr.free.nrw.commons.upload.UploadBaseFragment
 import fr.free.nrw.commons.upload.structure.depictions.DepictedItem
 import fr.free.nrw.commons.utils.DialogUtil.showAlertDialog
+import fr.free.nrw.commons.utils.handleKeyboardInsets
 import fr.free.nrw.commons.wikidata.WikidataConstants.SELECTED_NEARBY_PLACE
 import io.reactivex.Notification
 import io.reactivex.android.schedulers.AndroidSchedulers
@@ -69,6 +70,7 @@ class DepictsFragment : UploadBaseFragment(), DepictsContract.View {
         savedInstanceState: Bundle?
     ): View {
         _binding = UploadDepictsFragmentBinding.inflate(inflater, container, false)
+        _binding!!.navigationButtonsContainer.handleKeyboardInsets()
         return binding.root
     }
 
diff --git a/app/src/main/res/layout/upload_depicts_fragment.xml b/app/src/main/res/layout/upload_depicts_fragment.xml
index 9fa621396..a1b85666c 100644
--- a/app/src/main/res/layout/upload_depicts_fragment.xml
+++ b/app/src/main/res/layout/upload_depicts_fragment.xml
@@ -124,38 +124,35 @@
     </LinearLayout>
 
     <View
-        android:id="@+id/button_divider"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_above="@+id/depicts_next"
-        android:background="@color/divider_grey" />
+      android:id="@+id/button_divider"
+      android:layout_width="match_parent"
+      android:layout_height="1dp"
+      android:layout_above="@+id/navigation_buttons_container"
+      android:background="@color/divider_grey" />
 
-    <Button
-      android:id="@+id/depicts_next"
-      android:layout_width="wrap_content"
+    <LinearLayout
+      android:id="@+id/navigation_buttons_container"
+      android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:layout_alignParentEnd="true"
-      android:layout_alignParentRight="true"
+      android:paddingHorizontal="@dimen/medium_padding"
+      android:paddingVertical="@dimen/small_padding"
       android:layout_alignParentBottom="true"
-      android:layout_marginEnd="24dp"
-      android:layout_marginRight="24dp"
-      android:layout_marginBottom="24dp"
-      android:contentDescription="@string/next"
-      android:text="@string/next"
-      android:textColor="@android:color/white" />
-
-    <Button
-      android:id="@+id/depicts_previous"
-      style="@style/Widget.AppCompat.Button.Borderless"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_alignParentBottom="true"
-      android:layout_marginEnd="@dimen/standard_gap"
-      android:layout_marginRight="@dimen/standard_gap"
-      android:layout_marginBottom="24dp"
-      android:layout_toStartOf="@id/depicts_next"
-      android:layout_toLeftOf="@id/depicts_next"
-      android:contentDescription="@string/previous"
-      android:text="@string/previous" />
+      android:gravity="end">
+        <Button
+          android:id="@+id/depicts_previous"
+          style="@style/Widget.AppCompat.Button.Borderless"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_marginEnd="@dimen/standard_gap"
+          android:contentDescription="@string/previous"
+          android:text="@string/previous" />
 
+        <Button
+          android:id="@+id/depicts_next"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:contentDescription="@string/next"
+          android:text="@string/next"
+          android:textColor="@android:color/white" />
+    </LinearLayout>
 </RelativeLayout>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index cd51dde76..5a3634277 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -7,6 +7,9 @@
     <dimen name="achievements_activity_margin_vertical">8dp</dimen>
     <dimen name="medium_height">12dp</dimen>
     <dimen name="medium_width">12dp</dimen>
+    <dimen name="small_padding">8dp</dimen>
+    <dimen name="medium_padding">16dp</dimen>
+    <dimen name="large_padding">24dp</dimen>
 
     <!-- Standard margins / padding -->
     <dimen name="login_padding">30dp</dimen>