From 5ddad164f420eb1719afee951cb8ebca94d201d5 Mon Sep 17 00:00:00 2001 From: alperozturk Date: Mon, 28 Jul 2025 18:03:23 +0200 Subject: [PATCH 1/4] fix Signed-off-by: alperozturk --- .../common/ui/util/extensions/WindowExtensions.kt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/util/extensions/WindowExtensions.kt b/ui/src/main/java/com/nextcloud/android/common/ui/util/extensions/WindowExtensions.kt index 492c4e0e..6f5c9e74 100644 --- a/ui/src/main/java/com/nextcloud/android/common/ui/util/extensions/WindowExtensions.kt +++ b/ui/src/main/java/com/nextcloud/android/common/ui/util/extensions/WindowExtensions.kt @@ -19,13 +19,15 @@ fun Window?.addSystemBarPaddings() { } ViewCompat.setOnApplyWindowInsetsListener(decorView) { v: View, insets: WindowInsetsCompat -> - val bars = insets.getInsets(WindowInsetsCompat.Type.systemBars()) + val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()) + val ime = insets.getInsets(WindowInsetsCompat.Type.ime()) + val bottomInset = maxOf(systemBars.bottom, ime.bottom) v.updatePadding( - left = bars.left, - top = bars.top, - right = bars.right, - bottom = bars.bottom + left = systemBars.left, + top = systemBars.top, + right = systemBars.right, + bottom = bottomInset ) WindowInsetsCompat.CONSUMED From b5094daea7abfce34138894219d6d7cc5640484f Mon Sep 17 00:00:00 2001 From: alperozturk Date: Tue, 29 Jul 2025 11:59:36 +0200 Subject: [PATCH 2/4] fix status bar Signed-off-by: alperozturk --- .../ui/util/extensions/AppCompatActivityExtensions.kt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/util/extensions/AppCompatActivityExtensions.kt b/ui/src/main/java/com/nextcloud/android/common/ui/util/extensions/AppCompatActivityExtensions.kt index c1b02738..533252cf 100644 --- a/ui/src/main/java/com/nextcloud/android/common/ui/util/extensions/AppCompatActivityExtensions.kt +++ b/ui/src/main/java/com/nextcloud/android/common/ui/util/extensions/AppCompatActivityExtensions.kt @@ -21,13 +21,7 @@ fun AppCompatActivity.adjustUIForAPILevel35( statusBarStyle: SystemBarStyle = SystemBarStyle.auto(Color.TRANSPARENT, Color.TRANSPARENT), navigationBarStyle: SystemBarStyle = SystemBarStyle.auto(Color.TRANSPARENT, Color.TRANSPARENT) ) { - val isApiLevel35OrHigher = (Build.VERSION.SDK_INT >= 35) - if (!isApiLevel35OrHigher) { - return - } - enableEdgeToEdge(statusBarStyle, navigationBarStyle) - window.addSystemBarPaddings() } From d992b56c0ffd01b533476b62fa6954336cbc835b Mon Sep 17 00:00:00 2001 From: alperozturk Date: Tue, 29 Jul 2025 12:05:27 +0200 Subject: [PATCH 3/4] change function name Signed-off-by: alperozturk --- .../common/ui/util/extensions/AppCompatActivityExtensions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/util/extensions/AppCompatActivityExtensions.kt b/ui/src/main/java/com/nextcloud/android/common/ui/util/extensions/AppCompatActivityExtensions.kt index 533252cf..15b049d0 100644 --- a/ui/src/main/java/com/nextcloud/android/common/ui/util/extensions/AppCompatActivityExtensions.kt +++ b/ui/src/main/java/com/nextcloud/android/common/ui/util/extensions/AppCompatActivityExtensions.kt @@ -17,7 +17,7 @@ import androidx.appcompat.app.AppCompatActivity @JvmOverloads @Suppress("MagicNumber") -fun AppCompatActivity.adjustUIForAPILevel35( +fun AppCompatActivity.prepareWindowForEdgeToEdge( statusBarStyle: SystemBarStyle = SystemBarStyle.auto(Color.TRANSPARENT, Color.TRANSPARENT), navigationBarStyle: SystemBarStyle = SystemBarStyle.auto(Color.TRANSPARENT, Color.TRANSPARENT) ) { From 562ae0a8605def9665528e0ab0ab5051178ae3e0 Mon Sep 17 00:00:00 2001 From: alperozturk Date: Tue, 29 Jul 2025 12:06:16 +0200 Subject: [PATCH 4/4] change function name Signed-off-by: alperozturk --- .../common/ui/util/extensions/AppCompatActivityExtensions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/util/extensions/AppCompatActivityExtensions.kt b/ui/src/main/java/com/nextcloud/android/common/ui/util/extensions/AppCompatActivityExtensions.kt index 15b049d0..1f6f4c51 100644 --- a/ui/src/main/java/com/nextcloud/android/common/ui/util/extensions/AppCompatActivityExtensions.kt +++ b/ui/src/main/java/com/nextcloud/android/common/ui/util/extensions/AppCompatActivityExtensions.kt @@ -17,7 +17,7 @@ import androidx.appcompat.app.AppCompatActivity @JvmOverloads @Suppress("MagicNumber") -fun AppCompatActivity.prepareWindowForEdgeToEdge( +fun AppCompatActivity.applyEdgeToEdgeWithSystemBarPadding( statusBarStyle: SystemBarStyle = SystemBarStyle.auto(Color.TRANSPARENT, Color.TRANSPARENT), navigationBarStyle: SystemBarStyle = SystemBarStyle.auto(Color.TRANSPARENT, Color.TRANSPARENT) ) {