Dbrant has submitted this change and it was merged.
Change subject: Read More only for regular pages
......................................................................
Read More only for regular pages
Don't add a ToC entry and don't even try to request
one from the server for main, file and special pages.
Change-Id: Ia47c8131facf38469368c6a7f9fea980e8ad25a2
---
M wikipedia/src/main/java/org/wikipedia/page/Page.java
M wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
M
wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
3 files changed, 10 insertions(+), 4 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
diff --git a/wikipedia/src/main/java/org/wikipedia/page/Page.java
b/wikipedia/src/main/java/org/wikipedia/page/Page.java
index 1e4e696..bc911bf 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/Page.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/Page.java
@@ -42,6 +42,12 @@
return pageProperties;
}
+ public boolean couldHaveReadMoreSection() {
+ return !getPageProperties().isMainPage()
+ && !getTitle().isFilePage()
+ && !getTitle().isSpecial();
+ }
+
@Override
public boolean equals(Object o) {
if (!(o instanceof Page)) {
diff --git a/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
b/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
index be09ea0..2122a4a 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
@@ -225,7 +225,7 @@
sections.add(s);
}
}
- if (!page.getPageProperties().isMainPage()) {
+ if (page.couldHaveReadMoreSection()) {
// add a fake section at the end to represent the "read more"
contents at the bottom:
sections.add(new Section(READ_MORE_SECTION_ID, 0,
parentActivity.getString(R.string.read_more_section),
"", ""));
diff --git
a/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
b/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
index 0d56c08..97076b5 100644
---
a/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
+++
b/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
@@ -193,11 +193,11 @@
public void beginLayout() {
setupAttribution();
- if
(parentFragment.getFragment().getPage().getPageProperties().isMainPage()) {
+ if (parentFragment.getFragment().getPage().couldHaveReadMoreSection())
{
+ requestReadMoreItems(activity.getLayoutInflater());
+ } else {
bottomContentContainer.findViewById(R.id.read_more_container).setVisibility(View.GONE);
layoutContent();
- } else {
- requestReadMoreItems(activity.getLayoutInflater());
}
}
--
To view, visit https://gerrit.wikimedia.org/r/180382
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia47c8131facf38469368c6a7f9fea980e8ad25a2
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND <bsitzm...@wikimedia.org>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: Dbrant <dbr...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
