Merge pull request #17146 from wordpress-mobile/release/20.7

Merge changes from hotfix 20.6.1, 20.7 code freeze, and 20.7-rc.2 into `trunk`

Author: AliSoftware

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

@@ -75,9 +75,11 @@ class ActivityLogDetailFragment : Fragment(R.layout.activity_log_item_detail) {
 
         if (jetpackBrandingUtils.shouldShowJetpackBranding()) {
             jetpackBadge.root.isVisible = true
-            jetpackBadge.jetpackPoweredBadge.setOnClickListener {
-                jetpackBrandingUtils.trackBadgeTapped(ACTIVITY_LOG_DETAIL)
-                viewModel.showJetpackPoweredBottomSheet()
+            if (jetpackBrandingUtils.shouldShowJetpackPoweredBottomSheet()) {
+                jetpackBadge.jetpackPoweredBadge.setOnClickListener {
+                    jetpackBrandingUtils.trackBadgeTapped(ACTIVITY_LOG_DETAIL)
+                    viewModel.showJetpackPoweredBottomSheet()
+                }
             }
         }
     }

WordPress/src/main/java/org/wordpress/android/ui/main/MeFragment.kt

@@ -126,12 +126,14 @@ class MeFragment : Fragment(R.layout.me_fragment), OnScrollToTopListener {
                 setTitle(packageManager.getActivityInfo(componentName, PackageManager.GET_META_DATA).labelRes)
             }
         }
-
+        
         if (jetpackBrandingUtils.shouldShowJetpackBranding()) {
             jetpackBadge.isVisible = true
-            jetpackBadge.setOnClickListener {
-                jetpackBrandingUtils.trackBadgeTapped(ME)
-                viewModel.showJetpackPoweredBottomSheet()
+            if (jetpackBrandingUtils.shouldShowJetpackPoweredBottomSheet()) {
+                jetpackBadge.setOnClickListener {
+                    jetpackBrandingUtils.trackBadgeTapped(ME)
+                    viewModel.showJetpackPoweredBottomSheet()
+                }
             }
         }
 

WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteCardAndItem.kt

@@ -277,6 +277,6 @@ sealed class MySiteCardAndItem(open val type: Type, open val activeQuickStartIte
     }
 
     data class JetpackBadge(
-        val onClick: ListItemInteraction
+        val onClick: ListItemInteraction? = null
     ) : MySiteCardAndItem(JETPACK_BADGE)
 }

WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteViewModel.kt

