Skip to content

Commit fb2c38b

Browse files
committed
Remove nav bar Jetpack branding tint
This commit removes the feature of changing the navigation bar color below Jetpack banner.
1 parent 8f8ccbd commit fb2c38b

File tree

4 files changed

+0
-20
lines changed

4 files changed

+0
-20
lines changed

WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListActivity.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ class ActivityLogListActivity : LocaleAwareActivity(), ScrollableViewInitialized
5656
?: return@post
5757

5858
jetpackBrandingUtils.showJetpackBannerIfScrolledToTop(jetpackBannerView, scrollableView)
59-
window?.let { jetpackBrandingUtils.setNavigationBarColorForBanner(it) }
6059
jetpackBrandingUtils.initJetpackBannerAnimation(jetpackBannerView, scrollableView)
6160

6261
if (jetpackBrandingUtils.shouldShowJetpackPoweredBottomSheet()) {

WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostListFragment.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import android.app.Activity;
44
import android.content.Context;
55
import android.content.Intent;
6-
import android.content.res.Configuration;
76
import android.graphics.drawable.Drawable;
87
import android.os.Bundle;
98
import android.text.Html;
@@ -511,7 +510,6 @@ private void toggleJetpackBannerIfEnabled(final boolean showIfEnabled, boolean a
511510
if (animateOnScroll) {
512511
RecyclerView scrollView = mRecyclerView.getInternalRecyclerView();
513512
mJetpackBrandingUtils.showJetpackBannerIfScrolledToTop(mJetpackBanner, scrollView);
514-
mJetpackBrandingUtils.setNavigationBarColorForBanner(requireActivity().getWindow());
515513
// Return early since the banner visibility was handled by showJetpackBannerIfScrolledToTop
516514
return;
517515
}
@@ -526,7 +524,6 @@ private void toggleJetpackBannerIfEnabled(final boolean showIfEnabled, boolean a
526524

527525
private void showJetpackBanner() {
528526
mJetpackBanner.setVisibility(View.VISIBLE);
529-
mJetpackBrandingUtils.setNavigationBarColorForBanner(requireActivity().getWindow());
530527

531528
// Add bottom margin to search suggestions list and empty view.
532529
int jetpackBannerHeight = getResources().getDimensionPixelSize(R.dimen.jetpack_banner_height);
@@ -538,10 +535,6 @@ private void showJetpackBanner() {
538535
private void hideJetpackBanner() {
539536
mJetpackBanner.setVisibility(View.GONE);
540537

541-
if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) {
542-
requireActivity().getWindow().setNavigationBarColor(0);
543-
}
544-
545538
// Remove bottom margin from search suggestions list and empty view.
546539
((MarginLayoutParams) mRecyclerView.getSearchSuggestionsRecyclerView().getLayoutParams()).bottomMargin = 0;
547540
((MarginLayoutParams) mActionableEmptyView.getLayoutParams()).bottomMargin = 0;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,6 @@ class StatsFragment : Fragment(R.layout.stats_fragment), ScrollableViewInitializ
271271
?: return@post
272272

273273
jetpackBrandingUtils.showJetpackBannerIfScrolledToTop(jetpackBannerView, scrollableView)
274-
activity?.window?.let { jetpackBrandingUtils.setNavigationBarColorForBanner(it) }
275274
jetpackBrandingUtils.initJetpackBannerAnimation(jetpackBannerView, scrollableView)
276275

277276
if (jetpackBrandingUtils.shouldShowJetpackPoweredBottomSheet()) {

WordPress/src/main/java/org/wordpress/android/util/JetpackBrandingUtils.kt

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
package org.wordpress.android.util
22

3-
import android.content.res.Configuration
43
import android.view.View
54
import android.view.View.OnScrollChangeListener
6-
import android.view.Window
75
import androidx.core.view.isVisible
86
import androidx.recyclerview.widget.RecyclerView
97
import org.wordpress.android.R
@@ -66,15 +64,6 @@ class JetpackBrandingUtils @Inject constructor(
6664
})
6765
}
6866

69-
/**
70-
* Sets the navigation bar color as same as Jetpack banner background color in portrait orientation.
71-
*/
72-
fun setNavigationBarColorForBanner(window: Window) {
73-
if (window.context.resources.configuration.orientation == Configuration.ORIENTATION_PORTRAIT) {
74-
window.navigationBarColor = window.context.getColor(R.color.jetpack_banner_background)
75-
}
76-
}
77-
7867
private fun isWpComSite(): Boolean {
7968
val selectedSite = selectedSiteRepository.getSelectedSite()
8069
return selectedSite != null && siteUtilsWrapper.isAccessedViaWPComRest(selectedSite)

0 commit comments

Comments
 (0)