diff --git a/Kiwix-iOS/Controller/Main/MainShowHide.swift b/Kiwix-iOS/Controller/Main/MainShowHide.swift
index d7f90436..24f1d02b 100644
--- a/Kiwix-iOS/Controller/Main/MainShowHide.swift
+++ b/Kiwix-iOS/Controller/Main/MainShowHide.swift
@@ -24,9 +24,9 @@ extension MainController {
}
func hideWelcome() {
- let controller = childViewControllers.flatMap({$0 as? WelcomeController}).first
- controller?.removeFromParentViewController()
- controller?.view.removeFromSuperview()
+ guard let controller = childViewControllers.flatMap({$0 as? WelcomeController}).first else {return}
+ controller.removeFromParentViewController()
+ controller.view.removeFromSuperview()
}
// MARK: - Search
diff --git a/Kiwix-iOS/Controller/Main/WebViewController.swift b/Kiwix-iOS/Controller/Main/WebViewController.swift
index 6638aece..fd9e6a44 100644
--- a/Kiwix-iOS/Controller/Main/WebViewController.swift
+++ b/Kiwix-iOS/Controller/Main/WebViewController.swift
@@ -10,10 +10,10 @@ import UIKit
class WebViewController: UIViewController {
+ @IBOutlet weak var webView: UIWebView!
+
override func viewDidLoad() {
super.viewDidLoad()
-
- // Do any additional setup after loading the view.
}
diff --git a/Kiwix-iOS/Info.plist b/Kiwix-iOS/Info.plist
index 307933f7..9313f97a 100644
--- a/Kiwix-iOS/Info.plist
+++ b/Kiwix-iOS/Info.plist
@@ -49,7 +49,7 @@
CFBundleVersion
- 1.8.2900
+ 1.8.2902
ITSAppUsesNonExemptEncryption
LSRequiresIPhoneOS
diff --git a/Kiwix-iOS/Storyboard/Main.storyboard b/Kiwix-iOS/Storyboard/Main.storyboard
index e4527343..e45ab619 100644
--- a/Kiwix-iOS/Storyboard/Main.storyboard
+++ b/Kiwix-iOS/Storyboard/Main.storyboard
@@ -36,6 +36,9 @@
+
+
+
diff --git a/Kiwix-iOSWidgets/Bookmarks/Info.plist b/Kiwix-iOSWidgets/Bookmarks/Info.plist
index 43702d52..d5bdc5c8 100644
--- a/Kiwix-iOSWidgets/Bookmarks/Info.plist
+++ b/Kiwix-iOSWidgets/Bookmarks/Info.plist
@@ -21,7 +21,7 @@
CFBundleSignature
????
CFBundleVersion
- 1.8.2900
+ 1.8.2902
NSExtension
NSExtensionMainStoryboard
diff --git a/Kiwix.xcodeproj/project.pbxproj b/Kiwix.xcodeproj/project.pbxproj
index 8fb6a74a..7ee076d6 100644
--- a/Kiwix.xcodeproj/project.pbxproj
+++ b/Kiwix.xcodeproj/project.pbxproj
@@ -96,6 +96,7 @@
97BC0FC01DD90A65004BBAD1 /* MainController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97BC0FBE1DD90A65004BBAD1 /* MainController.swift */; };
97BC0FC21DD92B62004BBAD1 /* Buttons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97BC0FC11DD92B62004BBAD1 /* Buttons.swift */; };
97C005D61D64B3B0004352E8 /* Library.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C005D51D64B3B0004352E8 /* Library.storyboard */; };
+ 97C2C26A1DDCC58500A9CC64 /* ArticleOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9764CBD21D8083AA00072D6A /* ArticleOperation.swift */; };
97C601DC1D7F15C400362D4F /* Bookmark.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C601DB1D7F15C400362D4F /* Bookmark.storyboard */; };
97C601DE1D7F342100362D4F /* HTMLHeading.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97C601DD1D7F342100362D4F /* HTMLHeading.swift */; };
97D0E98F1DDA12B30029530E /* MainDelegates.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97D0E98E1DDA12B30029530E /* MainDelegates.swift */; };
@@ -1186,6 +1187,7 @@
97A1FD191D6F71CE00A80EE2 /* ZimMultiReader.swift in Sources */,
97A1FD261D6F71E200A80EE2 /* ZimReader.mm in Sources */,
97A1FD1C1D6F71D800A80EE2 /* KiwixURLProtocol.swift in Sources */,
+ 97C2C26A1DDCC58500A9CC64 /* ArticleOperation.swift in Sources */,
973208261DD21E9C00EDD3DC /* CoreDataContainer.swift in Sources */,
972F815B1DDCBF71008D7289 /* MainShowHide.swift in Sources */,
97D6813F1D6F712800E5FA99 /* Article+CoreDataProperties.swift in Sources */,
diff --git a/Kiwix/Operations/ArticleOperation.swift b/Kiwix/Operations/ArticleOperation.swift
index a1433449..c5035034 100644
--- a/Kiwix/Operations/ArticleOperation.swift
+++ b/Kiwix/Operations/ArticleOperation.swift
@@ -50,7 +50,7 @@ class ArticleLoadOperation: Procedure {
}
override func execute() {
- let controller = ((UIApplication.shared.delegate as! AppDelegate)
+ let main = ((UIApplication.shared.delegate as! AppDelegate)
.window?.rootViewController as! UINavigationController)
.topViewController as! MainController
guard let url: URL = {
@@ -75,12 +75,15 @@ class ArticleLoadOperation: Procedure {
let request = URLRequest(url: url)
OperationQueue.main.addOperation {
- controller.hideSearch(animated: self.animated)
- controller.presentingViewController?.dismiss(animated: self.animated, completion: nil)
- if controller.traitCollection.horizontalSizeClass == .compact {controller.hideTableOfContentsController()}
+ main.hideWelcome()
+ main.showWeb()
+ main.hideSearch(animated: self.animated)
+ main.presentingViewController?.dismiss(animated: self.animated, completion: nil)
+ //if main.traitCollection.horizontalSizeClass == .compact {main.hideTableOfContentsController()}
- if controller.webView.request?.url != url {
- controller.webView.loadRequest(request)
+ let webView = main.controllers.web.webView
+ if webView.request?.url != url {
+ webView?.loadRequest(request)
}
self.finish()