jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Don't require Context in PageToolbarHideHandler.
......................................................................
Hygiene: Don't require Context in PageToolbarHideHandler.
Change-Id: Ia26e9092bcb948d0cd348d214f76ccfb0dea2a09
---
M app/src/main/java/org/wikipedia/page/PageActivity.java
M app/src/main/java/org/wikipedia/page/PageToolbarHideHandler.java
2 files changed, 6 insertions(+), 18 deletions(-)
Approvals:
jenkins-bot: Verified
Niedzielski: Looks good to me, approved
diff --git a/app/src/main/java/org/wikipedia/page/PageActivity.java
b/app/src/main/java/org/wikipedia/page/PageActivity.java
index 990b62b..d6f67f0 100644
--- a/app/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/app/src/main/java/org/wikipedia/page/PageActivity.java
@@ -143,7 +143,7 @@
getSupportActionBar().setTitle("");
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
- toolbarHideHandler = new PageToolbarHideHandler(this,
toolbarContainerView);
+ toolbarHideHandler = new PageToolbarHideHandler(toolbarContainerView);
boolean languageChanged = false;
if (savedInstanceState != null) {
diff --git a/app/src/main/java/org/wikipedia/page/PageToolbarHideHandler.java
b/app/src/main/java/org/wikipedia/page/PageToolbarHideHandler.java
index 7dd12c5..d1546ed 100644
--- a/app/src/main/java/org/wikipedia/page/PageToolbarHideHandler.java
+++ b/app/src/main/java/org/wikipedia/page/PageToolbarHideHandler.java
@@ -1,12 +1,10 @@
package org.wikipedia.page;
-import android.content.Context;
-import android.content.res.Resources;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.LayerDrawable;
import android.support.annotation.ColorInt;
-import android.support.annotation.ColorRes;
import android.support.annotation.NonNull;
+import android.support.v4.content.ContextCompat;
import android.view.Gravity;
import android.view.View;
@@ -17,20 +15,19 @@
public class PageToolbarHideHandler extends ViewHideHandler {
private static final int FULL_OPACITY = 255;
- @NonNull private final Context context;
private boolean fadeEnabled;
private boolean forceNoFade;
@NonNull private final Drawable toolbarBackground;
private Drawable toolbarGradient;
@NonNull private final Drawable statusBar;
- public PageToolbarHideHandler(@NonNull Context context, @NonNull View
hideableView) {
+ public PageToolbarHideHandler(@NonNull View hideableView) {
super(hideableView, Gravity.TOP);
- this.context = context;
LayerDrawable toolbarBackgroundLayers = (LayerDrawable)
hideableView.getBackground();
toolbarBackground =
toolbarBackgroundLayers.findDrawableByLayerId(R.id.toolbar_background_solid).mutate();
- initToolbarGradient(toolbarBackgroundLayers);
+ initToolbarGradient(toolbarBackgroundLayers,
+ ContextCompat.getColor(hideableView.getContext(),
R.color.lead_gradient_start));
statusBar =
hideableView.findViewById(R.id.empty_status_bar).getBackground().mutate();
}
@@ -63,8 +60,7 @@
statusBar.setAlpha(opacity);
}
- private void initToolbarGradient(LayerDrawable toolbarBackgroundLayers) {
- @ColorInt int baseColor = getColor(R.color.lead_gradient_start);
+ private void initToolbarGradient(LayerDrawable toolbarBackgroundLayers,
@ColorInt int baseColor) {
toolbarGradient = GradientUtil.getCubicGradient(baseColor,
Gravity.TOP);
toolbarBackgroundLayers.setDrawableByLayerId(R.id.toolbar_background_gradient,
toolbarGradient);
}
@@ -79,13 +75,5 @@
opacity = Math.max(0, opacity);
opacity = Math.min(FULL_OPACITY, opacity);
return opacity;
- }
-
- @ColorInt private int getColor(@ColorRes int id) {
- return getResources().getColor(id);
- }
-
- @NonNull private Resources getResources() {
- return context.getResources();
}
}
--
To view, visit https://gerrit.wikimedia.org/r/319130
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia26e9092bcb948d0cd348d214f76ccfb0dea2a09
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[email protected]>
Gerrit-Reviewer: BearND <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Mholloway <[email protected]>
Gerrit-Reviewer: Niedzielski <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
