Merge branch 'trunk' into analysis/wordpress-all-warnings-as-errors

Author: ovitrif

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

@@ -31,7 +31,7 @@ import org.wordpress.android.ui.accounts.login.components.PrimaryButton
 import org.wordpress.android.ui.accounts.login.components.SecondaryButton
 import org.wordpress.android.ui.accounts.login.components.TopLinearGradient
 import org.wordpress.android.ui.compose.theme.AppTheme
-import org.wordpress.android.util.extensions.setTransparentSystemBars
+import org.wordpress.android.util.extensions.setEdgeToEdgeContentDisplay
 
 val LocalPosition = compositionLocalOf { 0f }
 
@@ -64,12 +64,12 @@ class LoginPrologueRevampedFragment : Fragment() {
 
     override fun onResume() {
         super.onResume()
-        requireActivity().window.setTransparentSystemBars(true)
+        requireActivity().window.setEdgeToEdgeContentDisplay(true)
     }
 
     override fun onPause() {
         super.onPause()
-        requireActivity().window.setTransparentSystemBars(false)
+        requireActivity().window.setEdgeToEdgeContentDisplay(true)
     }
 
     companion object {

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

@@ -10,11 +10,11 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Devices
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
 import org.wordpress.android.R
 import org.wordpress.android.ui.compose.theme.AppTheme
 
@@ -33,7 +33,7 @@ fun LoopingTextWithBackground(
         LoopingText(
                 modifier = Modifier
                         .fillMaxSize()
-                        .padding(horizontal = 20.dp)
+                        .padding(horizontal = dimensionResource(R.dimen.login_prologue_revamped_prompts_padding))
                         .then(textModifier)
         )
     }

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

@@ -8,6 +8,7 @@ import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
@@ -31,7 +32,7 @@ fun PrimaryButton(
                     contentColor = colorResource(R.color.text_color_jetpack_login_splash_primary_button),
             ),
             modifier = modifier
-                    .padding(horizontal = 20.dp)
+                    .padding(horizontal = dimensionResource(R.dimen.login_prologue_revamped_buttons_padding))
                     .padding(top = Margin.ExtraLarge.value)
                     .fillMaxWidth(),
     ) {

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

@@ -9,6 +9,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
@@ -31,7 +32,7 @@ fun SecondaryButton(
                     backgroundColor = Color.Transparent,
             ),
             modifier = modifier
-                    .padding(horizontal = 20.dp)
+                    .padding(horizontal = dimensionResource(R.dimen.login_prologue_revamped_buttons_padding))
                     .padding(bottom = 60.dp)
                     .fillMaxWidth(),
     ) {

WordPress/src/jetpack/res/values-w600dp/dimens.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="login_prologue_revamped_prompts_padding">150dp</dimen>
+</resources>

WordPress/src/jetpack/res/values/dimens.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="login_prologue_tagline_start_end_padding">40dp</dimen>
+    <dimen name="login_prologue_revamped_prompts_padding">20dp</dimen>
 </resources>

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

@@ -7,8 +7,8 @@ import android.view.View.SYSTEM_UI_FLAG_LAYOUT_STABLE
 import android.view.View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR
 import android.view.View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
 import android.view.Window
-import android.view.WindowManager.LayoutParams
 import androidx.core.content.ContextCompat
+import androidx.core.view.WindowCompat
 import org.wordpress.android.R
 
 @Suppress("DEPRECATION")
@@ -44,23 +44,9 @@ fun Window.setLightNavigationBar(showInLightMode: Boolean, applyDefaultColors: B
     }
 }
 
-fun Window.setTransparentSystemBars(isTransparent: Boolean) {
-    when (isTransparent) {
-        true -> {
-            if (VERSION.SDK_INT >= VERSION_CODES.R) {
-                setDecorFitsSystemWindows(false)
-            } else {
-                addFlags(LayoutParams.FLAG_LAYOUT_NO_LIMITS)
-            }
-        }
-        false -> {
-            if (VERSION.SDK_INT >= VERSION_CODES.R) {
-                setDecorFitsSystemWindows(true)
-            } else {
-                clearFlags(LayoutParams.FLAG_LAYOUT_NO_LIMITS)
-            }
-        }
-    }
+fun Window.setEdgeToEdgeContentDisplay(isEnabled: Boolean) {
+    val decorFitsSystemWindows = !isEnabled
+    WindowCompat.setDecorFitsSystemWindows(this, decorFitsSystemWindows)
 }
 
 @Suppress("DEPRECATION")

WordPress/src/main/res/values-v29/styles_login.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="LoginTheme.TransparentSystemBars" parent="LoginTheme.BaseTransparentSystemBars">
+        <item name="android:enforceNavigationBarContrast">false</item>
+    </style>
+
+</resources>

WordPress/src/main/res/values-w600dp/dimens.xml

@@ -12,4 +12,6 @@
     <dimen name="post_list_content_margin_standard">@dimen/content_margin_tablet</dimen>
     <dimen name="interests_content_margin">@dimen/margin_extra_extra_large</dimen>
 
+    <!-- Login Prologue -->
+    <dimen name="login_prologue_revamped_buttons_padding">250dp</dimen>
 </resources>

WordPress/src/main/res/values/dimens.xml

@@ -677,6 +677,7 @@
     <dimen name="login_prologue_content_area">320dp</dimen>
     <dimen name="login_prologue_background_circle_size">140dp</dimen>
     <dimen name="login_prologue_background_circle_size_large">160dp</dimen>
+    <dimen name="login_prologue_revamped_buttons_padding">32dp</dimen>
 
     <!-- edit text with chips view -->
     <dimen name="edit_text_with_chips_margin_top">5dp</dimen>