diff --git a/Kiwix-iOS/Controller/Library/CloudBooksController.swift b/Kiwix-iOS/Controller/Library/CloudBooksController.swift
index 8fc72041..4ed5b97c 100644
--- a/Kiwix-iOS/Controller/Library/CloudBooksController.swift
+++ b/Kiwix-iOS/Controller/Library/CloudBooksController.swift
@@ -26,8 +26,8 @@ class CloudBooksController: UITableViewController, NSFetchedResultsControllerDel
override func viewDidLoad() {
super.viewDidLoad()
- tableView.emptyDataSetSource = self
- tableView.emptyDataSetDelegate = self
+// tableView.emptyDataSetSource = self
+// tableView.emptyDataSetDelegate = self
tableView.tableFooterView = UIView()
refreshControl = RefreshLibControl()
@@ -91,6 +91,10 @@ class CloudBooksController: UITableViewController, NSFetchedResultsControllerDel
NSOperationQueue.mainQueue().addOperationWithBlock({
self.refreshControl?.endRefreshing()
})
+ let t = ReachabilityCondition.Error.NotReachable
+// if let error = errors.first {
+// guard error == ReachabilityCondition.Error.NotReachable else {return}
+// }
})
GlobalOperationQueue.sharedInstance.addOperation(operation)
}
diff --git a/Kiwix-iOS/Controller/Library/EmptyTableConfigExtension.swift b/Kiwix-iOS/Controller/Library/EmptyTableConfigExtension.swift
index 26bb66a2..d00019cb 100644
--- a/Kiwix-iOS/Controller/Library/EmptyTableConfigExtension.swift
+++ b/Kiwix-iOS/Controller/Library/EmptyTableConfigExtension.swift
@@ -12,7 +12,7 @@ import DZNEmptyDataSet
extension CloudBooksController {
func titleForEmptyDataSet(scrollView: UIScrollView!) -> NSAttributedString! {
- let string = NSLocalizedString("", comment: "")
+ let string = NSLocalizedString("Library is Empty", comment: "")
let attributes = [NSFontAttributeName: UIFont.systemFontOfSize(18), NSForegroundColorAttributeName: UIColor.darkGrayColor()]
return NSAttributedString(string: string, attributes: attributes)
}
@@ -21,7 +21,7 @@ extension CloudBooksController {
extension DownloadTasksController {
func titleForEmptyDataSet(scrollView: UIScrollView!) -> NSAttributedString! {
- let string = NSLocalizedString("No task", comment: "")
+ let string = NSLocalizedString("No Download Tasks", comment: "")
let attributes = [NSFontAttributeName: UIFont.systemFontOfSize(18), NSForegroundColorAttributeName: UIColor.darkGrayColor()]
return NSAttributedString(string: string, attributes: attributes)
}
@@ -33,7 +33,7 @@ extension DownloadTasksController {
extension LocalBooksController {
func titleForEmptyDataSet(scrollView: UIScrollView!) -> NSAttributedString! {
- let string = NSLocalizedString("No Local Books", comment: "")
+ let string = NSLocalizedString("No Local Books on Device", comment: "")
let attributes = [NSFontAttributeName: UIFont.systemFontOfSize(18), NSForegroundColorAttributeName: UIColor.darkGrayColor()]
return NSAttributedString(string: string, attributes: attributes)
}
diff --git a/Kiwix-iOS/Info.plist b/Kiwix-iOS/Info.plist
index 38a6e0b0..e149d340 100644
--- a/Kiwix-iOS/Info.plist
+++ b/Kiwix-iOS/Info.plist
@@ -49,7 +49,7 @@
CFBundleVersion
- 1.7.1597
+ 1.7.1606
ITSAppUsesNonExemptEncryption
LSRequiresIPhoneOS
diff --git a/Kiwix-iOS/Storyboard/Library.storyboard b/Kiwix-iOS/Storyboard/Library.storyboard
index 4c55a0c7..72ad8deb 100644
--- a/Kiwix-iOS/Storyboard/Library.storyboard
+++ b/Kiwix-iOS/Storyboard/Library.storyboard
@@ -219,7 +219,7 @@
-
+
@@ -243,10 +243,10 @@
-
+
-
+
-
+
@@ -315,7 +315,7 @@
-
+
diff --git a/Kiwix-iOSWidgets/Bookmarks/Info.plist b/Kiwix-iOSWidgets/Bookmarks/Info.plist
index cd39f4e4..32a7f390 100644
--- a/Kiwix-iOSWidgets/Bookmarks/Info.plist
+++ b/Kiwix-iOSWidgets/Bookmarks/Info.plist
@@ -21,7 +21,7 @@
CFBundleSignature
????
CFBundleVersion
- 1.7.2016
+ 1.7.2035
NSExtension
NSExtensionMainStoryboard
diff --git a/Kiwix.xcodeproj/project.pbxproj b/Kiwix.xcodeproj/project.pbxproj
index fc69aaf1..f4fe746b 100644
--- a/Kiwix.xcodeproj/project.pbxproj
+++ b/Kiwix.xcodeproj/project.pbxproj
@@ -1888,7 +1888,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = DA0AB5D61F19BE37BD0AFA0A /* Pods-Kiwix-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;
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
@@ -1925,7 +1925,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 5B9300794E7F4EFE5B3E8F19 /* Pods-Kiwix-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;
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
diff --git a/Podfile b/Podfile
index 3b66ed56..25278284 100644
--- a/Podfile
+++ b/Podfile
@@ -5,7 +5,6 @@ target 'Kiwix-iOS' do
platform :ios, '9.0'
-pod 'DateTools'
pod 'DZNEmptyDataSet'
pod 'SwiftyUserDefaults'
pod 'Operations', :git => 'https://github.com/ProcedureKit/ProcedureKit.git', :branch => 'swift/2.3'
@@ -16,7 +15,6 @@ target 'Kiwix-OSX' do
platform :osx, '10.10'
-pod 'DateTools'
pod 'Operations', :git => 'https://github.com/ProcedureKit/ProcedureKit.git', :branch => 'swift/2.3'
end
diff --git a/Podfile.lock b/Podfile.lock
index 791a8382..da58d793 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -1,13 +1,11 @@
PODS:
- - DateTools (1.7.0)
- DZNEmptyDataSet (1.8.1)
- - Operations (3.1.0):
- - Operations/Standard (= 3.1.0)
- - Operations/Standard (3.1.0)
- - SwiftyUserDefaults (2.2.0)
+ - Operations (3.2.0):
+ - Operations/Standard (= 3.2.0)
+ - Operations/Standard (3.2.0)
+ - SwiftyUserDefaults (2.2.1)
DEPENDENCIES:
- - DateTools
- DZNEmptyDataSet
- Operations (from `https://github.com/ProcedureKit/ProcedureKit.git`, branch `swift/2.3`)
- SwiftyUserDefaults
@@ -19,15 +17,14 @@ EXTERNAL SOURCES:
CHECKOUT OPTIONS:
Operations:
- :commit: 5964aebb4abd76c466232c6477fcfdded2395cdc
+ :commit: 9761166587775ac75230df4b72a883392e5d35e5
:git: https://github.com/ProcedureKit/ProcedureKit.git
SPEC CHECKSUMS:
- DateTools: 53288ee8b905fdc75897a1e6b5cc0144b14cba60
DZNEmptyDataSet: 9525833b9e68ac21c30253e1d3d7076cc828eaa7
- Operations: d09dbb1c32ce01061ebbb022c8a955b34fd9ec35
- SwiftyUserDefaults: e7c8197a9d4068702e7f2406a968cae413b8de27
+ Operations: 4c5f06d7328f1b097d5dac5c0d614917ecbc96e7
+ SwiftyUserDefaults: 7abdba50a50ea0c18ee8903af3c88e4c1cb8448d
-PODFILE CHECKSUM: dafe7442de9229d78c81ec09646e9230caf12c71
+PODFILE CHECKSUM: 385ab6f80e54cf2d2a029ad39e3ce32eaa738fcc
COCOAPODS: 1.0.1