Merge branch 'issue/13268-implement-clear-and-apply-actions' into iss…

…ue/13268-persist-activity-type-filters-in-parent-vm

RELEASE-NOTES.txt

@@ -1,6 +1,15 @@
+16.4
+-----
+
 16.3
 -----
+* [***] Site Creation: Adds an option to pick a home page design when creating a WordPress.com site.
 * [*] Posts Settings: removed deprecated location setting [https://github.com/wordpress-mobile/WordPress-Android/pull/13404]
+* [**] Block Editor: Button block - Add link picker to the block settings [https://github.com/WordPress/gutenberg/pull/26206]
+* [***] Block Editor: Adding support for selecting different unit of value in Cover and Columns blocks [https://github.com/WordPress/gutenberg/pull/26161]
+* [*] Block Editor: Fix theme colors syncing with the editor [https://github.com/WordPress/gutenberg/pull/26821]
+* [***] Stories: New feature for WordPress.com and Jetpack sites: Use photos and videos to create engaging and tappable fullscreen slideshows. [https://github.com/wordpress-mobile/WordPress-Android/pull/13459]
+* [**] Reader: introduced a Follow/Unfollow button in comments screen to follow a post conversation and get notified by e-mail. Not supported for self-hosted sites not Jetpack connected. [https://github.com/wordpress-mobile/WordPress-Android/pull/13473]
 
 16.2
 -----

WordPress/build.gradle

@@ -54,9 +54,9 @@ android {
         if (project.hasProperty("versionName")) {
             versionName project.property("versionName")
         } else {
-            versionName "alpha-259"
+            versionName "alpha-260"
         }
-        versionCode 960
+        versionCode 963
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.targetSdkVersion
 
@@ -71,7 +71,7 @@ android {
         buildConfigField "boolean", "FEATURE_ANNOUNCEMENT_AVAILABLE", "false"
         buildConfigField "boolean", "GUTENBERG_MENTIONS", "true"
         buildConfigField "boolean", "MODAL_LAYOUT_PICKER", "true"
-        buildConfigField "boolean", "HOME_PAGE_PICKER", "false"
+        buildConfigField "boolean", "HOME_PAGE_PICKER", "true"
         buildConfigField "boolean", "UNIFIED_LOGIN_AVAILABLE", "true"
         buildConfigField "boolean", "WP_STORIES_AVAILABLE", "true"
         buildConfigField "boolean", "ANY_FILE_UPLOAD", "true"
@@ -81,6 +81,7 @@ android {
         buildConfigField "boolean", "ENABLE_FEATURE_CONFIGURATION", "true"
         buildConfigField "boolean", "MY_SITE_IMPROVEMENTS", "false"
         buildConfigField "boolean", "BACKUP_AVAILABLE", "false"
+        buildConfigField "boolean", "FOLLOW_UNFOLLOW_COMMENTS", "false"
     }
 
     // Gutenberg's dependency - react-native-video is using
@@ -97,15 +98,14 @@ android {
             dimension "buildType"
             // Only set the release version if one isn't provided
             if (!project.hasProperty("versionName")) {
-                versionName "16.2-rc-2"
+                versionName "16.3-rc-1"
             }
-            versionCode 959
+            versionCode 962
             buildConfigField "boolean", "ME_ACTIVITY_AVAILABLE", "false"
             buildConfigField "boolean", "TENOR_AVAILABLE", "false"
             buildConfigField "long", "REMOTE_CONFIG_FETCH_INTERVAL", "3600"
             buildConfigField "boolean", "GUTENBERG_MENTIONS", "true"
-            buildConfigField "boolean", "HOME_PAGE_PICKER", "false"
-            buildConfigField "boolean", "WP_STORIES_AVAILABLE", "false"
+            buildConfigField "boolean", "WP_STORIES_AVAILABLE", "true"
             buildConfigField "boolean", "ANY_FILE_UPLOAD", "false"
             buildConfigField "boolean", "ENABLE_FEATURE_CONFIGURATION", "false"
         }
@@ -120,15 +120,13 @@ android {
         wasabi { // "hot" version, can be installed along release, alpha or beta versions
             applicationId "org.wordpress.android.beta"
             dimension "buildType"
-            buildConfigField "boolean", "HOME_PAGE_PICKER", "true"
             // Enable this for testing consolidated media picker
             // buildConfigField "boolean", "CONSOLIDATED_MEDIA_PICKER", "true"
         }
 
         jalapeno { // Pre-Alpha version, used for PR builds, can be installed along release, alpha, beta, dev versions
             applicationId "org.wordpress.android.prealpha"
             dimension "buildType"
-            buildConfigField "boolean", "HOME_PAGE_PICKER", "false"
         }
     }
 

WordPress/metadata/release_notes.txt

@@ -1,4 +1,8 @@
-Block editor enhancements: We’ve improved the overall performance and speed, which you might notice when you open the editor to create a new post. We’ve also improved the Image block, with better support for uploading multiple images.
-
-Other updates and fixes: Your app now uses a new Media Picker when you select files for posts, your site icon, Gravatar, and other places. We also fixed a bug on pure self-hosted sites on HTTP that prevented featured images from displaying in the Posts List.
+* [***] Site Creation: Adds an option to pick a home page design when creating a WordPress.com site.
+* [*] Posts Settings: removed deprecated location setting [https://github.com/wordpress-mobile/WordPress-Android/pull/13404]
+* [**] Block Editor: Button block - Add link picker to the block settings [https://github.com/WordPress/gutenberg/pull/26206]
+* [***] Block Editor: Adding support for selecting different unit of value in Cover and Columns blocks [https://github.com/WordPress/gutenberg/pull/26161]
+* [*] Block Editor: Fix theme colors syncing with the editor [https://github.com/WordPress/gutenberg/pull/26821]
+* [***] Stories: New feature for WordPress.com and Jetpack sites: Use photos and videos to create engaging and tappable fullscreen slideshows. [https://github.com/wordpress-mobile/WordPress-Android/pull/13459]
+* [**] Reader: introduced a Follow/Unfollow button in comments screen to follow a post conversation and get notified by e-mail. Not supported for self-hosted sites not Jetpack connected. [https://github.com/wordpress-mobile/WordPress-Android/pull/13473]
 

WordPress/metadata/release_notes_short.txt

@@ -1,3 +0,0 @@
-Block editor: We’ve improved the overall performance, which you may notice when you start a new post. The Image block now has better support for uploading multiple images.
-
-More updates: Your app uses a new Media Picker when you select files. We also fixed a bug on pure self-hosted sites on HTTP that affected featured images in the Posts List.

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

@@ -16,6 +16,7 @@
 import static androidx.test.espresso.matcher.ViewMatchers.withText;
 import static org.hamcrest.Matchers.allOf;
 import static org.wordpress.android.support.WPSupportUtils.clickOn;
+import static org.wordpress.android.support.WPSupportUtils.isElementDisplayed;
 import static org.wordpress.android.support.WPSupportUtils.longClickOn;
 
 public class MySitesPage {
@@ -49,6 +50,10 @@ public void removeSite(String siteName) {
 
     public void startNewPost() {
         clickOn(R.id.fab_button);
+        if (isElementDisplayed(R.id.design_bottom_sheet)) {
+            // If Stories are enabled, FAB opens a bottom sheet with options - select the 'Blog post' option
+            clickOn(onView(withText(R.string.my_site_bottom_sheet_add_post)));
+        }
     }
 
     public void gotoSiteSettings() {

WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java

@@ -157,6 +157,7 @@
 import org.wordpress.android.ui.reader.services.discover.ReaderDiscoverLogic;
 import org.wordpress.android.ui.reader.services.discover.ReaderDiscoverService;
 import org.wordpress.android.ui.reader.services.update.ReaderUpdateLogic;
+import org.wordpress.android.ui.reader.views.ReaderCommentsPostHeaderView;
 import org.wordpress.android.ui.reader.views.ReaderExpandableTagsView;
 import org.wordpress.android.ui.reader.views.ReaderLikingUsersView;
 import org.wordpress.android.ui.reader.views.ReaderPostDetailHeaderView;
@@ -427,6 +428,8 @@ public interface AppComponent extends AndroidInjector<WordPress> {
 
     void inject(ReaderBlogAdapter object);
 
+    void inject(ReaderCommentsPostHeaderView object);
+
     void inject(ReleaseNotesActivity object);
 
     void inject(WPWebViewActivity object);

WordPress/src/main/java/org/wordpress/android/push/NotificationsProcessingService.java

@@ -49,6 +49,7 @@
 import org.wordpress.android.util.AppLog.T;
 import org.wordpress.android.util.LocaleManager;
 import org.wordpress.android.util.analytics.AnalyticsUtils;
+import org.wordpress.android.util.analytics.AnalyticsUtils.AnalyticsCommentActionSource;
 import org.wordpress.android.util.analytics.AnalyticsUtils.QuickActionTrackPropertyValue;
 
 import java.util.ArrayList;
@@ -543,15 +544,19 @@ private void likeComment() {
                 return;
             }
 
+            SiteModel site = mSiteStore.getSiteBySiteId(mNote.getSiteId());
+
             // Bump analytics
+            // TODO klymyam remove legacy comment tracking after new comments are shipped and new funnels are made
             AnalyticsUtils.trackWithBlogPostDetails(
                     AnalyticsTracker.Stat.NOTIFICATION_QUICK_ACTIONS_LIKED, mNote.getSiteId(), mNote.getPostId());
+            AnalyticsUtils.trackCommentActionWithSiteDetails(Stat.COMMENT_QUICK_ACTION_LIKED,
+                    AnalyticsCommentActionSource.NOTIFICATIONS, site);
             AnalyticsUtils.trackQuickActionTouched(
                     QuickActionTrackPropertyValue.LIKE,
-                    mSiteStore.getSiteBySiteId(mNote.getSiteId()),
+                    site,
                     mNote.buildComment());
 
-            SiteModel site = mSiteStore.getSiteBySiteId(mNote.getSiteId());
             if (site != null) {
                 mDispatcher.dispatch(CommentActionBuilder.newLikeCommentAction(
                         new RemoteLikeCommentPayload(site, mNote.getCommentId(), true)));
@@ -567,18 +572,24 @@ private void approveComment() {
                 return;
             }
 
+            SiteModel site = mSiteStore.getSiteBySiteId(mNote.getSiteId());
+
             // Bump analytics
+            // TODO klymyam remove legacy comment tracking after new comments are shipped and new funnels are made
             AnalyticsUtils.trackWithBlogPostDetails(
                     AnalyticsTracker.Stat.NOTIFICATION_QUICK_ACTIONS_APPROVED, mNote.getSiteId(), mNote.getPostId());
+            AnalyticsUtils.trackCommentActionWithSiteDetails(Stat.COMMENT_QUICK_ACTION_APPROVED,
+                    AnalyticsCommentActionSource.NOTIFICATIONS, site);
+
             AnalyticsUtils.trackQuickActionTouched(
                     QuickActionTrackPropertyValue.APPROVE,
-                    mSiteStore.getSiteBySiteId(mNote.getSiteId()),
+                    site,
                     mNote.buildComment());
 
             // Update pseudo comment (built from the note)
             CommentModel comment = mNote.buildComment();
             comment.setStatus(CommentStatus.APPROVED.toString());
-            SiteModel site = mSiteStore.getSiteBySiteId(mNote.getSiteId());
+
             if (site == null) {
                 AppLog.e(T.NOTIFS, "Impossible to approve a comment on a site that is not in the App. SiteId: "
                                    + mNote.getSiteId());
@@ -621,7 +632,8 @@ private void replyToComment() {
                 mDispatcher.dispatch(CommentActionBuilder.newCreateNewCommentAction(payload));
 
                 // Bump analytics
-                AnalyticsUtils.trackCommentReplyWithDetails(true, site, comment);
+                AnalyticsUtils.trackCommentReplyWithDetails(true,
+                        site, comment, AnalyticsCommentActionSource.NOTIFICATIONS);
                 AnalyticsUtils.trackQuickActionTouched(QuickActionTrackPropertyValue.REPLY_TO, site, comment);
             } else {
                 // cancel the current notification

WordPress/src/main/java/org/wordpress/android/ui/activitylog/BackupDownloadProgressChecker.kt

@@ -21,8 +21,8 @@ class BackupDownloadProgressChecker @Inject constructor(
     private val activityLogStore: ActivityLogStore,
     @param:Named(DEFAULT_SCOPE) private val defaultScope: CoroutineScope
 ) {
-    suspend fun startNow(site: SiteModel, restoreId: Long): OnBackupDownloadStatusFetched? {
-        return start(site, restoreId, true)
+    suspend fun startNow(site: SiteModel, downloadId: Long): OnBackupDownloadStatusFetched? {
+        return start(site, downloadId, true)
     }
 
     suspend fun start(