Merge release/19.7 Release Notes

WordPress/jetpack_metadata/PlayStoreStrings.po

@@ -11,6 +11,16 @@ msgstr ""
 "Project-Id-Version: Jetpack - Apps - Android - Release Notes\n"
 
 #. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
+msgctxt "release_note_197"
+msgid ""
+"19.7:\n"
+"- Added Site Menu and Home tabs to My Site screen\n"
+"- Made Add Block button more visible when block editor opens\n"
+"- Removed media/audio block upload error text\n"
+"- Added Site Intent screen to site creation process\n"
+"- Fixed crash caused by notification details for comments on GB File blocks\n"
+msgstr ""
+
 msgctxt "release_note_196"
 msgid ""
 "19.6:\n"
@@ -19,15 +29,6 @@ msgid ""
 "We’ve fixed that—deleted sites now disappear right away. So long, farewell.\n"
 msgstr ""
 
-msgctxt "release_note_195"
-msgid ""
-"19.5:\n"
-"- We tweaked the upload error text in media upload blocks.\n"
-"- Animated GIFs now come with a GIF badge.\n"
-"- Block setting changes to ordered lists now appear in the editor.\n"
-"- You can disable Weekly Roundup notifications for all sites in App Info.\n"
-msgstr ""
-
 #. translators: Shorter Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
 #. translators: Short description of the Jetpack app to be displayed in the Play Store. Limit to 80 characters including spaces and commas!
 msgctxt "short-description"

WordPress/jetpack_metadata/release_notes.txt

