[MediaWiki-commits] [Gerrit] Hygiene: replace Views with custom View - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: replace Views with custom View
..
Hygiene: replace Views with custom View
Replace Views associated with the lead image and article title with a
custom View, ArticleHeaderView. Additional patches forthcoming to keep
the diffs small and intelligible.
Change-Id: Ide61249cad6a1a2522d2a315dfb7c58e4ce46408
---
M app/src/main/java/org/wikipedia/page/PageFragment.java
M app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
A app/src/main/java/org/wikipedia/views/ArticleHeaderView.java
M app/src/main/res/layout/fragment_page.xml
A app/src/main/res/layout/view_article_header.xml
5 files changed, 122 insertions(+), 41 deletions(-)
Approvals:
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/page/PageFragment.java
b/app/src/main/java/org/wikipedia/page/PageFragment.java
index f654917..8bfd426 100755
--- a/app/src/main/java/org/wikipedia/page/PageFragment.java
+++ b/app/src/main/java/org/wikipedia/page/PageFragment.java
@@ -32,6 +32,7 @@
import org.wikipedia.util.ShareUtils;
import org.wikipedia.util.ThrowableUtil;
import org.wikipedia.util.log.L;
+import org.wikipedia.views.ArticleHeaderView;
import org.wikipedia.views.ObservableWebView;
import org.wikipedia.views.SwipeRefreshLayoutWithScroll;
import org.wikipedia.views.WikiDrawerLayout;
@@ -76,6 +77,7 @@
import javax.net.ssl.SSLException;
+import static org.wikipedia.views.ViewUtil.findView;
public class PageFragment extends Fragment implements BackPressedHandler {
public static final int TOC_ACTION_SHOW = 0;
@@ -115,7 +117,7 @@
*/
private boolean saveOnComplete = false;
-private ViewGroup leadSectionContainer;
+private ArticleHeaderView articleHeaderView;
private LeadImagesHandler leadImagesHandler;
private SearchBarHideHandler searchBarHideHandler;
private ObservableWebView webView;
@@ -315,7 +317,7 @@
@Override
int getDialogHeight() {
// could have scrolled up a bit but the page info links must
still be visible else they couldn't have been clicked
-return webView.getHeight() + webView.getScrollY() -
leadSectionContainer.getHeight();
+return webView.getHeight() + webView.getScrollY() -
articleHeaderView.getHeight();
}
};
@@ -341,8 +343,9 @@
tocHandler = new ToCHandler(getPageActivity(), tocDrawer, bridge);
-leadSectionContainer = (ViewGroup)
getView().findViewById(R.id.page_image_container);
-leadImagesHandler = new LeadImagesHandler(this, bridge, webView,
leadSectionContainer);
+// TODO: initialize View references in onCreateView().
+articleHeaderView = findView(getView(), R.id.page_header_view);
+leadImagesHandler = new LeadImagesHandler(this, bridge, webView,
articleHeaderView);
searchBarHideHandler = getPageActivity().getSearchBarHideHandler();
searchBarHideHandler.setScrollView(webView);
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 20caea0..6d6e8f2 100755
--- a/app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
+++ b/app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
@@ -50,11 +50,10 @@
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;
-
-import static org.wikipedia.views.ViewUtil.findView;
public class LeadImagesHandler {
/**
@@ -123,15 +122,15 @@
public LeadImagesHandler(@NonNull final PageFragment parentFragment,
@NonNull CommunicationBridge bridge,
@NonNull ObservableWebView webView,
- @NonNull ViewGroup hidingView) {
+ @NonNull ArticleHeaderView articleHeaderView) {
this.parentFragment = parentFragment;
-this.imageContainer = hidingView;
+this.imageContainer = articleHeaderView;
this.bridge = bridge;
this.webView = webView;
-imagePlaceholder = findView(imageContainer,
R.id.page_image_placeholder);
-image = findView(imageContainer, R.id.page_image);
-pageTitleText = findView(imageContainer, R.id.page_title_text);
+imagePlaceholder = articleHeaderView.getPlaceholder();
+image = articleHeaderView.getImage();
+pageTitleText = articleHeaderView.getText();
pageTitleGradient =
GradientUtil.getCubicGradient(getCol
[MediaWiki-commits] [Gerrit] Hygiene: replace Views with custom View - change (apps...wikipedia)
Niedzielski has uploaded a new change for review.
https://gerrit.wikimedia.org/r/247100
Change subject: Hygiene: replace Views with custom View
..
Hygiene: replace Views with custom View
Replace Views associated with the lead image and article title with a
custom View, ArticleHeaderView. Additional patches forthcoming to keep
the diffs small and intelligible.
Change-Id: Ide61249cad6a1a2522d2a315dfb7c58e4ce46408
---
M app/src/main/java/org/wikipedia/page/PageFragment.java
M app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
A app/src/main/java/org/wikipedia/views/ArticleHeaderView.java
M app/src/main/res/layout/fragment_page.xml
A app/src/main/res/layout/view_article_header.xml
5 files changed, 122 insertions(+), 41 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/00/247100/1
diff --git a/app/src/main/java/org/wikipedia/page/PageFragment.java
b/app/src/main/java/org/wikipedia/page/PageFragment.java
index f654917..8bfd426 100755
--- a/app/src/main/java/org/wikipedia/page/PageFragment.java
+++ b/app/src/main/java/org/wikipedia/page/PageFragment.java
@@ -32,6 +32,7 @@
import org.wikipedia.util.ShareUtils;
import org.wikipedia.util.ThrowableUtil;
import org.wikipedia.util.log.L;
+import org.wikipedia.views.ArticleHeaderView;
import org.wikipedia.views.ObservableWebView;
import org.wikipedia.views.SwipeRefreshLayoutWithScroll;
import org.wikipedia.views.WikiDrawerLayout;
@@ -76,6 +77,7 @@
import javax.net.ssl.SSLException;
+import static org.wikipedia.views.ViewUtil.findView;
public class PageFragment extends Fragment implements BackPressedHandler {
public static final int TOC_ACTION_SHOW = 0;
@@ -115,7 +117,7 @@
*/
private boolean saveOnComplete = false;
-private ViewGroup leadSectionContainer;
+private ArticleHeaderView articleHeaderView;
private LeadImagesHandler leadImagesHandler;
private SearchBarHideHandler searchBarHideHandler;
private ObservableWebView webView;
@@ -315,7 +317,7 @@
@Override
int getDialogHeight() {
// could have scrolled up a bit but the page info links must
still be visible else they couldn't have been clicked
-return webView.getHeight() + webView.getScrollY() -
leadSectionContainer.getHeight();
+return webView.getHeight() + webView.getScrollY() -
articleHeaderView.getHeight();
}
};
@@ -341,8 +343,9 @@
tocHandler = new ToCHandler(getPageActivity(), tocDrawer, bridge);
-leadSectionContainer = (ViewGroup)
getView().findViewById(R.id.page_image_container);
-leadImagesHandler = new LeadImagesHandler(this, bridge, webView,
leadSectionContainer);
+// TODO: initialize View references in onCreateView().
+articleHeaderView = findView(getView(), R.id.page_header_view);
+leadImagesHandler = new LeadImagesHandler(this, bridge, webView,
articleHeaderView);
searchBarHideHandler = getPageActivity().getSearchBarHideHandler();
searchBarHideHandler.setScrollView(webView);
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 20caea0..6d6e8f2 100755
--- a/app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
+++ b/app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
@@ -50,11 +50,10 @@
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;
-
-import static org.wikipedia.views.ViewUtil.findView;
public class LeadImagesHandler {
/**
@@ -123,15 +122,15 @@
public LeadImagesHandler(@NonNull final PageFragment parentFragment,
@NonNull CommunicationBridge bridge,
@NonNull ObservableWebView webView,
- @NonNull ViewGroup hidingView) {
+ @NonNull ArticleHeaderView articleHeaderView) {
this.parentFragment = parentFragment;
-this.imageContainer = hidingView;
+this.imageContainer = articleHeaderView;
this.bridge = bridge;
this.webView = webView;
-imagePlaceholder = findView(imageContainer,
R.id.page_image_placeholder);
-image = findView(imageContainer, R.id.page_image);
-pageTitleText = findView(imageContainer, R.id.page_title_text);
+imagePlaceholder = articleHeaderView.getPlaceholder();
+image = articleHeaderView.getImage();
+pageTitleText = articleHeaderView.getText();
pageTitleGradient =
GradientUtil.getCubicGradient(getColor(R.col
