app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.kt

@@ -89,7 +89,6 @@ class LoginActivity : AccountAuthenticatorActivity() {
 
         binding = ActivityLoginBinding.inflate(layoutInflater)
         applyEdgeToEdgeAllInsets(binding!!.root)
-        binding?.aboutPrivacyPolicy?.handleKeyboardInsets()
         with(binding!!) {
             setContentView(root)
 

app/src/main/java/fr/free/nrw/commons/upload/categories/UploadCategoriesFragment.kt

@@ -70,7 +70,6 @@ class UploadCategoriesFragment : UploadBaseFragment(), CategoriesContract.View {
         savedInstanceState: Bundle?
     ): View? {
         binding = UploadCategoriesFragmentBinding.inflate(inflater, container, false)
-        binding!!.llContainerButtons.handleKeyboardInsets()
         return binding!!.root
     }
 

app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsFragment.kt

@@ -70,7 +70,6 @@ class DepictsFragment : UploadBaseFragment(), DepictsContract.View {
         savedInstanceState: Bundle?
     ): View {
         _binding = UploadDepictsFragmentBinding.inflate(inflater, container, false)
-        _binding!!.navigationButtonsContainer.handleKeyboardInsets()
         return binding.root
     }
 

app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.kt

@@ -146,7 +146,6 @@ class UploadMediaDetailFragment : UploadBaseFragment(), UploadMediaDetailsContra
         inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
     ): View {
         _binding = FragmentUploadMediaDetailFragmentBinding.inflate(inflater, container, false)
-        _binding!!.mediaDetailCardView.handleKeyboardInsets()
         // intialise the adapter early to prevent uninitialized access
         uploadMediaDetailAdapter = UploadMediaDetailAdapter(
             this,

app/src/main/java/fr/free/nrw/commons/utils/EdgeToEdgeUtils.kt

@@ -166,29 +166,46 @@ fun applyEdgeToEdgeBottomInsets(view: View) = view.applyEdgeToEdgeInsets { inset
  * and accounts for navigation bar insets to avoid double offsets.
  */
 fun View.handleKeyboardInsets() {
-    ViewCompat.setOnApplyWindowInsetsListener(this) { view, insets ->
+    var existingBottomMargin = 0
-        val existingBottomMargin = if (view.getTag(R.id.initial_margin_bottom) != null) {
+
+    ViewCompat.setOnApplyWindowInsetsListener(this) { view, windowInsets ->
+        existingBottomMargin = if (view.getTag(R.id.initial_margin_bottom) != null) {
             view.getTag(R.id.initial_margin_bottom) as Int
         } else {
             view.setTag(R.id.initial_margin_bottom, view.marginBottom)
             view.marginBottom
         }
 
-        val lp = layoutParams as MarginLayoutParams
-
-        val navBarInsets = insets.getInsets(WindowInsetsCompat.Type.navigationBars())
-        val imeInsets = insets.getInsets(WindowInsetsCompat.Type.ime())
-        val imeVisible = insets.isVisible(WindowInsetsCompat.Type.ime())
-        val imeBottomMargin = imeInsets.bottom - navBarInsets.bottom
-
-        lp.bottomMargin = if (imeVisible && imeBottomMargin >= existingBottomMargin)
-            imeBottomMargin + existingBottomMargin
-        else existingBottomMargin
-
-        layoutParams = lp
-
         WindowInsetsCompat.CONSUMED
     }
+
+    // Animate during IME transition
+    ViewCompat.setWindowInsetsAnimationCallback(
+        this,
+        object : WindowInsetsAnimationCompat.Callback(
+            DISPATCH_MODE_CONTINUE_ON_SUBTREE
+        ) {
+            override fun onProgress(
+                insets: WindowInsetsCompat,
+                runningAnimations: MutableList<WindowInsetsAnimationCompat>
+            ): WindowInsetsCompat {
+                val lp = layoutParams as MarginLayoutParams
+                val navBarInsets = insets.getInsets(WindowInsetsCompat.Type.navigationBars())
+                val imeInsets = insets.getInsets(WindowInsetsCompat.Type.ime())
+                val imeVisible = insets.isVisible(WindowInsetsCompat.Type.ime())
+
+                // Avoid extra space due to system nav bar when the keyboard is shown
+                val imeBottomMargin = imeInsets.bottom - navBarInsets.bottom
+
+                lp.bottomMargin = if(imeVisible && imeBottomMargin >= existingBottomMargin)
+                    imeBottomMargin + existingBottomMargin
+                else existingBottomMargin
+
+                layoutParams = lp
+                return WindowInsetsCompat.CONSUMED
+            }
+        }
+    )
 }
 
 /**