Merge branch '1.8.1'

AppStore/changelog.md

@@ -0,0 +1,10 @@
+# 1.8
+We have improved Kiwix for you:
+- The library has a new look.
+- You can now use ZIM files that have a built-in index. 
+- Better performance.
+
+# 1.8.1
+- Clear search history & browsing history
+- Now remember scroll position when go back / forward when browsing
+- Fix: zim files no longer got backed up to iCloud ot iTunes

AppStore/description

@@ -0,0 +1,5 @@
+Kiwix enables you to have the whole Wikipedia (an many other web sites) at hand wherever you go! On a boat, in the middle of nowhere or when data charges are too high, Kiwix gives you access to the whole human knowledge for free. You don't need Internet, everything is stored on your mobile device!
+
+Download the Kiwix program from the iTunes App Store then download the ZIM data files. You can download the ZIM file (or files) directly using the Kiwix App on your iPone, iPad, or iPod Touch - but this might take a long time and is liable to errors because some files are rather large.
+
+A faster and more reliable method is to use a computer to download the small torrent file for the large non-indexed ZIM file you want (not the pre-indexed package for Windows) from http://www.kiwix.org/wiki/Content_in_all_languages, then use a bit-torrent client (such a qTorrent) to download the actual ZIM data file to your computer. You can then transfer the ZIM file to your iOS device using iTunes File Sharing.

Kiwix.xcodeproj/project.pbxproj

@@ -7,8 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		2BBD22DA1BB9BA213212E3D0 /* Pods_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2E854211810A39173DD6A5BD /* Pods_iOS.framework */; };
 		4F85759625A491CA2F27C1BF /* Pods_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EBC0C1E7272F1F1CFC34318A /* Pods_iOS.framework */; };
-		970D79D41E60B8A8003F5997 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 970D79D01E60B8A8003F5997 /* Assets.xcassets */; };
 		970D79D61E60B8A8003F5997 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 970D79D31E60B8A8003F5997 /* LaunchScreen.storyboard */; };
 		9711871E1CEB449A00B9909D /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 9711871D1CEB449A00B9909D /* libz.tbd */; };
 		971A10521D022D9D007FC62C /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 971A10511D022D9D007FC62C /* AppDelegate.swift */; };
@@ -21,7 +21,6 @@
 		97318E4A1E6780E7000B718B /* Pic_I.png in Resources */ = {isa = PBXBuildFile; fileRef = 97318E431E6780E7000B718B /* Pic_I.png */; };
 		97318E4B1E6780E7000B718B /* Pic_P.png in Resources */ = {isa = PBXBuildFile; fileRef = 97318E441E6780E7000B718B /* Pic_P.png */; };
 		97318E511E6780F9000B718B /* 1.5.xcmappingmodel in Sources */ = {isa = PBXBuildFile; fileRef = 97318E4D1E6780F9000B718B /* 1.5.xcmappingmodel */; };
-		97318E521E6780F9000B718B /* 1.8-old.xcmappingmodel in Sources */ = {isa = PBXBuildFile; fileRef = 97318E4E1E6780F9000B718B /* 1.8-old.xcmappingmodel */; };
 		97318E531E6780F9000B718B /* 1.8.xcmappingmodel in Sources */ = {isa = PBXBuildFile; fileRef = 97318E4F1E6780F9000B718B /* 1.8.xcmappingmodel */; };
 		97318E541E6780F9000B718B /* MigrationPolicy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97318E501E6780F9000B718B /* MigrationPolicy.swift */; };
 		9732075C1DD136BB00EDD3DC /* CoreDataExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9732075B1DD136BB00EDD3DC /* CoreDataExtension.swift */; };
@@ -32,7 +31,6 @@
 		973A5C951DEA6DD000C7804C /* URLResponseCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 973A5C931DEA6CA900C7804C /* URLResponseCache.swift */; };
 		974000151DB008C6009A740D /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9788419C1DA2FF2A00D22D3C /* MainInterface.storyboard */; };
 		974C49681DA4266200E276E1 /* CloudKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 974C49671DA4266200E276E1 /* CloudKit.framework */; };
-		9757F6671E5147FF0062D419 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9757F6661E5147FF0062D419 /* Assets.xcassets */; };
 		9757F66A1E5148620062D419 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9757F6681E5148260062D419 /* Main.storyboard */; };
 		9757F66D1E5149200062D419 /* MainWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9757F66C1E5149200062D419 /* MainWindowController.swift */; };
 		975B90FE1CEB909100D13906 /* iOSExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 975B90FD1CEB909100D13906 /* iOSExtensions.swift */; };
