Dbrant has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/395659 )
Change subject: Design tweak to on-this-day page cards. ...................................................................... Design tweak to on-this-day page cards. Bug: T175995 Change-Id: I5e39f8266219037a500f7b8ec18ba3ab6b18a639 --- M app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayPagesViewHolder.java M app/src/main/res/layout/item_on_this_day_pages.xml 2 files changed, 9 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/59/395659/1 diff --git a/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayPagesViewHolder.java b/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayPagesViewHolder.java index 9781542..bc5638c 100644 --- a/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayPagesViewHolder.java +++ b/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayPagesViewHolder.java @@ -7,6 +7,7 @@ import android.support.annotation.Nullable; import android.support.v7.widget.CardView; import android.support.v7.widget.RecyclerView; +import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -50,6 +51,8 @@ public void setFields(@NonNull RbPageSummary page) { selectedPage = page; pageItemDescTextView.setText(StringUtils.capitalize(page.getDescription())); + pageItemDescTextView.setVisibility(TextUtils.isEmpty(page.getDescription()) ? View.GONE : View.VISIBLE); + pageItemTitleTextView.setMaxLines(TextUtils.isEmpty(page.getDescription()) ? 2 : 1); pageItemTitleTextView.setText(StringUtil.fromHtml(StringUtils.defaultString(page.getNormalizedTitle()))); setImage(page.getThumbnailUrl()); } diff --git a/app/src/main/res/layout/item_on_this_day_pages.xml b/app/src/main/res/layout/item_on_this_day_pages.xml index b233e5e..931d408 100644 --- a/app/src/main/res/layout/item_on_this_day_pages.xml +++ b/app/src/main/res/layout/item_on_this_day_pages.xml @@ -24,7 +24,8 @@ android:layout_height="match_parent" android:layout_weight="1" android:gravity="center_vertical" - android:layout_marginStart="16dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" android:orientation="vertical"> <TextView @@ -32,18 +33,21 @@ style="@style/RtlAwareTextView" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:lineSpacingExtra="6sp" android:ellipsize="end" android:textSize="14sp" android:maxLines="1" android:textColor="?attr/primary_text_color" /> - <org.wikipedia.views.GoneIfEmptyTextView + <TextView android:id="@+id/page_list_item_description" style="@style/RtlAwareTextView" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginTop="4dp" android:ellipsize="end" android:textSize="12sp" + android:lineSpacingExtra="4sp" android:maxLines="2" /> </LinearLayout> -- To view, visit https://gerrit.wikimedia.org/r/395659 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5e39f8266219037a500f7b8ec18ba3ab6b18a639 Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Dbrant <dbr...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits