Dbrant has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372899 )
Change subject: Further simplify bottom gradient on lead images.
......................................................................
Further simplify bottom gradient on lead images.
Change-Id: Id35860cc3fd12366d19bece361961a081e538e4d
---
M app/src/main/java/org/wikipedia/page/PageToolbarHideHandler.java
M app/src/main/java/org/wikipedia/page/leadimages/PageHeaderImageView.java
M app/src/main/java/org/wikipedia/page/leadimages/PageHeaderView.java
M app/src/main/java/org/wikipedia/util/GradientUtil.java
M app/src/main/res/layout/view_page_header_image.xml
5 files changed, 14 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/99/372899/1
diff --git a/app/src/main/java/org/wikipedia/page/PageToolbarHideHandler.java
b/app/src/main/java/org/wikipedia/page/PageToolbarHideHandler.java
index be902f0..ab222b6 100644
--- a/app/src/main/java/org/wikipedia/page/PageToolbarHideHandler.java
+++ b/app/src/main/java/org/wikipedia/page/PageToolbarHideHandler.java
@@ -8,7 +8,6 @@
import org.wikipedia.R;
import org.wikipedia.util.DimenUtil;
-import org.wikipedia.util.GradientUtil;
public class PageToolbarHideHandler extends ViewHideHandler {
private static final int FULL_OPACITY = 255;
@@ -16,7 +15,6 @@
private boolean fadeEnabled;
private boolean forceNoFade;
@NonNull private final Drawable toolbarBackground;
- private Drawable toolbarGradient;
@NonNull private final Drawable statusBar;
public PageToolbarHideHandler(@NonNull View hideableView) {
@@ -24,7 +22,6 @@
LayerDrawable toolbarBackgroundLayers = (LayerDrawable)
hideableView.getBackground();
toolbarBackground =
toolbarBackgroundLayers.findDrawableByLayerId(R.id.toolbar_background_solid).mutate();
- initToolbarGradient(toolbarBackgroundLayers);
statusBar =
hideableView.findViewById(R.id.empty_status_bar).getBackground().mutate();
}
@@ -53,13 +50,7 @@
protected void onScrolled(int oldScrollY, int scrollY) {
int opacity = calculateScrollOpacity(scrollY);
toolbarBackground.setAlpha(opacity);
- toolbarGradient.setAlpha(FULL_OPACITY - opacity);
statusBar.setAlpha(opacity);
- }
-
- private void initToolbarGradient(LayerDrawable toolbarBackgroundLayers) {
- toolbarGradient =
GradientUtil.getPowerGradient(R.color.lead_gradient_start, Gravity.TOP);
-
toolbarBackgroundLayers.setDrawableByLayerId(R.id.toolbar_background_gradient,
toolbarGradient);
}
/** @return Alpha value between 0 and 0xff. */
diff --git
a/app/src/main/java/org/wikipedia/page/leadimages/PageHeaderImageView.java
b/app/src/main/java/org/wikipedia/page/leadimages/PageHeaderImageView.java
index 2fefdfd..63b727a 100644
--- a/app/src/main/java/org/wikipedia/page/leadimages/PageHeaderImageView.java
+++ b/app/src/main/java/org/wikipedia/page/leadimages/PageHeaderImageView.java
@@ -3,7 +3,6 @@
import android.annotation.TargetApi;
import android.content.Context;
import android.graphics.PointF;
-import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Build;
import android.support.annotation.Nullable;
@@ -24,7 +23,8 @@
public class PageHeaderImageView extends FrameLayout {
@BindView(R.id.view_page_header_image_image) FaceAndColorDetectImageView
image;
- @BindView(R.id.view_page_header_image_gradient) View gradientView;
+ @BindView(R.id.view_page_header_image_gradient_top) View topGradientView;
+ @BindView(R.id.view_page_header_image_gradient_bottom) View
bottomGradientView;
public PageHeaderImageView(Context context) {
super(context);
@@ -87,7 +87,7 @@
inflate(getContext(), R.layout.view_page_header_image, this);
ButterKnife.bind(this);
- Drawable gradient = getPowerGradient(R.color.new_lead_gradient_start,
Gravity.BOTTOM);
- ViewUtil.setBackgroundDrawable(gradientView, gradient);
+ ViewUtil.setBackgroundDrawable(topGradientView,
getPowerGradient(R.color.new_lead_gradient_start, Gravity.TOP));
+ ViewUtil.setBackgroundDrawable(bottomGradientView,
getPowerGradient(R.color.new_lead_gradient_start, Gravity.BOTTOM));
}
}
diff --git
a/app/src/main/java/org/wikipedia/page/leadimages/PageHeaderView.java
b/app/src/main/java/org/wikipedia/page/leadimages/PageHeaderView.java
index 17bc581..8347673 100644
--- a/app/src/main/java/org/wikipedia/page/leadimages/PageHeaderView.java
+++ b/app/src/main/java/org/wikipedia/page/leadimages/PageHeaderView.java
@@ -61,7 +61,7 @@
public class PageHeaderView extends FrameLayout implements
ObservableWebView.OnScrollChangeListener {
@BindView(R.id.view_page_header_image) PageHeaderImageView image;
- @BindView(R.id.view_page_header_image_gradient) View gradient;
+ @BindView(R.id.view_page_header_image_gradient_bottom) View bottomGradient;
@BindView(R.id.view_page_title_text) AppTextView titleText;
@BindView(R.id.view_page_subtitle_text) AppTextView subtitleText;
@BindView(R.id.view_page_header_divider) View divider;
@@ -322,9 +322,9 @@
}
private void setImageHeight(int height) {
- final float oneThird = 1 / 3;
+ final float oneThird = 1f / 3f;
DimenUtil.setViewHeight(image, height);
- DimenUtil.setViewHeight(gradient, (int) oneThird * height);
+ DimenUtil.setViewHeight(bottomGradient, (int) (oneThird * height));
}
private void init() {
diff --git a/app/src/main/java/org/wikipedia/util/GradientUtil.java
b/app/src/main/java/org/wikipedia/util/GradientUtil.java
index f5919c5..87cac8c 100644
--- a/app/src/main/java/org/wikipedia/util/GradientUtil.java
+++ b/app/src/main/java/org/wikipedia/util/GradientUtil.java
@@ -16,7 +16,7 @@
public final class GradientUtil {
private static final int GRADIENT_NUM_STOPS = 8;
- private static final int GRADIENT_POWER = 2;
+ private static final int GRADIENT_POWER = 3;
public static Drawable getPowerGradient(@ColorRes int baseColor, int
gravity) {
PaintDrawable drawable = new PaintDrawable();
diff --git a/app/src/main/res/layout/view_page_header_image.xml
b/app/src/main/res/layout/view_page_header_image.xml
index b2eabe3..18918a9 100644
--- a/app/src/main/res/layout/view_page_header_image.xml
+++ b/app/src/main/res/layout/view_page_header_image.xml
@@ -19,7 +19,12 @@
android:contentDescription="@null" />
<View
- android:id="@+id/view_page_header_image_gradient"
+ android:id="@+id/view_page_header_image_gradient_top"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"/>
+
+ <View
+ android:id="@+id/view_page_header_image_gradient_bottom"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="bottom"/>
--
To view, visit https://gerrit.wikimedia.org/r/372899
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id35860cc3fd12366d19bece361961a081e538e4d
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
