[MediaWiki-commits] [Gerrit] Hygiene: move View concerns to ArticleHeaderView - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: move View concerns to ArticleHeaderView
..
Hygiene: move View concerns to ArticleHeaderView
Continue to prune the LeadImagesHandler class by moving some View
concerns to ArticleHeaderView and encapsulating some of the presentation
logic in ArticleHeaderView by hiding internal View implementation
details.
Change-Id: I12341a8fa7b6fd75c5c443dd609d4a11f755209f
---
M app/src/main/java/org/wikipedia/Utils.java
M app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
M app/src/main/java/org/wikipedia/views/ArticleHeaderView.java
M app/src/main/res/layout/view_article_header.xml
M app/src/main/res/values/attrs.xml
M app/src/main/res/values/styles_light.xml
6 files changed, 232 insertions(+), 184 deletions(-)
Approvals:
BearND: Looks good to me, but someone else must approve
Mholloway: Looks good to me, but someone else must approve
Dbrant: Looks good to me, approved
jenkins-bot: Verified
diff --git a/app/src/main/java/org/wikipedia/Utils.java
b/app/src/main/java/org/wikipedia/Utils.java
index 4fce8be..4056391 100644
--- a/app/src/main/java/org/wikipedia/Utils.java
+++ b/app/src/main/java/org/wikipedia/Utils.java
@@ -424,13 +424,13 @@
/**
* Resolves the resource ID of a theme-dependent attribute (for example, a
color value
* that changes based on the selected theme)
- * @param activity The activity whose theme contains the attribute.
+ * @param context The Context whose theme contains the attribute.
* @param id Theme-dependent attribute ID to be resolved.
* @return The actual resource ID of the requested theme-dependent
attribute.
*/
-public static int getThemedAttributeId(Activity activity, int id) {
+public static int getThemedAttributeId(Context context, int id) {
TypedValue tv = new TypedValue();
-activity.getTheme().resolveAttribute(id, tv, true);
+context.getTheme().resolveAttribute(id, tv, true);
return tv.resourceId;
}
diff --git
a/app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
b/app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
index 3126e21..31cd378 100755
--- a/app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
+++ b/app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
@@ -2,12 +2,6 @@
import android.content.res.Resources;
import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Typeface;
-import android.graphics.drawable.Drawable;
-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;
@@ -21,16 +15,10 @@
import android.text.style.AbsoluteSizeSpan;
import android.util.TypedValue;
import android.graphics.PointF;
-import android.view.Gravity;
-import android.view.View;
-import android.view.ViewGroup;
import android.view.animation.Animation;
import android.view.animation.AnimationUtils;
import android.widget.FrameLayout;
import android.widget.ImageView;
-
-import com.squareup.picasso.Picasso;
-import com.squareup.picasso.Target;
import org.json.JSONException;
import org.json.JSONObject;
@@ -48,12 +36,9 @@
import org.wikipedia.richtext.ParagraphSpan;
import org.wikipedia.richtext.RichTextUtil;
import org.wikipedia.util.DimenUtil;
-import org.wikipedia.util.GradientUtil;
import org.wikipedia.util.StringUtil;
import org.wikipedia.views.ArticleHeaderView;
import org.wikipedia.views.ObservableWebView;
-import org.wikipedia.views.ConfigurableTextView;
-import org.wikipedia.views.ViewUtil;
public class LeadImagesHandler {
/**
@@ -97,7 +82,6 @@
}
@NonNull private final PageFragment parentFragment;
-@NonNull private final ViewGroup imageContainer;
@NonNull private final CommunicationBridge bridge;
@NonNull private final ObservableWebView webView;
@@ -108,10 +92,9 @@
*/
private boolean leadImagesEnabled;
+@NonNull private final ArticleHeaderView articleHeaderView;
private ImageView imagePlaceholder;
private ImageViewWithFace image;
-private ConfigurableTextView pageTitleText;
-private Drawable pageTitleGradient;
private int displayHeightDp;
private int imageBaseYOffset;
@@ -123,17 +106,13 @@
@NonNull CommunicationBridge bridge,
@NonNull ObservableWebView webView,
@NonNull ArticleHeaderView articleHeaderView) {
+this.articleHeaderView = articleHeaderView;
this.parentFragment = parentFragment;
-this.imageContainer = articleHeaderView;
this.bridge = bridge;
this.webView = webView;
[MediaWiki-commits] [Gerrit] Hygiene: move View concerns to ArticleHeaderView - change (apps...wikipedia)
Niedzielski has uploaded a new change for review.
https://gerrit.wikimedia.org/r/247180
Change subject: Hygiene: move View concerns to ArticleHeaderView
..
Hygiene: move View concerns to ArticleHeaderView
Continue to prune the LeadImagesHandler class by moving some View
concerns to ArticleHeaderView and encapsulating some of the presentation
logic in ArticleHeaderView by hiding internal View implementation
details.
Change-Id: I12341a8fa7b6fd75c5c443dd609d4a11f755209f
---
M app/src/main/java/org/wikipedia/Utils.java
M app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
M app/src/main/java/org/wikipedia/views/ArticleHeaderView.java
M app/src/main/res/layout/view_article_header.xml
M app/src/main/res/values/attrs.xml
M app/src/main/res/values/styles_light.xml
6 files changed, 236 insertions(+), 184 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/80/247180/1
diff --git a/app/src/main/java/org/wikipedia/Utils.java
b/app/src/main/java/org/wikipedia/Utils.java
index 4fce8be..4056391 100644
--- a/app/src/main/java/org/wikipedia/Utils.java
+++ b/app/src/main/java/org/wikipedia/Utils.java
@@ -424,13 +424,13 @@
/**
* Resolves the resource ID of a theme-dependent attribute (for example, a
color value
* that changes based on the selected theme)
- * @param activity The activity whose theme contains the attribute.
+ * @param context The Context whose theme contains the attribute.
* @param id Theme-dependent attribute ID to be resolved.
* @return The actual resource ID of the requested theme-dependent
attribute.
*/
-public static int getThemedAttributeId(Activity activity, int id) {
+public static int getThemedAttributeId(Context context, int id) {
TypedValue tv = new TypedValue();
-activity.getTheme().resolveAttribute(id, tv, true);
+context.getTheme().resolveAttribute(id, tv, true);
return tv.resourceId;
}
diff --git
a/app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
b/app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
index 6d6e8f2..71fd001 100755
--- a/app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
+++ b/app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
@@ -2,12 +2,6 @@
import android.content.res.Resources;
import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Typeface;
-import android.graphics.drawable.Drawable;
-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;
@@ -21,16 +15,10 @@
import android.text.style.AbsoluteSizeSpan;
import android.util.TypedValue;
import android.graphics.PointF;
-import android.view.Gravity;
-import android.view.View;
-import android.view.ViewGroup;
import android.view.animation.Animation;
import android.view.animation.AnimationUtils;
import android.widget.FrameLayout;
import android.widget.ImageView;
-
-import com.squareup.picasso.Picasso;
-import com.squareup.picasso.Target;
import org.json.JSONException;
import org.json.JSONObject;
@@ -48,12 +36,9 @@
import org.wikipedia.richtext.ParagraphSpan;
import org.wikipedia.richtext.RichTextUtil;
import org.wikipedia.util.DimenUtil;
-import org.wikipedia.util.GradientUtil;
import org.wikipedia.util.StringUtil;
import org.wikipedia.views.ArticleHeaderView;
import org.wikipedia.views.ObservableWebView;
-import org.wikipedia.views.ConfigurableTextView;
-import org.wikipedia.views.ViewUtil;
public class LeadImagesHandler {
/**
@@ -97,7 +82,6 @@
}
@NonNull private final PageFragment parentFragment;
-@NonNull private final ViewGroup imageContainer;
@NonNull private final CommunicationBridge bridge;
@NonNull private final ObservableWebView webView;
@@ -108,10 +92,9 @@
*/
private boolean leadImagesEnabled;
+@NonNull private final ArticleHeaderView articleHeaderView;
private ImageView imagePlaceholder;
private ImageViewWithFace image;
-private ConfigurableTextView pageTitleText;
-private Drawable pageTitleGradient;
private int displayHeightDp;
private int imageBaseYOffset;
@@ -123,17 +106,13 @@
@NonNull CommunicationBridge bridge,
@NonNull ObservableWebView webView,
@NonNull ArticleHeaderView articleHeaderView) {
+this.articleHeaderView = articleHeaderView;
this.parentFragment = parentFragment;
-this.imageContainer = articleHeaderView;
this.bridge = bridge;
this.webView = webView;
imagePlaceholder = articleHeaderView.getPlaceholder();
image =