@@ -46,6 +44,8 @@
 		9780DE061E43BFF5009B6945 /* NetworkActivityIndicatorController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9780DE051E43BFF5009B6945 /* NetworkActivityIndicatorController.swift */; };
 		979315841E5127930093D3BA /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 979315831E5127930093D3BA /* AppDelegate.swift */; };
 		979315861E5127930093D3BA /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 979315851E5127930093D3BA /* ViewController.swift */; };
+		979D17831E6DE50C006AE496 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 979D17821E6DE50C006AE496 /* Assets.xcassets */; };
+		979D17841E6DE50C006AE496 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 979D17821E6DE50C006AE496 /* Assets.xcassets */; };
 		97A08C151DD263B90070D0E4 /* Book.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97D681341D6F711A00E5FA99 /* Book.swift */; };
 		97A1FD161D6F71CE00A80EE2 /* DirectoryMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97A1FD121D6F71CE00A80EE2 /* DirectoryMonitor.swift */; };
 		97A1FD181D6F71CE00A80EE2 /* SearchResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97A1FD141D6F71CE00A80EE2 /* SearchResult.swift */; };
@@ -104,7 +104,9 @@
 		97D6813A1D6F711A00E5FA99 /* Language.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97D681361D6F711A00E5FA99 /* Language.swift */; };
 		97D6813F1D6F712800E5FA99 /* Article+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97D6813B1D6F712800E5FA99 /* Article+CoreDataProperties.swift */; };
 		97D681411D6F712800E5FA99 /* DownloadTask+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97D6813D1D6F712800E5FA99 /* DownloadTask+CoreDataProperties.swift */; };
+		97DA5C1E1E6F420800873048 /* BrowsingHistoryController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97DA5C1D1E6F420800873048 /* BrowsingHistoryController.swift */; };
 		97DB65DA1D4576B600A2CC42 /* BookmarkWidgetCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97DB65D91D4576B600A2CC42 /* BookmarkWidgetCell.swift */; };
+		97E0A7B71E96CC3300320F06 /* TabController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97E0A7B61E96CC3300320F06 /* TabController.swift */; };
 		97ED50111DD257D00089E9B6 /* Kiwix.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 97D6812A1D6F70DE00E5FA99 /* Kiwix.xcdatamodeld */; };
 		97FC27DE1E69CE31008B2348 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 97FC27DC1E69CE31008B2348 /* Info.plist */; };
 		97FC27DF1E69CE31008B2348 /* iOS_ScreenshotAutomator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97FC27DD1E69CE31008B2348 /* iOS_ScreenshotAutomator.swift */; };
