From bb8200d7f30f078f78b4c8c550912e63cb928d85 Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Thu, 12 Jun 2025 19:45:50 +0200 Subject: [PATCH] Replace method initStatusBar (use from common lib) add comment on adjustUIForAPILevel35 Signed-off-by: Marcel Hibbe --- .../nextcloud/talk/activities/BaseActivity.kt | 3 +- .../talk/utils/AppCompatActivityExtensions.kt | 28 ++++--------------- 2 files changed, 7 insertions(+), 24 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/activities/BaseActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/BaseActivity.kt index b609d1d77..2bc55a798 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/BaseActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/activities/BaseActivity.kt @@ -26,7 +26,7 @@ import androidx.appcompat.app.AppCompatActivity import androidx.core.content.res.ResourcesCompat import autodagger.AutoInjector import com.google.android.material.dialog.MaterialAlertDialogBuilder - +import com.nextcloud.android.common.ui.util.extensions.initStatusBar import com.nextcloud.talk.R import com.nextcloud.talk.account.AccountVerificationActivity import com.nextcloud.talk.account.ServerSelectionActivity @@ -43,7 +43,6 @@ import com.nextcloud.talk.utils.adjustUIForAPILevel35 import com.nextcloud.talk.utils.bundle.BundleKeys import com.nextcloud.talk.utils.database.user.CurrentUserProviderNew import com.nextcloud.talk.utils.preferences.AppPreferences -import com.nextcloud.talk.utils.initStatusBar import com.nextcloud.talk.utils.ssl.TrustManager import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe diff --git a/app/src/main/java/com/nextcloud/talk/utils/AppCompatActivityExtensions.kt b/app/src/main/java/com/nextcloud/talk/utils/AppCompatActivityExtensions.kt index 9e1b97def..e8a5cc64a 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/AppCompatActivityExtensions.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/AppCompatActivityExtensions.kt @@ -9,39 +9,23 @@ package com.nextcloud.talk.utils 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 +/** + * This method is similar to "adjustUIForAPILevel35" in + * AppCompatActivityExtensions.kt in https://github.com/nextcloud/android-common/ + * Only window.addSystemBarPaddings() had to be removed. This could be unified again at some point. + */ @JvmOverloads -@Suppress("MagicNumber") 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) + val isApiLevel35OrHigher = (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) if (!isApiLevel35OrHigher) { return } enableEdgeToEdge(statusBarStyle, navigationBarStyle) } - -fun AppCompatActivity.initStatusBar(@ColorInt color: Int) { - window.decorView.setOnApplyWindowInsetsListener { view, insets -> - view.setBackgroundColor(color) - - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) { - val statusBarHeight = insets.getInsets(WindowInsets.Type.statusBars()).top - view.setPadding( - view.paddingLeft, - statusBarHeight, - view.paddingRight, - 0 - ) - } - insets - } -}