jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/326187 )
Change subject: Update design of "add description" CTA in article header.
......................................................................
Update design of "add description" CTA in article header.
Added a compound drawable to the description TextView, taking RTL into
account in code.
Change-Id: I4f037b8393b8b1b0df484590983670566f84ef2e
---
M app/src/main/java/org/wikipedia/page/leadimages/ArticleHeaderView.java
M app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
A app/src/main/res/drawable/ic_short_text.xml
M app/src/main/res/layout/view_article_header.xml
M app/src/main/res/values/strings.xml
5 files changed, 21 insertions(+), 14 deletions(-)
Approvals:
Niedzielski: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/app/src/main/java/org/wikipedia/page/leadimages/ArticleHeaderView.java
b/app/src/main/java/org/wikipedia/page/leadimages/ArticleHeaderView.java
index feaf172..a6448d5 100644
--- a/app/src/main/java/org/wikipedia/page/leadimages/ArticleHeaderView.java
+++ b/app/src/main/java/org/wikipedia/page/leadimages/ArticleHeaderView.java
@@ -191,6 +191,15 @@
subtitleText.getPaddingTop(),
isLangRTL(locale) ? 0 : subtitlePadding,
subtitleText.getPaddingBottom());
+ if (TextUtils.isEmpty(subtitle)) {
+ subtitleText.setCompoundDrawablesWithIntrinsicBounds(
+ isLangRTL(locale) ? 0 : R.drawable.ic_short_text,
+ 0,
+ isLangRTL(locale) ? R.drawable.ic_short_text : 0,
+ 0);
+ } else {
+ subtitleText.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
+ }
}
public void setTextColor(@ColorInt int color) {
@@ -293,7 +302,7 @@
final float leadingScalar =
DimenUtil.getFloat(R.dimen.lead_subtitle_leading_scalar);
final float paragraphScalar =
DimenUtil.getFloat(R.dimen.lead_subtitle_paragraph_scalar);
String description = TextUtils.isEmpty(subtitle)
- ?
getResources().getString(R.string.description_edit_add_description).toUpperCase()
+ ?
getResources().getString(R.string.description_edit_add_description)
: subtitle.toString();
return RichTextUtil.setSpans(new SpannableString(description),
0,
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 d4be8ca..ec2dcc0 100755
--- a/app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
+++ b/app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
@@ -131,10 +131,9 @@
// set the page title text, and honor any HTML formatting in the title
loadLeadImage();
articleHeaderView.setTitle(StringUtil.fromHtml(getPage().getDisplayTitle()));
+
articleHeaderView.setSubtitle(StringUtils.capitalize(getTitle().getDescription()));
articleHeaderView.setLocale(getPage().getTitle().getWikiSite().languageCode());
articleHeaderView.setPronunciation(getPage().getTitlePronunciationUrl());
- // Set the subtitle, too, so text measurements are accurate.
- layoutWikiDataDescription(getTitle().getDescription());
layoutViews(listener, sequence);
}
@@ -183,16 +182,6 @@
throw new RuntimeException(e);
}
bridge.sendMessage("setPaddingTop", payload);
- }
-
- /**
- * Final step in the WikiData description process: lay out the
description, and animate it
- * into place, along with the page title.
- *
- * @param description WikiData description to be shown.
- */
- private void layoutWikiDataDescription(@Nullable final String description)
{
- articleHeaderView.setSubtitle(StringUtils.capitalize(description));
}
/**
diff --git a/app/src/main/res/drawable/ic_short_text.xml
b/app/src/main/res/drawable/ic_short_text.xml
new file mode 100644
index 0000000..081e555
--- /dev/null
+++ b/app/src/main/res/drawable/ic_short_text.xml
@@ -0,0 +1,7 @@
+<vector android:autoMirrored="true" android:height="6dp"
+ android:viewportHeight="6.0" android:viewportWidth="16.0"
+ android:width="16dp"
xmlns:android="http://schemas.android.com/apk/res/android";>
+ <path android:fillColor="#3366CC"
+ android:pathData="M0,0L16,0L16,2L0,2L0,0ZM0,4L10,4L10,6L0,6L0,4Z"
+ android:strokeColor="#00000000" android:strokeWidth="1"/>
+</vector>
diff --git a/app/src/main/res/layout/view_article_header.xml
b/app/src/main/res/layout/view_article_header.xml
index c55c590..a1eb2a5 100644
--- a/app/src/main/res/layout/view_article_header.xml
+++ b/app/src/main/res/layout/view_article_header.xml
@@ -49,6 +49,8 @@
android:textColor="@color/foundation_gray"
android:textColorLink="@color/foundation_gray"
android:textColorHighlight="?attr/window_background_color"
+ android:drawablePadding="8dp"
+ android:drawableTint="@color/foundation_blue"
tools:text="Subtitle" />
<View
diff --git a/app/src/main/res/values/strings.xml
b/app/src/main/res/values/strings.xml
index c3ed342..c9fa27c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -336,7 +336,7 @@
<string name="description_edit_help_hint">What\'s this?</string>
<string name="description_edit_text_hint">Write a description!</string>
<string name="description_edit_save">Save</string>
- <string name="description_edit_add_description">Add description</string>
+ <string name="description_edit_add_description">Add short
description</string>
<!-- /Description editing -->
<!-- Description editing success -->
--
To view, visit https://gerrit.wikimedia.org/r/326187
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4f037b8393b8b1b0df484590983670566f84ef2e
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <dbr...@wikimedia.org>
Gerrit-Reviewer: BearND <bsitzm...@wikimedia.org>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: Mholloway <mhollo...@wikimedia.org>
Gerrit-Reviewer: Niedzielski <sniedziel...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
