Dbrant has uploaded a new change for review.
https://gerrit.wikimedia.org/r/172735
Change subject: [WIP] Final styling tweaks for lead images / wikidata
description.
......................................................................
[WIP] Final styling tweaks for lead images / wikidata description.
Change-Id: I7c370c090854e9c4121a10d43810ec1d5cc5f0a4
---
M wikipedia/assets/styles.css
M wikipedia/res/layout/fragment_page.xml
M wikipedia/res/values/colors.xml
M wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
4 files changed, 19 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/35/172735/1
diff --git a/wikipedia/assets/styles.css b/wikipedia/assets/styles.css
index 5ed0e53..22c2bc9 100644
--- a/wikipedia/assets/styles.css
+++ b/wikipedia/assets/styles.css
@@ -763,6 +763,8 @@
a.edit_section_button {
height: 32px;
width: 32px;
+ margin-left: 8px;
+ margin-bottom: 8px;
background-image:
url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAMAAAC5zwKfAAAANlBMVEUAAAD///9sbW9sbW9sbW9sbW9sbW9sbW9sbW9sbW9sbW9sbW9sbW9sbW9sbW9sbW9sbW9sbW+FiFraAAAAEXRSTlMAABAgMEBQYHCAkKCwwNDg8InUWv0AAAGfSURBVHhe7djBjsIgFIXhOwjFeltK3/9lJ4J6SG5dHGgyyaRn1dUXlb8slJ+T9//AC7zACxRiLu37EqXsDPCW9ue2cBLo8/7a/RQwFK9OTwDj3k6Hwbk6Mb/EeRDUojyaHzKMgG4pRmy/ehoAXcklT3h+buoGffU8vDJlQJtfuuG5busEY/Xc28N4EPkp7EHwUaODjSkLIr8Iu/VIELkE2Bj9psDzSBuLQoLIxX1sLEfhQHirQ9rwvLAgcoHdejx4b3IJ8PDOcCBysfklJzToipc9Piu2OKFA5LL5o/xUhAZ9Qi7W40Dkspj8as48OGXkYj0ORH73w/yC8OCMXA5y5sE2lwgPh86Bbi3h+i8506Brc3kYjwb9VkL7lh8N+jaXxXg0GBGayW8WCoSXq+dNzjyIXGx+UXhQm1yCyZkHA8JAfvBosF6h21RvU3vb86B+4lCTcxf4rkTV3PZ9IAiTcxcYvnm94P3Qi9IN6rHXDybL5SAD4IHnZQAMxtu8jIA4E+Q8BKr1xkCcybrOcwhOBsE3JOT+4G+WC7zAC7zAXxMIT+qGYJfyAAAAAElFTkSuQmCC);
background-image:
url(//bits.beta.wmflabs.org/static-master/extensions/MobileApp/less/../images/edit.png?2014-09-30T20:38:20Z)!ie;
background-size: 32px 32px;
@@ -787,12 +789,13 @@
}
div.issues_container {
- margin-top: 1em;
- margin-bottom: 2em;
- padding: 2px;
+ margin-top: 0.5em;
+ margin-bottom: 2.5em;
+ padding-top: 1px;
+ padding-bottom: 1px;
width: 100%;
display: block;
- font-size: .95em;
+ font-size: .9em;
letter-spacing: 0.02em;
color: #555555;
}
diff --git a/wikipedia/res/layout/fragment_page.xml
b/wikipedia/res/layout/fragment_page.xml
index 1d0cced..f3825a6 100644
--- a/wikipedia/res/layout/fragment_page.xml
+++ b/wikipedia/res/layout/fragment_page.xml
@@ -47,9 +47,10 @@
android:layout_height="wrap_content"
android:fontFamily="serif"
android:paddingTop="16dp"
- android:paddingBottom="16dp"
+ android:paddingBottom="24dp"
android:paddingRight="16dp"
- android:paddingLeft="16dp"/>
+ android:paddingLeft="16dp"
+ android:lineSpacingMultiplier="0.8"/>
<TextView
android:id="@+id/page_description_text"
android:layout_width="match_parent"
diff --git a/wikipedia/res/values/colors.xml b/wikipedia/res/values/colors.xml
index 1159f25..bd1634a 100644
--- a/wikipedia/res/values/colors.xml
+++ b/wikipedia/res/values/colors.xml
@@ -61,7 +61,7 @@
<color name="lead_text_color">#fff0f0f0</color>
<color name="lead_text_shadow">#80000000</color>
<color name="lead_disabled_text_light">#ff000000</color>
- <color name="lead_disabled_text_dark">#ff909090</color>
+ <color name="lead_disabled_text_dark">#ffffffff</color>
<!-- Copied for 2.3 -->
<color name="holo_green_light">#ff99cc00</color>
diff --git
a/wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
b/wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
index cb2fea3..fa7327d 100644
---
a/wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
+++
b/wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
@@ -76,7 +76,7 @@
* Number of pixels to offset the WebView content (in addition to page
title height),
* when lead images are disabled.
*/
- private static final int DISABLED_OFFSET_DP = 32;
+ private static final int DISABLED_OFFSET_DP = 100;
/**
* Whether lead images are enabled, overall. They will be disabled
automatically
@@ -257,7 +257,7 @@
if (!parentFragment.isAdded()) {
return;
}
- final int webViewPadding;
+ int webViewPadding;
if (!leadImagesEnabled) {
// ok, we're not going to show lead images, so we need to make some
// adjustments to our layout:
@@ -265,7 +265,8 @@
webViewPadding = (int) ((pageTitleContainer.getHeight() /
displayDensity))
+ DISABLED_OFFSET_DP;
imageContainer.setLayoutParams(new
FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT,
- FrameLayout.LayoutParams.WRAP_CONTENT));
+ (int) ((webViewPadding) * displayDensity)));
+ webViewPadding -= 16;
// hide the lead image
image1.setVisibility(View.GONE);
// set the color of the title
@@ -308,7 +309,7 @@
// ended up with
JSONObject payload = new JSONObject();
try {
- payload.put("paddingTop", webViewPadding);
+ payload.put("paddingTop", webViewPadding + 8);
} catch (JSONException e) {
throw new RuntimeException(e);
}
@@ -321,8 +322,8 @@
listener.onLayoutComplete();
// kick off loading of the WikiData description, if we have one
- // (and only if the lead image is enabled)
- if (leadImagesEnabled) {
+ // (and only if it's not the Main page)
+ if
(!parentFragment.getFragment().getPage().getPageProperties().isMainPage()) {
fetchWikiDataDescription();
}
}
@@ -375,7 +376,7 @@
return;
}
final int animDuration = 500;
- final int newMargin = pageDescriptionText.getHeight() -
(int)(8 * displayDensity);
+ final int newMargin = pageDescriptionText.getHeight() -
(int)(14 * displayDensity);
// create an animation that will grow the bottom margin of the
Title text,
// pushing it upward, and creating sufficient space for the
Description.
Animation anim = new Animation() {
--
To view, visit https://gerrit.wikimedia.org/r/172735
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7c370c090854e9c4121a10d43810ec1d5cc5f0a4
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
