Merge pull request #17009 from wordpress-mobile/Jetpack-Focus-Update-bottom-sheet-layout

Jetpack focus update bottom sheet layout

Author: ravishanker

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

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

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

@@ -129,7 +129,7 @@ class MeFragment : Fragment(R.layout.me_fragment), OnScrollToTopListener {
 
         if (jetpackBrandingUtils.shouldShowJetpackBranding()) {
             jetpackBadge.root.isVisible = true
-            jetpackBadge.jetpackBadge.root.setOnClickListener {
+            jetpackBadge.footerJetpackBadge.jetpackPoweredBadge.setOnClickListener {
                 jetpackBrandingUtils.trackBadgeTapped(ME)
                 viewModel.showJetpackPoweredBottomSheet()
             }

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

@@ -32,7 +32,7 @@ class JetpackPoweredDialogViewModel @Inject constructor(
         _uiState.value = UiState(
                 listOf(
                         Illustration(R.raw.wp2jp),
-                        Title(UiStringRes(string.wp_jetpack_powered)),
+                        Title(UiStringRes(string.wp_jetpack_powered_better_with_jetpack)),
                         Caption(UiStringRes(string.wp_jetpack_powered_features))
                 )
         )

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

@@ -9,7 +9,7 @@ import org.wordpress.android.util.extensions.viewBinding
 class MySiteJetpackBadgeViewHolder(
     parent: ViewGroup,
 ) : MySiteCardAndItemViewHolder<JetpackBadgeBinding>(parent.viewBinding(JetpackBadgeBinding::inflate)) {
-    fun bind(item: JetpackBadge) {
-        itemView.setOnClickListener { item.onClick.click() }
+    fun bind(item: JetpackBadge) = with(binding) {
+        jetpackPoweredBadge.setOnClickListener { item.onClick.click() }
     }
 }

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

@@ -249,7 +249,7 @@ 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.jetpackBadge.getRoot().setOnClickListener(v -> {
+            binding.footerJetpackBadge.jetpackPoweredBadge.setOnClickListener(v -> {
                     mJetpackBrandingUtils.trackBadgeTapped(Screen.APP_SETTINGS);
                     new JetpackPoweredBottomSheetFragment().show(
                             ((AppCompatActivity) getActivity()).getSupportFragmentManager(),

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

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

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

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

WordPress/src/main/res/layout-land/jetpack_powered_bottom_sheet.xml

@@ -8,13 +8,6 @@
     android:background="@color/jetpack_powered_bottom_sheet_background"
     android:orientation="vertical">
 
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideline3"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        app:layout_constraintGuide_end="130dp" />
-
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/content_recycler_view"
         android:layout_width="match_parent"
@@ -49,7 +42,7 @@
         app:layout_constraintBottom_toTopOf="@id/secondary_button"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_goneMarginBottom="@dimen/margin_extra_large" />
+        app:layout_goneMarginBottom="@dimen/margin_extra_extra_medium_large" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/secondary_button"

WordPress/src/main/res/layout/jetpack_badge.xml

@@ -9,6 +9,7 @@
     android:paddingTop="@dimen/margin_large">
 
     <com.google.android.material.button.MaterialButton
+        android:id="@+id/jetpack_powered_badge"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"

WordPress/src/main/res/layout/jetpack_badge_footer.xml

@@ -6,7 +6,7 @@
     android:paddingBottom="@dimen/jetpack_badge_footer_bottom_spacing">
 
     <include
-        android:id="@+id/jetpack_badge"
+        android:id="@+id/footer_jetpack_badge"
         layout="@layout/jetpack_badge"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />