From a64bd1bd553c1675ff0ce0f32e4edf68864b23f9 Mon Sep 17 00:00:00 2001 From: alperozturk Date: Mon, 26 May 2025 14:55:03 +0800 Subject: [PATCH 1/4] add setStatusBarColor Signed-off-by: alperozturk --- .../extensions/AppCompatActivityExtensions.kt | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) 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 50b65eee..bff34d18 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 @@ -9,8 +9,10 @@ package com.nextcloud.android.common.ui.util.extensions import android.graphics.Color import android.os.Build +import android.view.WindowInsets import androidx.activity.SystemBarStyle import androidx.activity.enableEdgeToEdge +import androidx.annotation.ColorInt import androidx.appcompat.app.AppCompatActivity @JvmOverloads @@ -28,3 +30,21 @@ fun AppCompatActivity.adjustUIForAPILevel35( window.addSystemBarPaddings() } + +fun AppCompatActivity.setStatusBarColor( + @ColorInt color: Int +) { + window.decorView.setOnApplyWindowInsetsListener { view, insets -> + val statusBarHeight = + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { + insets.getInsets(WindowInsets.Type.statusBars()).top + } else { + @Suppress("DEPRECATION") + insets.systemWindowInsetTop + } + + view.setBackgroundColor(color) + view.setPadding(0, statusBarHeight, 0, 0) + insets + } +} From 1e91c59333e5332656f34ed2fc18cd2a2b4a4885 Mon Sep 17 00:00:00 2001 From: alperozturk Date: Mon, 2 Jun 2025 12:28:21 +0800 Subject: [PATCH 2/4] only add padding Android 15 and above Signed-off-by: alperozturk --- .../extensions/AppCompatActivityExtensions.kt | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 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 bff34d18..9a7d7de7 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 @@ -35,16 +35,13 @@ fun AppCompatActivity.setStatusBarColor( @ColorInt color: Int ) { window.decorView.setOnApplyWindowInsetsListener { view, insets -> - val statusBarHeight = - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { - insets.getInsets(WindowInsets.Type.statusBars()).top - } else { - @Suppress("DEPRECATION") - insets.systemWindowInsetTop - } - view.setBackgroundColor(color) - view.setPadding(0, statusBarHeight, 0, 0) + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) { + val statusBarHeight = insets.getInsets(WindowInsets.Type.statusBars()).top + view.setPadding(0, statusBarHeight, 0, 0) + } + insets } } From b352ff9cff185f311f9016832ff98095fbdd23a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alper=20=C3=96zt=C3=BCrk?= <67455295+alperozturk96@users.noreply.github.com> Date: Wed, 11 Jun 2025 06:13:26 +0200 Subject: [PATCH 3/4] Update ui/src/main/java/com/nextcloud/android/common/ui/util/extensions/AppCompatActivityExtensions.kt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Alper Öztürk <67455295+alperozturk96@users.noreply.github.com> --- .../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 9a7d7de7..1b91a635 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 @@ -31,7 +31,7 @@ fun AppCompatActivity.adjustUIForAPILevel35( window.addSystemBarPaddings() } -fun AppCompatActivity.setStatusBarColor( +fun AppCompatActivity. initStatusBar( @ColorInt color: Int ) { window.decorView.setOnApplyWindowInsetsListener { view, insets -> From 88654d1e1394d70445727109dae4bcef9ed83ff2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alper=20=C3=96zt=C3=BCrk?= <67455295+alperozturk96@users.noreply.github.com> Date: Wed, 11 Jun 2025 06:13:41 +0200 Subject: [PATCH 4/4] Update AppCompatActivityExtensions.kt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Alper Öztürk <67455295+alperozturk96@users.noreply.github.com> --- .../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 1b91a635..122a96d3 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 @@ -31,7 +31,7 @@ fun AppCompatActivity.adjustUIForAPILevel35( window.addSystemBarPaddings() } -fun AppCompatActivity. initStatusBar( +fun AppCompatActivity.initStatusBar( @ColorInt color: Int ) { window.decorView.setOnApplyWindowInsetsListener { view, insets ->