diff --git a/Kiwix-iOS/Controller/Main/MainControllerShowHide.swift b/Kiwix-iOS/Controller/Main/MainControllerShowHide.swift
index b28a6319..7e0b9544 100644
--- a/Kiwix-iOS/Controller/Main/MainControllerShowHide.swift
+++ b/Kiwix-iOS/Controller/Main/MainControllerShowHide.swift
@@ -60,7 +60,8 @@ extension MainController {
let views = ["SearchController": searchController.view]
view.addConstraints(NSLayoutConstraint.constraintsWithVisualFormat("H:|[SearchController]|", options: .AlignAllCenterY, metrics: nil, views: views))
- view.addConstraints(NSLayoutConstraint.constraintsWithVisualFormat("V:|[SearchController]|", options: .AlignAllCenterX, metrics: nil, views: views))
+ view.addConstraint(searchController.view.topAnchor.constraintEqualToAnchor(topLayoutGuide.bottomAnchor))
+ view.addConstraint(searchController.view.bottomAnchor.constraintEqualToAnchor(bottomLayoutGuide.topAnchor))
if animated {
searchController.view.alpha = 0.5
@@ -195,4 +196,4 @@ extension MainController {
GlobalOperationQueue.sharedInstance.addOperation(operation)
Preference.hasShowGetStartedAlert = true
}
-}
\ No newline at end of file
+}
diff --git a/Kiwix-iOS/Info.plist b/Kiwix-iOS/Info.plist
index 509d99cc..9b9cb8fa 100644
--- a/Kiwix-iOS/Info.plist
+++ b/Kiwix-iOS/Info.plist
@@ -49,7 +49,7 @@
CFBundleVersion
- 1.7.987
+ 1.7.990
ITSAppUsesNonExemptEncryption
LSRequiresIPhoneOS
diff --git a/Kiwix-iOS/Storyboard/Search.storyboard b/Kiwix-iOS/Storyboard/Search.storyboard
index 175e5b78..0caffb70 100644
--- a/Kiwix-iOS/Storyboard/Search.storyboard
+++ b/Kiwix-iOS/Storyboard/Search.storyboard
@@ -1,10 +1,10 @@
-
-
+
+
-
-
+
+
@@ -16,102 +16,44 @@
-
+
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
+
-
-
-
-
-
-
-
@@ -119,56 +61,33 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -176,66 +95,34 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -252,118 +139,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -374,73 +150,60 @@
-
+
-
-
+
-
+
-
+
-
-
-
+
@@ -452,15 +215,11 @@
-
-
+
-
-
-
@@ -492,7 +251,7 @@
-
+
@@ -500,9 +259,9 @@
-
+
@@ -515,17 +274,17 @@
-
+
-
+
@@ -534,7 +293,6 @@
-
@@ -544,22 +302,14 @@
-
-
-
-
-
-
-
-
@@ -573,44 +323,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -620,45 +332,38 @@
-
+
-
-
+
-
+
-
+
-
-
-
+
@@ -688,49 +393,39 @@
-
+
-
+
-
-
-
+
@@ -776,7 +471,7 @@
-
+
@@ -802,133 +497,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -938,12 +506,11 @@
-
+
-
-
+
@@ -959,15 +526,13 @@
-
-
+
@@ -980,7 +545,7 @@
-
+
@@ -1000,8 +565,5 @@
-
-
-
diff --git a/Kiwix-iOSWidgets/Bookmarks/Info.plist b/Kiwix-iOSWidgets/Bookmarks/Info.plist
index 8df20ae5..9b614555 100644
--- a/Kiwix-iOSWidgets/Bookmarks/Info.plist
+++ b/Kiwix-iOSWidgets/Bookmarks/Info.plist
@@ -21,7 +21,7 @@
CFBundleSignature
????
CFBundleVersion
- 1.7.1075
+ 1.7.1078
NSExtension
NSExtensionMainStoryboard
diff --git a/Kiwix-iOSWidgets/Bookmarks/TodayViewController.swift b/Kiwix-iOSWidgets/Bookmarks/TodayViewController.swift
index 19d1e8ba..32da0850 100644
--- a/Kiwix-iOSWidgets/Bookmarks/TodayViewController.swift
+++ b/Kiwix-iOSWidgets/Bookmarks/TodayViewController.swift
@@ -72,7 +72,7 @@ class TodayViewController: UIViewController, NCWidgetProviding, UICollectionView
itemSize = CGSizeMake(itemWidth, itemHeight)
rowCount = min(ceil(CGFloat(bookmarks.count) / CGFloat(itemsPerRow)), maxRowCount)
- let collectionViewHeight = itemHeight * rowCount + hInset * rowCount
+ let collectionViewHeight = itemHeight * rowCount + hInset * (rowCount - 1)
preferredContentSize = CGSizeMake(0, max(1, collectionViewHeight))
}
@@ -114,6 +114,9 @@ class TodayViewController: UIViewController, NCWidgetProviding, UICollectionView
cell.label.text = title
cell.imageView.image = UIImage(data: thumbImageData)
+ if #available(iOS 10.0, *) {
+ cell.label.textColor = UIColor.darkTextColor()
+ }
}
// MARK: - UICollectionViewDelegate
diff --git a/Kiwix.xcodeproj/project.pbxproj b/Kiwix.xcodeproj/project.pbxproj
index da5e59ec..9e269f4a 100644
--- a/Kiwix.xcodeproj/project.pbxproj
+++ b/Kiwix.xcodeproj/project.pbxproj
@@ -1282,7 +1282,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0730;
- LastUpgradeCheck = 0730;
+ LastUpgradeCheck = 0800;
ORGANIZATIONNAME = Chris;
TargetAttributes = {
973BCCE81CEB3FA400F10B44 = {
@@ -1791,6 +1791,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 6DCB0E958A1083CA248C5A12 /* Pods-Kiwix-OSX.debug.xcconfig */;
buildSettings = {
+ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
@@ -1822,6 +1823,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 69E75DFE2EF83272AC5B02BA /* Pods-Kiwix-OSX.release.xcconfig */;
buildSettings = {
+ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
@@ -1961,8 +1963,10 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+ CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -2006,8 +2010,10 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+ CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -2026,6 +2032,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
+ SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
};
@@ -2035,6 +2042,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = DA0AB5D61F19BE37BD0AFA0A /* Pods-Kiwix-iOS.debug.xcconfig */;
buildSettings = {
+ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
ALWAYS_SEARCH_USER_PATHS = NO;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
@@ -2043,7 +2051,6 @@
CODE_SIGN_ENTITLEMENTS = "Kiwix-iOS/Kiwix.entitlements";
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
- EMBEDDED_CONTENT_CONTAINS_SWIFT = "$(inherited)";
ENABLE_BITCODE = YES;
HEADER_SEARCH_PATHS = (
"$(inherited)",
@@ -2072,6 +2079,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 5B9300794E7F4EFE5B3E8F19 /* Pods-Kiwix-iOS.release.xcconfig */;
buildSettings = {
+ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
ALWAYS_SEARCH_USER_PATHS = NO;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
@@ -2080,7 +2088,6 @@
CODE_SIGN_ENTITLEMENTS = "Kiwix-iOS/Kiwix.entitlements";
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
- EMBEDDED_CONTENT_CONTAINS_SWIFT = "$(inherited)";
ENABLE_BITCODE = YES;
HEADER_SEARCH_PATHS = (
"$(inherited)",
diff --git a/Kiwix.xcodeproj/xcuserdata/Chrisli.xcuserdatad/xcschemes/Bookmarks.xcscheme b/Kiwix.xcodeproj/xcuserdata/Chrisli.xcuserdatad/xcschemes/Bookmarks.xcscheme
index 6d1b1e46..ec826d86 100644
--- a/Kiwix.xcodeproj/xcuserdata/Chrisli.xcuserdatad/xcschemes/Bookmarks.xcscheme
+++ b/Kiwix.xcodeproj/xcuserdata/Chrisli.xcuserdatad/xcschemes/Bookmarks.xcscheme
@@ -1,6 +1,6 @@
@@ -47,7 +47,7 @@
diff --git a/Kiwix.xcodeproj/xcuserdata/Chrisli.xcuserdatad/xcschemes/Kiwix-OSX.xcscheme b/Kiwix.xcodeproj/xcuserdata/Chrisli.xcuserdatad/xcschemes/Kiwix-OSX.xcscheme
index 9090c03b..e43eec5e 100644
--- a/Kiwix.xcodeproj/xcuserdata/Chrisli.xcuserdatad/xcschemes/Kiwix-OSX.xcscheme
+++ b/Kiwix.xcodeproj/xcuserdata/Chrisli.xcuserdatad/xcschemes/Kiwix-OSX.xcscheme
@@ -1,6 +1,6 @@