jenkins-bot has submitted this change and it was merged.
Change subject: Fix page title position when Wikidata description is empty.
......................................................................
Fix page title position when Wikidata description is empty.
The final piece of the puzzle in correctly laying out the page title and
the Wikidata description below it. This patch fixes the case when the
description is empty, which was causing the title to be totally flush with
the bottom of the lead image.
This also hides the page title until the description is fully laid out,
since the title was sometimes 'jumping' when the page is first loaded.
Change-Id: Ibd3991a8f3615670a697cdc09fdb2442936eddec
---
M app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
M app/src/main/java/org/wikipedia/views/ViewUtil.java
2 files changed, 34 insertions(+), 33 deletions(-)
Approvals:
BearND: Looks good to me, approved
Mholloway: Looks good to me, but someone else must approve
jenkins-bot: Verified
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 097356f..901415d 100755
--- a/app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
+++ b/app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
@@ -5,6 +5,7 @@
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.drawable.Drawable;
+import android.support.annotation.Nullable;
import android.text.Html;
import android.text.TextUtils;
import android.util.TypedValue;
@@ -106,7 +107,6 @@
private int imageBaseYOffset = 0;
private float faceYOffsetNormalized = 0f;
private float displayDensity;
- private Animation pageTitleAnimation;
public interface OnLeadImageLayoutListener {
void onLayoutComplete();
@@ -351,11 +351,6 @@
}
}
- // cancel any pending animations...
- if (pageTitleAnimation != null) {
- pageTitleAnimation.cancel();
- }
-
// set the page title text, and honor any HTML formatting in the title
pageTitleText.setText(Html.fromHtml(parentFragment.getPage().getDisplayTitle()));
// hide the description text...
@@ -452,16 +447,14 @@
image1.setVisibility(View.GONE);
image1.setImageDrawable(null);
imagePlaceholder.setVisibility(View.GONE);
- pageTitleText.setVisibility(View.VISIBLE);
+ pageTitleText.setVisibility(View.INVISIBLE);
pageDescriptionText.setVisibility(View.INVISIBLE);
// set the color of the title
pageTitleText.setTextColor(context.getResources()
.getColor(Utils.getThemedAttributeId(parentFragment.getActivity(),
-
R.attr.lead_disabled_text_color)));
+ R.attr.lead_disabled_text_color)));
// remove bottom padding from the description
-
pageDescriptionText.setPadding(pageDescriptionText.getPaddingLeft(),
- pageDescriptionText.getPaddingTop(),
-
pageDescriptionText.getPaddingRight(), 0);
+ ViewUtil.setBottomPaddingDp(pageDescriptionText, 0);
// and give it no drop shadow
pageTitleText.setShadowLayer(0, 0, 0, 0);
// do the same for the description...
@@ -483,15 +476,13 @@
// prepare the lead image to be populated
image1.setVisibility(View.INVISIBLE);
imagePlaceholder.setVisibility(View.VISIBLE);
- pageTitleText.setVisibility(View.VISIBLE);
+ pageTitleText.setVisibility(View.INVISIBLE);
pageDescriptionText.setVisibility(View.INVISIBLE);
// set the color of the title
pageTitleText.setTextColor(context.getResources().getColor(R.color.lead_text_color));
- final int bottomPadding = (int) (16 * displayDensity);
// give default padding to the description
-
pageDescriptionText.setPadding(pageDescriptionText.getPaddingLeft(),
- pageDescriptionText.getPaddingTop(),
pageDescriptionText.getPaddingRight(),
- bottomPadding);
+ final int bottomPadding = 16;
+ ViewUtil.setBottomPaddingDp(pageDescriptionText, bottomPadding);
// and give it a nice drop shadow!
pageTitleText.setShadowLayer(2, 1, 1,
context.getResources().getColor(R.color.lead_text_shadow));
// do the same for the description...
@@ -506,15 +497,8 @@
// for API >10, decrease line spacing and boost bottom padding to
account for it.
// (in API 10, decreased line spacing cuts off the bottom of the
text)
final float lineSpacing = 0.8f;
- final int lineSpacePadding = (int)(10 * displayDensity);
pageTitleText.setLineSpacing(0, lineSpacing);
- // however, if it's Lollipop or greater, then don't boost the
bottom padding of the
- // title text, since it now correctly does it automatically.
- if (!ApiUtil.hasLollipop()) {
- pageTitleText.setPadding(pageTitleText.getPaddingLeft(),
- pageTitleText.getPaddingTop(),
pageTitleText.getPaddingRight(),
- lineSpacePadding);
- }
+
}
// pad the webview contents, to account for the lead image view height
that we've
// ended up with
@@ -546,11 +530,8 @@
if (!isMainPage) {
// make everything visible!
imageContainer.setVisibility(View.VISIBLE);
-
- // kick off loading of the WikiData description, if we have one
- if
(!TextUtils.isEmpty(parentFragment.getTitle().getDescription())) {
-
layoutWikiDataDescription(parentFragment.getTitle().getDescription());
- }
+ // kick off loading of the WikiData description
+
layoutWikiDataDescription(parentFragment.getTitle().getDescription());
}
}
@@ -559,7 +540,7 @@
* into place, along with the page title.
* @param description WikiData description to be shown.
*/
- private void layoutWikiDataDescription(String description) {
+ private void layoutWikiDataDescription(@Nullable final String description)
{
// set the text of the description...
pageDescriptionText.setText(description);
// and wait for it to lay out, so that we know the height of the
description text.
@@ -569,9 +550,24 @@
if (!parentFragment.isAdded()) {
return;
}
- // only show the description if it's two lines or less
-
pageDescriptionText.setVisibility(pageDescriptionText.getLineCount() > 2
- ? View.GONE : View.VISIBLE);
+ // only show the description if it's two lines or less, and
nonempty,
+ // and adjust title padding based on whether the description
is shown
+ int bottomPadding = 0;
+ if (TextUtils.isEmpty(description) ||
pageDescriptionText.getLineCount() > 2) {
+ final int blankPadding = 16;
+ bottomPadding += blankPadding;
+ pageDescriptionText.setVisibility(View.GONE);
+ } else {
+ pageDescriptionText.setVisibility(View.VISIBLE);
+ }
+ if (ApiUtil.hasHoneyComb() && !ApiUtil.hasLollipop()) {
+ // boost the title padding a bit more, because these API
versions don't
+ // automatically apply correct padding when line spacing
is decreased.
+ final int extraPadding = 10;
+ bottomPadding += extraPadding;
+ }
+ ViewUtil.setBottomPaddingDp(pageTitleText, bottomPadding);
+ pageTitleText.setVisibility(View.VISIBLE);
}
});
}
diff --git a/app/src/main/java/org/wikipedia/views/ViewUtil.java
b/app/src/main/java/org/wikipedia/views/ViewUtil.java
index 8c3e4c6..5a0685b 100644
--- a/app/src/main/java/org/wikipedia/views/ViewUtil.java
+++ b/app/src/main/java/org/wikipedia/views/ViewUtil.java
@@ -47,5 +47,10 @@
return false;
}
+ public static void setBottomPaddingDp(View view, int padding) {
+ view.setPadding(view.getPaddingLeft(), view.getPaddingTop(),
view.getPaddingRight(),
+ (int) (padding *
view.getContext().getResources().getDisplayMetrics().density));
+ }
+
private ViewUtil() { }
}
--
To view, visit https://gerrit.wikimedia.org/r/231581
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibd3991a8f3615670a697cdc09fdb2442936eddec
Gerrit-PatchSet: 4
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[email protected]>
Gerrit-Reviewer: BearND <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Dbrant <[email protected]>
Gerrit-Reviewer: Mholloway <[email protected]>
Gerrit-Reviewer: Niedzielski <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