@@ -154,8 +156,8 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		2E854211810A39173DD6A5BD /* Pods_iOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_iOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		970912551D7F452C00BBD5A1 /* 1.8.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = 1.8.xcdatamodel; sourceTree = "<group>"; };
-		970D79D01E60B8A8003F5997 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		970D79D11E60B8A8003F5997 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		970D79D21E60B8A8003F5997 /* Kiwix.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Kiwix.entitlements; sourceTree = "<group>"; };
 		970D79D31E60B8A8003F5997 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
@@ -182,7 +184,6 @@
 		973A5C931DEA6CA900C7804C /* URLResponseCache.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = URLResponseCache.swift; sourceTree = "<group>"; };
 		973A5C981DEBC54800C7804C /* CloudKit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CloudKit.swift; sourceTree = "<group>"; };
 		974C49671DA4266200E276E1 /* CloudKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CloudKit.framework; path = System/Library/Frameworks/CloudKit.framework; sourceTree = SDKROOT; };
-		9757F6661E5147FF0062D419 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		9757F6681E5148260062D419 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
 		9757F66C1E5149200062D419 /* MainWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MainWindowController.swift; sourceTree = "<group>"; };
 		975B90FD1CEB909100D13906 /* iOSExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = iOSExtensions.swift; sourceTree = "<group>"; };
@@ -201,6 +202,7 @@
 		979315831E5127930093D3BA /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		979315851E5127930093D3BA /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
 		9793158C1E5127930093D3BA /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		979D17821E6DE50C006AE496 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97A1FD121D6F71CE00A80EE2 /* DirectoryMonitor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DirectoryMonitor.swift; sourceTree = "<group>"; };
 		97A1FD141D6F71CE00A80EE2 /* SearchResult.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchResult.swift; sourceTree = "<group>"; };
 		97A1FD151D6F71CE00A80EE2 /* ZimMultiReader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ZimMultiReader.swift; sourceTree = "<group>"; };
@@ -272,9 +274,11 @@
 		97D6813C1D6F712800E5FA99 /* Book+CoreDataProperties.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "Book+CoreDataProperties.swift"; path = "Classes/Book+CoreDataProperties.swift"; sourceTree = "<group>"; };
 		97D6813D1D6F712800E5FA99 /* DownloadTask+CoreDataProperties.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "DownloadTask+CoreDataProperties.swift"; path = "Classes/DownloadTask+CoreDataProperties.swift"; sourceTree = "<group>"; };
 		97D6813E1D6F712800E5FA99 /* Language+CoreDataProperties.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "Language+CoreDataProperties.swift"; path = "Classes/Language+CoreDataProperties.swift"; sourceTree = "<group>"; };
+		97DA5C1C1E6F35F700873048 /* iOS_ScreenshotAutomator.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = iOS_ScreenshotAutomator.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		97DA5C1D1E6F420800873048 /* BrowsingHistoryController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BrowsingHistoryController.swift; sourceTree = "<group>"; };
 		97DB65D91D4576B600A2CC42 /* BookmarkWidgetCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BookmarkWidgetCell.swift; sourceTree = "<group>"; };
+		97E0A7B61E96CC3300320F06 /* TabController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TabController.swift; sourceTree = "<group>"; };
 		97E609F01D103DED00EBCB9D /* NotificationCenter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NotificationCenter.framework; path = System/Library/Frameworks/NotificationCenter.framework; sourceTree = SDKROOT; };
-		97FC27D11E69CE10008B2348 /* iOS_ScreenshotAutomator.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = iOS_ScreenshotAutomator.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		97FC27DC1E69CE31008B2348 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		97FC27DD1E69CE31008B2348 /* iOS_ScreenshotAutomator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = iOS_ScreenshotAutomator.swift; sourceTree = "<group>"; };
 		97FC607E1E6868F1003CFD38 /* libicudata.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libicudata.a; sourceTree = "<group>"; };
@@ -327,6 +331,7 @@
 				4F85759625A491CA2F27C1BF /* Pods_iOS.framework in Frameworks */,
 				97FC608E1E6868F1003CFD38 /* libicutest.a in Frameworks */,
 				97FC60911E6868F1003CFD38 /* liblzma.a in Frameworks */,