@@ -497,7 +497,11 @@ class MySiteViewModel @Inject constructor(
         )
 
         val jetpackBadge = JetpackBadge(
-                ListItemInteraction.create(this::onJetpackBadgeClick)
+                if (jetpackBrandingUtils.shouldShowJetpackPoweredBottomSheet()) {
+                    ListItemInteraction.create(this::onJetpackBadgeClick)
+                } else {
+                    null
+                }
         ).takeIf { jetpackBrandingUtils.shouldShowJetpackBranding() }
 
         return mapOf(

WordPress/src/main/java/org/wordpress/android/ui/mysite/jetpackbadge/MySiteJetpackBadgeViewHolder.kt

@@ -10,6 +10,8 @@ class MySiteJetpackBadgeViewHolder(
     parent: ViewGroup,
 ) : MySiteCardAndItemViewHolder<JetpackBadgeBinding>(parent.viewBinding(JetpackBadgeBinding::inflate)) {
     fun bind(item: JetpackBadge) = with(binding) {
-        jetpackPoweredBadge.setOnClickListener { item.onClick.click() }
+        item.onClick?.run {
+            jetpackPoweredBadge.setOnClickListener { click() }
+        }
     }
 }

WordPress/src/main/java/org/wordpress/android/ui/prefs/AppSettingsFragment.java

@@ -249,12 +249,14 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
     private void addJetpackBadgeAsFooterIfEnabled(LayoutInflater inflater, ListView listView) {
         if (mJetpackBrandingUtils.shouldShowJetpackBranding()) {
             final JetpackBadgeFooterBinding binding = JetpackBadgeFooterBinding.inflate(inflater);
-            binding.footerJetpackBadge.jetpackPoweredBadge.setOnClickListener(v -> {
+            if (mJetpackBrandingUtils.shouldShowJetpackPoweredBottomSheet()) {
+                binding.footerJetpackBadge.jetpackPoweredBadge.setOnClickListener(v -> {
                     mJetpackBrandingUtils.trackBadgeTapped(Screen.APP_SETTINGS);
                     new JetpackPoweredBottomSheetFragment().show(
                             ((AppCompatActivity) getActivity()).getSupportFragmentManager(),
                             JetpackPoweredBottomSheetFragment.TAG);
-            });
+                });
+            }
             listView.addFooterView(binding.getRoot(), null, false);
         }
     }

WordPress/src/main/java/org/wordpress/android/ui/prefs/notifications/NotificationsSettingsFragment.java

@@ -229,12 +229,14 @@ private void addJetpackBadgeAsFooterIfEnabled(ListView listView) {
         if (mJetpackBrandingUtils.shouldShowJetpackBranding()) {
             LayoutInflater inflater = LayoutInflater.from(getContext());
             final JetpackBadgeFooterBinding binding = JetpackBadgeFooterBinding.inflate(inflater);
-            binding.footerJetpackBadge.jetpackPoweredBadge.setOnClickListener(v -> {
-                mJetpackBrandingUtils.trackBadgeTapped(Screen.NOTIFICATIONS_SETTINGS);
-                new JetpackPoweredBottomSheetFragment().show(
-                        ((AppCompatActivity) getActivity()).getSupportFragmentManager(),
-                        JetpackPoweredBottomSheetFragment.TAG);
-            });
+            if (mJetpackBrandingUtils.shouldShowJetpackPoweredBottomSheet()) {
+                binding.footerJetpackBadge.jetpackPoweredBadge.setOnClickListener(v -> {
+                    mJetpackBrandingUtils.trackBadgeTapped(Screen.NOTIFICATIONS_SETTINGS);
+                    new JetpackPoweredBottomSheetFragment().show(
+                            ((AppCompatActivity) getActivity()).getSupportFragmentManager(),
+                            JetpackPoweredBottomSheetFragment.TAG);
+                });
+            }
             listView.addFooterView(binding.getRoot(), null, false);
         }
     }

WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostDetailFragment.kt

@@ -715,9 +715,11 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
 
         if (jetpackBrandingUtils.shouldShowJetpackBranding()) {
             binding.jetpackBadge.root.isVisible = true
-            binding.jetpackBadge.jetpackPoweredBadge.setOnClickListener {
-                jetpackBrandingUtils.trackBadgeTapped(READER_POST_DETAIL)
-                viewModel.showJetpackPoweredBottomSheet()
+            if (jetpackBrandingUtils.shouldShowJetpackPoweredBottomSheet()) {
+                binding.jetpackBadge.jetpackPoweredBadge.setOnClickListener {
+                    jetpackBrandingUtils.trackBadgeTapped(READER_POST_DETAIL)
+                    viewModel.showJetpackPoweredBottomSheet()
+                }
             }
         }
 

WordPress/src/main/java/org/wordpress/android/util/config/JetpackPoweredBottomSheetFeatureConfig.kt

@@ -1,23 +1,16 @@
 package org.wordpress.android.util.config
 
 import org.wordpress.android.BuildConfig
-import org.wordpress.android.annotation.FeatureInDevelopment
+import org.wordpress.android.annotation.Feature
 import javax.inject.Inject
 
-/**
- * Configuration for Jetpack Powered Bottom Sheet
- *
- * TODO: When it is ready to be rolled out uncomment the lines 12 and 19, remove line 13 and this to-do
- */
-// @Feature(JetpackPoweredBottomSheetFeatureConfig.JETPACK_POWERED_BOTTOM_SHEET_REMOTE_FIELD, true)
-@FeatureInDevelopment
-@Suppress("ForbiddenComment")
+@Feature(JetpackPoweredBottomSheetFeatureConfig.JETPACK_POWERED_BOTTOM_SHEET_REMOTE_FIELD, false)
 class JetpackPoweredBottomSheetFeatureConfig @Inject constructor(
     appConfig: AppConfig
 ) : FeatureConfig(
         appConfig,
-        BuildConfig.JETPACK_POWERED,
-//        JETPACK_POWERED_BOTTOM_SHEET_REMOTE_FIELD
+        BuildConfig.JETPACK_POWERED_BOTTOM_SHEET,
+        JETPACK_POWERED_BOTTOM_SHEET_REMOTE_FIELD
 ) {
     companion object {
         const val JETPACK_POWERED_BOTTOM_SHEET_REMOTE_FIELD = "jetpack_powered_bottom_sheet_remote_field"

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

@@ -59,7 +59,6 @@ Language: ar
     <string name="stats_insights_comments_guide_card">💡اضغط على \"عرض المزيد\" للاطلاع على أفضل المعلقين لديك.</string>
     <string name="stats_insights_views_and_visitors_visitors_empty_state">مراجعة أفضل نصائحنا لزيادة مشاهداتك وحركة مرورك ⁦%1$s⁩</string>
     <string name="stats_action_card_schedule_post_message">✍️ قم بجدولة مسوداتك لنشرها في أفضل وقت للوصول إلى جمهورك.</string>
-    <string name="stats_view_publicize">اتصالات شبكات التواصل الاجتماعي</string>
     <string name="stats_insights_latest_post_empty">تحقَّق من هذا مرة أخرى عندما تكون قد نشرت تدوينتك الأولى!</string>
     <string name="stats_action_card_blogging_reminders_message">💡يُعد التدوين باستمرار طريقة رائعة لبناء جمهورك. أضف تذكيرًا يبقيك في المسار الصحيح.</string>
     <string name="stats_action_card_grow_audience_message">💡ارتق بمستوى تدوينك بشكل أسرع بفضل دورة &lt;i&gt;مقدمة إلى التدوين&lt;/i&gt; التدريبية الخاصة بنا التي يقودها الخبراء.</string>
@@ -1332,7 +1331,6 @@ Language: ar
     <string name="gutenberg_native_add_paragraph_block">إضافة مكوّن فقرة</string>
     <string name="gutenberg_native_border_radius">زوايا الحدود</string>
     <string name="dialog_title_sharing_facebook_account_must_have_pages">غير متصل</string>
-    <string name="sharing_facebook_account_must_have_pages">يتعذر الاتصال بـ Facebook العثور على أي صفحات. لا يمكن لآلية النشر الاتصال بملفات تعريف Facebook الشخصية، فقط للصفحات المنشورة.</string>
     <string name="post_list_tab_published_posts">منشور</string>
     <string name="post_list_tab_scheduled_posts">مجدول</string>
     <string name="post_list_tab_trashed_posts">محذوف</string>
@@ -2560,10 +2558,8 @@ Language: ar
     <string name="share_btn_disconnect">قطع الاتصال</string>
     <string name="share_btn_connect">اتصال</string>
     <string name="connection_service_description">اتصل لمشاركة مقالات مدونتك تلقائيًا على %s.</string>
-    <string name="connection_service_label">الإشهار على %s</string>
     <string name="connected_accounts_label">الحسابات المتصلة</string>
     <string name="connections_description">قم بتوصيل خدمات التواصل الاجتماعي المفضلة لديك لمشاركة المقالات الجديدة تلقائيًا مع الأصدقاء.</string>
-    <string name="connections_label">اتصالات</string>
     <string name="sharing">مشاركة</string>
     <string name="tabbar_accessibility_label_notifications">تنبيهات. قم بإدارة تنبيهاتك.</string>
     <string name="tabbar_accessibility_label_reader">القارئ. متابعة محتوى من مواقع أخرى.</string>