Merge pull request #17035 from wordpress-mobile/issue/17029-use-jetpack-badge-instead-of-banner-on-sharing-screen

[Jetpack] Use Jetpack badge instead of banner on sharing screen

Author: mkevins

WordPress/src/main/java/org/wordpress/android/ui/publicize/PublicizeListActivity.java

@@ -3,8 +3,6 @@
 import android.app.ProgressDialog;
 import android.os.Bundle;
 import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup.MarginLayoutParams;
 
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
@@ -32,12 +30,10 @@
 import org.wordpress.android.ui.ActivityLauncher;
 import org.wordpress.android.ui.LocaleAwareActivity;
 import org.wordpress.android.ui.ScrollableViewInitializedListener;
-import org.wordpress.android.ui.mysite.jetpackbadge.JetpackPoweredBottomSheetFragment;
 import org.wordpress.android.ui.publicize.PublicizeConstants.ConnectAction;
 import org.wordpress.android.ui.publicize.adapters.PublicizeServiceAdapter;
 import org.wordpress.android.ui.publicize.services.PublicizeUpdateService;
 import org.wordpress.android.util.JetpackBrandingUtils;
-import org.wordpress.android.util.JetpackBrandingUtils.Screen;
 import org.wordpress.android.util.SiteUtils;
 import org.wordpress.android.util.ToastUtils;
 import org.wordpress.android.util.analytics.AnalyticsUtils;
@@ -82,25 +78,6 @@ public void onCreate(Bundle savedInstanceState) {
 
         mAppBarLayout = findViewById(R.id.appbar_main);
 
-        if (mJetpackBrandingUtils.shouldShowJetpackBranding()) {
-            View jetpackBanner = findViewById(R.id.jetpack_banner);
-            jetpackBanner.setVisibility(View.VISIBLE);
-            mJetpackBrandingUtils.setNavigationBarColorForBanner(getWindow());
-
-            // Add bottom margin to content.
-            MarginLayoutParams layoutParams =
-                    (MarginLayoutParams) findViewById(R.id.fragment_container).getLayoutParams();
-            layoutParams.bottomMargin = getResources().getDimensionPixelSize(R.dimen.jetpack_banner_height);
-
-            if (mJetpackBrandingUtils.shouldShowJetpackPoweredBottomSheet()) {
-                jetpackBanner.setOnClickListener(v -> {
-                    mJetpackBrandingUtils.trackBannerTapped(Screen.SHARE);
-                    new JetpackPoweredBottomSheetFragment()
-                            .show(getSupportFragmentManager(), JetpackPoweredBottomSheetFragment.TAG);
-                });
-            }
-        }
-
         if (savedInstanceState == null) {
             mSite = (SiteModel) getIntent().getSerializableExtra(WordPress.SITE);
             PublicizeTable.createTables(WordPress.wpDB.getDatabase());

WordPress/src/main/java/org/wordpress/android/ui/publicize/PublicizeListFragment.java

@@ -24,11 +24,14 @@
 import org.wordpress.android.fluxc.store.AccountStore;
 import org.wordpress.android.ui.ScrollableViewInitializedListener;
 import org.wordpress.android.ui.mysite.cards.quickstart.QuickStartRepository;
+import org.wordpress.android.ui.mysite.jetpackbadge.JetpackPoweredBottomSheetFragment;
 import org.wordpress.android.ui.publicize.adapters.PublicizeServiceAdapter;
 import org.wordpress.android.ui.publicize.adapters.PublicizeServiceAdapter.OnAdapterLoadedListener;
 import org.wordpress.android.ui.publicize.adapters.PublicizeServiceAdapter.OnServiceClickListener;
 import org.wordpress.android.ui.quickstart.QuickStartEvent;
 import org.wordpress.android.ui.utils.UiString.UiStringText;
+import org.wordpress.android.util.JetpackBrandingUtils;
+import org.wordpress.android.util.JetpackBrandingUtils.Screen;
 import org.wordpress.android.util.NetworkUtils;
 import org.wordpress.android.util.QuickStartUtils;
 import org.wordpress.android.util.QuickStartUtilsWrapper;
@@ -60,6 +63,7 @@ public interface PublicizeButtonPrefsListener {
     @Inject QuickStartUtilsWrapper mQuickStartUtilsWrapper;
     @Inject QuickStartRepository mQuickStartRepository;
     @Inject SnackbarSequencer mSnackbarSequencer;
+    @Inject JetpackBrandingUtils mJetpackBrandingUtils;
 
     public static PublicizeListFragment newInstance(@NonNull SiteModel site) {
         Bundle args = new Bundle();
@@ -130,6 +134,19 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
             showQuickStartFocusPoint();
         }
 
+        if (mJetpackBrandingUtils.shouldShowJetpackBranding()) {
+            View jetpackBadge = rootView.findViewById(R.id.jetpack_powered_badge);
+            jetpackBadge.setVisibility(View.VISIBLE);
+
+            if (mJetpackBrandingUtils.shouldShowJetpackPoweredBottomSheet()) {
+                jetpackBadge.setOnClickListener(v -> {
+                    mJetpackBrandingUtils.trackBadgeTapped(Screen.SHARE);
+                    new JetpackPoweredBottomSheetFragment()
+                            .show(requireActivity().getSupportFragmentManager(), JetpackPoweredBottomSheetFragment.TAG);
+                });
+            }
+        }
+
         return rootView;
     }
 

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

@@ -24,8 +24,4 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
-
-    <include
-        android:id="@+id/jetpack_banner"
-        layout="@layout/jetpack_banner" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -113,6 +113,28 @@
 
             </RelativeLayout>
 
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/jetpack_powered_badge"
+                android:visibility="gone"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:importantForAccessibility="no"
+                android:paddingEnd="15dp"
+                android:paddingStart="5dp"
+                android:paddingVertical="5dp"
+                android:text="@string/wp_jetpack_powered"
+                android:textAppearance="?attr/textAppearanceBody1"
+                android:textColor="@color/white"
+                android:textSize="@dimen/text_sz_large"
+                app:backgroundTint="@color/jetpack_badge_background"
+                app:cornerRadius="20dp"
+                app:icon="@drawable/ic_jetpack_logo_24dp"
+                app:iconPadding="10dp"
+                app:iconTint="@null"
+                tools:ignore="TextContrastCheck"
+                tools:visibility="visible" />
+
         </LinearLayout>
     </RelativeLayout>
 </androidx.core.widget.NestedScrollView>