jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/394403 )
Change subject: Update style of Trending card footer.
......................................................................
Update style of Trending card footer.
Bug: T170884
Change-Id: Ice432e063a11cbfe370f65438a28ae999f1e2d39
---
M app/src/main/java/org/wikipedia/feed/mostread/MostReadCardView.java
M app/src/main/res/layout/view_list_card.xml
M app/src/main/res/layout/view_static_card.xml
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/strings.xml
5 files changed, 21 insertions(+), 19 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/app/src/main/java/org/wikipedia/feed/mostread/MostReadCardView.java
b/app/src/main/java/org/wikipedia/feed/mostread/MostReadCardView.java
index 53e9172..bf23886 100644
--- a/app/src/main/java/org/wikipedia/feed/mostread/MostReadCardView.java
+++ b/app/src/main/java/org/wikipedia/feed/mostread/MostReadCardView.java
@@ -28,7 +28,7 @@
header(card);
this.card = card;
set(new RecyclerAdapter(card.items().subList(0,
Math.min(card.items().size(), EVENTS_SHOWN))));
-
setMoreContentTextView(String.format(getContext().getString(R.string.all_trending_text),
card.subtitle()));
+
setMoreContentTextView(getContext().getString(R.string.more_trending_text));
}
private void header(@NonNull MostReadListCard card) {
diff --git a/app/src/main/res/layout/view_list_card.xml
b/app/src/main/res/layout/view_list_card.xml
index b1717df..8e33387 100644
--- a/app/src/main/res/layout/view_list_card.xml
+++ b/app/src/main/res/layout/view_list_card.xml
@@ -25,34 +25,35 @@
<LinearLayout
android:id="@+id/view_list_card_more_container"
- android:layout_width="match_parent"
+ android:layout_width="wrap_content"
android:layout_height="48dp"
+ android:paddingLeft="16dp"
+ android:paddingRight="16dp"
app:layout_constraintTop_toBottomOf="@id/view_list_card_list"
- android:background="?android:colorBackground"
- android:foreground="?attr/selectableItemBackground"
+ android:background="?attr/selectableItemBackground"
android:clickable="true"
android:layout_below="@+id/view_list_card_list"
android:visibility="gone"
tools:visibility="visible">
- <TextView
- android:id="@+id/view_list_card_more_text"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:paddingLeft="16dp"
- android:paddingRight="16dp"
- android:textColor="?attr/secondary_text_color"
- android:gravity="center_vertical"/>
-
<ImageView
- android:layout_width="48dp"
- android:layout_height="match_parent"
- android:scaleType="center"
- app:srcCompat="@drawable/ic_chevron_forward_gray"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ app:srcCompat="@drawable/ic_arrow_forward_black_24dp"
android:tint="?attr/secondary_text_color"
android:contentDescription="@null"/>
+ <TextView
+ android:id="@+id/view_list_card_more_text"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_marginStart="8dp"
+ android:fontFamily="sans-serif-medium"
+ android:textAllCaps="true"
+ android:textColor="?attr/secondary_text_color"
+ android:gravity="center_vertical"/>
+
</LinearLayout>
</android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/layout/view_static_card.xml
b/app/src/main/res/layout/view_static_card.xml
index 67c25a8..8c11ef2 100644
--- a/app/src/main/res/layout/view_static_card.xml
+++ b/app/src/main/res/layout/view_static_card.xml
@@ -97,7 +97,6 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="8dp"
- android:layout_marginLeft="8dp"
android:text="@string/view_featured_article_footer_save_button_label"
android:fontFamily="sans-serif-medium"
android:textColor="?attr/secondary_text_color"
diff --git a/app/src/main/res/values-qq/strings.xml
b/app/src/main/res/values-qq/strings.xml
index 5785d15..5ef9a0f 100644
--- a/app/src/main/res/values-qq/strings.xml
+++ b/app/src/main/res/values-qq/strings.xml
@@ -537,6 +537,7 @@
<string name="app_shortcuts_continue_reading">A shortcut icon on the home
screen for continuing reading an article.</string>
<string name="app_shortcuts_search">A shortcut icon on the home screen for
opening the search page.\n{{Identical|Search}}</string>
<string name="all_trending_text">Instruction text for button leading to All
trending articles on that day. \"%1$s\" represents the date string</string>
+ <string name="more_trending_text">Button label to navigate to a full-screen
view containing more trending articles.</string>
<string name="top_on_this_day">Title for the screen with all trending links.
\"%1$s\" represents the date string</string>
<string name="on_this_day_card_title">Title for the card that shows historic
events of a particular day.</string>
<string name="more_events_text">Suggestion text for the user indicating that
there are more events for the date in caps</string>
diff --git a/app/src/main/res/values/strings.xml
b/app/src/main/res/values/strings.xml
index 209f8fa..a291874 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -595,6 +595,7 @@
<string name="app_shortcuts_random">Random</string>
<string name="app_shortcuts_continue_reading">Continue reading</string>
<string name="app_shortcuts_search">Search</string>
+ <string name="more_trending_text">More like this</string>
<string name="all_trending_text">All trending articles on %1$s</string>
<string name="top_on_this_day">Trending on %1$s</string>
<!-- /App Shortcuts -->
--
To view, visit https://gerrit.wikimedia.org/r/394403
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ice432e063a11cbfe370f65438a28ae999f1e2d39
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Cooltey <[email protected]>
Gerrit-Reviewer: Dbrant <[email protected]>
Gerrit-Reviewer: Sharvaniharan <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
