Merge branch 'trunk' into issue/16202-remove-msd-default-tab-expr

Author: AjeshRPai

WordPress/build.gradle

@@ -397,6 +397,9 @@ dependencies {
     implementation "androidx.compose.ui:ui:$composeVersion"
     implementation "androidx.compose.foundation:foundation:$composeVersion"
     implementation "androidx.compose.material:material:$composeVersion"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycleVersion"
+    implementation "androidx.compose.ui:ui-tooling-preview:$composeVersion"
+    debugImplementation "androidx.compose.ui:ui-tooling:$composeVersion"
 
     testImplementation "junit:junit:$jUnitVersion"
 

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

@@ -26,7 +26,6 @@ public void setUp() {
         wpLogin();
     }
 
-    String mTitle = "Hello Espresso!";
     String mPostText = "Lorem ipsum dolor sit amet, consectetur adipiscing elit.";
     String mCategory = "Wedding";
     String mTag = "Tag " + Instant.now().toEpochMilli();
@@ -41,27 +40,31 @@ public void setUp() {
 
     @Test
     public void publishSimplePost() {
+        String title = "publishSimplePost";
+
         new MySitesPage()
                 .go()
                 .startNewPost();
 
         new BlockEditorPage()
                 .waitForTitleDisplayed()
-                .enterTitle(mTitle)
+                .enterTitle(title)
                 .enterParagraphText(mPostText)
                 .publish()
                 .verifyPostPublished();
     }
 
     @Test
     public void publishFullPost() {
+        String title = "publishFullPost";
+
         new MySitesPage()
                 .go()
                 .startNewPost();
 
         new BlockEditorPage()
                 .waitForTitleDisplayed()
-                .enterTitle(mTitle)
+                .enterTitle(title)
                 .enterParagraphText(mPostText)
                 .addImage()
                 .addPostSettings(mCategory, mTag)
@@ -73,13 +76,15 @@ public void publishFullPost() {
 
     @Test
     public void blockEditorCanDisplayElementAddedInHtmlMode() {
+        String title = "blockEditorCanDisplayElementAddedInHtmlMode";
+
         new MySitesPage()
                 .go()
                 .startNewPost();
 
         new BlockEditorPage()
                 .waitForTitleDisplayed()
-                .enterTitle(mTitle)
+                .enterTitle(title)
                 .switchToHtmlMode()
                 .enterParagraphText(mHtmlPost)
                 .switchToVisualMode()

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

@@ -42,13 +42,15 @@ public BlockEditorPage waitForTitleDisplayed() {
     }
 
     public BlockEditorPage enterTitle(String postTitle) {
+        clickOn(titleField);
         titleField.perform(typeText(postTitle), ViewActions.closeSoftKeyboard());
         return this;
     }
 
     public BlockEditorPage enterParagraphText(String paragraphText) {
-        onView(withHint(R.string.gutenberg_native_start_writing))
-                .perform(typeText(paragraphText), ViewActions.closeSoftKeyboard());
+        ViewInteraction startWritingPrompt = onView(withHint(R.string.gutenberg_native_start_writing));
+        clickOn(startWritingPrompt);
+        populateTextField(startWritingPrompt, paragraphText);
         return this;
     }
 

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

@@ -8,6 +8,7 @@
 import androidx.annotation.StringRes;
 import androidx.appcompat.widget.SwitchCompat;
 import androidx.appcompat.widget.Toolbar;
+import androidx.test.core.app.ApplicationProvider;
 import androidx.test.espresso.UiController;
 import androidx.test.espresso.ViewAction;
 import androidx.test.espresso.ViewInteraction;
@@ -20,6 +21,7 @@
 
 import static androidx.test.espresso.Espresso.onData;
 import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu;
 import static androidx.test.espresso.action.ViewActions.click;
 import static androidx.test.espresso.assertion.ViewAssertions.matches;
 import static androidx.test.espresso.contrib.RecyclerViewActions.actionOnItem;
@@ -81,7 +83,14 @@ public void startNewPost() {
 
     public void startNewSite() {
         switchSite();
-        clickOn(R.id.menu_add);
+        // If the device has a narrower display, the menu_add is hidden in the overflow
+        if (isElementDisplayed(R.id.menu_add)) {
+            clickOn(R.id.menu_add);
+        } else {
+            // open the overflow and then click on the item with text
+            openActionBarOverflowOrOptionsMenu(ApplicationProvider.getApplicationContext());
+            onView(withText(getTranslatedString(R.string.site_picker_add_site))).perform(click());
+        }
     }
 
     public void goToSettings() {

WordPress/src/androidTest/java/org/wordpress/android/ui/screenshots/JPScreenshotTest.java

@@ -11,6 +11,7 @@
 import com.google.android.libraries.cloudtesting.screenshots.ScreenShotter;
 
 import org.junit.ClassRule;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.wordpress.android.BuildConfig;
 import org.wordpress.android.R;
@@ -95,6 +96,7 @@ public static String buildScreenshotName(Screenshots screen) {
         }
     }
 
+    @Ignore("Ignored until there's a way to exclude tests on FTL properly, via `--test-targets` option.")
     @Test
     public void jPScreenshotTest() {
         if (BuildConfig.IS_JETPACK_APP) {
@@ -199,8 +201,6 @@ private void generateSiteTopic() {
         clickOn(R.id.nav_sites);
         (new MySitesPage()).startNewSite();
 
-        waitForElementToBeDisplayedWithoutFailure(R.id.recycler_view);
-
         // Wait for page to load
         idleFor(2000);
 

WordPress/src/androidTest/java/org/wordpress/android/ui/screenshots/WPScreenshotTest.java

@@ -50,7 +50,7 @@ public class WPScreenshotTest extends BaseTest {
 
     private DemoModeEnabler mDemoModeEnabler = new DemoModeEnabler();
 
-    @Ignore
+    @Ignore("Ignored until there's a way to exclude tests on FTL properly, via `--test-targets` option.")
     @Test
     public void wPScreenshotTest() {
         if (!BuildConfig.IS_JETPACK_APP) {

WordPress/src/main/java/org/wordpress/android/ui/compose/Color.kt

@@ -0,0 +1,27 @@
+package org.wordpress.android.ui.compose.components
+
+import androidx.compose.foundation.ScrollState
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxScope
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+
+/**
+ * Box UI component with vertical scroll.
+ */
+@Composable
+fun VerticalScrollBox(
+    modifier: Modifier = Modifier,
+    scrollState: ScrollState = rememberScrollState(),
+    alignment: Alignment = Alignment.TopStart,
+    content: @Composable BoxScope.() -> Unit
+) {
+    Box(
+        modifier = modifier.then(Modifier.verticalScroll(scrollState)),
+        contentAlignment = alignment,
+        content = content
+    )
+}

WordPress/src/main/java/org/wordpress/android/ui/compose/WordPressTheme.kt

@@ -0,0 +1,25 @@
+package org.wordpress.android.ui.compose.theme
+
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material.MaterialTheme
+import androidx.compose.runtime.Composable
+import org.wordpress.android.BuildConfig
+
+/**
+ * Project's base theme.
+ */
+@Composable
+fun AppTheme(
+    isDarkTheme: Boolean = isSystemInDarkTheme(),
+    content: @Composable () -> Unit
+) {
+    val colorPalette = when (BuildConfig.IS_JETPACK_APP) {
+        true -> JpColorPalette(isDarkTheme)
+        else -> WpColorPalette(isDarkTheme)
+    }
+
+    MaterialTheme(
+            colors = colorPalette,
+            content = content
+    )
+}