From 991d1845581656894f6b6397a5ddb17b4cf0c583 Mon Sep 17 00:00:00 2001
From: Rohit Verma <rv17837@outlook.com>
Date: Fri, 8 Aug 2025 00:57:55 +0530
Subject: [PATCH] fix: apply system bar top and bottom insets for edge to edge

---
 app/src/main/java/fr/free/nrw/commons/AboutActivity.kt      | 2 ++
 app/src/main/java/fr/free/nrw/commons/WelcomeActivity.kt    | 2 ++
 app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.kt | 2 ++
 .../main/java/fr/free/nrw/commons/auth/SignupActivity.kt    | 2 ++
 .../fr/free/nrw/commons/category/CategoryDetailsActivity.kt | 2 ++
 .../java/fr/free/nrw/commons/contributions/MainActivity.kt  | 2 ++
 .../customselector/ui/selector/CustomSelectorActivity.kt    | 2 ++
 .../explore/depictions/WikidataItemDetailsActivity.java     | 6 ++++--
 .../free/nrw/commons/notification/NotificationActivity.kt   | 2 ++
 .../java/fr/free/nrw/commons/profile/ProfileActivity.kt     | 2 ++
 .../main/java/fr/free/nrw/commons/review/ReviewActivity.kt  | 2 ++
 .../java/fr/free/nrw/commons/settings/SettingsActivity.kt   | 2 ++
 .../main/java/fr/free/nrw/commons/upload/UploadActivity.kt  | 2 ++
 .../fr/free/nrw/commons/upload/UploadProgressActivity.kt    | 2 ++
 14 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/AboutActivity.kt b/app/src/main/java/fr/free/nrw/commons/AboutActivity.kt
index ebbb4097a..865ad3ddb 100644
--- a/app/src/main/java/fr/free/nrw/commons/AboutActivity.kt
+++ b/app/src/main/java/fr/free/nrw/commons/AboutActivity.kt
@@ -19,6 +19,7 @@ import fr.free.nrw.commons.utils.ConfigUtils.getVersionNameWithSha
 import fr.free.nrw.commons.utils.DialogUtil.showAlertDialog
 import java.util.Collections
 import androidx.core.net.toUri
+import fr.free.nrw.commons.utils.applyEdgeToEdgeTopInsets
 import fr.free.nrw.commons.utils.handleWebUrl
 import fr.free.nrw.commons.utils.setUnderlinedText
 
