FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1112 from philviso/UndoAlert 

iOS: Only show mark all as read alert one time
This commit is contained in:
Maurice Parker 2019-10-07 21:24:14 -05:00 committed by GitHub
parent 6f0c957731 93ab639509
commit f77b0834ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 71 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NetNewsWire.xcodeproj/project.pbxproj
View File

@ -404,6 +404,7 @@
FF3ABF13232599810074C542 /* ArticleSorterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF3ABF09232599450074C542 /* ArticleSorterTests.swift */; };
FF3ABF1523259DDB0074C542 /* ArticleSorter.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF3ABF1423259DDB0074C542 /* ArticleSorter.swift */; };
FF3ABF162325AF5D0074C542 /* ArticleSorter.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF3ABF1423259DDB0074C542 /* ArticleSorter.swift */; };
FFD43E412340F488009E5CA3 /* MarkArticlesReadAlertController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FFD43E372340F320009E5CA3 /* MarkArticlesReadAlertController.swift */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@ -1034,6 +1035,7 @@
DF999FF622B5AEFA0064B687 /* SafariView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SafariView.swift; sourceTree = "<group>"; };
FF3ABF09232599450074C542 /* ArticleSorterTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArticleSorterTests.swift; sourceTree = "<group>"; };
FF3ABF1423259DDB0074C542 /* ArticleSorter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArticleSorter.swift; sourceTree = "<group>"; };
FFD43E372340F320009E5CA3 /* MarkArticlesReadAlertController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarkArticlesReadAlertController.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@ -1278,6 +1280,7 @@
51C4525D226508F600C03939 /* MasterFeed */ = {
isa = PBXGroup;
children = (
FFD43E372340F320009E5CA3 /* MarkArticlesReadAlertController.swift */,
51C45264226508F600C03939 /* MasterFeedViewController.swift */,
51CC9B3D231720B2000E842F /* MasterFeedDataSource.swift */,
51C45260226508F600C03939 /* Cell */,
@ -2810,6 +2813,7 @@
51C4529F22650A1900C03939 /* AuthorAvatarDownloader.swift in Sources */,
519E743D22C663F900A78E47 /* SceneDelegate.swift in Sources */,
51CC9B3E231720B2000E842F /* MasterFeedDataSource.swift in Sources */,
FFD43E412340F488009E5CA3 /* MarkArticlesReadAlertController.swift in Sources */,
51C452A322650A1E00C03939 /* HTMLMetadataDownloader.swift in Sources */,
51C4528D2265095F00C03939 /* AddFolderViewController.swift in Sources */,
51C452782265091600C03939 /* MasterTimelineCellData.swift in Sources */,

13
iOS/AppDefaults.swift
View File

@ -18,6 +18,7 @@ struct AppDefaults {
static let timelineGroupByFeed = "timelineGroupByFeed"
static let timelineNumberOfLines = "timelineNumberOfLines"
static let timelineSortDirection = "timelineSortDirection"
static let displayMarkAllAsReadUndoTip = "displayMarkAllAsReadUndoTip"
static let refreshInterval = "refreshInterval"
static let lastRefresh = "lastRefresh"
}
@ -67,6 +68,15 @@ struct AppDefaults {
}
}
static var displayMarkAllAsReadUndoTip: Bool {
get {
return bool(for: Key.displayMarkAllAsReadUndoTip)
}
set {
setBool(for: Key.displayMarkAllAsReadUndoTip, newValue)
}
}
static var lastRefresh: Date? {
get {
return date(for: Key.lastRefresh)
@ -90,7 +100,8 @@ struct AppDefaults {
Key.refreshInterval: RefreshInterval.everyHour.rawValue,
Key.timelineGroupByFeed: false,
Key.timelineNumberOfLines: 3,
Key.timelineSortDirection: ComparisonResult.orderedDescending.rawValue]
Key.timelineSortDirection: ComparisonResult.orderedDescending.rawValue,
Key.displayMarkAllAsReadUndoTip: true]
AppDefaults.shared.register(defaults: defaults)
}

31
iOS/MasterFeed/MarkArticlesReadAlertController.swift Normal file
View File

@ -0,0 +1,31 @@
//
// MarkArticlesReadAlertControllerr.swift
// NetNewsWire
//
// Created by Phil Viso on 9/29/19.
// Copyright © 2019 Ranchero Software. All rights reserved.
//
import Foundation
import UIKit
struct MarkArticlesReadAlertController {
static func markAllAsReadAlert(handler: @escaping (UIAlertAction) -> Void) -> UIAlertController {
let title = NSLocalizedString("Mark All Read", comment: "Mark All Read")
let message = NSLocalizedString("You can undo this and other actions with a three finger swipe to the left.",
comment: "Mark all articles")
let cancelTitle = NSLocalizedString("Cancel", comment: "Cancel")
let confirmTitle = NSLocalizedString("Got It", comment: "Got It")
let alertController = UIAlertController(title: title, message: message, preferredStyle: .alert)
let cancelAction = UIAlertAction(title: cancelTitle, style: .cancel)
let markAction = UIAlertAction(title: confirmTitle, style: .default, handler: handler)
alertController.addAction(cancelAction)
alertController.addAction(markAction)
return alertController
}
}

28
iOS/MasterFeed/MasterFeedViewController.swift
View File

@ -344,24 +344,16 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner {
}
@IBAction func markAllAsRead(_ sender: Any) {
let title = NSLocalizedString("Mark All Read", comment: "Mark All Read")
let message = NSLocalizedString("Mark all articles in all accounts as read?", comment: "Mark all articles")
let alertController = UIAlertController(title: title, message: message, preferredStyle: .alert)
let cancelTitle = NSLocalizedString("Cancel", comment: "Cancel")
let cancelAction = UIAlertAction(title: cancelTitle, style: .cancel)
alertController.addAction(cancelAction)
let markTitle = NSLocalizedString("Mark All Read", comment: "Mark All Read")
let markAction = UIAlertAction(title: markTitle, style: .default) { [weak self] (action) in
self?.coordinator.markAllAsRead()
}
alertController.addAction(markAction)
present(alertController, animated: true)
if coordinator.displayMarkAllAsReadUndoTip {
let alertController = MarkArticlesReadAlertController.markAllAsReadAlert { [weak self] _ in
self?.coordinator.displayMarkAllAsReadUndoTip = false
self?.coordinator.markAllAsRead()
}
present(alertController, animated: true)
} else {
coordinator.markAllAsRead()
}
}
@IBAction func add(_ sender: UIBarButtonItem) {

26
iOS/MasterTimeline/MasterTimelineViewController.swift
View File

@ -89,24 +89,16 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
// MARK: Actions
@IBAction func markAllAsRead(_ sender: Any) {
let title = NSLocalizedString("Mark All Read", comment: "Mark All Read")
let message = NSLocalizedString("Mark all articles in this timeline as read?", comment: "Mark all articles")
let alertController = UIAlertController(title: title, message: message, preferredStyle: .alert)
let cancelTitle = NSLocalizedString("Cancel", comment: "Cancel")
let cancelAction = UIAlertAction(title: cancelTitle, style: .cancel)
alertController.addAction(cancelAction)
let markTitle = NSLocalizedString("Mark All Read", comment: "Mark All Read")
let markAction = UIAlertAction(title: markTitle, style: .default) { [weak self] (action) in
self?.coordinator.markAllAsReadInTimeline()
if coordinator.displayMarkAllAsReadUndoTip {
let alertController = MarkArticlesReadAlertController.markAllAsReadAlert { [weak self] _ in
self?.coordinator.displayMarkAllAsReadUndoTip = false
self?.coordinator.markAllAsReadInTimeline()
}
present(alertController, animated: true)
} else {
coordinator.markAllAsReadInTimeline()
}
alertController.addAction(markAction)
present(alertController, animated: true)
}
@IBAction func firstUnread(_ sender: Any) {

5
iOS/SceneCoordinator.swift
View File

@ -82,6 +82,11 @@ class SceneCoordinator: NSObject, UndoableCommandRunner, UnreadCountProvider {
}
}
}
var displayMarkAllAsReadUndoTip: Bool {
get { AppDefaults.displayMarkAllAsReadUndoTip }
set { AppDefaults.displayMarkAllAsReadUndoTip = newValue }
}
private let treeControllerDelegate = FeedTreeControllerDelegate()
private lazy var treeController: TreeController = {