From 79eabd2e90e48836f2ee036e19eb4ebac5c9ef4d Mon Sep 17 00:00:00 2001 From: Chris Li Date: Thu, 29 Sep 2016 16:20:58 -0400 Subject: [PATCH] refactor --- Kiwix-iOS/Controller/ControllerRetainer.swift | 10 +++++----- .../Controller/Main/MainControllerDelegates.swift | 2 +- Kiwix-iOS/Info.plist | 2 +- Kiwix-iOSWidgets/Bookmarks/Info.plist | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Kiwix-iOS/Controller/ControllerRetainer.swift b/Kiwix-iOS/Controller/ControllerRetainer.swift index acd5aeca..50d97b8b 100644 --- a/Kiwix-iOS/Controller/ControllerRetainer.swift +++ b/Kiwix-iOS/Controller/ControllerRetainer.swift @@ -20,7 +20,7 @@ class Controllers { @objc func removeStrongReference() { bookmark = nil - bookmarkStar = nil + bookmarkHUD = nil library = nil search = nil setting = nil @@ -43,11 +43,11 @@ class Controllers { return controller } - private var bookmarkStar: BookmarkHUD? + private var bookmarkHUD: BookmarkHUD? - class var bookmarkStar: BookmarkHUD { - let controller = Controllers.shared.bookmarkStar ?? UIStoryboard(name: "Bookmark", bundle: nil).instantiateViewControllerWithIdentifier("BookmarkHUD") as! BookmarkHUD - Controllers.shared.bookmarkStar = controller + class var bookmarkHUD: BookmarkHUD { + let controller = Controllers.shared.bookmarkHUD ?? UIStoryboard(name: "Bookmark", bundle: nil).instantiateViewControllerWithIdentifier("BookmarkHUD") as! BookmarkHUD + Controllers.shared.bookmarkHUD = controller return controller } diff --git a/Kiwix-iOS/Controller/Main/MainControllerDelegates.swift b/Kiwix-iOS/Controller/Main/MainControllerDelegates.swift index 89a9e68d..a691c2d4 100644 --- a/Kiwix-iOS/Controller/Main/MainControllerDelegates.swift +++ b/Kiwix-iOS/Controller/Main/MainControllerDelegates.swift @@ -85,7 +85,7 @@ extension MainController: UIWebViewDelegate, SFSafariViewControllerDelegate, LPT let operation = UpdateWidgetDataSourceOperation() GlobalQueue.shared.addOperation(operation) - let controller = Controllers.bookmarkStar + let controller = Controllers.bookmarkHUD controller.bookmarkAdded = article.isBookmarked controller.transitioningDelegate = self controller.modalPresentationStyle = .OverFullScreen diff --git a/Kiwix-iOS/Info.plist b/Kiwix-iOS/Info.plist index 55e439a9..25a2241e 100644 --- a/Kiwix-iOS/Info.plist +++ b/Kiwix-iOS/Info.plist @@ -49,7 +49,7 @@ CFBundleVersion - 1.8.1475 + 1.8.1476 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/Kiwix-iOSWidgets/Bookmarks/Info.plist b/Kiwix-iOSWidgets/Bookmarks/Info.plist index ce3a1c1c..31ea68c0 100644 --- a/Kiwix-iOSWidgets/Bookmarks/Info.plist +++ b/Kiwix-iOSWidgets/Bookmarks/Info.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 1.8.1479 + 1.8.1480 NSExtension NSExtensionMainStoryboard