Skip to content

Commit a337904

Browse files
committed
Remove Jetpack banner from StatsActivity
1 parent af4f5e8 commit a337904

2 files changed

Lines changed: 5 additions & 29 deletions

File tree

WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsActivity.kt

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,16 @@ import android.content.Intent
55
import android.os.Bundle
66
import android.view.MenuItem
77
import androidx.activity.viewModels
8-
import androidx.core.view.isVisible
98
import dagger.hilt.android.AndroidEntryPoint
109
import org.wordpress.android.WordPress
1110
import org.wordpress.android.databinding.StatsListActivityBinding
1211
import org.wordpress.android.fluxc.model.SiteModel
1312
import org.wordpress.android.push.NotificationType
1413
import org.wordpress.android.push.NotificationsProcessingService.ARG_NOTIFICATION_TYPE
1514
import org.wordpress.android.ui.LocaleAwareActivity
16-
import org.wordpress.android.ui.mysite.jetpackbadge.JetpackPoweredBottomSheetFragment
1715
import org.wordpress.android.ui.stats.StatsTimeframe
1816
import org.wordpress.android.ui.stats.refresh.utils.StatsSiteProvider
1917
import org.wordpress.android.util.JetpackBrandingUtils
20-
import org.wordpress.android.util.JetpackBrandingUtils.Screen.STATS
2118
import javax.inject.Inject
2219

2320
@AndroidEntryPoint
@@ -29,22 +26,7 @@ class StatsActivity : LocaleAwareActivity() {
2926
override fun onCreate(savedInstanceState: Bundle?) {
3027
super.onCreate(savedInstanceState)
3128

32-
with(StatsListActivityBinding.inflate(layoutInflater)) {
33-
setContentView(root)
34-
if (jetpackBrandingUtils.shouldShowJetpackBranding()) {
35-
jetpackBanner.root.isVisible = true
36-
jetpackBrandingUtils.setNavigationBarColorForBanner(window)
37-
38-
if (jetpackBrandingUtils.shouldShowJetpackPoweredBottomSheet()) {
39-
jetpackBanner.root.setOnClickListener {
40-
jetpackBrandingUtils.trackBannerTapped(STATS)
41-
JetpackPoweredBottomSheetFragment
42-
.newInstance()
43-
.show(supportFragmentManager, JetpackPoweredBottomSheetFragment.TAG)
44-
}
45-
}
46-
}
47-
}
29+
setContentView(StatsListActivityBinding.inflate(layoutInflater).root)
4830
}
4931

5032
override fun onOptionsItemSelected(item: MenuItem): Boolean {
Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
android:id="@+id/coordinator"
44
android:layout_width="match_parent"
5-
android:layout_height="match_parent"
6-
android:orientation="vertical">
5+
android:layout_height="match_parent">
76

87
<androidx.fragment.app.FragmentContainerView
98
android:id="@+id/fragment_container"
109
android:name="org.wordpress.android.ui.stats.refresh.StatsFragment"
1110
android:layout_width="match_parent"
12-
android:layout_height="0dp"
13-
android:layout_weight="1" />
14-
15-
<include
16-
android:id="@+id/jetpack_banner"
17-
layout="@layout/jetpack_banner" />
18-
</LinearLayout>
11+
android:layout_height="match_parent" />
12+
</FrameLayout>

0 commit comments

Comments
 (0)