[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix/simplify RecyclerView item decorations (dividers).
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/380889 )
Change subject: Fix/simplify RecyclerView item decorations (dividers).
..
Fix/simplify RecyclerView item decorations (dividers).
This fixes (and simplifies) the way we draw the thin dividers between the
items in our RecyclerViews. Some recent changes exposed a flaw in the
previous implementation, where it actually wasn't providing enough space
for the divider to be drawn (and instead drawing it on top of the item
itself.
Change-Id: Ie589ef5262561d90558a8309db0057f2e1e3ff9b
---
M app/src/main/java/org/wikipedia/feed/news/NewsFragment.java
M app/src/main/java/org/wikipedia/feed/view/ListCardView.java
M app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
M app/src/main/java/org/wikipedia/offline/RemoteCompilationsFragment.java
M app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java
M app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
M app/src/main/java/org/wikipedia/views/DrawableItemDecoration.java
7 files changed, 25 insertions(+), 54 deletions(-)
Approvals:
jenkins-bot: Verified
Mholloway: Looks good to me, approved
diff --git a/app/src/main/java/org/wikipedia/feed/news/NewsFragment.java
b/app/src/main/java/org/wikipedia/feed/news/NewsFragment.java
index 30c262d..72a74b8 100644
--- a/app/src/main/java/org/wikipedia/feed/news/NewsFragment.java
+++ b/app/src/main/java/org/wikipedia/feed/news/NewsFragment.java
@@ -27,7 +27,6 @@
import org.wikipedia.page.PageActivity;
import org.wikipedia.readinglist.AddToReadingListDialog;
import org.wikipedia.util.GradientUtil;
-import org.wikipedia.util.ResourceUtil;
import org.wikipedia.util.ShareUtil;
import org.wikipedia.views.DefaultRecyclerAdapter;
import org.wikipedia.views.DefaultViewHolder;
@@ -103,8 +102,7 @@
private void initRecycler() {
links.setLayoutManager(new LinearLayoutManager(getContext()));
-links.addItemDecoration(new DrawableItemDecoration(getContext(),
-ResourceUtil.getThemedAttributeId(getContext(),
R.attr.list_separator_drawable), true));
+links.addItemDecoration(new DrawableItemDecoration(getContext(),
R.attr.list_separator_drawable));
links.setNestedScrollingEnabled(false);
}
diff --git a/app/src/main/java/org/wikipedia/feed/view/ListCardView.java
b/app/src/main/java/org/wikipedia/feed/view/ListCardView.java
index 4fc4eac..9601de2 100644
--- a/app/src/main/java/org/wikipedia/feed/view/ListCardView.java
+++ b/app/src/main/java/org/wikipedia/feed/view/ListCardView.java
@@ -9,7 +9,6 @@
import org.wikipedia.R;
import org.wikipedia.feed.model.Card;
-import org.wikipedia.util.ResourceUtil;
import org.wikipedia.views.DrawableItemDecoration;
import org.wikipedia.views.ViewUtil;
@@ -60,8 +59,7 @@
directly. */
protected void initRecycler(@NonNull RecyclerView recyclerView) {
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
-recyclerView.addItemDecoration(new DrawableItemDecoration(getContext(),
-ResourceUtil.getThemedAttributeId(getContext(),
R.attr.list_separator_drawable), true));
+recyclerView.addItemDecoration(new
DrawableItemDecoration(getContext(), R.attr.list_separator_drawable));
recyclerView.setNestedScrollingEnabled(false);
}
}
diff --git
a/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
b/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
index a45d171..14ce604 100644
--- a/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
+++ b/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
@@ -77,8 +77,7 @@
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
recyclerView.setAdapter(adapter);
-recyclerView.addItemDecoration(new DrawableItemDecoration(getContext(),
-ResourceUtil.getThemedAttributeId(getContext(),
R.attr.list_separator_drawable), true));
+recyclerView.addItemDecoration(new
DrawableItemDecoration(getContext(), R.attr.list_separator_drawable));
((SimpleItemAnimator)
recyclerView.getItemAnimator()).setSupportsChangeAnimations(false);
errorView.setBackClickListener(new View.OnClickListener() {
diff --git
a/app/src/main/java/org/wikipedia/offline/RemoteCompilationsFragment.java
b/app/src/main/java/org/wikipedia/offline/RemoteCompilationsFragment.java
index 72bb951..a9c0889 100644
--- a/app/src/main/java/org/wikipedia/offline/RemoteCompilationsFragment.java
+++ b/app/src/main/java/org/wikipedia/offline/RemoteCompilationsFragment.java
@@ -89,8 +89,7 @@
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
recyclerView.setAdapter(adapter);
-recyclerView.addItemDecoration(new DrawableItemDecoration(getContext(),
-
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix/simplify RecyclerView item decorations (dividers).
Dbrant has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/380889 )
Change subject: Fix/simplify RecyclerView item decorations (dividers).
..
Fix/simplify RecyclerView item decorations (dividers).
This fixes (and simplifies) the way we draw the thin dividers between the
items in our RecyclerViews. Some recent changes exposed a flaw in the
previous implementation, where it actually wasn't providing enough space
for the divider to be drawn (and instead drawing it on top of the item
itself.
Change-Id: Ie589ef5262561d90558a8309db0057f2e1e3ff9b
---
M app/src/main/java/org/wikipedia/feed/news/NewsFragment.java
M app/src/main/java/org/wikipedia/feed/view/ListCardView.java
M app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
M app/src/main/java/org/wikipedia/offline/RemoteCompilationsFragment.java
M app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java
M app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
M app/src/main/java/org/wikipedia/views/DrawableItemDecoration.java
7 files changed, 25 insertions(+), 54 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/89/380889/1
diff --git a/app/src/main/java/org/wikipedia/feed/news/NewsFragment.java
b/app/src/main/java/org/wikipedia/feed/news/NewsFragment.java
index 30c262d..72a74b8 100644
--- a/app/src/main/java/org/wikipedia/feed/news/NewsFragment.java
+++ b/app/src/main/java/org/wikipedia/feed/news/NewsFragment.java
@@ -27,7 +27,6 @@
import org.wikipedia.page.PageActivity;
import org.wikipedia.readinglist.AddToReadingListDialog;
import org.wikipedia.util.GradientUtil;
-import org.wikipedia.util.ResourceUtil;
import org.wikipedia.util.ShareUtil;
import org.wikipedia.views.DefaultRecyclerAdapter;
import org.wikipedia.views.DefaultViewHolder;
@@ -103,8 +102,7 @@
private void initRecycler() {
links.setLayoutManager(new LinearLayoutManager(getContext()));
-links.addItemDecoration(new DrawableItemDecoration(getContext(),
-ResourceUtil.getThemedAttributeId(getContext(),
R.attr.list_separator_drawable), true));
+links.addItemDecoration(new DrawableItemDecoration(getContext(),
R.attr.list_separator_drawable));
links.setNestedScrollingEnabled(false);
}
diff --git a/app/src/main/java/org/wikipedia/feed/view/ListCardView.java
b/app/src/main/java/org/wikipedia/feed/view/ListCardView.java
index 4fc4eac..9601de2 100644
--- a/app/src/main/java/org/wikipedia/feed/view/ListCardView.java
+++ b/app/src/main/java/org/wikipedia/feed/view/ListCardView.java
@@ -9,7 +9,6 @@
import org.wikipedia.R;
import org.wikipedia.feed.model.Card;
-import org.wikipedia.util.ResourceUtil;
import org.wikipedia.views.DrawableItemDecoration;
import org.wikipedia.views.ViewUtil;
@@ -60,8 +59,7 @@
directly. */
protected void initRecycler(@NonNull RecyclerView recyclerView) {
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
-recyclerView.addItemDecoration(new DrawableItemDecoration(getContext(),
-ResourceUtil.getThemedAttributeId(getContext(),
R.attr.list_separator_drawable), true));
+recyclerView.addItemDecoration(new
DrawableItemDecoration(getContext(), R.attr.list_separator_drawable));
recyclerView.setNestedScrollingEnabled(false);
}
}
diff --git
a/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
b/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
index a45d171..14ce604 100644
--- a/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
+++ b/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
@@ -77,8 +77,7 @@
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
recyclerView.setAdapter(adapter);
-recyclerView.addItemDecoration(new DrawableItemDecoration(getContext(),
-ResourceUtil.getThemedAttributeId(getContext(),
R.attr.list_separator_drawable), true));
+recyclerView.addItemDecoration(new
DrawableItemDecoration(getContext(), R.attr.list_separator_drawable));
((SimpleItemAnimator)
recyclerView.getItemAnimator()).setSupportsChangeAnimations(false);
errorView.setBackClickListener(new View.OnClickListener() {
diff --git
a/app/src/main/java/org/wikipedia/offline/RemoteCompilationsFragment.java
b/app/src/main/java/org/wikipedia/offline/RemoteCompilationsFragment.java
index 72bb951..a9c0889 100644
--- a/app/src/main/java/org/wikipedia/offline/RemoteCompilationsFragment.java
+++ b/app/src/main/java/org/wikipedia/offline/RemoteCompilationsFragment.java
@@ -89,8 +89,7 @@
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
recyclerView.setAdapter(adapter);
-recyclerView.addItemDecoration(new DrawableItemDecoration(getContext(),
-
