Niedzielski has uploaded a new change for review.
https://gerrit.wikimedia.org/r/259411
Change subject: Hygiene: move lead views to leadimages package
......................................................................
Hygiene: move lead views to leadimages package
These views weren't meant to be generic and are more appropriate under
the leadimages package where they're used.
Change-Id: I9086c2a78b4ae9ef2dced7b23ccd9319860851d9
---
M app/src/main/java/org/wikipedia/page/PageFragment.java
R app/src/main/java/org/wikipedia/page/leadimages/ArticleHeaderImageView.java
R app/src/main/java/org/wikipedia/page/leadimages/ArticleHeaderView.java
R app/src/main/java/org/wikipedia/page/leadimages/ArticleMenuBarView.java
M app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
M app/src/main/res/layout/fragment_page.xml
M app/src/main/res/layout/view_article_header.xml
7 files changed, 12 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/11/259411/1
diff --git a/app/src/main/java/org/wikipedia/page/PageFragment.java
b/app/src/main/java/org/wikipedia/page/PageFragment.java
index cd1dcbb..d35ce6b 100755
--- a/app/src/main/java/org/wikipedia/page/PageFragment.java
+++ b/app/src/main/java/org/wikipedia/page/PageFragment.java
@@ -33,7 +33,7 @@
import org.wikipedia.util.FeedbackUtil;
import org.wikipedia.util.ThrowableUtil;
import org.wikipedia.util.log.L;
-import org.wikipedia.views.ArticleHeaderView;
+import org.wikipedia.page.leadimages.ArticleHeaderView;
import org.wikipedia.views.ObservableWebView;
import org.wikipedia.views.SwipeRefreshLayoutWithScroll;
import org.wikipedia.views.WikiDrawerLayout;
diff --git a/app/src/main/java/org/wikipedia/views/ArticleHeaderImageView.java
b/app/src/main/java/org/wikipedia/page/leadimages/ArticleHeaderImageView.java
similarity index 98%
rename from app/src/main/java/org/wikipedia/views/ArticleHeaderImageView.java
rename to
app/src/main/java/org/wikipedia/page/leadimages/ArticleHeaderImageView.java
index 9189981..ab9fe32 100644
--- a/app/src/main/java/org/wikipedia/views/ArticleHeaderImageView.java
+++
b/app/src/main/java/org/wikipedia/page/leadimages/ArticleHeaderImageView.java
@@ -1,4 +1,4 @@
-package org.wikipedia.views;
+package org.wikipedia.page.leadimages;
import android.annotation.TargetApi;
import android.content.Context;
diff --git a/app/src/main/java/org/wikipedia/views/ArticleHeaderView.java
b/app/src/main/java/org/wikipedia/page/leadimages/ArticleHeaderView.java
similarity index 97%
rename from app/src/main/java/org/wikipedia/views/ArticleHeaderView.java
rename to app/src/main/java/org/wikipedia/page/leadimages/ArticleHeaderView.java
index 7aa0364..cdf415e 100644
--- a/app/src/main/java/org/wikipedia/views/ArticleHeaderView.java
+++ b/app/src/main/java/org/wikipedia/page/leadimages/ArticleHeaderView.java
@@ -1,4 +1,4 @@
-package org.wikipedia.views;
+package org.wikipedia.page.leadimages;
import android.annotation.TargetApi;
import android.content.Context;
@@ -38,6 +38,9 @@
import org.wikipedia.util.DimenUtil;
import org.wikipedia.util.GradientUtil;
import org.wikipedia.util.StringUtil;
+import org.wikipedia.views.AppTextView;
+import org.wikipedia.views.ObservableWebView;
+import org.wikipedia.views.ViewUtil;
import butterknife.Bind;
import butterknife.ButterKnife;
@@ -48,7 +51,8 @@
private static final float SCREEN_PROPORTION = 1 / 1.75f;
@Bind(R.id.view_article_header_image) ArticleHeaderImageView image;
- @Bind(R.id.view_article_header_text) AppTextView text;
+ @Bind(R.id.view_article_header_text)
+ AppTextView text;
@Bind(R.id.view_article_header_menu_bar) ArticleMenuBarView menuBar;
@NonNull private CharSequence title = "";
diff --git a/app/src/main/java/org/wikipedia/views/ArticleMenuBarView.java
b/app/src/main/java/org/wikipedia/page/leadimages/ArticleMenuBarView.java
similarity index 98%
rename from app/src/main/java/org/wikipedia/views/ArticleMenuBarView.java
rename to
app/src/main/java/org/wikipedia/page/leadimages/ArticleMenuBarView.java
index b577090..0de4454 100644
--- a/app/src/main/java/org/wikipedia/views/ArticleMenuBarView.java
+++ b/app/src/main/java/org/wikipedia/page/leadimages/ArticleMenuBarView.java
@@ -1,4 +1,4 @@
-package org.wikipedia.views;
+package org.wikipedia.page.leadimages;
import android.animation.ArgbEvaluator;
import android.animation.ObjectAnimator;
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 a5fa6ce..df61315 100755
--- a/app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
+++ b/app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
@@ -33,8 +33,6 @@
import org.wikipedia.util.FeedbackUtil;
import org.wikipedia.util.ShareUtil;
import org.wikipedia.util.UriUtil;
-import org.wikipedia.views.ArticleHeaderView;
-import org.wikipedia.views.ArticleMenuBarView;
import org.wikipedia.views.ObservableWebView;
import static org.wikipedia.util.DimenUtil.getContentTopOffsetPx;
diff --git a/app/src/main/res/layout/fragment_page.xml
b/app/src/main/res/layout/fragment_page.xml
index 88babab..e1defad 100644
--- a/app/src/main/res/layout/fragment_page.xml
+++ b/app/src/main/res/layout/fragment_page.xml
@@ -28,7 +28,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent" />
- <org.wikipedia.views.ArticleHeaderView
+ <org.wikipedia.page.leadimages.ArticleHeaderView
android:id="@+id/page_header_view"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout/view_article_header.xml
b/app/src/main/res/layout/view_article_header.xml
index d35a7fd..95822e2 100644
--- a/app/src/main/res/layout/view_article_header.xml
+++ b/app/src/main/res/layout/view_article_header.xml
@@ -2,7 +2,7 @@
xmlns:android="http://schemas.android.com/apk/res/android";
xmlns:tools="http://schemas.android.com/tools";>
- <org.wikipedia.views.ArticleHeaderImageView
+ <org.wikipedia.page.leadimages.ArticleHeaderImageView
android:id="@+id/view_article_header_image"
android:layout_width="match_parent"
android:layout_height="match_parent" />
@@ -29,7 +29,7 @@
android:lineSpacingMultiplier="@dimen/lead_title_leading_scalar"
tools:text="Title\nSubtitle" />
- <org.wikipedia.views.ArticleMenuBarView
+ <org.wikipedia.page.leadimages.ArticleMenuBarView
android:id="@+id/view_article_header_menu_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
--
To view, visit https://gerrit.wikimedia.org/r/259411
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9086c2a78b4ae9ef2dced7b23ccd9319860851d9
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
