Skip to content

Commit db459aa

Browse files
committed
Use WindowCompat utility to set edge-to-edge content display
1 parent 7dc0df9 commit db459aa

3 files changed

Lines changed: 10 additions & 24 deletions

File tree

WordPress/src/jetpack/java/org/wordpress/android/ui/accounts/login/LoginPrologueRevampedFragment.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import org.wordpress.android.ui.accounts.login.components.PrimaryButton
3131
import org.wordpress.android.ui.accounts.login.components.SecondaryButton
3232
import org.wordpress.android.ui.accounts.login.components.TopLinearGradient
3333
import org.wordpress.android.ui.compose.theme.AppTheme
34-
import org.wordpress.android.util.extensions.setTransparentSystemBars
34+
import org.wordpress.android.util.extensions.setEdgeToEdgeContentDisplay
3535

3636
val LocalPosition = compositionLocalOf { 0f }
3737

@@ -64,12 +64,12 @@ class LoginPrologueRevampedFragment : Fragment() {
6464

6565
override fun onResume() {
6666
super.onResume()
67-
requireActivity().window.setTransparentSystemBars(true)
67+
requireActivity().window.setEdgeToEdgeContentDisplay(true)
6868
}
6969

7070
override fun onPause() {
7171
super.onPause()
72-
requireActivity().window.setTransparentSystemBars(false)
72+
requireActivity().window.setEdgeToEdgeContentDisplay(true)
7373
}
7474

7575
companion object {

WordPress/src/main/java/org/wordpress/android/util/extensions/WindowExtensions.kt

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import android.view.View.SYSTEM_UI_FLAG_LAYOUT_STABLE
77
import android.view.View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR
88
import android.view.View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
99
import android.view.Window
10-
import android.view.WindowManager.LayoutParams
1110
import androidx.core.content.ContextCompat
11+
import androidx.core.view.WindowCompat
1212
import org.wordpress.android.R
1313

1414
@Suppress("DEPRECATION")
@@ -44,23 +44,9 @@ fun Window.setLightNavigationBar(showInLightMode: Boolean, applyDefaultColors: B
4444
}
4545
}
4646

47-
fun Window.setTransparentSystemBars(isTransparent: Boolean) {
48-
when (isTransparent) {
49-
true -> {
50-
if (VERSION.SDK_INT >= VERSION_CODES.R) {
51-
setDecorFitsSystemWindows(false)
52-
} else {
53-
addFlags(LayoutParams.FLAG_LAYOUT_NO_LIMITS)
54-
}
55-
}
56-
false -> {
57-
if (VERSION.SDK_INT >= VERSION_CODES.R) {
58-
setDecorFitsSystemWindows(true)
59-
} else {
60-
clearFlags(LayoutParams.FLAG_LAYOUT_NO_LIMITS)
61-
}
62-
}
63-
}
47+
fun Window.setEdgeToEdgeContentDisplay(isEnabled: Boolean) {
48+
val decorFitsSystemWindows = !isEnabled
49+
WindowCompat.setDecorFitsSystemWindows(this, decorFitsSystemWindows)
6450
}
6551

6652
@Suppress("DEPRECATION")

WordPress/src/wordpress/java/org/wordpress/android/ui/accounts/login/LoginPrologueRevampedFragment.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import org.wordpress.android.ui.accounts.login.compose.components.PrimaryButton
3333
import org.wordpress.android.ui.accounts.login.compose.components.SecondaryButton
3434
import org.wordpress.android.ui.accounts.login.compose.components.Tagline
3535
import org.wordpress.android.ui.compose.theme.AppTheme
36-
import org.wordpress.android.util.extensions.setTransparentSystemBars
36+
import org.wordpress.android.util.extensions.setEdgeToEdgeContentDisplay
3737

3838
class LoginPrologueRevampedFragment : Fragment() {
3939
private lateinit var loginPrologueListener: LoginPrologueListener
@@ -61,12 +61,12 @@ class LoginPrologueRevampedFragment : Fragment() {
6161

6262
override fun onResume() {
6363
super.onResume()
64-
requireActivity().window.setTransparentSystemBars(true)
64+
requireActivity().window.setEdgeToEdgeContentDisplay(true)
6565
}
6666

6767
override fun onPause() {
6868
super.onPause()
69-
requireActivity().window.setTransparentSystemBars(false)
69+
requireActivity().window.setEdgeToEdgeContentDisplay(false)
7070
}
7171

7272
companion object {

0 commit comments

Comments
 (0)