Dbrant has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173018
Change subject: Don't show title or lead image block on Main page(s).
......................................................................
Don't show title or lead image block on Main page(s).
Change-Id: I1696eca96e755b67a5b1fb848490cc43881685a5
---
M wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
1 file changed, 12 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/18/173018/1
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 5e67388..e347fa7 100644
---
a/wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
+++
b/wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
@@ -334,9 +334,14 @@
if (!parentFragment.isAdded()) {
return;
}
+ boolean isMainPage =
parentFragment.getFragment().getPage().getPageProperties().isMainPage();
int titleContainerHeight;
int titleBottomPadding = 0;
- if (!leadImagesEnabled) {
+
+ if (isMainPage) {
+ titleContainerHeight =
(int)(parentFragment.getResources().getDimension(R.dimen.actionBarHeight) /
displayDensity);
+ imageContainer.setVisibility(View.INVISIBLE);
+ } else if (!leadImagesEnabled) {
// ok, we're not going to show lead images, so we need to make some
// adjustments to our layout:
// make the WebView padding be just the height of the title text,
plus a fixed offset
@@ -412,7 +417,7 @@
// and start fetching the lead image, if we have one
String thumbUrl =
parentFragment.getFragment().getPage().getPageProperties().getLeadImageUrl();
- if (thumbUrl != null && leadImagesEnabled) {
+ if (isMainPage && thumbUrl != null && leadImagesEnabled) {
thumbUrl = WikipediaApp.getInstance().getNetworkProtocol() + ":" +
thumbUrl;
Picasso.with(parentFragment.getActivity())
.load(thumbUrl)
@@ -420,15 +425,14 @@
.into((Target)image1);
}
- // make everything visible!
- imageContainer.setVisibility(View.VISIBLE);
-
// tell our listener that it's ok to start loading the rest of the
WebView content
listener.onLayoutComplete();
- // kick off loading of the WikiData description, if we have one
- // (and only if it's not the Main page)
- if
(!parentFragment.getFragment().getPage().getPageProperties().isMainPage()) {
+ if (!isMainPage) {
+ // make everything visible!
+ imageContainer.setVisibility(View.VISIBLE);
+
+ // kick off loading of the WikiData description, if we have one
fetchWikiDataDescription();
}
}
--
To view, visit https://gerrit.wikimedia.org/r/173018
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1696eca96e755b67a5b1fb848490cc43881685a5
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
