jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372899 )
Change subject: Further simplify gradient on lead images.
......................................................................
Further simplify gradient on lead images.
See inline comment(s).
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/res/layout/view_page_header_image.xml
4 files changed, 5 insertions(+), 36 deletions(-)
Approvals:
jenkins-bot: Verified
Mholloway: Looks good to me, approved
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..b9b084a 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;
@@ -87,7 +86,6 @@
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(gradientView,
getPowerGradient(R.color.new_lead_gradient_start, Gravity.TOP));
}
}
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..ca31c78 100644
--- a/app/src/main/java/org/wikipedia/page/leadimages/PageHeaderView.java
+++ b/app/src/main/java/org/wikipedia/page/leadimages/PageHeaderView.java
@@ -6,8 +6,6 @@
import android.graphics.PointF;
import android.graphics.Typeface;
import android.os.Build;
-import android.support.annotation.ColorInt;
-import android.support.annotation.ColorRes;
import android.support.annotation.DimenRes;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
@@ -61,7 +59,6 @@
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_title_text) AppTextView titleText;
@BindView(R.id.view_page_subtitle_text) AppTextView subtitleText;
@BindView(R.id.view_page_header_divider) View divider;
@@ -115,7 +112,7 @@
updateText();
- setTextColor(getThemedColor(getContext(), R.attr.page_title_color));
+ titleText.setTextColor(getThemedColor(getContext(),
R.attr.page_title_color));
}
public void showTextImage() {
@@ -124,8 +121,8 @@
updateText();
- setTextColor(getThemedColor(getContext(), R.attr.page_title_color));
- setImageHeight(leadImageHeightForDevice());
+ titleText.setTextColor(getThemedColor(getContext(),
R.attr.page_title_color));
+ DimenUtil.setViewHeight(image, leadImageHeightForDevice());
}
// TODO: remove.
@@ -255,10 +252,6 @@
avPlayer.deinit();
}
- private void setTextColor(@ColorInt int color) {
- titleText.setTextColor(color);
- }
-
private void updateScroll() {
updateScroll((int) -getTranslationY());
}
@@ -321,22 +314,11 @@
TextUtils.isEmpty(subtitle) ? new StyleSpan(Typeface.ITALIC) :
null);
}
- private void setImageHeight(int height) {
- final float oneThird = 1 / 3;
- DimenUtil.setViewHeight(image, height);
- DimenUtil.setViewHeight(gradient, (int) oneThird * height);
- }
-
private void init() {
inflate(getContext(), R.layout.view_page_header, this);
ButterKnife.bind(this);
FeedbackUtil.setToolbarButtonLongPressToast(editPencil);
hide();
- }
-
- @ColorInt
- private int getColor(@ColorRes int id) {
- return ContextCompat.getColor(getContext(), id);
}
private int getDimensionPixelSize(@DimenRes int id) {
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..fc24911 100644
--- a/app/src/main/res/layout/view_page_header_image.xml
+++ b/app/src/main/res/layout/view_page_header_image.xml
@@ -21,7 +21,5 @@
<View
android:id="@+id/view_page_header_image_gradient"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_gravity="bottom"/>
-
+ android:layout_height="match_parent"/>
</merge>
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/372899
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id35860cc3fd12366d19bece361961a081e538e4d
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Dbrant <[email protected]>
Gerrit-Reviewer: Mholloway <[email protected]>
Gerrit-Reviewer: Sharvaniharan <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