@@ -47,6 +48,7 @@ class AboutActivity : BaseActivity() {
          */
         binding = ActivityAboutBinding.inflate(layoutInflater)
         val view: View = binding!!.root
+        applyEdgeToEdgeTopInsets(binding!!.toolbarLayout)
         setContentView(view)
 
         setSupportActionBar(binding!!.toolbarBinding.toolbar)
diff --git a/app/src/main/java/fr/free/nrw/commons/WelcomeActivity.kt b/app/src/main/java/fr/free/nrw/commons/WelcomeActivity.kt
index 439ed1e92..0882ba117 100644
--- a/app/src/main/java/fr/free/nrw/commons/WelcomeActivity.kt
+++ b/app/src/main/java/fr/free/nrw/commons/WelcomeActivity.kt
@@ -9,6 +9,7 @@ import fr.free.nrw.commons.databinding.ActivityWelcomeBinding
 import fr.free.nrw.commons.databinding.PopupForCopyrightBinding
 import fr.free.nrw.commons.quiz.QuizActivity
 import fr.free.nrw.commons.theme.BaseActivity
+import fr.free.nrw.commons.utils.applyEdgeToEdgeAllInsets
 import fr.free.nrw.commons.utils.ConfigUtils.isBetaFlavour
 
 class WelcomeActivity : BaseActivity() {
@@ -23,6 +24,7 @@ class WelcomeActivity : BaseActivity() {
     public override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityWelcomeBinding.inflate(layoutInflater)
+        applyEdgeToEdgeAllInsets(binding!!.welcomePager.rootView)
         setContentView(binding!!.root)
 
         isQuiz = intent?.extras?.getBoolean("isQuiz", false) ?: false
diff --git a/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.kt b/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.kt
index 7a665197b..025c10180 100644
--- a/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.kt
+++ b/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.kt
@@ -32,6 +32,7 @@ import fr.free.nrw.commons.contributions.MainActivity
 import fr.free.nrw.commons.databinding.ActivityLoginBinding
 import fr.free.nrw.commons.di.ApplicationlessInjection
 import fr.free.nrw.commons.kvstore.JsonKvStore
+import fr.free.nrw.commons.utils.applyEdgeToEdgeAllInsets
 import fr.free.nrw.commons.utils.AbstractTextWatcher
 import fr.free.nrw.commons.utils.ActivityUtils.startActivityWithFlags
 import fr.free.nrw.commons.utils.ConfigUtils.isBetaFlavour
@@ -80,6 +81,7 @@ class LoginActivity : AccountAuthenticatorActivity() {
         delegate.onCreate(savedInstanceState)
 
         binding = ActivityLoginBinding.inflate(layoutInflater)
+        applyEdgeToEdgeAllInsets(binding!!.root)
         with(binding!!) {
             setContentView(root)
 
diff --git a/app/src/main/java/fr/free/nrw/commons/auth/SignupActivity.kt b/app/src/main/java/fr/free/nrw/commons/auth/SignupActivity.kt
index 5b48ecd8f..22f557bcd 100644
--- a/app/src/main/java/fr/free/nrw/commons/auth/SignupActivity.kt
+++ b/app/src/main/java/fr/free/nrw/commons/auth/SignupActivity.kt
@@ -10,6 +10,7 @@ import android.widget.Toast
 import fr.free.nrw.commons.BuildConfig
 import fr.free.nrw.commons.R
 import fr.free.nrw.commons.theme.BaseActivity
+import fr.free.nrw.commons.utils.applyEdgeToEdgeAllInsets
 import timber.log.Timber
 
 class SignupActivity : BaseActivity() {
@@ -21,6 +22,7 @@ class SignupActivity : BaseActivity() {
         Timber.d("Signup Activity started")
 
         webView = WebView(this)
+        applyEdgeToEdgeAllInsets(webView!!)
         with(webView!!) {
             setContentView(this)
             webViewClient = MyWebViewClient()
diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategoryDetailsActivity.kt b/app/src/main/java/fr/free/nrw/commons/category/CategoryDetailsActivity.kt
index c998f96ac..fefe462a9 100644
--- a/app/src/main/java/fr/free/nrw/commons/category/CategoryDetailsActivity.kt
+++ b/app/src/main/java/fr/free/nrw/commons/category/CategoryDetailsActivity.kt
@@ -23,6 +23,7 @@ import fr.free.nrw.commons.explore.categories.sub.SubCategoriesFragment
 import fr.free.nrw.commons.media.MediaDetailPagerFragment
 import fr.free.nrw.commons.media.MediaDetailProvider
 import fr.free.nrw.commons.theme.BaseActivity
+import fr.free.nrw.commons.utils.applyEdgeToEdgeAllInsets
 import fr.free.nrw.commons.utils.handleWebUrl
 import fr.free.nrw.commons.wikidata.model.WikiSite
 import fr.free.nrw.commons.wikidata.model.page.PageTitle
@@ -57,6 +58,7 @@ class CategoryDetailsActivity : BaseActivity(),
 
         binding = ActivityCategoryDetailsBinding.inflate(layoutInflater)
         val view = binding.root
+        applyEdgeToEdgeAllInsets(view)
         setContentView(view)
         supportFragmentManager = getSupportFragmentManager()
         viewPagerAdapter = ViewPagerAdapter(this, supportFragmentManager)
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 b9fa3e395..5c2c44ab5 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
@@ -34,6 +34,7 @@ import fr.free.nrw.commons.quiz.QuizChecker
 import fr.free.nrw.commons.settings.SettingsFragment
 import fr.free.nrw.commons.startWelcome
 import fr.free.nrw.commons.theme.BaseActivity
+import fr.free.nrw.commons.utils.applyEdgeToEdgeAllInsets
 import fr.free.nrw.commons.upload.UploadProgressActivity
 import fr.free.nrw.commons.upload.worker.WorkRequestHelper.Companion.makeOneTimeWorkRequest
 import fr.free.nrw.commons.utils.ViewUtilWrapper
@@ -112,6 +113,7 @@ class MainActivity : BaseActivity(), FragmentManager.OnBackStackChangedListener
     public override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = MainBinding.inflate(layoutInflater)
+        applyEdgeToEdgeAllInsets(binding!!.root)
         setContentView(binding!!.root)
         setSupportActionBar(binding!!.toolbarBinding.toolbar)
         tabLayout = binding!!.fragmentMainNavTabLayout
diff --git a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorActivity.kt b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorActivity.kt
index 7e7d7e4cd..fd2987c97 100644
--- a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorActivity.kt
+++ b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorActivity.kt
@@ -54,6 +54,7 @@ import fr.free.nrw.commons.databinding.CustomSelectorBottomLayoutBinding
 import fr.free.nrw.commons.databinding.CustomSelectorToolbarBinding
 import fr.free.nrw.commons.media.ZoomableActivity
 import fr.free.nrw.commons.theme.BaseActivity
+import fr.free.nrw.commons.utils.applyEdgeToEdgeAllInsets
 import fr.free.nrw.commons.upload.FileUtilsWrapper
 import fr.free.nrw.commons.utils.CustomSelectorUtils
 import kotlinx.coroutines.CoroutineDispatcher
@@ -198,6 +199,7 @@ class CustomSelectorActivity :
                         .fillMaxWidth(),
             )
         }
+        applyEdgeToEdgeAllInsets(binding.root)
         val view = binding.root
         setContentView(view)
 
diff --git a/app/src/main/java/fr/free/nrw/commons/explore/depictions/WikidataItemDetailsActivity.java b/app/src/main/java/fr/free/nrw/commons/explore/depictions/WikidataItemDetailsActivity.java
index ec5ea42a4..dbb5d388b 100644
--- a/app/src/main/java/fr/free/nrw/commons/explore/depictions/WikidataItemDetailsActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/explore/depictions/WikidataItemDetailsActivity.java
@@ -2,7 +2,6 @@ package fr.free.nrw.commons.explore.depictions;
 
 import static fr.free.nrw.commons.ViewPagerAdapter.pairOf;
 import static fr.free.nrw.commons.utils.UrlUtilsKt.handleWebUrl;
-
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
@@ -27,6 +26,7 @@ import fr.free.nrw.commons.media.MediaDetailProvider;
 import fr.free.nrw.commons.theme.BaseActivity;
 import fr.free.nrw.commons.upload.structure.depictions.DepictModel;
 import fr.free.nrw.commons.upload.structure.depictions.DepictedItem;
+import fr.free.nrw.commons.utils.EdgeToEdgeUtilsKt;
 import fr.free.nrw.commons.wikidata.WikidataConstants;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
@@ -62,7 +62,9 @@ public class WikidataItemDetailsActivity extends BaseActivity implements MediaDe
         super.onCreate(savedInstanceState);
 
         binding = ActivityWikidataItemDetailsBinding.inflate(getLayoutInflater());
-        setContentView(binding.getRoot());
+        final View view = binding.getRoot();
+        EdgeToEdgeUtilsKt.applyEdgeToEdgeAllInsets(view);
+        setContentView(view);
         compositeDisposable = new CompositeDisposable();
         supportFragmentManager = getSupportFragmentManager();
         viewPagerAdapter = new ViewPagerAdapter(this, getSupportFragmentManager());
diff --git a/app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.kt b/app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.kt
index 76975964b..1650d86d6 100644
--- a/app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.kt
+++ b/app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.kt
@@ -19,6 +19,7 @@ import fr.free.nrw.commons.databinding.ActivityNotificationBinding
 import fr.free.nrw.commons.notification.models.Notification
 import fr.free.nrw.commons.notification.models.NotificationType
 import fr.free.nrw.commons.theme.BaseActivity
+import fr.free.nrw.commons.utils.applyEdgeToEdgeTopInsets
 import fr.free.nrw.commons.utils.NetworkUtils
 import fr.free.nrw.commons.utils.ViewUtil
 import fr.free.nrw.commons.utils.handleWebUrl
@@ -56,6 +57,7 @@ class NotificationActivity : BaseActivity() {
         super.onCreate(savedInstanceState)
         isRead = intent.getStringExtra("title") == "read"
         binding = ActivityNotificationBinding.inflate(layoutInflater)
+        applyEdgeToEdgeTopInsets(binding.root)
         setContentView(binding.root)
         mNotificationWorkerFragment = supportFragmentManager.findFragmentByTag(
             tagNotificationWorkerFragment
diff --git a/app/src/main/java/fr/free/nrw/commons/profile/ProfileActivity.kt b/app/src/main/java/fr/free/nrw/commons/profile/ProfileActivity.kt
index 48e61051c..c01a442b2 100644
--- a/app/src/main/java/fr/free/nrw/commons/profile/ProfileActivity.kt
+++ b/app/src/main/java/fr/free/nrw/commons/profile/ProfileActivity.kt
@@ -21,6 +21,7 @@ import fr.free.nrw.commons.databinding.ActivityProfileBinding
 import fr.free.nrw.commons.profile.achievements.AchievementsFragment
 import fr.free.nrw.commons.profile.leaderboard.LeaderboardFragment
 import fr.free.nrw.commons.theme.BaseActivity
+import fr.free.nrw.commons.utils.applyEdgeToEdgeAllInsets
 import fr.free.nrw.commons.utils.DialogUtil
 import java.io.File
 import java.io.FileOutputStream
@@ -61,6 +62,7 @@ class ProfileActivity : BaseActivity() {
         super.onCreate(savedInstanceState)
 
         binding = ActivityProfileBinding.inflate(layoutInflater)
+        applyEdgeToEdgeAllInsets(binding.root)
         setContentView(binding.root)
         setSupportActionBar(binding.toolbarBinding.toolbar)
 
diff --git a/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.kt b/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.kt
index 20f289f8f..42a75aeac 100644
--- a/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.kt
+++ b/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.kt
@@ -16,6 +16,7 @@ import fr.free.nrw.commons.databinding.ActivityReviewBinding
 import fr.free.nrw.commons.delete.DeleteHelper
 import fr.free.nrw.commons.media.MediaDetailFragment
 import fr.free.nrw.commons.theme.BaseActivity
+import fr.free.nrw.commons.utils.applyEdgeToEdgeAllInsets
 import fr.free.nrw.commons.utils.DialogUtil
 import fr.free.nrw.commons.utils.ViewUtil
 import io.reactivex.android.schedulers.AndroidSchedulers
@@ -73,6 +74,7 @@ class ReviewActivity : BaseActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityReviewBinding.inflate(layoutInflater)
+        applyEdgeToEdgeAllInsets(binding.root)
         setContentView(binding.root)
 
         setSupportActionBar(binding.toolbarBinding?.toolbar)
diff --git a/app/src/main/java/fr/free/nrw/commons/settings/SettingsActivity.kt b/app/src/main/java/fr/free/nrw/commons/settings/SettingsActivity.kt
index 91c88d7b0..233e688f4 100644
--- a/app/src/main/java/fr/free/nrw/commons/settings/SettingsActivity.kt
+++ b/app/src/main/java/fr/free/nrw/commons/settings/SettingsActivity.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.MenuItem
 import fr.free.nrw.commons.databinding.ActivitySettingsBinding
 import fr.free.nrw.commons.theme.BaseActivity
+import fr.free.nrw.commons.utils.applyEdgeToEdgeAllInsets
 
 
 /**
@@ -21,6 +22,7 @@ class SettingsActivity : BaseActivity() {
         super.onCreate(savedInstanceState)
         binding = ActivitySettingsBinding.inflate(layoutInflater)
         val view = binding.root
+        applyEdgeToEdgeAllInsets(view)
         setContentView(view)
 
         setSupportActionBar(binding.toolbarBinding.toolbar)
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.kt b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.kt
index 38e7dace8..bca59428c 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.kt
+++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.kt
@@ -38,6 +38,7 @@ import fr.free.nrw.commons.mwapi.UserClient
 import fr.free.nrw.commons.nearby.Place
 import fr.free.nrw.commons.settings.Prefs
 import fr.free.nrw.commons.theme.BaseActivity
+import fr.free.nrw.commons.utils.applyEdgeToEdgeAllInsets
 import fr.free.nrw.commons.upload.ThumbnailsAdapter.OnThumbnailDeletedListener
 import fr.free.nrw.commons.upload.categories.UploadCategoriesFragment
 import fr.free.nrw.commons.upload.depicts.DepictsFragment
@@ -177,6 +178,7 @@ class UploadActivity : BaseActivity(), UploadContract.View, UploadBaseFragment.C
         presenter?.setupBasicKvStoreFactory { BasicKvStore(this@UploadActivity, it) }
 
         _binding = ActivityUploadBinding.inflate(layoutInflater)
+        applyEdgeToEdgeAllInsets(_binding!!.root)
         setContentView(binding.root)
 
         // Overrides the back button to make sure the user is prepared to lose their progress
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadProgressActivity.kt b/app/src/main/java/fr/free/nrw/commons/upload/UploadProgressActivity.kt
index 5d98ebffb..3ada76f23 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/UploadProgressActivity.kt
+++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadProgressActivity.kt
@@ -10,6 +10,7 @@ import fr.free.nrw.commons.ViewPagerAdapter
 import fr.free.nrw.commons.contributions.ContributionDao
 import fr.free.nrw.commons.databinding.ActivityUploadProgressBinding
 import fr.free.nrw.commons.theme.BaseActivity
+import fr.free.nrw.commons.utils.applyEdgeToEdgeAllInsets
 import javax.inject.Inject
 
 /**
@@ -35,6 +36,7 @@ class UploadProgressActivity : BaseActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityUploadProgressBinding.inflate(layoutInflater)
+        applyEdgeToEdgeAllInsets(binding.root)
         setContentView(binding.root)
         viewPagerAdapter = ViewPagerAdapter(this, supportFragmentManager)
         binding.uploadProgressViewPager.setAdapter(viewPagerAdapter)