From 3f2c75ce114d5a1043880a2f05cccd3d18124034 Mon Sep 17 00:00:00 2001 From: Ritika Pahwa Date: Wed, 22 Oct 2025 13:43:37 +0530 Subject: [PATCH] Refactor handleKeyboardInsets() --- .../free/nrw/commons/utils/EdgeToEdgeUtils.kt | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/utils/EdgeToEdgeUtils.kt b/app/src/main/java/fr/free/nrw/commons/utils/EdgeToEdgeUtils.kt index a5145c24d..973884164 100644 --- a/app/src/main/java/fr/free/nrw/commons/utils/EdgeToEdgeUtils.kt +++ b/app/src/main/java/fr/free/nrw/commons/utils/EdgeToEdgeUtils.kt @@ -166,14 +166,13 @@ fun applyEdgeToEdgeBottomInsets(view: View) = view.applyEdgeToEdgeInsets { inset * and accounts for navigation bar insets to avoid double offsets. */ fun View.handleKeyboardInsets() { - val existingBottomMargin = if (getTag(R.id.initial_margin_bottom) != null) { - getTag(R.id.initial_margin_bottom) as Int - } else { - setTag(R.id.initial_margin_bottom, marginBottom) - marginBottom - } - - ViewCompat.setOnApplyWindowInsetsListener(this) { _, insets -> + ViewCompat.setOnApplyWindowInsetsListener(this) { view, insets -> + val 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, marginBottom) + marginBottom + } val lp = layoutParams as MarginLayoutParams @@ -188,11 +187,8 @@ fun View.handleKeyboardInsets() { layoutParams = lp - insets + WindowInsetsCompat.CONSUMED } - - ViewCompat.requestApplyInsets(this) - } /**