+				2BBD22DA1BB9BA213212E3D0 /* Pods_iOS.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -340,6 +345,14 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		3B93EAF9B5C5AA23046BDEAC /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				2E854211810A39173DD6A5BD /* Pods_iOS.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 		931D277C156AE671D3F9EADA /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
@@ -455,6 +468,7 @@
 		973BCD1F1CEB412E00F10B44 /* Shared */ = {
 			isa = PBXGroup;
 			children = (
+				979D17821E6DE50C006AE496 /* Assets.xcassets */,
 				977A458A1E14E98F0089C596 /* Cloud */,
 				97318E3D1E6780E7000B718B /* Help */,
 				9711872D1CEB507600B9909D /* CoreData */,
@@ -471,7 +485,6 @@
 		974C49391DA3067C00E276E1 /* Support */ = {
 			isa = PBXGroup;
 			children = (
-				970D79D01E60B8A8003F5997 /* Assets.xcassets */,
 				970D79D11E60B8A8003F5997 /* Info.plist */,
 				970D79D21E60B8A8003F5997 /* Kiwix.entitlements */,
 				970D79D31E60B8A8003F5997 /* LaunchScreen.storyboard */,
@@ -566,7 +579,7 @@
 		979315AC1E5147A70093D3BA /* Support */ = {
 			isa = PBXGroup;
 			children = (
-				9757F6661E5147FF0062D419 /* Assets.xcassets */,
+				979315811E5127930093D3BA /* Kiwix.app */,
 				9793158C1E5127930093D3BA /* Info.plist */,
 			);
 			path = Support;
@@ -595,14 +608,14 @@
 				9706DA9F1E6750360005FE0F /* Tests */,
 				931D277C156AE671D3F9EADA /* Libraries */,
 				F544A4E4357A6D33CF234C6B /* Pods */,
-				979315811E5127930093D3BA /* Kiwix.app */,
-				97FC27D11E69CE10008B2348 /* iOS_ScreenshotAutomator.xctest */,
+				3B93EAF9B5C5AA23046BDEAC /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
 		97A2AB891C1B80FF00052E74 /* Products */ = {
 			isa = PBXGroup;
 			children = (
+				97DA5C1C1E6F35F700873048 /* iOS_ScreenshotAutomator.xctest */,
 				97A2AB881C1B80FF00052E74 /* Kiwix.app */,
 				9779C3131D4575AD0064CC8E /* Bookmarks.appex */,
 			);
@@ -659,6 +672,7 @@
 				97D231751E677C6700DCD4A4 /* Controllers.swift */,
 				97D231761E677C6700DCD4A4 /* JSInjection.swift */,
 				97D231771E677C6700DCD4A4 /* MainController.swift */,
+				97E0A7B61E96CC3300320F06 /* TabController.swift */,
 				97D231781E677C6700DCD4A4 /* TableOfContentsController.swift */,
 			);
 			path = Main;
@@ -689,6 +703,7 @@
 		97D231831E677C6700DCD4A4 /* Setting */ = {
 			isa = PBXGroup;
 			children = (
+				97DA5C1D1E6F420800873048 /* BrowsingHistoryController.swift */,
 				97D231841E677C6700DCD4A4 /* FontSizeController.swift */,
 				97D231851E677C6700DCD4A4 /* NotificationSettingController.swift */,
 				97D231861E677C6700DCD4A4 /* SettingController.swift */,
@@ -869,7 +884,7 @@
 			);
 			name = iOS_ScreenshotAutomator;
 			productName = iOS_ScreenshotAutomator;
-			productReference = 97FC27D11E69CE10008B2348 /* iOS_ScreenshotAutomator.xctest */;
+			productReference = 97DA5C1C1E6F35F700873048 /* iOS_ScreenshotAutomator.xctest */;
 			productType = "com.apple.product-type.bundle.ui-testing";
 		};
 /* End PBXNativeTarget section */
@@ -961,6 +976,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				979D17841E6DE50C006AE496 /* Assets.xcassets in Resources */,
 				9757F66A1E5148620062D419 /* Main.storyboard in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -973,12 +989,11 @@
 				97318E451E6780E7000B718B /* About.html in Resources */,
 				97A9F6F51E2E990500F423AA /* JSInject.js in Resources */,
 				97D231671E677C5600DCD4A4 /* Setting.storyboard in Resources */,
+				979D17831E6DE50C006AE496 /* Assets.xcassets in Resources */,
 				97318E481E6780E7000B718B /* ImportBookLearnMore.html in Resources */,
-				970D79D41E60B8A8003F5997 /* Assets.xcassets in Resources */,
 				97318E4B1E6780E7000B718B /* Pic_P.png in Resources */,
 				97D231681E677C5600DCD4A4 /* Welcome.storyboard in Resources */,
 				97D231661E677C5600DCD4A4 /* Search.storyboard in Resources */,
-				9757F6671E5147FF0062D419 /* Assets.xcassets in Resources */,
 				97D231631E677C5600DCD4A4 /* Bookmark.storyboard in Resources */,
 				970D79D61E60B8A8003F5997 /* LaunchScreen.storyboard in Resources */,
 				97D231651E677C5600DCD4A4 /* Main.storyboard in Resources */,
@@ -1082,6 +1097,7 @@
 				97A08C151DD263B90070D0E4 /* Book.swift in Sources */,
 				97D2319D1E677C6700DCD4A4 /* NotificationSettingController.swift in Sources */,
 				97D2319B1E677C6700DCD4A4 /* SearchScopeAndHistoryController.swift in Sources */,
+				97E0A7B71E96CC3300320F06 /* TabController.swift in Sources */,
 				97D2318C1E677C6700DCD4A4 /* LibraryDownloadController.swift in Sources */,
 				97D6813A1D6F711A00E5FA99 /* Language.swift in Sources */,
 				97D231991E677C6700DCD4A4 /* SearchContainer.swift in Sources */,
@@ -1101,6 +1117,7 @@
 				972F81571DDBFC79008D7289 /* SearchProcedure.swift in Sources */,
 				97D231961E677C6700DCD4A4 /* WelcomeController.swift in Sources */,
 				97A1FD3B1D6F724E00A80EE2 /* stringTools.cpp in Sources */,
+				97DA5C1E1E6F420800873048 /* BrowsingHistoryController.swift in Sources */,
 				9780DE061E43BFF5009B6945 /* NetworkActivityIndicatorController.swift in Sources */,
 				97A1FD321D6F723D00A80EE2 /* resourceTools.cpp in Sources */,
 				97D231971E677C6700DCD4A4 /* RecentSearchController.swift in Sources */,
@@ -1140,7 +1157,6 @@
 				97D2319A1E677C6700DCD4A4 /* SearchResultController.swift in Sources */,
 				97ED50111DD257D00089E9B6 /* Kiwix.xcdatamodeld in Sources */,
 				9725345F1E43E2250005D169 /* UserHabit.swift in Sources */,
-				97318E521E6780F9000B718B /* 1.8-old.xcmappingmodel in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1208,7 +1224,7 @@
 		979315A41E5127940093D3BA /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_APPICON_NAME = icon_macOS;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CODE_SIGN_IDENTITY = "Mac Developer";
@@ -1228,7 +1244,7 @@
 		979315A51E5127940093D3BA /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_APPICON_NAME = icon_macOS;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CODE_SIGN_IDENTITY = "Mac Developer";
@@ -1338,9 +1354,9 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = BDFD686AE11F06B9F1B3B782 /* Pods-iOS.debug.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_APPICON_NAME = icon_iOS;
 				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -1376,9 +1392,9 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = EAE9B571F10BDC813C035DF1 /* Pods-iOS.release.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_APPICON_NAME = icon_iOS;
 				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;

Kiwix.xcodeproj/xcuserdata/Chrisli.xcuserdatad/xcschemes/Bookmarks.xcscheme

@@ -47,7 +47,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "9706DAA81E6750EB0005FE0F"
+               BlueprintIdentifier = "97FC27D01E69CE10008B2348"
                BuildableName = "iOS_ScreenshotAutomator.xctest"
                BlueprintName = "iOS_ScreenshotAutomator"
                ReferencedContainer = "container:Kiwix.xcodeproj">

Kiwix.xcodeproj/xcuserdata/Chrisli.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -14,7 +14,7 @@
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>2</integer>
 		</dict>
 		<key>iOS.xcscheme</key>
 		<dict>
@@ -24,9 +24,9 @@
 		<key>iOS_ScreenshotAutomator.xcscheme</key>
 		<dict>
 			<key>isShown</key>
-			<true/>
+			<false/>
 			<key>orderHint</key>
-			<integer>2</integer>
+			<integer>3</integer>
 		</dict>
 		<key>macOS.xcscheme</key>
 		<dict>

Podfile

@@ -8,9 +8,9 @@ platform :ios, '10.0'
 pod 'DZNEmptyDataSet'
 pod 'MBProgressHUD', '~> 1.0.0'
 pod 'SwiftyUserDefaults'
-pod 'ProcedureKit', :git => 'https://github.com/ProcedureKit/ProcedureKit.git', :branch => 'release/4.0.0.beta.6'
-pod 'ProcedureKit/Cloud', :git => 'https://github.com/ProcedureKit/ProcedureKit.git', :branch => 'release/4.0.0.beta.6'
-pod 'ProcedureKit/Network', :git => 'https://github.com/ProcedureKit/ProcedureKit.git', :branch => 'release/4.0.0.beta.6'
-pod 'ProcedureKit/Mobile', :git => 'https://github.com/ProcedureKit/ProcedureKit.git', :branch => 'release/4.0.0.beta.6'
+pod 'ProcedureKit', :git => 'https://github.com/ProcedureKit/ProcedureKit.git', :branch => 'release/4.1.0'
+pod 'ProcedureKit/Cloud', :git => 'https://github.com/ProcedureKit/ProcedureKit.git', :branch => 'release/4.1.0'
+pod 'ProcedureKit/Network', :git => 'https://github.com/ProcedureKit/ProcedureKit.git', :branch => 'release/4.1.0'
+pod 'ProcedureKit/Mobile', :git => 'https://github.com/ProcedureKit/ProcedureKit.git', :branch => 'release/4.1.0'
 
 end

Podfile.lock

@@ -1,42 +1,42 @@
 PODS:
   - DZNEmptyDataSet (1.8.1)
   - MBProgressHUD (1.0.0)
-  - ProcedureKit (4.0.0):
-    - ProcedureKit/Standard (= 4.0.0)
-  - ProcedureKit/Cloud (4.0.0):
+  - ProcedureKit (4.1.0):
+    - ProcedureKit/Standard (= 4.1.0)
+  - ProcedureKit/Cloud (4.1.0):
     - ProcedureKit/Standard
-  - ProcedureKit/Mobile (4.0.0):
+  - ProcedureKit/Mobile (4.1.0):
     - ProcedureKit/Standard
-  - ProcedureKit/Network (4.0.0):
+  - ProcedureKit/Network (4.1.0):
     - ProcedureKit/Standard
-  - ProcedureKit/Standard (4.0.0)
+  - ProcedureKit/Standard (4.1.0)
   - SwiftyUserDefaults (3.0.0)
 
 DEPENDENCIES:
   - DZNEmptyDataSet
   - MBProgressHUD (~> 1.0.0)
-  - ProcedureKit (from `https://github.com/ProcedureKit/ProcedureKit.git`, branch `release/4.0.0.beta.6`)
-  - ProcedureKit/Cloud (from `https://github.com/ProcedureKit/ProcedureKit.git`, branch `release/4.0.0.beta.6`)
-  - ProcedureKit/Mobile (from `https://github.com/ProcedureKit/ProcedureKit.git`, branch `release/4.0.0.beta.6`)
-  - ProcedureKit/Network (from `https://github.com/ProcedureKit/ProcedureKit.git`, branch `release/4.0.0.beta.6`)
+  - ProcedureKit (from `https://github.com/ProcedureKit/ProcedureKit.git`, branch `release/4.1.0`)
+  - ProcedureKit/Cloud (from `https://github.com/ProcedureKit/ProcedureKit.git`, branch `release/4.1.0`)
+  - ProcedureKit/Mobile (from `https://github.com/ProcedureKit/ProcedureKit.git`, branch `release/4.1.0`)
+  - ProcedureKit/Network (from `https://github.com/ProcedureKit/ProcedureKit.git`, branch `release/4.1.0`)
   - SwiftyUserDefaults
 
 EXTERNAL SOURCES:
   ProcedureKit:
-    :branch: release/4.0.0.beta.6
+    :branch: release/4.1.0
     :git: https://github.com/ProcedureKit/ProcedureKit.git
 
 CHECKOUT OPTIONS:
   ProcedureKit:
-    :commit: 5d8e0766b8fd41aca545896030f2ffae5249688d
+    :commit: 60c17b4bcd9e0f7bdc62d9654410f9aabfb9b2a5
     :git: https://github.com/ProcedureKit/ProcedureKit.git
 
 SPEC CHECKSUMS:
   DZNEmptyDataSet: 9525833b9e68ac21c30253e1d3d7076cc828eaa7
   MBProgressHUD: 4890f671c94e8a0f3cf959aa731e9de2f036d71a
-  ProcedureKit: 9825e1850007c3879e8e6ea175852a73605ecdf2
+  ProcedureKit: 13c6e50fc5ac671f122e3ff8e2ee66931363b713
   SwiftyUserDefaults: 0f1d45fc3aafb9064dac661e367f8f83fe21a4b4
 
-PODFILE CHECKSUM: 28797b95738306052fa8a6edf4aff3bf9dd2ec20
+PODFILE CHECKSUM: eefb403e0f3c8c90465e47f2a64feb157454b3d9
 
-COCOAPODS: 1.1.1
+COCOAPODS: 1.2.0

Shared/Assets.xcassets/GoBack.imageset/Contents.json

@@ -10,12 +10,24 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "RightArrow.png",
+      "filename" : "backward-arrow-1.pdf",
       "scale" : "3x"
+    },
+    {
+      "idiom" : "mac",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "mac",
+      "filename" : "backward-arrow.pdf",
+      "scale" : "2x"
     }
   ],
   "info" : {
     "version" : 1,
     "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
   }
 }

Shared/Assets.xcassets/GoForward.imageset/Contents.json

@@ -10,12 +10,24 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "LeftArrow.png",
+      "filename" : "skip-track-1.pdf",
       "scale" : "3x"
+    },
+    {
+      "idiom" : "mac",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "mac",
+      "filename" : "skip-track.pdf",
+      "scale" : "2x"
     }
   ],
   "info" : {
     "version" : 1,
     "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
   }
 }