[MediaWiki-commits] [Gerrit] Fix toolbar background - change (apps...wikipedia)

[Niedzielski (Code Review)]

Niedzielski has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/244088

Change subject: Fix toolbar background
......................................................................

Fix toolbar background

Fix regression in 3e91f1d where the toolbar background was incorrect for
many articles. The fix was to simplify the state of
SearchBarHideHandler.

Bug: T114800

Change-Id: I7c7d0e7718c91a74cc9570fd1ebdb06a768d6625
---
M app/src/main/java/org/wikipedia/search/SearchBarHideHandler.java
1 file changed, 4 insertions(+), 36 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/88/244088/1

diff --git a/app/src/main/java/org/wikipedia/search/SearchBarHideHandler.java 
b/app/src/main/java/org/wikipedia/search/SearchBarHideHandler.java
index bf03a51..df93074 100644
--- a/app/src/main/java/org/wikipedia/search/SearchBarHideHandler.java
+++ b/app/src/main/java/org/wikipedia/search/SearchBarHideHandler.java
@@ -1,37 +1,29 @@
 package org.wikipedia.search;
 
-import android.animation.ArgbEvaluator;
 import android.app.Activity;
 import android.content.Context;
 import android.content.res.Resources;
-import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
-import android.graphics.drawable.PaintDrawable;
-import android.support.annotation.ColorInt;
-import android.support.annotation.ColorRes;
 import android.support.annotation.NonNull;
-import android.view.Gravity;
 import android.view.View;
 
 import org.wikipedia.R;
 import org.wikipedia.ViewAnimations;
-import org.wikipedia.util.GradientUtil;
 import org.wikipedia.views.ObservableWebView;
-import org.wikipedia.views.ViewUtil;
 
-public class SearchBarHideHandler implements 
ObservableWebView.OnScrollChangeListener, 
ObservableWebView.OnUpOrCancelMotionEventListener, 
ObservableWebView.OnDownMotionEventListener {
+public class SearchBarHideHandler implements 
ObservableWebView.OnScrollChangeListener,
+        ObservableWebView.OnUpOrCancelMotionEventListener,
+        ObservableWebView.OnDownMotionEventListener {
     private static final int HUMAN_SCROLL_THRESHOLD = 200;
     private static final int FULL_OPACITY = 255;
     @NonNull private final View quickReturnView;
     private final float displayDensity;
-    private final ArgbEvaluator colorEvaluator;
 
     @NonNull private final Context context;
     private ObservableWebView webview;
     private boolean fadeEnabled;
     private boolean forceNoFade;
     @NonNull private final Drawable toolbarBackground;
-    @NonNull private final PaintDrawable toolbarGradient = new PaintDrawable();
     @NonNull private final Drawable toolbarShadow;
     @NonNull private final Drawable statusBar;
 
@@ -42,10 +34,7 @@
 
         toolbarBackground = 
quickReturnView.findViewById(R.id.main_toolbar).getBackground().mutate();
         toolbarShadow = 
quickReturnView.findViewById(R.id.main_toolbar_shadow).getBackground().mutate();
-        ViewUtil.setBackgroundDrawable(quickReturnView, toolbarBackground);
-        initToolbarGradient();
 
-        colorEvaluator = new ArgbEvaluator();
         statusBar = 
quickReturnView.findViewById(R.id.empty_status_bar).getBackground().mutate();
     }
 
@@ -97,10 +86,8 @@
         int opacity = calculateScrollOpacity(scrollY);
         toolbarBackground.setAlpha(opacity);
         toolbarShadow.setAlpha(opacity);
-        toolbarGradient.setAlpha(FULL_OPACITY - opacity);
+        statusBar.setAlpha(opacity);
 
-        int color = calculateScrollStatusBarColorTween(opacity);
-        statusBar.setColorFilter(color, PorterDuff.Mode.SRC_IN);
         if (scrollY <= webview.getHeight()) {
             // For the first screenful, ensure it always exists.
             ViewAnimations.ensureTranslationY(quickReturnView, 0);
@@ -148,11 +135,6 @@
         // Don't do anything for now
     }
 
-    private void initToolbarGradient() {
-        @ColorInt int baseColor = getColor(R.color.lead_gradient_start);
-        GradientUtil.setCubicGradient(toolbarGradient, baseColor, Gravity.TOP);
-    }
-
     /** @return Alpha value between 0 and 0xff. */
     private int calculateScrollOpacity(int scrollY) {
         final int fadeHeight = 256;
@@ -163,20 +145,6 @@
         opacity = Math.max(0, opacity);
         opacity = Math.min(FULL_OPACITY, opacity);
         return opacity;
-    }
-
-    @ColorInt private int calculateScrollStatusBarColorTween(int opacity) {
-        final int alphaMask = 0xff000000;
-        return (int) colorEvaluator.evaluate((float) opacity / FULL_OPACITY,
-                toolbarColor() & ~alphaMask, toolbarColor());
-    }
-
-    @ColorInt private int toolbarColor() {
-        return getColor(R.color.actionbar_background);
-    }
-
-    @ColorInt private int getColor(@ColorRes int id) {
-        return getResources().getColor(id);
     }
 
     @NonNull private Resources getResources() {

-- 
To view, visit https://gerrit.wikimedia.org/r/244088
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7c7d0e7718c91a74cc9570fd1ebdb06a768d6625
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski <sniedziel...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits