975 improve iphone launch sequence new

App/App_iOS.swift

@@ -123,9 +123,17 @@ struct Kiwix: App {
 
 private struct RootView: UIViewControllerRepresentable {
     @EnvironmentObject private var navigation: NavigationViewModel
+    @FetchRequest(
+        sortDescriptors: [NSSortDescriptor(keyPath: \ZimFile.size, ascending: false)],
+        predicate: ZimFile.openedPredicate,
+        animation: .easeInOut
+    ) private var zimFiles: FetchedResults<ZimFile>
 
     func makeUIViewController(context: Context) -> SplitViewController {
-        SplitViewController(navigationViewModel: navigation)
+        SplitViewController(
+            navigationViewModel: navigation,
+            hasZimFiles: !zimFiles.isEmpty
+        )
     }
 
     func updateUIViewController(_ controller: SplitViewController, context: Context) {

App/App_macOS.swift

@@ -110,7 +110,7 @@ struct RootView: View {
     private let tabCloses = NotificationCenter.default.publisher(for: NSWindow.willCloseNotification)
 
     var body: some View {
-        NavigationView {
+        NavigationSplitView {
             List(selection: $navigation.currentItem) {
                 ForEach(primaryItems, id: \.self) { navigationItem in
                     Label(navigationItem.name, systemImage: navigationItem.icon)
@@ -124,14 +124,7 @@ struct RootView: View {
                 }
             }
             .frame(minWidth: 150)
-            .toolbar {
-                Button {
-                    guard let responder = NSApp.keyWindow?.firstResponder else { return }
-                    responder.tryToPerform(#selector(NSSplitViewController.toggleSidebar(_:)), with: nil)
-                } label: {
-                    Image(systemName: "sidebar.leading")
-                }.help("app_macos_navigation.show_sidebar".localized)
-            }
+        } detail: {
             switch navigation.currentItem {
             case .loading:
                 LoadingView()

App/CompactViewController.swift

@@ -31,8 +31,11 @@ final class CompactViewController: UIHostingController<AnyView>, UISearchControl
 
     private var trailingNavItemGroups: [UIBarButtonItemGroup] = []
     private var rightNavItem: UIBarButtonItem?
+    private let navigation: NavigationViewModel
+    private var navigationItemObserver: AnyCancellable?
 
-    init() {
+    init(navigation: NavigationViewModel) {
+        self.navigation = navigation
         searchViewModel = SearchViewModel()
         let searchResult = SearchResults().environmentObject(searchViewModel)
         searchController = UISearchController(searchResultsController: UIHostingController(rootView: searchResult))
@@ -47,8 +50,23 @@ final class CompactViewController: UIHostingController<AnyView>, UISearchControl
     override func viewDidLoad() {
         super.viewDidLoad()
 
+        navigationItemObserver = navigation.$currentItem
+            .receive(on: DispatchQueue.main)
+            .sink(receiveValue: { [weak self] currentItem in
+                if currentItem != .loading {
+                    self?.navigationController?.isToolbarHidden = false
+                    self?.navigationController?.isNavigationBarHidden = false
+                    // listen to only the first change from .loading to something else
+                    self?.navigationItemObserver?.cancel()
+                }
+            })
+
+        // the .loading initial state:
+        navigationController?.isToolbarHidden = true
+        navigationController?.isNavigationBarHidden = true
+        // eof .loading initial state
+
         definesPresentationContext = true
-        navigationController?.isToolbarHidden = false
         navigationController?.toolbar.scrollEdgeAppearance = {
             let apperance = UIToolbarAppearance()
             apperance.configureWithDefaultBackground()
@@ -117,17 +135,11 @@ private struct CompactView: View {
     @EnvironmentObject private var navigation: NavigationViewModel
     @State private var presentedSheet: PresentedSheet?
 
-    private enum PresentedSheet: Identifiable {
-        case library(LibraryTabItem?)
+    private enum PresentedSheet: String, Identifiable {
+        case library
         case settings
-
         var id: String {
-            switch self {
-            case let .library(libraryItem):
-                return "library-\(String(describing: libraryItem))"
-            case .settings:
-                return "settings"
-            }
+            rawValue
         }
     }
 
@@ -136,10 +148,12 @@ private struct CompactView: View {
     }
 
     var body: some View {
-        if case let .tab(tabID) = navigation.currentItem {
+        if case .loading = navigation.currentItem {
+            LoadingView()
+        } else if case let .tab(tabID) = navigation.currentItem {
             Content(tabID: tabID, showLibrary: {
                 if presentedSheet == nil {
-                    presentedSheet = .library(.categories)
+                    presentedSheet = .library
                 } else {
                     // there's a sheet already presented by the user
                     // do nothing
@@ -161,7 +175,7 @@ private struct CompactView: View {
                         Spacer()
                         if FeatureFlags.hasLibrary {
                             Button {
-                                presentedSheet = .library(nil)
+                                presentedSheet = .library
                             } label: {
                                 Label("common.tab.menu.library".localized, systemImage: "folder")
                             }
@@ -178,8 +192,8 @@ private struct CompactView: View {
                 .environmentObject(BrowserViewModel.getCached(tabID: tabID))
                 .sheet(item: $presentedSheet) { presentedSheet in
                     switch presentedSheet {
-                    case .library(let tabItem):
-                        Library(dismiss: dismiss, tabItem: tabItem)
+                    case .library:
+                        Library(dismiss: dismiss)
                     case .settings:
                         NavigationView {
                             Settings().toolbar {

App/SplitViewController.swift

@@ -22,9 +22,14 @@ final class SplitViewController: UISplitViewController {
     let navigationViewModel: NavigationViewModel
     private var navigationItemObserver: AnyCancellable?
     private var openURLObserver: NSObjectProtocol?
+    private var hasZimFiles: Bool
 
-    init(navigationViewModel: NavigationViewModel) {
+    init(
+        navigationViewModel: NavigationViewModel,
+        hasZimFiles: Bool
+    ) {
         self.navigationViewModel = navigationViewModel
+        self.hasZimFiles = hasZimFiles
         super.init(style: .doubleColumn)
     }
 
@@ -41,33 +46,46 @@ final class SplitViewController: UISplitViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
+        // start with collapsed state for .loading
+        preferredDisplayMode = .secondaryOnly
+
         // setup controllers
-        setViewController(UINavigationController(rootViewController: CompactViewController()), for: .compact)
+        setViewController(
+            UINavigationController(
+                rootViewController: CompactViewController(navigation: navigationViewModel)
+            ),
+            for: .compact
+        )
         setViewController(SidebarViewController(), for: .primary)
         setSecondaryController()
 
         // observers
         navigationItemObserver = navigationViewModel.$currentItem
             .receive(on: DispatchQueue.main)  // needed to postpones sink after navigationViewModel.currentItem updates
             .dropFirst()
-            .sink { [weak self] _ in
+            .sink { [weak self] currentItem in
                 if let sidebarViewController = self?.viewController(for: .primary) as? SidebarViewController {
                     sidebarViewController.updateSelection()
                 }
                 if self?.traitCollection.horizontalSizeClass == .regular {
                     self?.setSecondaryController()
                 }
+                if self?.hasZimFiles == true, currentItem != .loading {
+                    self?.preferredDisplayMode = .automatic
+                }
             }
         openURLObserver = NotificationCenter.default.addObserver(
             forName: .openURL, object: nil, queue: nil
         ) { [weak self] notification in
             guard let url = notification.userInfo?["url"] as? URL else { return }
             let inNewTab = notification.userInfo?["inNewTab"] as? Bool ?? false
-            if !inNewTab, case let .tab(tabID) = self?.navigationViewModel.currentItem {
-                BrowserViewModel.getCached(tabID: tabID).load(url: url)
-            } else {
-                guard let tabID = self?.navigationViewModel.createTab() else { return }
-                BrowserViewModel.getCached(tabID: tabID).load(url: url)
+            Task { @MainActor in
+                if !inNewTab, case let .tab(tabID) = self?.navigationViewModel.currentItem {
+                    BrowserViewModel.getCached(tabID: tabID).load(url: url)
+                } else {
+                    guard let tabID = self?.navigationViewModel.createTab() else { return }
+                    BrowserViewModel.getCached(tabID: tabID).load(url: url)
+                }
             }
         }
     }

Kiwix/SplashScreenKiwix.storyboard

@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23094" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <device id="retina4_0" orientation="landscape" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23084"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="EHf-IW-A2E">
+            <objects>
+                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="UTd-Wd-2hu"/>
+                        <viewControllerLayoutGuide type="bottom" id="5aq-KH-MQP"/>
+                    </layoutGuides>
+                    <view key="view" userInteractionEnabled="NO" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="Ze5-6b-2t3">
+                        <rect key="frame" x="0.0" y="0.0" width="568" height="320"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="welcomeLogo" adjustsImageSizeForAccessibilityContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="aq8-ue-tYD" userLabel="Logo">
+                                <rect key="frame" x="142" y="82" width="284" height="92"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="300" id="zyG-3z-VNV"/>
+                                </constraints>
+                                <variation key="default">
+                                    <mask key="constraints">
+                                        <exclude reference="zyG-3z-VNV"/>
+                                    </mask>
+                                </variation>
+                                <variation key="widthClass=regular">
+                                    <mask key="constraints">
+                                        <include reference="zyG-3z-VNV"/>
+                                    </mask>
+                                </variation>
+                            </imageView>
+                        </subviews>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstItem="aq8-ue-tYD" firstAttribute="height" secondItem="Ze5-6b-2t3" secondAttribute="height" multiplier="0.5" id="S68-g2-nFH"/>
+                            <constraint firstItem="aq8-ue-tYD" firstAttribute="width" secondItem="Ze5-6b-2t3" secondAttribute="width" multiplier="0.5" id="TF7-1V-ah2"/>
+                            <constraint firstItem="aq8-ue-tYD" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="m7x-hm-LnP"/>
+                            <constraint firstItem="aq8-ue-tYD" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" constant="-58" id="tmp-PG-GZz">
+                                <variation key="heightClass=compact" constant="-32"/>
+                            </constraint>
+                            <constraint firstItem="aq8-ue-tYD" firstAttribute="height" secondItem="Ze5-6b-2t3" secondAttribute="height" constant="-228" id="yNt-tV-blG"/>
+                        </constraints>
+                        <variation key="default">
+                            <mask key="constraints">
+                                <exclude reference="TF7-1V-ah2"/>
+                                <exclude reference="S68-g2-nFH"/>
+                                <exclude reference="yNt-tV-blG"/>
+                            </mask>
+                        </variation>
+                        <variation key="heightClass=compact">
+                            <mask key="constraints">
+                                <include reference="yNt-tV-blG"/>
+                            </mask>
+                        </variation>
+                        <variation key="heightClass=regular">
+                            <mask key="constraints">
+                                <include reference="S68-g2-nFH"/>
+                            </mask>
+                        </variation>
+                        <variation key="widthClass=compact">
+                            <mask key="constraints">
+                                <include reference="TF7-1V-ah2"/>
+                            </mask>
+                        </variation>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="52.761627906976742" y="375"/>
+        </scene>
+    </scenes>
+    <resources>
+        <image name="welcomeLogo" width="192" height="140"/>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+    </resources>
+</document>

Model/Brand.swift

@@ -46,7 +46,12 @@ enum AppType {
 enum Brand {
     static let appName: String = Config.value(for: .displayName) ?? "Kiwix"
     static let appStoreId: String = Config.value(for: .appStoreID) ?? "id997079563"
-    static let welcomeLogoImageName: String = "welcomeLogo"
+    static let loadingLogoImage: String = "welcomeLogo"
+    static let loadingLogoWidth: Int = Config.value(for: .logoWidth) ?? 192
+    static let loadingLogoHeight: Int = Config.value(for: .logoHeight) ?? 140
+    static var loadingLogoSize: CGSize {
+        CGSize(width: loadingLogoWidth, height: loadingLogoHeight)
+    }
     static let aboutText: String = Config.value(for: .aboutText) ?? "settings.about.description".localized
     static let aboutWebsite: String = Config.value(for: .aboutWebsite) ?? "https://www.kiwix.org"
 
@@ -79,6 +84,8 @@ enum Config: String {
     case showSearchSnippetInSettings = "SETTINGS_SHOW_SEARCH_SNIPPET"
     case aboutText = "CUSTOM_ABOUT_TEXT"
     case aboutWebsite = "CUSTOM_ABOUT_WEBSITE"
+    case logoWidth = "LOGO_WIDTH"
+    case logoHeight = "LOGO_HEIGHT"
 
     static func value<T>(for key: Config) -> T? where T: LosslessStringConvertible {
         guard let object = Bundle.main.object(forInfoDictionaryKey: key.rawValue) else {

Model/Utilities/Resizer.swift

@@ -0,0 +1,36 @@
+// This file is part of Kiwix for iOS & macOS.
+//
+// Kiwix is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// any later version.
+//
+// Kiwix is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Kiwix; If not, see https://www.gnu.org/licenses/.
+
+import Foundation
+
+enum Resizer {
+
+    static func fit(_ size: CGSize, into maxSize: CGSize) -> CGSize {
+        let ratio = size.ratio
+        if maxSize.ratio <= ratio {
+            // subject is horizontal
+            return CGSize(width: maxSize.width, height: maxSize.width / ratio)
+        } else {
+            return CGSize(width: maxSize.height * ratio, height: maxSize.height)
+        }
+    }
+}
+
+extension CGSize {
+    var ratio: CGFloat {
+        guard height != 0 else { return 1 }
+        return width / height
+    }
+}

Support/Assets.xcassets/welcomeLogo.imageset/Contents.json

@@ -1,12 +1,35 @@
 {
   "images" : [
     {
-      "filename" : "Kiwix_logo_v3.svg",
+      "filename" : "vertical-logo-light.svg",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "filename" : "vertical-logo-light 1.svg",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "vertical-logo-dark.svg",
       "idiom" : "universal"
     }
   ],
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
   }
 }