Dr0ptp4kt has submitted this change and it was merged.
Change subject: Re-added delete all trash can to saved pages.
......................................................................
Re-added delete all trash can to saved pages.
Also made initial saved pages alert go away after 5 seconds.
T97066
Change-Id: I5bfed53f3e76184d3070d7832518b52b61c590db
---
M Wikipedia/View Controllers/Navigation/Top/TopMenuViewController.m
M Wikipedia/View Controllers/SavedPages/SavedPagesViewController.m
M Wikipedia/View Controllers/WebView/WebViewController.m
M Wikipedia/en.lproj/Localizable.strings
M Wikipedia/qqq.lproj/Localizable.strings
5 files changed, 28 insertions(+), 2 deletions(-)
Approvals:
Dr0ptp4kt: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/Wikipedia/View Controllers/Navigation/Top/TopMenuViewController.m
b/Wikipedia/View Controllers/Navigation/Top/TopMenuViewController.m
index a7d70e1..e4f55b0 100644
--- a/Wikipedia/View Controllers/Navigation/Top/TopMenuViewController.m
+++ b/Wikipedia/View Controllers/Navigation/Top/TopMenuViewController.m
@@ -479,7 +479,7 @@
break;
case NAVBAR_MODE_PAGES_SAVED:
self.navBarSubViewsHorizontalVFLString =
-
@"H:|-(6)-[NAVBAR_BUTTON_X(50)]-(10)-[NAVBAR_LABEL]-(10)-[NAVBAR_BUTTON_RELOAD(50@250)]-(6)-|";
+
@"H:|-(6)-[NAVBAR_BUTTON_X(50)]-(10)-[NAVBAR_LABEL][NAVBAR_BUTTON_TRASH(38@250)][NAVBAR_BUTTON_RELOAD(38@250)]-(6)-|";
break;
case NAVBAR_MODE_X_WITH_TEXT_FIELD:
self.navBarSubViewsHorizontalVFLString =
diff --git a/Wikipedia/View Controllers/SavedPages/SavedPagesViewController.m
b/Wikipedia/View Controllers/SavedPages/SavedPagesViewController.m
index 19b326f..80f3684 100644
--- a/Wikipedia/View Controllers/SavedPages/SavedPagesViewController.m
+++ b/Wikipedia/View Controllers/SavedPages/SavedPagesViewController.m
@@ -113,6 +113,9 @@
case NAVBAR_BUTTON_RELOAD:
[self startRefresh];
break;
+ case NAVBAR_BUTTON_TRASH:
+ [self showDeleteAllDialog];
+ break;
default:
break;
}
@@ -322,6 +325,16 @@
self.progressView.alpha = 0.0;
}
+-(void)hideTrashButton {
+ MenuButton *trashButton = (MenuButton *)[self.topMenuViewController
getNavBarItem:NAVBAR_BUTTON_TRASH];
+ trashButton.alpha = 0.0;
+}
+
+-(void)showTrashButton {
+ MenuButton *trashButton = (MenuButton *)[self.topMenuViewController
getNavBarItem:NAVBAR_BUTTON_TRASH];
+ trashButton.alpha = 1.0;
+}
+
- (void)setEmptyOverlayAndTrashIconVisibility {
BOOL savedPageFound = (savedPageList.length > 0);
@@ -329,6 +342,12 @@
MenuButton* reloadButton = [self reloadButton];
reloadButton.alpha = savedPageFound ? 1.0 : 0.0;
+
+ if (savedPageFound){
+ [self showTrashButton];
+ }else{
+ [self hideTrashButton];
+ }
}
- (void)showCancelRefreshAlertIfFirstTime {
@@ -418,6 +437,7 @@
[self hideRefreshButton];
[self showProgressView];
[self showRefreshTitle];
+ [self hideTrashButton];
} completion:^(BOOL finished) {
[UIView animateWithDuration:0.25 animations:^{
[self showCancelButton];
@@ -433,6 +453,7 @@
[self showProgressView];
[self showCancelButton];
+ [self hideTrashButton];
[self hideRefreshButton];
[self showRefreshTitle];
}
@@ -450,6 +471,9 @@
} completion:^(BOOL finished) {
[UIView animateWithDuration:0.25 animations:^{
[self showRefreshButton];
+ if (self->savedPageList.length > 0) {
+ [self showTrashButton];
+ }
}];
self.progressView.progress = 0.0;
diff --git a/Wikipedia/View Controllers/WebView/WebViewController.m
b/Wikipedia/View Controllers/WebView/WebViewController.m
index 7b866bd..a7c2ede 100644
--- a/Wikipedia/View Controllers/WebView/WebViewController.m
+++ b/Wikipedia/View Controllers/WebView/WebViewController.m
@@ -978,7 +978,7 @@
//AccessSavedPagesMessageShown = NO;
if (!AccessSavedPagesMessageShown) {
- duration = -1;
+ duration = 5;
[[NSUserDefaults standardUserDefaults] setObject:@YES
forKey:@"AccessSavedPagesMessageShown"];
[[NSUserDefaults standardUserDefaults] synchronize];
diff --git a/Wikipedia/en.lproj/Localizable.strings
b/Wikipedia/en.lproj/Localizable.strings
index 30355bf..8b2f73e 100644
--- a/Wikipedia/en.lproj/Localizable.strings
+++ b/Wikipedia/en.lproj/Localizable.strings
@@ -135,6 +135,7 @@
"saved-pages-clear-confirmation-heading" = "Delete all saved items?";
"saved-pages-clear-confirmation-sub-heading" = "This action cannot be undone!";
"saved-pages-clear-cancel" = "Cancel";
+"saved-pages-clear-delete-all" = "Delete All";
"saved-pages-refresh-cancel-alert-title" = "Update cancelled";
"saved-pages-refresh-cancel-alert-message" = "Wikipedia articles are updated
all the time. Tap refresh to get the latest versions of all the articles.";
"saved-pages-refresh-cancel-alert-button" = "Got it";
diff --git a/Wikipedia/qqq.lproj/Localizable.strings
b/Wikipedia/qqq.lproj/Localizable.strings
index d388e29..1e01045 100644
--- a/Wikipedia/qqq.lproj/Localizable.strings
+++ b/Wikipedia/qqq.lproj/Localizable.strings
@@ -133,6 +133,7 @@
"saved-pages-clear-confirmation-heading" = "Heading text of delete all
confirmation dialog";
"saved-pages-clear-confirmation-sub-heading" = "Sub-heading text of delete all
confirmation dialog";
"saved-pages-clear-cancel" = "Button text for cancelling delete all
action\n{{Identical|Cancel}}";
+"saved-pages-clear-delete-all" = "Button text for confirming delete all
action\n{{Identical|Delete all}}";
"saved-pages-refresh-cancel-alert-title" = "Title of alert shown when a user
first cancels a refresh of saved pages";
"saved-pages-refresh-cancel-alert-message" = "Message of alert shown when a
user first cancels a refresh of saved pages";
"saved-pages-refresh-cancel-alert-button" = "Button confirmation text of alert
shown when a user first cancels a refresh of saved pages";
--
To view, visit https://gerrit.wikimedia.org/r/206158
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5bfed53f3e76184d3070d7832518b52b61c590db
Gerrit-PatchSet: 2
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mhurd <[email protected]>
Gerrit-Reviewer: Bgerstle <[email protected]>
Gerrit-Reviewer: Dr0ptp4kt <[email protected]>
Gerrit-Reviewer: Fjalapeno <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
