Merge branch 'trunk' of github.com:wordpress-mobile/WordPress-Android into analysis/wordpress-main-deprecated-warnings-part-2

� Conflicts:
�	WordPress/src/main/java/org/wordpress/android/ui/mediapicker/loader/DeviceMediaLoader.kt

Author: ParaskP7

RELEASE-NOTES.txt

@@ -3,6 +3,7 @@
 21.0
 -----
 * [*] Updates splash screen for Android 12+ [https://github.com/wordpress-mobile/WordPress-Android/pull/17273]
+* [*] Fix text color of success messages in the QR code login flow [https://github.com/wordpress-mobile/WordPress-Android/pull/17286]
 
 20.9
 -----

WordPress/src/androidTest/java/org/wordpress/android/TestUtils.java

@@ -4,9 +4,10 @@
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.database.sqlite.SQLiteDatabase;
-import android.preference.PreferenceManager;
 import android.text.TextUtils;
 
+import androidx.preference.PreferenceManager;
+
 import org.greenrobot.eventbus.EventBus;
 import org.wordpress.android.util.DateTimeUtils;
 

WordPress/src/androidTest/java/org/wordpress/android/e2e/ContactUsTests.java

@@ -38,29 +38,6 @@ public void e2eSendButtonEnabledWhenTextIsEntered() {
         }
     }
 
-    @Ignore("As long as CI does not use gradle.properties from MobileSecrets")
-    @Test
-    public void e2eMessageCanBeSent() {
-        String userMessageText = "Please ignore, this is an automated test.";
-        String automatedReplyText = "Mobile support will respond as soon as possible, "
-                                    + "generally within 48-96 hours. "
-                                    + "Please reply with your site address (URL) "
-                                    + "and any additional details we should know.";
-
-        try {
-            new LoginFlow()
-                .chooseContinueWithWpCom()
-                .tapHelp()
-                .openContactUs()
-                .setMessageText(userMessageText)
-                .tapSendButton()
-                .assertUserMessageDelivered(userMessageText)
-                .assertSystemMessageReceived(automatedReplyText);
-        } finally {
-            new ContactSupportScreen().goBackAndDeleteUnsentMessageIfNeeded();
-        }
-    }
-
     @Test
     public void e2eHelpCanBeOpenedWhileEnteringEmail() {
         new LoginFlow()

WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/ContactSupportScreen.java

@@ -8,7 +8,6 @@
 
 import static androidx.test.espresso.Espresso.onView;
 import static androidx.test.espresso.assertion.ViewAssertions.matches;
-import static androidx.test.espresso.matcher.ViewMatchers.hasDescendant;
 import static androidx.test.espresso.matcher.ViewMatchers.isCompletelyDisplayed;
 import static androidx.test.espresso.matcher.ViewMatchers.isEnabled;
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
@@ -18,7 +17,6 @@
 import static org.hamcrest.Matchers.not;
 import static org.wordpress.android.support.WPSupportUtils.populateTextField;
 import static org.wordpress.android.support.WPSupportUtils.sleep;
-import static org.wordpress.android.support.WPSupportUtils.waitForElementToBeDisplayed;
 import static org.wordpress.android.support.WPSupportUtils.waitForElementToBeDisplayedWithoutFailure;
 
 public class ContactSupportScreen {
@@ -42,11 +40,6 @@ public class ContactSupportScreen {
     ));
 
     // Actions:
-    public ContactSupportScreen tapSendButton() {
-        sendButton.perform(ViewActions.click());
-        return this;
-    }
-
     public ContactSupportScreen setMessageText(String text) {
         populateTextField(textInput, text);
         // This sleep serves only one purpose: allowing human to notice
@@ -88,32 +81,4 @@ public ContactSupportScreen assertSendButtonEnabled() {
         sendButton.check(matches(isEnabled()));
         return this;
     }
-
-    public ContactSupportScreen assertUserMessageDelivered(String messageText) {
-        ViewInteraction userMessageContainer = onView(allOf(
-                withId(R.id.request_user_message_container),
-                hasDescendant(allOf(
-                        withId(R.id.request_user_message_text),
-                        withText(messageText)
-                )),
-                hasDescendant(allOf(
-                        withId(R.id.request_user_message_status),
-                        withText("Delivered")
-                ))
-        ));
-
-        waitForElementToBeDisplayed(userMessageContainer);
-        userMessageContainer.check(matches(isCompletelyDisplayed()));
-        return this;
-    }
-
-    public ContactSupportScreen assertSystemMessageReceived(String messageText) {
-        ViewInteraction systemResponseBubble = onView(allOf(
-                withId(R.id.request_system_message_text),
-                withText(messageText)));
-
-        waitForElementToBeDisplayed(systemResponseBubble);
-        systemResponseBubble.check(matches(isCompletelyDisplayed()));
-        return this;
-    }
 }

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

@@ -5,7 +5,6 @@ import android.content.res.Configuration.UI_MODE_NIGHT_YES
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import android.view.WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
@@ -32,6 +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
 
 val LocalPosition = compositionLocalOf { 0f }
 
@@ -64,12 +64,12 @@ class LoginPrologueRevampedFragment : Fragment() {
 
     override fun onResume() {
         super.onResume()
-        requireActivity().window.addFlags(FLAG_LAYOUT_NO_LIMITS)
+        requireActivity().window.setTransparentSystemBars(true)
     }
 
     override fun onPause() {
         super.onPause()
-        requireActivity().window.clearFlags(FLAG_LAYOUT_NO_LIMITS)
+        requireActivity().window.setTransparentSystemBars(false)
     }
 
     companion object {

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

@@ -11,71 +11,88 @@ import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
-import kotlin.math.exp
-import kotlin.math.ln
+import kotlin.math.PI
 
-// This factor is used to convert the raw values emitted from device sensor to an appropriate scale for the consuming
-// composables.
-private const val ACCELERATION_FACTOR = -0.1f
+/**
+ * This factor is used to convert the raw values emitted from device sensor to an appropriate scale for the consuming
+ * composables. The range for pitch values is -π/2 to π/2, representing an upright pose and an upside-down pose,
+ * respectively. E.g. Setting this factor to 0.2 / (π/2) will scale this output range to -0.2 to 0.2. The resulting
+ * product is interpreted in units proportional to the repeating child composable's height per second, i.e. at a
+ * velocity of 0.1, it will take 10 seconds for the looping animation to repeat. When applied, the product can also be
+ * thought of as a frequency value in Hz.
+ */
+private const val VELOCITY_FACTOR = (0.2 / (PI / 2)).toFloat()
 
-// The maximum velocity (in either direction)
-private const val MAXIMUM_VELOCITY = 0.125f
-
-// The velocity decay factor (i.e. 1/4th velocity after 1 second)
-private val VELOCITY_DECAY = -ln(4f)
-
-// An additional acceleration applied to make the text scroll when the device is flat on a table
-private const val DRIFT = -0.05f
+/**
+ * This is the default pitch provided for devices lacking support for the sensors used. This is consumed by the model
+ * as a value in radians, but is specified here as -30 degrees for convenience. This represents a device pose that is
+ * slightly upright from flat, approximating a typical usage pattern, and will ensure that the text is animated at
+ * an appropriate velocity when sensors are unavailable.
+ */
+private const val DEFAULT_PITCH = (-30 * PI / 180).toFloat()
 
 @HiltViewModel
 class LoginPrologueRevampedViewModel @Inject constructor(
     @ApplicationContext appContext: Context,
 ) : ViewModel() {
-    private var acceleration = -0.3f // Default value when sensor is off
-    private var velocity = 0f
+    private val accelerometerData = FloatArray(3)
+    private val magnetometerData = FloatArray(3)
+    private val rotationMatrix = FloatArray(9)
+    private val orientationAngles = floatArrayOf(0f, DEFAULT_PITCH, 0f)
     private var position = 0f
 
     /**
      * This function updates the physics model for the interactive animation by applying the elapsed time (in seconds)
      * to update the velocity and position.
      *
-     *  * Velocity is constrained so that it does not fall below -MAXIMUM_VELOCITY and does not exceed MAXIMUM_VELOCITY.
+     *  * Velocity is calculated as proportional to the pitch angle
      *  * Position is constrained so that it always falls between 0 and 1, and represents the relative vertical offset
      *  in terms of the height of the repeated child composable.
      *
      *  @param elapsed the elapsed time (in seconds) since the last frame
      */
     fun updateForFrame(elapsed: Float) {
-        // Update the velocity, (decayed and clamped to the maximum)
-        velocity = (velocity * exp(elapsed * VELOCITY_DECAY) + elapsed * acceleration)
-                .coerceIn(-MAXIMUM_VELOCITY, MAXIMUM_VELOCITY)
-        // Update the position, modulo 1 (ensuring a value greater or equal to 0, and less than 1)
-        position = ((position + elapsed * velocity) % 1 + 1) % 1
+        orientationAngles.let { (_, pitch) ->
+            val velocity = pitch * VELOCITY_FACTOR
 
-        _positionData.postValue(position)
+            // Update the position, modulo 1 (ensuring a value greater or equal to 0, and less than 1)
+            position = ((position + elapsed * velocity) % 1 + 1) % 1
+
+            _positionData.postValue(position)
+        }
     }
 
-    /** This LiveData responds to accelerometer data from the y-axis of the device and emits updated position data. */
+    /**
+     * This LiveData responds to orientation data to calculate the pitch of the device. This is then used to update the
+     * velocity and position for each frame.
+     */
     private val _positionData = object : MutableLiveData<Float>(), SensorEventListener {
         private val sensorManager
             get() = appContext.getSystemService(Context.SENSOR_SERVICE) as SensorManager
 
         override fun onActive() {
             super.onActive()
-            val sensor = sensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER)
-            sensorManager.registerListener(this, sensor, SensorManager.SENSOR_DELAY_GAME)
+            sensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER)?.also {
+                sensorManager.registerListener( this, it, SensorManager.SENSOR_DELAY_GAME)
+            }
+            sensorManager.getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD)?.also {
+                sensorManager.registerListener( this, it, SensorManager.SENSOR_DELAY_GAME)
+            }
         }
 
         override fun onInactive() {
             super.onInactive()
             sensorManager.unregisterListener(this)
         }
 
-        override fun onSensorChanged(event: SensorEvent?) {
-            event?.values?.let { (_, yAxisAcceleration, _) ->
-                acceleration = yAxisAcceleration * ACCELERATION_FACTOR + DRIFT
-                postValue(position)
+        override fun onSensorChanged(event: SensorEvent) {
+            when (event.sensor.type) {
+                Sensor.TYPE_ACCELEROMETER -> event.values.copyInto(accelerometerData)
+                Sensor.TYPE_MAGNETIC_FIELD -> event.values.copyInto(magnetometerData)
             }
+            // Update the orientation angles when sensor data is updated
+            SensorManager.getRotationMatrix(rotationMatrix, null, accelerometerData, magnetometerData)
+            SensorManager.getOrientation(rotationMatrix, orientationAngles)
         }
 
         override fun onAccuracyChanged(sensor: Sensor?, accuracy: Int) = Unit

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

@@ -19,7 +19,6 @@ import androidx.compose.ui.graphics.Outline.Rectangle
 import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.layout.SubcomposeLayout
-import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.unit.Density
 import androidx.compose.ui.unit.LayoutDirection
@@ -28,6 +27,8 @@ import org.wordpress.android.R
 import org.wordpress.android.ui.accounts.login.components.SlotsEnum.Buttons
 import org.wordpress.android.ui.accounts.login.components.SlotsEnum.ClippedBackground
 
+private val blurRadius = 30.dp
+
 /**
  * These slots are utilized below in a subcompose layout in order to measure the size of the buttons composable. The
  * measured height is then used to create a clip shape for the blurred background layer. This allows the background
@@ -37,23 +38,14 @@ private enum class SlotsEnum { Buttons, ClippedBackground }
 
 @Composable
 private fun ColumnWithTopGlassBorder(
-    modifier: Modifier = Modifier,
     content: @Composable ColumnScope.() -> Unit
 ) {
     Column(
-            modifier = modifier
-                    .background(
-                            brush = SolidColor(colorResource(R.color.bg_jetpack_login_splash_bottom_panel)),
-                            alpha = 0.6f
-                    )
+            modifier = Modifier.background(SolidColor(colorResource(R.color.bg_jetpack_login_splash_bottom_panel)))
     ) {
         Divider(
                 thickness = 1.dp,
-                color = colorResource(R.color.border_shadow_jetpack_login_splash_bottom_panel),
-        )
-        Divider(
-                thickness = 1.dp,
-                color = colorResource(R.color.border_highlight_jetpack_login_splash_bottom_panel),
+                color = colorResource(R.color.border_top_jetpack_login_splash_bottom_panel),
         )
         content()
     }
@@ -64,8 +56,6 @@ fun ColumnWithFrostedGlassBackground(
     background: @Composable (modifier: Modifier, textModifier: Modifier) -> Unit,
     content: @Composable () -> Unit,
 ) {
-    val topBorderHeight = with(LocalDensity.current) { 1.dp.toPx() }
-
     SubcomposeLayout { constraints ->
         val buttonsPlaceables = subcompose(Buttons) {
             ColumnWithTopGlassBorder {
@@ -81,7 +71,7 @@ fun ColumnWithFrostedGlassBackground(
                                 bottom = size.height,
                                 left = 0f,
                                 right = size.width,
-                                top = size.height - buttonsHeight + topBorderHeight,
+                                top = size.height - buttonsHeight,
                         )
                 )
             }
@@ -92,11 +82,11 @@ fun ColumnWithFrostedGlassBackground(
                     modifier = Modifier.clip(buttonsClipShape),
                     textModifier = Modifier.composed {
                         if (VERSION.SDK_INT >= VERSION_CODES.S) {
-                            blur(15.dp, BlurredEdgeTreatment.Unbounded)
+                            blur(blurRadius, BlurredEdgeTreatment.Unbounded)
                         } else {
                             // On versions older than Android 12 the blur modifier is not supported,
                             // so we make the text transparent to have the buttons stand out.
-                            alpha(0.25f)
+                            alpha(0.05f)
                         }
                     }
             )