[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Remove article header menu bar
jenkins-bot has submitted this change and it was merged.
Change subject: Remove article header menu bar
..
Remove article header menu bar
TODO in next patch: Update bookmark icon when page is saved
Note that this removes the Navigate action and the footer article action
toolbar doesn't replace it. Do we want to put it somewhere else?
Bug: T135295
Change-Id: I3516eb508d9f3a4844d49ed536fe3d3f1428d0ab
---
M app/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
M app/src/main/java/org/wikipedia/page/PageFragment.java
M app/src/main/java/org/wikipedia/page/leadimages/ArticleHeaderView.java
D app/src/main/java/org/wikipedia/page/leadimages/ArticleMenuBarView.java
M app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
M app/src/main/res/layout/dialog_add_to_reading_list.xml
M app/src/main/res/layout/view_article_header.xml
D app/src/main/res/layout/view_article_menu_bar.xml
M app/src/main/res/values/dimens.xml
M app/src/main/res/values/styles.xml
10 files changed, 10 insertions(+), 241 deletions(-)
Approvals:
jenkins-bot: Verified
Niedzielski: Looks good to me, approved
diff --git a/app/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
b/app/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
index 49fe1ce..6b87df8 100644
--- a/app/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
+++ b/app/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
@@ -165,7 +165,6 @@
loadOnWebViewReady(cachePreference);
} else {
fragment.updatePageInfo(null);
-leadImagesHandler.updateNavigate(null);
// kick off an event to the WebView that will cause it to clear
its contents,
// and then report back to us when the clearing is complete, so
that we can synchronize
@@ -594,8 +593,6 @@
if (fragment.callback() != null) {
fragment.callback().onPageUpdateProgressBar(true, true, 0);
}
-
-leadImagesHandler.updateNavigate(page.getPageProperties().getGeo());
}
private void sendMarginPayload() {
diff --git a/app/src/main/java/org/wikipedia/page/PageFragment.java
b/app/src/main/java/org/wikipedia/page/PageFragment.java
index 7cb4512..c74b5fd 100755
--- a/app/src/main/java/org/wikipedia/page/PageFragment.java
+++ b/app/src/main/java/org/wikipedia/page/PageFragment.java
@@ -599,6 +599,7 @@
webView.getSettings().setDefaultFontSize((int)
app.getFontSize(getActivity().getWindow()));
}
+// TODO: Update bookmark icon on the page action toolbar
public void updateBookmark() {
ReadingList.DAO.anyListContainsTitleAsync(ReadingListDaoProxy.key(getTitle()),
new CallbackTask.Callback() {
@@ -607,7 +608,7 @@
return;
}
if (page != null) {
-articleHeaderView.updateBookmark(true);
+//articleHeaderView.updateBookmark(true);
page.touch();
ReadingListPageDao.instance().upsert(page);
if (page.savedOrSaving()) {
@@ -616,7 +617,7 @@
ReadingListPageDao.instance().markOutdated(page);
}
} else {
-articleHeaderView.updateBookmark(false);
+//articleHeaderView.updateBookmark(false);
}
}
});
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 d66d643..e963a3e 100644
--- a/app/src/main/java/org/wikipedia/page/leadimages/ArticleHeaderView.java
+++ b/app/src/main/java/org/wikipedia/page/leadimages/ArticleHeaderView.java
@@ -50,7 +50,6 @@
public class ArticleHeaderView extends LinearLayout implements
ObservableWebView.OnScrollChangeListener {
@BindView(R.id.view_article_header_image) ArticleHeaderImageView image;
@BindView(R.id.view_article_header_text) AppTextView text;
-@BindView(R.id.view_article_header_menu_bar) ArticleMenuBarView menuBar;
@BindView(R.id.view_article_header_container) LinearLayout container;
@BindView(R.id.view_article_header_status_bar_placeholder)
StatusBarBlankView statusBarPlaceholder;
@@ -121,9 +120,6 @@
image.load(url);
int height = url == null ? 0 : leadImageHeightForDevice();
setMinimumHeight(height);
-if (url == null) {
-resetMenuBarColor();
-}
}
public boolean hasImage() {
@@ -180,26 +176,6 @@
public boolean hasPronunciation() {
return pronunciationUrl != null;
-}
-
-public void updateBookmark(boolean bookmarkSaved) {
-menuBar.updateBookmark(bookmarkSaved);
-}
-
-publi
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Remove article header menu bar
Mholloway has uploaded a new change for review.
https://gerrit.wikimedia.org/r/305637
Change subject: Remove article header menu bar
..
Remove article header menu bar
TODO in next patch: Update bookmark icon when page is saved
Note that this removes the Navigate action and the footer article action
toolbar doesn't replace it. Do we want to put it somewhere else?
Bug: T135295
Change-Id: I3516eb508d9f3a4844d49ed536fe3d3f1428d0ab
---
M app/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
M app/src/main/java/org/wikipedia/page/PageFragment.java
M app/src/main/java/org/wikipedia/page/leadimages/ArticleHeaderView.java
D app/src/main/java/org/wikipedia/page/leadimages/ArticleMenuBarView.java
M app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
M app/src/main/res/layout/dialog_add_to_reading_list.xml
M app/src/main/res/layout/view_article_header.xml
D app/src/main/res/layout/view_article_menu_bar.xml
M app/src/main/res/values/dimens.xml
M app/src/main/res/values/styles.xml
10 files changed, 10 insertions(+), 241 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/37/305637/1
diff --git a/app/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
b/app/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
index 49fe1ce..6b87df8 100644
--- a/app/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
+++ b/app/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
@@ -165,7 +165,6 @@
loadOnWebViewReady(cachePreference);
} else {
fragment.updatePageInfo(null);
-leadImagesHandler.updateNavigate(null);
// kick off an event to the WebView that will cause it to clear
its contents,
// and then report back to us when the clearing is complete, so
that we can synchronize
@@ -594,8 +593,6 @@
if (fragment.callback() != null) {
fragment.callback().onPageUpdateProgressBar(true, true, 0);
}
-
-leadImagesHandler.updateNavigate(page.getPageProperties().getGeo());
}
private void sendMarginPayload() {
diff --git a/app/src/main/java/org/wikipedia/page/PageFragment.java
b/app/src/main/java/org/wikipedia/page/PageFragment.java
index 7cb4512..c74b5fd 100755
--- a/app/src/main/java/org/wikipedia/page/PageFragment.java
+++ b/app/src/main/java/org/wikipedia/page/PageFragment.java
@@ -599,6 +599,7 @@
webView.getSettings().setDefaultFontSize((int)
app.getFontSize(getActivity().getWindow()));
}
+// TODO: Update bookmark icon on the page action toolbar
public void updateBookmark() {
ReadingList.DAO.anyListContainsTitleAsync(ReadingListDaoProxy.key(getTitle()),
new CallbackTask.Callback() {
@@ -607,7 +608,7 @@
return;
}
if (page != null) {
-articleHeaderView.updateBookmark(true);
+//articleHeaderView.updateBookmark(true);
page.touch();
ReadingListPageDao.instance().upsert(page);
if (page.savedOrSaving()) {
@@ -616,7 +617,7 @@
ReadingListPageDao.instance().markOutdated(page);
}
} else {
-articleHeaderView.updateBookmark(false);
+//articleHeaderView.updateBookmark(false);
}
}
});
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 d66d643..e963a3e 100644
--- a/app/src/main/java/org/wikipedia/page/leadimages/ArticleHeaderView.java
+++ b/app/src/main/java/org/wikipedia/page/leadimages/ArticleHeaderView.java
@@ -50,7 +50,6 @@
public class ArticleHeaderView extends LinearLayout implements
ObservableWebView.OnScrollChangeListener {
@BindView(R.id.view_article_header_image) ArticleHeaderImageView image;
@BindView(R.id.view_article_header_text) AppTextView text;
-@BindView(R.id.view_article_header_menu_bar) ArticleMenuBarView menuBar;
@BindView(R.id.view_article_header_container) LinearLayout container;
@BindView(R.id.view_article_header_status_bar_placeholder)
StatusBarBlankView statusBarPlaceholder;
@@ -121,9 +120,6 @@
image.load(url);
int height = url == null ? 0 : leadImageHeightForDevice();
setMinimumHeight(height);
-if (url == null) {
-resetMenuBarColor();
-}
}
public boolean hasImage() {
@@ -180,26 +176,6 @@
public boolean hasPronunciation() {
return pronunciationUrl != null;
-}
-
-public void updateBookmark(boolean bookmarkSaved) {
-menuBar.upda
