diff --git a/Kiwix-iOS/Assets.xcassets/Cross.imageset/Contents.json b/Kiwix-iOS/Assets.xcassets/Cross.imageset/Contents.json index 2cfaad3e..dbb51abf 100644 --- a/Kiwix-iOS/Assets.xcassets/Cross.imageset/Contents.json +++ b/Kiwix-iOS/Assets.xcassets/Cross.imageset/Contents.json @@ -10,7 +10,7 @@ }, { "idiom" : "universal", - "filename" : "multiply.png", + "filename" : "close copy.png", "scale" : "3x" } ], diff --git a/Kiwix-iOS/Assets.xcassets/Cross.imageset/close copy.png b/Kiwix-iOS/Assets.xcassets/Cross.imageset/close copy.png new file mode 100644 index 00000000..2791e3b2 Binary files /dev/null and b/Kiwix-iOS/Assets.xcassets/Cross.imageset/close copy.png differ diff --git a/Kiwix-iOS/Assets.xcassets/Cross.imageset/multiply.png b/Kiwix-iOS/Assets.xcassets/Cross.imageset/multiply.png deleted file mode 100644 index 5aa72bd1..00000000 Binary files a/Kiwix-iOS/Assets.xcassets/Cross.imageset/multiply.png and /dev/null differ diff --git a/Kiwix-iOS/Controller/Library/CloudBooksController.swift b/Kiwix-iOS/Controller/Library/CloudBooksController.swift index 59f63828..732a171a 100644 --- a/Kiwix-iOS/Controller/Library/CloudBooksController.swift +++ b/Kiwix-iOS/Controller/Library/CloudBooksController.swift @@ -10,14 +10,13 @@ import UIKit import CoreData class CloudBooksController: UITableViewController, NSFetchedResultsControllerDelegate { - - var bookDetailController = UIStoryboard.libraryNew.initViewController(BookDetailController.self)! override func viewDidLoad() { super.viewDidLoad() title = "" - navigationController?.view.backgroundColor = UIColor.whiteColor() tabBarItem.title = "Cloud" + tabBarController?.navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .Add) + } override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) { @@ -29,16 +28,10 @@ class CloudBooksController: UITableViewController, NSFetchedResultsControllerDel let cell = sender as? UITableViewCell, let indexPath = tableView.indexPathForCell(cell), let book = fetchedResultController.objectAtIndexPath(indexPath) as? Book else {return} -// navController.setViewControllers([bookDetailController], animated: false) bookDetailController.book = book default: break } - - } - - @IBAction func dismissSelf(sender: UIBarButtonItem) { - dismissViewControllerAnimated(true, completion: nil) } // MARK: - TableView Data Source diff --git a/Kiwix-iOS/Controller/Library/LibrarySplitViewController.swift b/Kiwix-iOS/Controller/Library/LibrarySplitViewController.swift index 83a3207f..adc96aa7 100644 --- a/Kiwix-iOS/Controller/Library/LibrarySplitViewController.swift +++ b/Kiwix-iOS/Controller/Library/LibrarySplitViewController.swift @@ -11,9 +11,22 @@ import UIKit class LibrarySplitViewController: UISplitViewController, UISplitViewControllerDelegate { override func viewDidLoad() { super.viewDidLoad() + preferredDisplayMode = .AllVisible minimumPrimaryColumnWidth = 320.0 delegate = self + + configureDismissButton() + } + + func configureDismissButton() { + guard let master = viewControllers.first as? UINavigationController else {return} + let barButtonItem = UIBarButtonItem(image: UIImage(named: "Cross"), style: .Plain, target: self, action: #selector(LibrarySplitViewController.dismiss)) + master.topViewController?.navigationItem.leftBarButtonItem = barButtonItem + } + + func dismiss() { + dismissViewControllerAnimated(true, completion: nil) } func splitViewController(splitViewController: UISplitViewController, collapseSecondaryViewController secondaryViewController: UIViewController, ontoPrimaryViewController primaryViewController: UIViewController) -> Bool { diff --git a/Kiwix-iOS/Controller/LibraryTabBarController.swift b/Kiwix-iOS/Controller/LibraryTabBarController.swift index 2e667bfb..a9150282 100644 --- a/Kiwix-iOS/Controller/LibraryTabBarController.swift +++ b/Kiwix-iOS/Controller/LibraryTabBarController.swift @@ -9,6 +9,8 @@ import UIKit class LibraryTabBarController: UITabBarController { + @IBAction func dismissSelf(sender: UIBarButtonItem) { + } override func viewWillLayoutSubviews() { super.viewWillLayoutSubviews() diff --git a/Kiwix-iOS/Info.plist b/Kiwix-iOS/Info.plist index 496fb220..d6ad36eb 100644 --- a/Kiwix-iOS/Info.plist +++ b/Kiwix-iOS/Info.plist @@ -49,7 +49,7 @@ CFBundleVersion - 1.7.921 + 1.7.955 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/Kiwix-iOS/Storyboard/LibraryNew.storyboard b/Kiwix-iOS/Storyboard/LibraryNew.storyboard index 63be8be3..c7593802 100644 --- a/Kiwix-iOS/Storyboard/LibraryNew.storyboard +++ b/Kiwix-iOS/Storyboard/LibraryNew.storyboard @@ -7,7 +7,26 @@ - + + + + + + + + + + + + + + + + + + + + @@ -132,16 +151,30 @@ - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -301,11 +334,12 @@ + - + @@ -350,8 +384,8 @@ - + @@ -359,10 +393,7 @@ - - - - + diff --git a/Kiwix-iOSWidgets/Bookmarks/Info.plist b/Kiwix-iOSWidgets/Bookmarks/Info.plist index 0653646e..7ef57ae2 100644 --- a/Kiwix-iOSWidgets/Bookmarks/Info.plist +++ b/Kiwix-iOSWidgets/Bookmarks/Info.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 1.7.992 + 1.7.1032 NSExtension NSExtensionMainStoryboard diff --git a/Kiwix.xcworkspace/xcuserdata/chrisli.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Kiwix.xcworkspace/xcuserdata/chrisli.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index ed9a9b4d..366022fc 100644 --- a/Kiwix.xcworkspace/xcuserdata/chrisli.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/Kiwix.xcworkspace/xcuserdata/chrisli.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -2,4 +2,38 @@ + + + + + + + + + +