Merge pull request #15651 from wordpress-mobile/release/18.8

Merge release/18.8 to develop (Release Notes + 18.8-rc-2)

Author: AliSoftware

WordPress/jetpack_metadata/PlayStoreStrings.po

@@ -11,22 +11,24 @@ 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_188"
+msgid ""
+"18.8:\n"
+"- Get link suggestions instead of auto-populated clipboard links for Button and Image blocks.\n"
+"- Click "Copy Link" to share published post links.\n"
+"- Inserter menu tabs match your device's language.\n"
+"- Device media options open when creating a Gallery block.\n"
+"- Font size bug and RTL visual issues are resolved.\n"
+"- Edit Embed block link in Block Settings.\n"
+msgstr ""
+
 msgctxt "release_note_187"
 msgid ""
 "18.7:\n"
 "- We expanded the "Link To" setting for the image block to include "Media File" and "Attachment Page" options alongside the preexisting "Custom URL" option.\n"
 "- We solved a problem with content autosaves so they now run more smoothly.\n"
 msgstr ""
 
-msgctxt "release_note_186"
-msgid ""
-"18.6:\n"
-"- You can now use the Mark HTML tag and change the Search block button's text and background color.\n"
-"- Native editor onboarding features are available to everyone, including the new block badge.\n"
-"- The Help screen won't break out of its box when rotated between portrait and landscape.\n"
-"- We fixed more loading glitches in the Embed block.\n"
-msgstr ""
-
 #. 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"
 msgid "Get powerful security and performance tools in your pocket."

WordPress/jetpack_metadata/release_notes.txt

