Dbrant has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/405839 )
Change subject: Fix background highlight of multi-select items.
......................................................................
Fix background highlight of multi-select items.
Bug: T185536
Change-Id: I57e4b68644a7343ad8df46edcb292c953bb27d68
---
M app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java
M app/src/main/java/org/wikipedia/views/PageItemView.java
2 files changed, 11 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/39/405839/1
diff --git
a/app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java
b/app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java
index f0cfba6..5d49406 100644
--- a/app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java
+++ b/app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java
@@ -71,6 +71,7 @@
List<ReadingListPage> pagesToSave =
ReadingListDbHelper.instance().getAllPagesToBeSaved();
List<ReadingListPage> pagesToUnsave =
ReadingListDbHelper.instance().getAllPagesToBeUnsaved();
List<ReadingListPage> pagesToDelete =
ReadingListDbHelper.instance().getAllPagesToBeDeleted();
+ boolean shouldSendSyncEvent = false;
try {
for (ReadingListPage page : pagesToDelete) {
@@ -84,13 +85,18 @@
} finally {
if (!pagesToDelete.isEmpty()) {
ReadingListDbHelper.instance().purgeDeletedPages();
+ shouldSendSyncEvent = true;
}
if (!pagesToUnsave.isEmpty()) {
ReadingListDbHelper.instance().resetUnsavedPageStatus();
+ shouldSendSyncEvent = true;
}
}
int itemsTotal = pagesToSave.size();
+ if (itemsTotal > 0) {
+ shouldSendSyncEvent = true;
+ }
int itemsSaved = 0;
try {
itemsSaved = savePages(pagesToSave);
@@ -100,7 +106,9 @@
} else {
savedPageSyncNotification.cancelNotification(getApplicationContext());
savedPageSyncNotification.setSyncCanceled(false);
- sendSyncEvent();
+ if (shouldSendSyncEvent) {
+ sendSyncEvent();
+ }
}
}
}
diff --git a/app/src/main/java/org/wikipedia/views/PageItemView.java
b/app/src/main/java/org/wikipedia/views/PageItemView.java
index 80ac1fe..bc0936c 100644
--- a/app/src/main/java/org/wikipedia/views/PageItemView.java
+++ b/app/src/main/java/org/wikipedia/views/PageItemView.java
@@ -155,10 +155,7 @@
imageView.setVisibility(selected ? GONE : VISIBLE);
imageSelectedView.setVisibility(selected ? VISIBLE : GONE);
// TODO: animate?
- if (selected) {
- setBackgroundColor(getThemedColor(getContext(),
R.attr.multi_select_background_color));
- } else {
- setBackground(null);
- }
+ containerView.setBackgroundColor(getThemedColor(getContext(),
+ selected ? R.attr.multi_select_background_color :
R.attr.paper_color));
}
}
--
To view, visit https://gerrit.wikimedia.org/r/405839
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I57e4b68644a7343ad8df46edcb292c953bb27d68
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
