Mholloway has uploaded a new change for review.
https://gerrit.wikimedia.org/r/305639
Change subject: Update bookmark icon to reflect page saved state
......................................................................
Update bookmark icon to reflect page saved state
This replaces updating the icon on the article menu bar (which is being
removed on a different branch).
Bug: T135295
Change-Id: I4edf71b77dccd92517a74390e12794e474236cc9
---
M app/src/main/java/org/wikipedia/page/PageActionTab.java
M app/src/main/java/org/wikipedia/page/PageFragment.java
A app/src/main/res/drawable/ic_bookmark_white_24dp.xml
3 files changed, 26 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/39/305639/1
diff --git a/app/src/main/java/org/wikipedia/page/PageActionTab.java
b/app/src/main/java/org/wikipedia/page/PageActionTab.java
index fcc6161..6f27d0a 100644
--- a/app/src/main/java/org/wikipedia/page/PageActionTab.java
+++ b/app/src/main/java/org/wikipedia/page/PageActionTab.java
@@ -58,5 +58,6 @@
void onChooseLangTabSelected();
void onFindInPageTabSelected();
void onViewToCTabSelected();
+ void updateBookmark(boolean pageSaved);
}
}
diff --git a/app/src/main/java/org/wikipedia/page/PageFragment.java
b/app/src/main/java/org/wikipedia/page/PageFragment.java
index d52c303..4ce7b01 100755
--- a/app/src/main/java/org/wikipedia/page/PageFragment.java
+++ b/app/src/main/java/org/wikipedia/page/PageFragment.java
@@ -217,6 +217,11 @@
public void onViewToCTabSelected() {
toggleToC(TOC_ACTION_TOGGLE);
}
+
+ @Override
+ public void updateBookmark(boolean pageSaved) {
+ setBookmarkIconForPageSavedState(pageSaved);
+ }
};
public ObservableWebView getWebView() {
@@ -634,7 +639,7 @@
return;
}
if (page != null) {
- articleHeaderView.updateBookmark(true);
+ pageActionTabsCallback.updateBookmark(true);
page.touch();
ReadingListPageDao.instance().upsert(page);
if (page.savedOrSaving()) {
@@ -643,7 +648,7 @@
ReadingListPageDao.instance().markOutdated(page);
}
} else {
- articleHeaderView.updateBookmark(false);
+ pageActionTabsCallback.updateBookmark(false);
}
}
});
@@ -947,6 +952,15 @@
similarTitles.setEnabled(true);
}
+ private void setBookmarkIconForPageSavedState(boolean pageSaved) {
+ TabLayout.Tab bookmarkTab
+ = tabLayout.getTabAt(PageActionTab.ADD_TO_READING_LIST.code());
+ if (bookmarkTab != null) {
+ bookmarkTab.setIcon(pageSaved ? R.drawable.ic_bookmark_white_24dp
+ : R.drawable.ic_bookmark_border_white_24dp);
+ }
+ }
+
private void showContentIssues() {
showPageInfoDialog(false);
}
diff --git a/app/src/main/res/drawable/ic_bookmark_white_24dp.xml
b/app/src/main/res/drawable/ic_bookmark_white_24dp.xml
new file mode 100644
index 0000000..24b47be
--- /dev/null
+++ b/app/src/main/res/drawable/ic_bookmark_white_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android";
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M17,3H7c-1.1,0 -1.99,0.9 -1.99,2L5,21l7,-3
7,3V5c0,-1.1 -0.9,-2 -2,-2z"/>
+</vector>
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/305639
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4edf71b77dccd92517a74390e12794e474236cc9
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway <mhollo...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
