From cc7ce340218701f0cfcbc7043c50e92b81339e4c Mon Sep 17 00:00:00 2001
From: Kota-Jagadeesh <kota.jagadesh123@gmail.com>
Date: Thu, 16 Oct 2025 23:15:50 +0530
Subject: [PATCH 1/2] Ensure bottom navigation bar is visible on back
 navigation

---
 .../nrw/commons/contributions/MainActivity.kt     | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.kt b/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.kt
index ac7068cc7..52a011314 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.kt
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.kt
@@ -381,7 +381,8 @@ after opening the app.
             if (contributionsFragment?.backButtonClicked() != true) { //If this one does not want to handle
                 // the back press, let the activity do so
                 super.onBackPressed()
-                }
+                showTabs()
+            }
             }
         ActiveFragment.NEARBY -> {
             // Means that nearby fragment is visible
@@ -390,7 +391,8 @@ after opening the app.
                 supportFragmentManager.beginTransaction().remove(it).commit()
                     }
                 setSelectedItemId(NavTab.CONTRIBUTIONS.code())
-                }
+                showTabs()
+            }
             }
          ActiveFragment.EXPLORE -> {
             // Explore Fragment is visible
@@ -400,15 +402,18 @@ after opening the app.
                 } else {
                     setSelectedItemId(NavTab.CONTRIBUTIONS.code())
                     }
-                }
+                showTabs()
+            }
             }
          ActiveFragment.BOOKMARK -> {
             // Means that bookmark fragment is visible
             bookmarkFragment?.onBackPressed()
-            }
+             showTabs()
+         }
          else -> {
             super.onBackPressed()
-            }
+             showTabs()
+         }
         }
     }
 

From 976e2112e7bbebba96b2c2ad809bb360f27b0730 Mon Sep 17 00:00:00 2001
From: Kota-Jagadeesh <kota.jagadesh123@gmail.com>
Date: Thu, 16 Oct 2025 23:16:10 +0530
Subject: [PATCH 2/2] Prevent hiding bottom navigation bar in
 MediaDetailPagerFragment

---
 .../free/nrw/commons/media/MediaDetailPagerFragment.kt | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.kt b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.kt
index 92cca611e..d0ae6a6eb 100644
--- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.kt
+++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.kt
@@ -109,8 +109,6 @@ class MediaDetailPagerFragment : CommonsDaggerSupportFragment(), OnPageChangeLis
         // If fragment is associated with ProfileActivity, then hide the tabLayout
         if (activity is ProfileActivity) {
             (activity as ProfileActivity).setTabLayoutVisibility(false)
-        } else if (activity is MainActivity) {
-            (activity as MainActivity).hideTabs()
         }
 
         binding!!.mediaDetailsPager.adapter = adapter
@@ -142,6 +140,14 @@ class MediaDetailPagerFragment : CommonsDaggerSupportFragment(), OnPageChangeLis
         initProvider()
     }
 
+    override fun onDestroyView() {
+        super.onDestroyView()
+        if (activity is MainActivity) {
+            (activity as MainActivity).showTabs()
+        }
+        binding = null
+    }
+
     /**
      * initialise the provider, based on from where the fragment was started, as in from an activity
      * or a fragment