Skip to content

Commit 0565801

Browse files
Matthew KevinsMatthew Kevins
authored andcommitted
Remove Jetpack banner from publicize activity
1 parent af4f5e8 commit 0565801

2 files changed

Lines changed: 0 additions & 27 deletions

File tree

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

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
import android.app.ProgressDialog;
44
import android.os.Bundle;
55
import android.view.MenuItem;
6-
import android.view.View;
7-
import android.view.ViewGroup.MarginLayoutParams;
86

97
import androidx.appcompat.app.ActionBar;
108
import androidx.appcompat.app.AlertDialog;
@@ -32,12 +30,10 @@
3230
import org.wordpress.android.ui.ActivityLauncher;
3331
import org.wordpress.android.ui.LocaleAwareActivity;
3432
import org.wordpress.android.ui.ScrollableViewInitializedListener;
35-
import org.wordpress.android.ui.mysite.jetpackbadge.JetpackPoweredBottomSheetFragment;
3633
import org.wordpress.android.ui.publicize.PublicizeConstants.ConnectAction;
3734
import org.wordpress.android.ui.publicize.adapters.PublicizeServiceAdapter;
3835
import org.wordpress.android.ui.publicize.services.PublicizeUpdateService;
3936
import org.wordpress.android.util.JetpackBrandingUtils;
40-
import org.wordpress.android.util.JetpackBrandingUtils.Screen;
4137
import org.wordpress.android.util.SiteUtils;
4238
import org.wordpress.android.util.ToastUtils;
4339
import org.wordpress.android.util.analytics.AnalyticsUtils;
@@ -82,25 +78,6 @@ public void onCreate(Bundle savedInstanceState) {
8278

8379
mAppBarLayout = findViewById(R.id.appbar_main);
8480

85-
if (mJetpackBrandingUtils.shouldShowJetpackBranding()) {
86-
View jetpackBanner = findViewById(R.id.jetpack_banner);
87-
jetpackBanner.setVisibility(View.VISIBLE);
88-
mJetpackBrandingUtils.setNavigationBarColorForBanner(getWindow());
89-
90-
// Add bottom margin to content.
91-
MarginLayoutParams layoutParams =
92-
(MarginLayoutParams) findViewById(R.id.fragment_container).getLayoutParams();
93-
layoutParams.bottomMargin = getResources().getDimensionPixelSize(R.dimen.jetpack_banner_height);
94-
95-
if (mJetpackBrandingUtils.shouldShowJetpackPoweredBottomSheet()) {
96-
jetpackBanner.setOnClickListener(v -> {
97-
mJetpackBrandingUtils.trackBannerTapped(Screen.SHARE);
98-
new JetpackPoweredBottomSheetFragment()
99-
.show(getSupportFragmentManager(), JetpackPoweredBottomSheetFragment.TAG);
100-
});
101-
}
102-
}
103-
10481
if (savedInstanceState == null) {
10582
mSite = (SiteModel) getIntent().getSerializableExtra(WordPress.SITE);
10683
PublicizeTable.createTables(WordPress.wpDB.getDatabase());

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,4 @@
2424
android:layout_width="match_parent"
2525
android:layout_height="match_parent"
2626
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
27-
28-
<include
29-
android:id="@+id/jetpack_banner"
30-
layout="@layout/jetpack_banner" />
3127
</androidx.coordinatorlayout.widget.CoordinatorLayout>

0 commit comments

Comments
 (0)