@@ -1,12 +1,6 @@
-* [*] Users can now upload files to forms when using the Preview within the editor. [https://github.com/wordpress-mobile/WordPress-Android/pull/15572]
-* [**] Posts List: Adds copy post link functionality [https://github.com/wordpress-mobile/WordPress-Android/pull/15570]
-* [*] Editor: Replace snackbar with compact notice when switching between HTML or Visual mode [https://github.com/wordpress-mobile/WordPress-Android/pull/15583]
-* [*] Fixed an issue where multiple screens were rendered incorrectly in RTL interface languages [https://github.com/wordpress-mobile/WordPress-Android/pull/15597]
-* [*] Updated UI of post comments [https://github.com/wordpress-mobile/WordPress-Android/pull/15595]
-* [**] Block editor: Add clipboard link suggestion to image block and button block. [https://github.com/WordPress/gutenberg/pull/35972]
-* [*] Block editor: Embed block: Include link in block settings. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4189]
-* [**] Block editor: Fix tab titles translation of inserter menu. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4248]
-* [**] Block editor: Gallery block: When a gallery block is added, the media options are auto opened for v2 of the Gallery block. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4277]
-* [*] Block editor: Media & Text block: Fix an issue where the text font size would be bigger than expected in some cases. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4252]
-
-
+- Get link suggestions instead of auto-populated clipboard links for Button and Image blocks.
+- Click "Copy Link" to share published post links.
+- Inserter menu tabs match your device's language.
+- Device media options open when creating a Gallery block.
+- Font size bug and RTL visual issues are resolved.
+- Edit Embed block link in Block Settings.

WordPress/metadata/PlayStoreStrings.po

@@ -11,22 +11,24 @@ 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_188"
+msgid ""
+"18.8:\n"
+"- Get link suggestions instead of auto-populated clipboard links for Button and Image blocks.\n"
+"- Click "Copy Link" to share published post links.\n"
+"- Inserter menu tabs match your device's language.\n"
+"- Device media options open when creating a Gallery block.\n"
+"- Font size bug and RTL visual issues are resolved.\n"
+"- Edit Embed block link in Block Settings.\n"
+msgstr ""
+
 msgctxt "release_note_187"
 msgid ""
 "18.7:\n"
 "- We expanded the "Link To" setting for the image block to include "Media File" and "Attachment Page" options alongside the preexisting "Custom URL" option.\n"
 "- We solved a problem with content autosaves so they now run more smoothly.\n"
 msgstr ""
 
-msgctxt "release_note_186"
-msgid ""
-"18.6:\n"
-"- You can now use the Mark HTML tag and change the Search block button's text and background color.\n"
-"- Native editor onboarding features are available to everyone, including the new block badge.\n"
-"- The Help screen won't break out of its box when rotated between portrait and landscape.\n"
-"- We fixed more loading glitches in the Embed block.\n"
-msgstr ""
-
 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."
 msgstr ""

WordPress/metadata/release_notes.txt

@@ -1,12 +1,6 @@
-* [*] Users can now upload files to forms when using the Preview within the editor. [https://github.com/wordpress-mobile/WordPress-Android/pull/15572]
-* [**] Posts List: Adds copy post link functionality [https://github.com/wordpress-mobile/WordPress-Android/pull/15570]
-* [*] Editor: Replace snackbar with compact notice when switching between HTML or Visual mode [https://github.com/wordpress-mobile/WordPress-Android/pull/15583]
-* [*] Fixed an issue where multiple screens were rendered incorrectly in RTL interface languages [https://github.com/wordpress-mobile/WordPress-Android/pull/15597]
-* [*] Updated UI of post comments [https://github.com/wordpress-mobile/WordPress-Android/pull/15595]
-* [**] Block editor: Add clipboard link suggestion to image block and button block. [https://github.com/WordPress/gutenberg/pull/35972]
-* [*] Block editor: Embed block: Include link in block settings. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4189]
-* [**] Block editor: Fix tab titles translation of inserter menu. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4248]
-* [**] Block editor: Gallery block: When a gallery block is added, the media options are auto opened for v2 of the Gallery block. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4277]
-* [*] Block editor: Media & Text block: Fix an issue where the text font size would be bigger than expected in some cases. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4252]
-
-
+- Get link suggestions instead of auto-populated clipboard links for Button and Image blocks.
+- Click "Copy Link" to share published post links.
+- Inserter menu tabs match your device's language.
+- Device media options open when creating a Gallery block.
+- Font size bug and RTL visual issues are resolved.
+- Edit Embed block link in Block Settings.

WordPress/src/main/java/org/wordpress/android/ui/about/UnifiedAboutTracker.kt

@@ -0,0 +1,43 @@
+package org.wordpress.android.ui.about
+
+import org.wordpress.android.analytics.AnalyticsTracker.Stat
+import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class UnifiedAboutTracker @Inject constructor(
+    private val analyticsTrackerWrapper: AnalyticsTrackerWrapper
+) {
+    fun trackScreenShown(screen: String) {
+        analyticsTrackerWrapper.track(
+                stat = Stat.ABOUT_SCREEN_SHOWN,
+                properties = mapOf(
+                        Property.SCREEN.value to screen
+                )
+        )
+    }
+
+    fun trackScreenDismissed(screen: String) {
+        analyticsTrackerWrapper.track(
+                stat = Stat.ABOUT_SCREEN_DISMISSED,
+                properties = mapOf(
+                        Property.SCREEN.value to screen
+                )
+        )
+    }
+
+    fun trackButtonTapped(button: String) {
+        analyticsTrackerWrapper.track(
+                stat = Stat.ABOUT_SCREEN_BUTTON_TAPPED,
+                properties = mapOf(
+                        Property.BUTTON.value to button
+                )
+        )
+    }
+
+    enum class Property(val value: String) {
+        SCREEN("screen"),
+        BUTTON("button")
+    }
+}

WordPress/src/main/java/org/wordpress/android/ui/about/UnifiedAboutViewModel.kt

@@ -4,6 +4,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import com.automattic.about.model.AboutConfig
+import com.automattic.about.model.AnalyticsConfig
 import com.automattic.about.model.HeaderConfig
 import com.automattic.about.model.LegalConfig
 import com.automattic.about.model.RateUsConfig
@@ -30,7 +31,8 @@ class UnifiedAboutViewModel @Inject constructor(
     private val contextProvider: ContextProvider,
     private val wpUrlUtils: WpUrlUtilsWrapper,
     private val recommendApiCallsProvider: RecommendApiCallsProvider,
-    private val buildConfig: BuildConfigWrapper
+    private val buildConfig: BuildConfigWrapper,
+    private val unifiedAboutTracker: UnifiedAboutTracker
 ) : ViewModel() {
     private val _onNavigation = MutableLiveData<Event<UnifiedAboutNavigationAction>>()
     val onNavigation: LiveData<Event<UnifiedAboutNavigationAction>> = _onNavigation
@@ -47,7 +49,12 @@ class UnifiedAboutViewModel @Inject constructor(
                     privacyPolicyUrl = Constants.URL_PRIVACY_POLICY,
                     acknowledgementsUrl = WP_ACKNOWLEDGEMENTS_URL
             ),
-            onDismiss = ::onDismiss
+            onDismiss = ::onDismiss,
+            analyticsTracker = AnalyticsConfig(
+                    trackScreenShown = ::trackScreenShown,
+                    trackScreenDismissed = ::trackScreenDismissed,
+                    trackButtonTapped = ::trackButtonTapped
+            )
     )
 
     private suspend fun createShareConfig(): ShareConfig {
@@ -74,4 +81,16 @@ class UnifiedAboutViewModel @Inject constructor(
         private const val WP_ACKNOWLEDGEMENTS_URL = "file:///android_asset/licenses.html"
         private const val WP_APPS_URL = "https://apps.wordpress.com/"
     }
+
+    private fun trackScreenShown(screen: String) {
+        unifiedAboutTracker.trackScreenShown(screen = screen)
+    }
+
+    private fun trackScreenDismissed(screen: String) {
+        unifiedAboutTracker.trackScreenDismissed(screen = screen)
+    }
+
+    private fun trackButtonTapped(button: String) {
+        unifiedAboutTracker.trackButtonTapped(button = button)
+    }
 }

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

@@ -573,15 +573,13 @@ Language: ar
     <string name="my_site_header_jetpack">Jetpack</string>
     <string name="my_site_btn_jetpack_settings">إعدادات Jetpack</string>
     <string name="new_site_creation_domain_header_title">اختيار نطاق</string>
-    <string name="reader_follow_comments_unsubscribe_success">تم إلغاء الاشتراك من التعليقات بنجاح</string>
     <string name="reader_follow_comments_get_status_error">خطأ في جلب حالة الاشتراك للمقالة</string>
     <string name="reader_follow_comments_could_not_subscribe_error">لا يمكن الاشتراك في التعليقات لهذه المقالة</string>
     <string name="reader_follow_comments_could_not_unsubscribe_error">لا يمكن إلغاء الاشتراك في التعليقات لهذه المقالة</string>
     <string name="reader_btn_following_comments">متابعة المحادثة عبر البريد الإلكتروني</string>
     <string name="reader_btn_follow_comments">تابع المحادثة عبر البريد الإلكتروني</string>
     <string name="activity_log_activity_type_filter_apply">تطبيق</string>
     <string name="activity_log_activity_type_filter_clear">مسح</string>
-    <string name="reader_follow_comments_subscribe_success">لقد اشتركت بالتعليقات بنجاح</string>
     <string name="reader_follow_comments_null_response">لم يتم تلقي أي ردّ</string>
     <string name="reader_follow_comments_bad_format_response">تم تلقي ردّ غير صالح</string>
     <string name="dialog_edit_story_unsupported_format_message">لم تتم إضافة شريحة واحدة أو أكثر إلى قصتك لأن القصص لا تدعم ملفات GIF في الوقت الحالي. الرجاء اختيار صورة ثابتة أو خلفية فيديو بدلاً من ذلك.</string>
@@ -1811,14 +1809,11 @@ Language: ar
     <string name="notification_settings_switch_desc">الإشعارات</string>
     <string name="jetpack_connection_failed_with_reason">فشل الاتصال بـ Jetpack: %s</string>
     <string name="jetpack_already_connected_toast">أنت متصل بالفعل بـ Jetpack</string>
-    <string name="menu_undo_snackbar_action">تراجع</string>
     <string name="menu_visual_mode">الوضع المرئي</string>
     <string name="menu_html_mode">وضع HTML</string>
     <string name="menu_preview">معاينة</string>
     <string name="menu_save_as_draft">حفظ كمسودة</string>
     <string name="file_size_in_terabytes">%s تيرابايت</string>
-    <string name="menu_html_mode_done_snackbar">تم التبديل إلى وضع HTML</string>
-    <string name="menu_visual_mode_done_snackbar">تم التبديل إلى الوضع المرئي</string>
     <string name="file_size_in_gigabytes">%s جيجابايت</string>
     <string name="file_size_in_megabytes">%s ميجابايت</string>
     <string name="file_size_in_kilobytes">%s كيلوبايت</string>
@@ -2896,7 +2891,6 @@ Language: ar
     <string name="comment_status_approved">تمّت الموافقة</string>
     <string name="share_link">رابط المشاركة</string>
     <string name="reader_empty_posts_in_tag_updating">يتم الآن جلب المقالات …</string>
-    <string name="reader_label_reply">رد</string>
     <string name="reader_likes_you_and_multi">أنت و %,d آخرون أحببتم هذا</string>
     <string name="reader_likes_multi">%,d أحبوا هذا</string>
     <string name="cant_share_no_visible_blog">لا تستطيع مشاركتها إلى ووردبريس بدون أن تجعل المدونة مرئية</string>

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

@@ -185,7 +185,6 @@ Language: az
     <string name="notifications_empty_all">Bildiriş yoxdur…</string>
     <string name="share_link">Bağlantını paylaş</string>
     <string name="reader_empty_posts_in_tag_updating">Yazılar gətirilir…</string>
-    <string name="reader_label_reply">Cavab</string>
     <string name="comment_spammed">Şərh spam olaraq işarələnmişdir</string>
     <string name="reader_likes_multi">%,d şəxs bunu bəyənir</string>
     <string name="reader_likes_you_and_multi">Siz və bir digər şəxs %,d bunu bəyənir</string>

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

@@ -759,7 +759,6 @@ Language: bg
     <string name="reader_empty_posts_in_tag_updating">Извличане на публикации…</string>
     <string name="reader_likes_you_and_multi">Вие и %,d още харесахте това</string>
     <string name="reader_likes_multi">%,d човека харесаха това</string>
-    <string name="reader_label_reply">Отговор</string>
     <string name="comment_spammed">Коментарът е отбелязан като спам</string>
     <string name="cant_share_no_visible_blog">Не можете да споделяте към WordPress без видим блог</string>
     <string name="reader_likes_you_and_one">Вие и още някой харесвате това.</string>