@@ -1,7 +1,5 @@
-* [***] My Site: your My Site screen now has two tabs, "Site Menu" and "Home". Under "Home", you'll find contextual cards with some highlights of whats going on with your site. Check your drafts or scheduled posts, your today's stats or go directly to another section of the app. [https://github.com/wordpress-mobile/WordPress-Android/issues/15989]
-* [*] Site creation: Adds a new screen asking the user the intent of the site [https://github.com/wordpress-mobile/WordPress-Android/pull/16306]
-* [*] Notifications: Fixed notification detail crash for comments with File block [https://github.com/wordpress-mobile/WordPress-Android/pull/16314]
-* [**] Block Editor: Quote block: Adds support for V2 behind a feature flag [https://github.com/WordPress/gutenberg/pull/40133]
-* [**] Block Editor: Update "add block" button's style in default editor view [https://github.com/WordPress/gutenberg/pull/39726]
-* [*] Block Editor: Remove banner error notification on upload failure [https://github.com/WordPress/gutenberg/pull/39694]
-
+- Added Site Menu and Home tabs to My Site screen
+- Made Add Block button more visible when block editor opens
+- Removed media/audio block upload error text
+- Added Site Intent screen to site creation process
+- Fixed crash caused by notification details for comments on GB File blocks

WordPress/metadata/PlayStoreStrings.po

@@ -11,6 +11,16 @@ msgstr ""
 "Project-Id-Version: Release Notes & Play Store Descriptions\n"
 
 #. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
+msgctxt "release_note_197"
+msgid ""
+"19.7:\n"
+"- Added Site Menu and Home tabs to My Site screen\n"
+"- Made Add Block button more visible when block editor opens\n"
+"- Removed media/audio block upload error text\n"
+"- Added Site Intent screen to site creation process\n"
+"- Fixed crash caused by notification details for comments on GB File blocks\n"
+msgstr ""
+
 msgctxt "release_note_196"
 msgid ""
 "19.6:\n"
@@ -19,15 +29,6 @@ msgid ""
 "We’ve fixed that—deleted sites now disappear right away. So long, farewell.\n"
 msgstr ""
 
-msgctxt "release_note_195"
-msgid ""
-"19.5:\n"
-"- We tweaked the upload error text in media upload blocks.\n"
-"- Animated GIFs now come with a GIF badge.\n"
-"- Block setting changes to ordered lists now appear in the editor.\n"
-"- You can disable Weekly Roundup notifications for all sites in App Info.\n"
-msgstr ""
-
 #. translators: Shorter Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
 msgctxt "sample_post_content"
 msgid "The best moment of any trip, for me, is when I first step foot off the plane. The whole of the trip is in front me, ripe with possibility."

WordPress/metadata/release_notes.txt

@@ -1,7 +1,5 @@
-* [***] My Site: your My Site screen now has two tabs, "Site Menu" and "Home". Under "Home", you'll find contextual cards with some highlights of whats going on with your site. Check your drafts or scheduled posts, your today's stats or go directly to another section of the app. [https://github.com/wordpress-mobile/WordPress-Android/issues/15989]
-* [*] Site creation: Adds a new screen asking the user the intent of the site [https://github.com/wordpress-mobile/WordPress-Android/pull/16306]
-* [*] Notifications: Fixed notification detail crash for comments with File block [https://github.com/wordpress-mobile/WordPress-Android/pull/16314]
-* [**] Block Editor: Quote block: Adds support for V2 behind a feature flag [https://github.com/WordPress/gutenberg/pull/40133]
-* [**] Block Editor: Update "add block" button's style in default editor view [https://github.com/WordPress/gutenberg/pull/39726]
-* [*] Block Editor: Remove banner error notification on upload failure [https://github.com/WordPress/gutenberg/pull/39694]
-
+- Added Site Menu and Home tabs to My Site screen
+- Made Add Block button more visible when block editor opens
+- Removed media/audio block upload error text
+- Added Site Intent screen to site creation process
+- Fixed crash caused by notification details for comments on GB File blocks

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

@@ -206,6 +206,7 @@
 import org.wordpress.android.ui.sitecreation.previews.SiteCreationPreviewFragment;
 import org.wordpress.android.ui.sitecreation.services.SiteCreationService;
 import org.wordpress.android.ui.sitecreation.sitename.SiteCreationSiteNameFragment;
+import org.wordpress.android.ui.sitecreation.theme.DesignPreviewFragment;
 import org.wordpress.android.ui.sitecreation.theme.HomePagePickerFragment;
 import org.wordpress.android.ui.sitecreation.verticals.SiteCreationIntentsFragment;
 import org.wordpress.android.ui.stats.StatsConnectJetpackActivity;
@@ -704,6 +705,8 @@ public interface AppComponent extends AndroidInjector<WordPress> {
 
     void inject(LayoutPreviewFragment object);
 
+    void inject(DesignPreviewFragment object);
+
     void inject(QuickStartPromptDialogFragment object);
 
     void inject(BloggingReminderTimePicker object);

WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/DesignPreviewFragment.kt

@@ -1,21 +1,36 @@
 package org.wordpress.android.ui.sitecreation.theme
 
+import android.content.Context
 import androidx.lifecycle.ViewModelProvider
 import org.wordpress.android.R
+import org.wordpress.android.WordPress
 import org.wordpress.android.ui.layoutpicker.LayoutPreviewFragment
+import org.wordpress.android.util.config.SiteNameFeatureConfig
+import javax.inject.Inject
 
 /**
  * Implements the Home Page Picker Design Preview UI
  */
 class DesignPreviewFragment : LayoutPreviewFragment() {
+    @Inject lateinit var siteNameFeatureConfig: SiteNameFeatureConfig
+
     companion object {
         const val DESIGN_PREVIEW_TAG = "DESIGN_PREVIEW_TAG"
 
         fun newInstance() = DesignPreviewFragment()
     }
 
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        (requireActivity().applicationContext as WordPress).component().inject(this)
+    }
+
     override fun getViewModel() =
             ViewModelProvider(requireActivity(), viewModelFactory).get(HomePagePickerViewModel::class.java)
 
-    override fun getChooseButtonText() = R.string.hpp_choose_button
+    override fun getChooseButtonText() = if (siteNameFeatureConfig.isEnabled()) {
+        R.string.hpp_choose_and_create_site
+    } else {
+        R.string.hpp_choose_button
+    }
 }

WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt

@@ -26,6 +26,7 @@ import org.wordpress.android.ui.utils.UiHelpers
 import org.wordpress.android.util.AniUtils
 import org.wordpress.android.util.DisplayUtilsWrapper
 import org.wordpress.android.util.ToastUtils
+import org.wordpress.android.util.config.SiteNameFeatureConfig
 import org.wordpress.android.util.image.ImageManager
 import org.wordpress.android.util.extensions.setVisible
 import org.wordpress.android.viewmodel.observeEvent
@@ -39,6 +40,7 @@ class HomePagePickerFragment : Fragment() {
     @Inject lateinit var imageManager: ImageManager
     @Inject lateinit var displayUtils: DisplayUtilsWrapper
     @Inject internal lateinit var uiHelper: UiHelpers
+    @Inject lateinit var siteNameFeatureConfig: SiteNameFeatureConfig
     @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
     private lateinit var viewModel: HomePagePickerViewModel
     private lateinit var previewModeSelectorPopup: PreviewModeSelectorPopup
@@ -92,6 +94,9 @@ class HomePagePickerFragment : Fragment() {
         homePagePickerTitlebar.title.isInvisible = !displayUtils.isPhoneLandscape()
         modalLayoutPickerHeaderSection.modalLayoutPickerTitleRow?.header?.setText(R.string.hpp_title)
         modalLayoutPickerHeaderSection.modalLayoutPickerSubtitleRow?.description?.setText(R.string.hpp_subtitle)
+        if (siteNameFeatureConfig.isEnabled()) {
+            homePagePickerBottomToolbar.chooseButton.setText(R.string.hpp_choose_and_create_site)
+        }
     }
 
     private fun HomePagePickerFragmentBinding.setupViewModel() {

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

@@ -3339,6 +3339,7 @@
     <string name="hpp_title">Choose a design</string>
     <string name="hpp_subtitle">Pick your favorite homepage layout. You can edit and customize it later.</string>
     <string name="hpp_choose_button">Choose</string>
+    <string name="hpp_choose_and_create_site">Create site</string>
     <string name="hpp_error_title">Layouts not available while offline</string>
     <string name="hpp_error_subtitle">Tap retry when you\'re back online.</string>
     <string name="hpp_retry_error">Please Check your internet connection and retry.</string>

fastlane/lanes/localization.rb

@@ -158,7 +158,7 @@
     )
   end
 
-  # Updates the metadata (from `fastlane/{metadata|jetpack_metadata}/android/*/*.txt`) in the PlayStore (Main store listing).
+  # Updates the metadata in the Play Store (Main store listing) from the content of `fastlane/{metadata|jetpack_metadata}/android/*/*.txt` files
   #
   # @option [String] app The app to update the metadata for. Mandatory. Must be one of `wordpress` or `jetpack`.
   #
@@ -169,9 +169,6 @@
     metadata_dir = File.join('fastlane', APP_SPECIFIC_VALUES[app.to_sym][:metadata_dir], 'android')
     version_code = android_get_release_version['code']
 
-    # TODO: This is currently a separate lane so we can invoke it separately, but if after a couple of sprints we see that it works well,
-    #       it we would make sense to remove the lane and instead directly use `skip_upload_metadata: (options[:track] != 'production')`
-    #       in the `upload_build_to_play_store` lane? (especially if we do the same for `skip_upload_changelogs` and get rid of `android_create_xml_release_notes`)
     upload_to_play_store(
       package_name: package_name,
       track: 'production',
@@ -180,7 +177,6 @@
       skip_upload_apk: true,
       skip_upload_aab: true,
       skip_upload_metadata: false,
-      # TODO: enable changelogs upload once we drop the `android_create_xml_release_notes` action call (and drop the step in release scenario)
       skip_upload_changelogs: true,
       skip_upload_images: true,
       skip_upload_screenshots: true,
@@ -229,9 +225,9 @@
       download_path: download_path
     )
 
-    # TODO: Remove this call after a few sprints of validating that that the `skip_upload_metadata: options[:track] != 'production'` recently added to `upload_build_to_play_store` lane works well
-    android_create_xml_release_notes(download_path: download_path, build_number: "#{options[:build_number]}", locales: RELEASE_NOTES_LOCALES)
-    sh("git add #{download_path} && git commit -m \"Update WordPress metadata translations for #{options[:version]}\" && git push origin HEAD")
+    git_add(path: download_path)
+    git_commit(path: download_path, message: "Update WordPress metadata translations for #{options[:version]}", allow_nothing_to_commit: true)
+    push_to_git_remote
   end
 
   desc "Downloads Jetpack's translated metadata from GlotPress"
@@ -264,10 +260,9 @@
       File.join(download_path, 'en-US')
     )
 
-    # TODO: Remove this call after a few sprints of validating that that the `skip_upload_metadata: options[:track] != 'production'` recently added to `upload_build_to_play_store` lane works well
-    locales_including_enUS = [['en-gb', 'en-US']] + JP_RELEASE_NOTES_LOCALES # first item (GlotPress locale) unused for this action; second param = google_play locale
-    android_create_xml_release_notes(download_path: download_path, build_number: "#{options[:build_number]}", locales: locales_including_enUS)
-    sh("git add #{download_path} && git commit -m \"Update Jetpack metadata translations for #{options[:version]}\" && git push origin HEAD")
+    git_add(path: download_path)
+    git_commit(path: download_path, message: "Update Jetpack metadata translations for #{options[:version]}", allow_nothing_to_commit: true)
+    push_to_git_remote
   end
 
   ########################################################################