jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/368944 )
Change subject: Feed design tweaks, pt. 1: adjust card margins
......................................................................
Feed design tweaks, pt. 1: adjust card margins
Bug: T171328
Change-Id: I005289dfd3ae57e06e10deed4ff84a7633795801
---
M app/src/main/java/org/wikipedia/feed/view/FeedView.java
M app/src/main/java/org/wikipedia/views/HeaderMarginItemDecoration.java
M app/src/main/res/values/dimens.xml
3 files changed, 13 insertions(+), 6 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
jenkins-bot: Verified
diff --git a/app/src/main/java/org/wikipedia/feed/view/FeedView.java
b/app/src/main/java/org/wikipedia/feed/view/FeedView.java
index e469bae..28ccb06 100644
--- a/app/src/main/java/org/wikipedia/feed/view/FeedView.java
+++ b/app/src/main/java/org/wikipedia/feed/view/FeedView.java
@@ -16,6 +16,9 @@
import org.wikipedia.views.ItemTouchHelperSwipeAdapter;
import org.wikipedia.views.MarginItemDecoration;
+import static org.wikipedia.util.DimenUtil.getDimension;
+import static org.wikipedia.util.DimenUtil.roundedDpToPx;
+
public class FeedView extends AutoFitRecyclerView {
private StaggeredGridLayoutManager recyclerLayoutManager;
@Nullable private ItemTouchHelper itemTouchHelper;
@@ -63,7 +66,7 @@
R.dimen.view_list_card_margin_horizontal,
R.dimen.view_list_card_margin_vertical,
R.dimen.view_list_card_margin_horizontal,
R.dimen.view_list_card_margin_vertical));
addItemDecoration(new HeaderMarginItemDecoration(getContext(),
- R.dimen.view_feed_padding_top));
+ R.dimen.view_feed_padding_top,
R.dimen.view_feed_search_padding_bottom));
setCallback(new RecyclerViewColumnCallback());
}
@@ -102,6 +105,8 @@
// we would need to also notify the layout manager when the
data set changes
// though.
recyclerLayoutManager.setSpanCount(columns);
+ int padding =
roundedDpToPx(getDimension(R.dimen.view_list_card_margin_horizontal));
+ setPadding(padding, 0, padding, 0);
}
}
}
diff --git
a/app/src/main/java/org/wikipedia/views/HeaderMarginItemDecoration.java
b/app/src/main/java/org/wikipedia/views/HeaderMarginItemDecoration.java
index 6859f0a..b598752 100644
--- a/app/src/main/java/org/wikipedia/views/HeaderMarginItemDecoration.java
+++ b/app/src/main/java/org/wikipedia/views/HeaderMarginItemDecoration.java
@@ -9,8 +9,9 @@
public class HeaderMarginItemDecoration extends MarginItemDecoration {
- public HeaderMarginItemDecoration(@NonNull Context context, @DimenRes int
topId) {
- super(0, pixelSize(context, topId), 0, 0);
+ public HeaderMarginItemDecoration(@NonNull Context context, @DimenRes int
topId,
+ @DimenRes int bottomId) {
+ super(0, pixelSize(context, topId), 0, pixelSize(context, bottomId));
}
@Override public void getItemOffsets(Rect outRect, View view, RecyclerView
parent,
diff --git a/app/src/main/res/values/dimens.xml
b/app/src/main/res/values/dimens.xml
index 6569542..5b0936c 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -94,10 +94,11 @@
<integer name="zero_notification_light_off_ms">3000</integer>
<!-- The Feed -->
- <dimen name="view_feed_padding_top">10dp</dimen>
+ <dimen name="view_feed_padding_top">4dp</dimen>
+ <dimen name="view_feed_search_padding_bottom">8dp</dimen>
<dimen name="view_feed_min_column_width">320dp</dimen>
- <dimen name="view_list_card_margin_vertical">5dp</dimen>
- <dimen name="view_list_card_margin_horizontal">7dp</dimen>
+ <dimen name="view_list_card_margin_vertical">4dp</dimen>
+ <dimen name="view_list_card_margin_horizontal">8dp</dimen>
<dimen
name="view_horizontal_scrolling_list_card_item_margin_horizontal">4dp</dimen>
<dimen
name="view_horizontal_scrolling_list_card_item_margin_vertical">0dp</dimen>
<dimen name="view_list_card_item_image">40dp</dimen>
--
To view, visit https://gerrit.wikimedia.org/r/368944
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I005289dfd3ae57e06e10deed4ff84a7633795801
Gerrit-PatchSet: 4
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Dbrant <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
