kiwix/kiwix-apple
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-apple.git synced 2025-09-28 06:25:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

3d touch shortcuts

Browse Source
This commit is contained in:
Chris Li 2017-02-02 14:26:26 -05:00
parent e191e57b0d
commit cc968a4add
3 changed files with 93 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
Kiwix-iOS/AppDelegate.swift
View File

@ -30,13 +30,39 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
return true
}
// MARK: - URLSession Background Event
func application(_ application: UIApplication, handleEventsForBackgroundURLSession identifier: String, completionHandler: @escaping () -> Void) {
Network.shared.backgroundEventsCompleteProcessing[identifier] = completionHandler
func applicationDidBecomeActive(_ application: UIApplication) {
ZimMultiReader.shared.startScan()
}
// MARK: Background Refresh
func applicationWillResignActive(_ application: UIApplication) {
let type = "org.kiwix.recent"
let previousIndex: Int? = {
guard let recent = UIApplication.shared.shortcutItems?.filter({$0.type == type}).first else {return nil}
return UIApplication.shared.shortcutItems?.index(of: recent)
}()
if let index = previousIndex { UIApplication.shared.shortcutItems?.remove(at: index) }
if let article = AppDelegate.mainController.article,
let title = article.title, let url = article.url?.absoluteString {
let item = UIMutableApplicationShortcutItem(type: type,
localizedTitle: title,
localizedSubtitle: nil,
icon: UIApplicationShortcutIcon(templateImageName: "Recent"),
userInfo: ["URL": url])
if let index = previousIndex {
UIApplication.shared.shortcutItems?.insert(item, at: index)
} else {
UIApplication.shared.shortcutItems?.append(item)
}
}
}
func applicationWillTerminate(_ application: UIApplication) {
self.saveContext()
}
// MARK: - Background
func application(_ application: UIApplication, performFetchWithCompletionHandler completionHandler: @escaping (UIBackgroundFetchResult) -> Void) {
let refresh = RefreshLibraryOperation()
@ -55,18 +81,30 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
GlobalQueue.shared.add(operation: refresh)
}
func application(_ application: UIApplication, handleEventsForBackgroundURLSession identifier: String, completionHandler: @escaping () -> Void) {
Network.shared.backgroundEventsCompleteProcessing[identifier] = completionHandler
}
// MARK: - Quick Actions
// MARK: - Continuity
func application(_ application: UIApplication, continue userActivity: NSUserActivity, restorationHandler: @escaping ([Any]?) -> Void) -> Bool {
switch userActivity.activityType {
case CSSearchableItemActionType:
return true
func application(_ application: UIApplication, performActionFor shortcutItem: UIApplicationShortcutItem, completionHandler: @escaping (Bool) -> Void) {
switch shortcutItem.type {
case "org.kiwix.search":
AppDelegate.mainController.dismissPresentedControllers()
_ = AppDelegate.mainController.searchBar.becomeFirstResponder()
completionHandler(true)
case "org.kiwix.bookmarks":
if AppDelegate.mainController.searchBar.isFirstResponder {_ = AppDelegate.mainController.searchBar.resignFirstResponder()}
AppDelegate.mainController.showBookmarkController()
completionHandler(true)
case "org.kiwix.recent":
guard let urlString = shortcutItem.userInfo?["URL"] as? String,
let url = URL(string: urlString) else {completionHandler(false); return}
GlobalQueue.shared.add(articleLoad: ArticleLoadOperation(url: url))
completionHandler(true)
default:
return false
completionHandler(false)
return
}
}
@ -88,6 +126,25 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
// MARK: - Continuity
func application(_ application: UIApplication, continue userActivity: NSUserActivity, restorationHandler: @escaping ([Any]?) -> Void) -> Bool {
switch userActivity.activityType {
case CSSearchableItemActionType:
return true
default:
return false
}
}
private let recentShortcutTypeString = "org.kiwix.recent"
func recordActiveSession() {
@ -146,11 +203,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
// // Here we get what notification permission user currently allows
// }
func applicationWillTerminate(_ application: UIApplication) {
// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
// Saves changes in the application's managed object context before the application terminates.
self.saveContext()
}
func application(_ app: UIApplication, open url: URL, options: [UIApplicationOpenURLOptionsKey : Any]) -> Bool {
guard url.isKiwixURL else {return false}
@ -172,14 +225,14 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
// MARK: - Active
func applicationDidBecomeActive(_ application: UIApplication) {
// Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
Timer.scheduledTimer(timeInterval: 60.0, target: self, selector: #selector(AppDelegate.recordActiveSession), userInfo: nil, repeats: false)
ZimMultiReader.shared.startScan()
removeAllDynamicShortcutItems()
}
// func applicationDidBecomeActive(_ application: UIApplication) {
// // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
// Timer.scheduledTimer(timeInterval: 60.0, target: self, selector: #selector(AppDelegate.recordActiveSession), userInfo: nil, repeats: false)
// ZimMultiReader.shared.startScan()
// removeAllDynamicShortcutItems()
// }
func applicationWillResignActive(_ application: UIApplication) {
// func applicationWillResignActive(_ application: UIApplication) {
// Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
// Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
@ -188,7 +241,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
// if let article = mainController?.article {
// addRecentArticleShortCutItem(article)
// }
}
// }
// class func updateApplicationIconBadgeNumber() {
// guard let settings = UIApplication.sharedApplication().currentUserNotificationSettings() else {return}
@ -216,25 +269,16 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
}
}
func application(_ application: UIApplication, performActionFor shortcutItem: UIApplicationShortcutItem, completionHandler: @escaping (Bool) -> Void) {
// switch shortcutItem.type {
// case "org.kiwix.search":
// self.mainController?.showSearch(animated: false)
// completionHandler(true)
// case "org.kiwix.bookmarks":
// self.mainController?.showBookmarkController()
// completionHandler(true)
// func application(_ application: UIApplication, performActionFor shortcutItem: UIApplicationShortcutItem, completionHandler: @escaping (Bool) -> Void) {
// case recentShortcutTypeString:
// guard let urlString = shortcutItem.userInfo?["URL"] as? String,
// let url = URL(string: urlString) else {completionHandler(false); return}
//// let operation = ArticleLoadOperation(url: url)
//// GlobalQueue.shared.add(load: operation)
// let operation = ArticleLoadOperation(url: url)
// GlobalQueue.shared.add(load: operation)
// completionHandler(true)
// default:
// completionHandler(false)
// return
// }
}
// }

8
Kiwix-iOS/Controller/Main/MainController.swift
View File

@ -35,6 +35,8 @@ class MainController: UIViewController {
}
}
// MARK: - Overrides
override func viewDidLoad() {
super.viewDidLoad()
@ -89,6 +91,12 @@ class MainController: UIViewController {
buttons.bookmark.isHighlighted = article.isBookmarked
}
}
func dismissPresentedControllers() {
presentedViewController?.dismiss(animated: true, completion: {
self.presentedViewController?.dismiss(animated: true, completion: nil)
})
}
}
// MARK: - Web

4
Kiwix/Operations/ArticleOperation.swift
View File

@ -79,9 +79,7 @@ class ArticleLoadOperation: Procedure {
OperationQueue.main.addOperation {
_ = main.searchBar.resignFirstResponder()
main.presentedViewController?.dismiss(animated: true, completion: {
main.presentedViewController?.dismiss(animated: true, completion: nil)
})
main.dismissPresentedControllers()
main.hideWelcome()
if main.traitCollection.horizontalSizeClass == .compact {