kiwix/kiwix-apple
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-apple.git synced 2025-09-22 11:03:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'TOC-UI-Design' into 1.6

Browse Source
This commit is contained in:
Chris Li 2016-07-01 21:18:26 -04:00
commit ef57339c76
7 changed files with 384 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
Kiwix-iOS/Controller/MainVC.swift
View File

@ -9,9 +9,15 @@
import UIKit
class MainVC: UIViewController {
@IBOutlet weak var webView: UIWebView!
var tableOfContentController: TableOfContentController?
@IBOutlet weak var dimView: UIView!
@IBOutlet weak var tocVisiualEffectView: UIVisualEffectView!
@IBOutlet weak var tocTopToSuperViewBottomSpacing: NSLayoutConstraint!
@IBOutlet weak var tocHeightConstraint: NSLayoutConstraint!
@IBOutlet weak var tocLeadSpacing: NSLayoutConstraint!
var tableOfContentsController: TableOfContentsController?
var bookmarkController: UIViewController?
var libraryController: UIViewController?
var settingController: UIViewController?
@ -25,6 +31,8 @@ class MainVC: UIViewController {
let navBarMinHeight: CGFloat = 10.0
var previousScrollViewYOffset: CGFloat = 0.0
var isShowingTableOfContents = false
// MARK: - Override
override func viewDidLoad() {
@ -54,7 +62,7 @@ class MainVC: UIViewController {
override func didReceiveMemoryWarning() {
super.didReceiveMemoryWarning()
tableOfContentController = nil
tableOfContentsController = nil
bookmarkController = nil
libraryController = nil
settingController = nil
@ -66,6 +74,15 @@ class MainVC: UIViewController {
if previousTraitCollection?.horizontalSizeClass != traitCollection.horizontalSizeClass {
configureUIElements(traitCollection.horizontalSizeClass)
}
configureTOCViewConstraints()
}
override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) {
if segue.identifier == "EmbeddedTOCController" {
guard let destinationViewController = segue.destinationViewController as? TableOfContentsController else {return}
tableOfContentsController = destinationViewController
tableOfContentsController?.delegate = self
}
}
// MARK: - First Time Launch Alert
@ -100,7 +117,6 @@ class MainVC: UIViewController {
case .Unspecified:
break
}
// configureWebViewInsets()
}
func configureButtonColor() {
@ -192,6 +208,9 @@ class MainVC: UIViewController {
if UIDevice.currentDevice().userInterfaceIdiom == .Pad && traitCollection.horizontalSizeClass == .Compact {
navigationItem.setRightBarButtonItem(cancelButton, animated: true)
}
if isShowingTableOfContents && traitCollection.horizontalSizeClass == .Compact {
animateOutTableOfContentsController()
}
}
func hideSearch() {
@ -203,6 +222,57 @@ class MainVC: UIViewController {
navigationItem.setRightBarButtonItem(nil, animated: true)
}
}
// MARK: - TOC
func animateInTableOfContentsController() {
isShowingTableOfContents = true
tocVisiualEffectView.hidden = false
dimView.hidden = false
dimView.alpha = 0.0
view.layoutIfNeeded()
tableOfContentsController?.headings = getTableOfContents(webView)
configureTOCViewConstraints()
UIView.animateWithDuration(0.3, delay: 0.0, usingSpringWithDamping: 0.6, initialSpringVelocity: 0.0, options: .CurveEaseOut, animations: {
self.view.layoutIfNeeded()
self.dimView.alpha = 0.5
}) { (completed) in
}
}
func animateOutTableOfContentsController() {
isShowingTableOfContents = false
view.layoutIfNeeded()
configureTOCViewConstraints()
UIView.animateWithDuration(0.2, delay: 0.0, options: .CurveEaseIn, animations: {
self.view.layoutIfNeeded()
self.dimView.alpha = 0.0
}) { (completed) in
self.dimView.hidden = true
self.tocVisiualEffectView.hidden = true
}
}
func configureTOCViewConstraints() {
switch traitCollection.horizontalSizeClass {
case .Compact:
let tocHeight: CGFloat = {
guard let controller = tableOfContentsController else {return floor(view.frame.height * 0.4)}
let tocContentHeight = controller.tableView.contentSize.height
guard controller.headings.count != 0 else {return floor(view.frame.height * 0.4)}
let toolBarHeight: CGFloat = traitCollection.horizontalSizeClass == .Regular ? 0.0 : (traitCollection.verticalSizeClass == .Compact ? 32.0 : 44.0)
return min(tocContentHeight + toolBarHeight, floor(view.frame.height * 0.65))
}()
tocHeightConstraint.constant = tocHeight
tocTopToSuperViewBottomSpacing.constant = isShowingTableOfContents ? tocHeight : 0.0
case .Regular:
tocLeadSpacing.constant = isShowingTableOfContents ? 0.0 : 270
break
default:
break
}
}
// MARK: - Buttons
@ -225,14 +295,11 @@ class MainVC: UIViewController {
}
func showTableOfContentButtonTapped(sender: UIBarButtonItem) {
guard let controller = tableOfContentController ?? UIStoryboard.main.initViewController(TableOfContentController.self) else {return}
controller.modalPresentationStyle = .Popover
controller.popoverPresentationController?.barButtonItem = sender
controller.popoverPresentationController?.permittedArrowDirections = [.Up, .Down]
controller.popoverPresentationController?.delegate = self
controller.headings = getTableOfContents(webView)
controller.delegate = self
presentViewController(controller, animated: true, completion: nil)
if isShowingTableOfContents {
animateOutTableOfContentsController()
} else {
animateInTableOfContentsController()
}
}
func showLibraryButtonTapped() {
@ -253,4 +320,8 @@ class MainVC: UIViewController {
hideSearch()
navigationItem.setRightBarButtonItem(nil, animated: true)
}
@IBAction func dimViewTapGestureRecognizer(sender: UITapGestureRecognizer) {
animateOutTableOfContentsController()
}
}

7
Kiwix-iOS/Controller/MainVCDelegates.swift
View File

@ -37,6 +37,9 @@ extension MainVC: LPTBarButtonItemDelegate, TableOfContentsDelegate, UISearchBar
func scrollTo(heading: HTMLHeading) {
webView.stringByEvaluatingJavaScriptFromString(heading.scrollToJavaScript)
if traitCollection.horizontalSizeClass == .Compact {
animateOutTableOfContentsController()
}
}
// MARK: - UISearchBarDelegate
@ -94,6 +97,10 @@ extension MainVC: LPTBarButtonItemDelegate, TableOfContentsDelegate, UISearchBar
adjustFontSizeIfNeeded()
configureNavigationButtonTint()
configureBookmarkButton()
if traitCollection.horizontalSizeClass == .Regular && isShowingTableOfContents {
tableOfContentsController?.headings = getTableOfContents(webView)
}
}
func injectTableWrappingJavaScriptIfNeeded() {

18
Kiwix-iOS/Controller/TableOfContentController.swift → Kiwix-iOS/Controller/TableOfContentsController.swift
View File

@ -1,5 +1,5 @@
//
// TableOfContentController.swift
// TableOfContentsController.swift
// Kiwix
//
// Created by Chris Li on 6/26/16.
@ -9,10 +9,12 @@
import UIKit
import DZNEmptyDataSet
class TableOfContentController: UITableViewController, DZNEmptyDataSetSource, DZNEmptyDataSetDelegate {
class TableOfContentsController: UIViewController, UITableViewDelegate, UITableViewDataSource ,DZNEmptyDataSetSource, DZNEmptyDataSetDelegate {
@IBOutlet weak var tableView: UITableView!
weak var delegate: TableOfContentsDelegate?
private var headinglevelMin = 0
var headings = [HTMLHeading]() {
didSet {
configurePreferredContentSize()
@ -23,6 +25,8 @@ class TableOfContentController: UITableViewController, DZNEmptyDataSetSource, DZ
override func viewDidLoad() {
super.viewDidLoad()
tableView.delegate = self
tableView.dataSource = self
tableView.emptyDataSetSource = self
tableView.emptyDataSetDelegate = self
tableView.tableFooterView = UIView()
@ -36,15 +40,15 @@ class TableOfContentController: UITableViewController, DZNEmptyDataSetSource, DZ
// MARK: - Table view data source
override func numberOfSectionsInTableView(tableView: UITableView) -> Int {
func numberOfSectionsInTableView(tableView: UITableView) -> Int {
return 1
}
override func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return headings.count
}
override func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCellWithIdentifier("Cell", forIndexPath: indexPath)
cell.textLabel?.text = headings[indexPath.row].textContent
cell.indentationLevel = (headings[indexPath.row].level - headinglevelMin) * 2
@ -53,7 +57,7 @@ class TableOfContentController: UITableViewController, DZNEmptyDataSetSource, DZ
// MARK: - Table view delegate
override func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) {
func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) {
delegate?.scrollTo(headings[indexPath.row])
}
@ -71,7 +75,7 @@ class TableOfContentController: UITableViewController, DZNEmptyDataSetSource, DZ
}
func verticalOffsetForEmptyDataSet(scrollView: UIScrollView!) -> CGFloat {
return 0
return 0.0
}
func spaceHeightForEmptyDataSet(scrollView: UIScrollView!) -> CGFloat {

14
Kiwix-iOS/Info.plist
View File

@ -36,7 +36,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>924</string>
<string>1366</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSRequiresIPhoneOS</key>
@ -44,7 +44,17 @@
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
<true/>
<false/>
<key>NSExceptionDomains</key>
<dict>
<key>kiwix.org</key>
<dict>
<key>NSExceptionAllowsInsecureHTTPLoads</key>
<true/>
<key>NSIncludesSubdomains</key>
<true/>
</dict>
</dict>
</dict>
<key>UIFileSharingEnabled</key>
<true/>

299
Kiwix-iOS/Storyboard/Main.storyboard
View File

@ -204,35 +204,127 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="mm8-aW-1rt" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="2607" y="433"/>
<point key="canvasLocation" x="3459" y="495"/>
</scene>
<!--Table Of Content Controller-->
<scene sceneID="iw2-hs-BiG">
<!--Table Of Contents Controller-->
<scene sceneID="sFA-xU-ByH">
<objects>
<tableViewController storyboardIdentifier="TableOfContentController" id="p5i-v1-okn" customClass="TableOfContentController" customModule="Kiwix" customModuleProvider="target" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" id="2on-Ss-GkQ">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<viewController automaticallyAdjustsScrollViewInsets="NO" id="H9F-uX-e8a" customClass="TableOfContentsController" customModule="Kiwix" customModuleProvider="target" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="m5m-JG-xST"/>
<viewControllerLayoutGuide type="bottom" id="4FP-XB-FlM"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="ckI-RJ-vNm">
<rect key="frame" x="0.0" y="0.0" width="600" height="390"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="Cell" id="au4-iz-tLz">
<rect key="frame" x="0.0" y="28" width="600" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="au4-iz-tLz" id="3UD-lZ-hs0">
<rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
</tableViewCellContentView>
</tableViewCell>
</prototypes>
<connections>
<outlet property="dataSource" destination="p5i-v1-okn" id="Khv-9C-1Wx"/>
<outlet property="delegate" destination="p5i-v1-okn" id="8sr-CM-fnw"/>
</connections>
</tableView>
</tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="coI-7Y-cLO" userLabel="First Responder" sceneMemberID="firstResponder"/>
<subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="xpu-sV-k1z">
<rect key="frame" x="0.0" y="0.0" width="600" height="390"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="Cell" textLabel="DJX-Kf-59M" style="IBUITableViewCellStyleDefault" id="au4-iz-tLz">
<rect key="frame" x="0.0" y="28" width="600" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="au4-iz-tLz" id="3UD-lZ-hs0">
<rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="DJX-Kf-59M">
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
<variation key="widthClass=regular">
<fontDescription key="fontDescription" type="system" pointSize="16"/>
</variation>
</label>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</tableViewCellContentView>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</tableViewCell>
</prototypes>
</tableView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="tZq-RO-dRD">
<rect key="frame" x="0.0" y="0.0" width="240" height="128"/>
<color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="width" constant="18" id="OTo-dk-TbS">
<variation key="widthClass=regular" constant="1"/>
</constraint>
</constraints>
<variation key="default">
<mask key="constraints">
<exclude reference="OTo-dk-TbS"/>
</mask>
</variation>
<variation key="widthClass=regular">
<mask key="constraints">
<include reference="OTo-dk-TbS"/>
</mask>
</variation>
</view>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="xpu-sV-k1z" firstAttribute="top" secondItem="ckI-RJ-vNm" secondAttribute="top" id="0Ke-XJ-1X0"/>
<constraint firstItem="tZq-RO-dRD" firstAttribute="leading" secondItem="xpu-sV-k1z" secondAttribute="trailing" constant="8" id="3No-fR-9mh">
<variation key="widthClass=regular" constant="0.0"/>
</constraint>
<constraint firstItem="tZq-RO-dRD" firstAttribute="top" secondItem="m5m-JG-xST" secondAttribute="bottom" id="Cl3-Kl-nY0"/>
<constraint firstAttribute="trailing" secondItem="xpu-sV-k1z" secondAttribute="trailing" id="FgY-e7-gFD"/>
<constraint firstItem="xpu-sV-k1z" firstAttribute="leading" secondItem="ckI-RJ-vNm" secondAttribute="leading" id="IeC-i9-2HS"/>
<constraint firstAttribute="trailing" secondItem="tZq-RO-dRD" secondAttribute="trailing" id="olA-XZ-0EX"/>
<constraint firstItem="xpu-sV-k1z" firstAttribute="bottom" secondItem="ckI-RJ-vNm" secondAttribute="bottomMargin" id="qdY-qI-Wxp"/>
<constraint firstItem="4FP-XB-FlM" firstAttribute="top" secondItem="tZq-RO-dRD" secondAttribute="bottom" id="qhd-h1-qMQ"/>
<constraint firstItem="4FP-XB-FlM" firstAttribute="top" secondItem="xpu-sV-k1z" secondAttribute="bottom" id="xwq-xw-Eg3"/>
<constraint firstAttribute="bottom" secondItem="tZq-RO-dRD" secondAttribute="bottom" id="y5a-P4-Smx"/>
</constraints>
<variation key="default">
<mask key="subviews">
<exclude reference="tZq-RO-dRD"/>
</mask>
<mask key="constraints">
<exclude reference="FgY-e7-gFD"/>
<exclude reference="qdY-qI-Wxp"/>
<exclude reference="3No-fR-9mh"/>
<exclude reference="Cl3-Kl-nY0"/>
<exclude reference="olA-XZ-0EX"/>
<exclude reference="y5a-P4-Smx"/>
<exclude reference="qhd-h1-qMQ"/>
<exclude reference="xwq-xw-Eg3"/>
</mask>
</variation>
<variation key="widthClass=compact">
<mask key="constraints">
<include reference="FgY-e7-gFD"/>
<exclude reference="qdY-qI-Wxp"/>
<include reference="xwq-xw-Eg3"/>
</mask>
</variation>
<variation key="widthClass=regular">
<mask key="subviews">
<include reference="tZq-RO-dRD"/>
</mask>
<mask key="constraints">
<exclude reference="FgY-e7-gFD"/>
<include reference="qdY-qI-Wxp"/>
<include reference="3No-fR-9mh"/>
<include reference="Cl3-Kl-nY0"/>
<include reference="olA-XZ-0EX"/>
<include reference="y5a-P4-Smx"/>
<exclude reference="qhd-h1-qMQ"/>
</mask>
</variation>
</view>
<extendedEdge key="edgesForExtendedLayout" top="YES"/>
<connections>
<outlet property="tableView" destination="xpu-sV-k1z" id="LF3-XM-mfa"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="Hel-4c-ecd" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="3393" y="432"/>
<point key="canvasLocation" x="2604" y="433"/>
</scene>
<!--MainVC-->
<scene sceneID="WWO-2R-Y9G">
@ -322,7 +414,7 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="Ysx-az-10y" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="2916" y="178.5"/>
<point key="canvasLocation" x="3307.5" y="-208.5"/>
</scene>
<!--MainVC-->
<scene sceneID="nEL-IB-dp3">
@ -340,36 +432,171 @@
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</webView>
<visualEffectView hidden="YES" opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="r0g-Y2-P3v">
<rect key="frame" x="0.0" y="600" width="600" height="390"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="duR-pa-KCb">
<rect key="frame" x="0.0" y="0.0" width="600" height="390"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<containerView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="U3d-ZH-PNu">
<rect key="frame" x="0.0" y="0.0" width="600" height="390"/>
<connections>
<segue destination="H9F-uX-e8a" kind="embed" identifier="EmbeddedTOCController" id="s9S-4d-udJ"/>
</connections>
</containerView>
</subviews>
<constraints>
<constraint firstAttribute="bottom" secondItem="U3d-ZH-PNu" secondAttribute="bottom" id="A3m-bt-13l"/>
<constraint firstItem="U3d-ZH-PNu" firstAttribute="top" secondItem="duR-pa-KCb" secondAttribute="top" id="DnQ-ea-z2O"/>
<constraint firstAttribute="trailing" secondItem="U3d-ZH-PNu" secondAttribute="trailing" id="Z2P-Sm-aQU"/>
<constraint firstItem="U3d-ZH-PNu" firstAttribute="leading" secondItem="duR-pa-KCb" secondAttribute="leading" id="bYi-26-xXD"/>
</constraints>
<variation key="default">
<mask key="constraints">
<exclude reference="A3m-bt-13l"/>
<exclude reference="DnQ-ea-z2O"/>
<exclude reference="Z2P-Sm-aQU"/>
<exclude reference="bYi-26-xXD"/>
</mask>
</variation>
<variation key="widthClass=compact">
<mask key="constraints">
<include reference="A3m-bt-13l"/>
<include reference="DnQ-ea-z2O"/>
<include reference="Z2P-Sm-aQU"/>
<include reference="bYi-26-xXD"/>
</mask>
</variation>
<variation key="widthClass=regular">
<mask key="constraints">
<include reference="A3m-bt-13l"/>
<include reference="DnQ-ea-z2O"/>
<include reference="Z2P-Sm-aQU"/>
<include reference="bYi-26-xXD"/>
</mask>
</variation>
</view>
<constraints>
<constraint firstAttribute="width" constant="270" id="EC0-IZ-NeD"/>
<constraint firstAttribute="height" constant="390" id="Hbh-Zr-Fie"/>
</constraints>
<blurEffect style="extraLight"/>
<variation key="default">
<mask key="constraints">
<exclude reference="EC0-IZ-NeD"/>
<exclude reference="Hbh-Zr-Fie"/>
</mask>
</variation>
<variation key="widthClass=compact">
<mask key="constraints">
<include reference="Hbh-Zr-Fie"/>
</mask>
</variation>
<variation key="widthClass=regular">
<mask key="constraints">
<include reference="EC0-IZ-NeD"/>
</mask>
</variation>
</visualEffectView>
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="K9J-LG-g2K">
<rect key="frame" x="0.0" y="64" width="600" height="536"/>
<color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<gestureRecognizers/>
<connections>
<outletCollection property="gestureRecognizers" destination="NUn-UO-p8Y" appends="YES" id="hSH-Mi-4Ly"/>
</connections>
</view>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="fXQ-NS-gMx" firstAttribute="top" secondItem="hIy-lu-2F6" secondAttribute="bottom" constant="-44" id="3bA-ye-yIU">
<variation key="heightClass=compact" constant="-44"/>
<variation key="widthClass=regular" constant="0.0"/>
<constraint firstAttribute="leading" secondItem="r0g-Y2-P3v" secondAttribute="leading" constant="270" id="6b5-8X-7aD"/>
<constraint firstItem="r0g-Y2-P3v" firstAttribute="leading" secondItem="BDO-xK-ZEa" secondAttribute="leading" id="AwJ-A8-0MO"/>
<constraint firstItem="hIy-lu-2F6" firstAttribute="leading" secondItem="BDO-xK-ZEa" secondAttribute="leading" id="Gde-Fa-kB8"/>
<constraint firstItem="r0g-Y2-P3v" firstAttribute="top" secondItem="HS5-a8-H6G" secondAttribute="bottom" id="JwF-38-cyF"/>
<constraint firstItem="hIy-lu-2F6" firstAttribute="top" secondItem="HS5-a8-H6G" secondAttribute="bottom" constant="-64" id="Ooa-c6-8q6">
<variation key="heightClass=compact-widthClass=compact" constant="-32"/>
<variation key="heightClass=compact-widthClass=regular" constant="-44"/>
</constraint>
<constraint firstItem="hIy-lu-2F6" firstAttribute="top" secondItem="HS5-a8-H6G" secondAttribute="bottom" constant="-64" id="6ak-gZ-Hzq">
<variation key="heightClass=compact" constant="-44"/>
<constraint firstItem="r0g-Y2-P3v" firstAttribute="top" secondItem="K9J-LG-g2K" secondAttribute="bottom" id="V1f-UR-jH8"/>
<constraint firstItem="fXQ-NS-gMx" firstAttribute="top" secondItem="hIy-lu-2F6" secondAttribute="bottom" constant="-44" id="WOB-MJ-B5Z">
<variation key="heightClass=compact-widthClass=compact" constant="-32"/>
<variation key="heightClass=compact-widthClass=regular" constant="0.0"/>
</constraint>
<constraint firstAttribute="trailing" secondItem="hIy-lu-2F6" secondAttribute="trailing" id="eC3-6r-itc"/>
<constraint firstAttribute="bottom" secondItem="hIy-lu-2F6" secondAttribute="bottom" id="xEp-oq-phK"/>
<constraint firstItem="hIy-lu-2F6" firstAttribute="leading" secondItem="BDO-xK-ZEa" secondAttribute="leading" id="y3g-CI-q82"/>
<constraint firstAttribute="trailing" secondItem="hIy-lu-2F6" secondAttribute="trailing" id="bDC-Yf-1BU"/>
<constraint firstAttribute="bottom" secondItem="r0g-Y2-P3v" secondAttribute="top" id="c3k-qN-lYX"/>
<constraint firstAttribute="trailing" secondItem="K9J-LG-g2K" secondAttribute="trailing" id="fNo-Ba-KRO"/>
<constraint firstItem="K9J-LG-g2K" firstAttribute="leading" secondItem="BDO-xK-ZEa" secondAttribute="leading" id="ieA-8B-e1X"/>
<constraint firstItem="hIy-lu-2F6" firstAttribute="leading" secondItem="r0g-Y2-P3v" secondAttribute="trailing" id="j9u-OA-K4W"/>
<constraint firstAttribute="trailing" secondItem="r0g-Y2-P3v" secondAttribute="trailing" id="qvn-rd-wza"/>
<constraint firstItem="fXQ-NS-gMx" firstAttribute="top" secondItem="r0g-Y2-P3v" secondAttribute="bottom" id="wIQ-Lv-buV"/>
<constraint firstItem="K9J-LG-g2K" firstAttribute="top" secondItem="HS5-a8-H6G" secondAttribute="bottom" priority="750" id="xcv-M9-m5f"/>
</constraints>
<variation key="default">
<mask key="subviews">
<exclude reference="r0g-Y2-P3v"/>
<exclude reference="K9J-LG-g2K"/>
</mask>
<mask key="constraints">
<exclude reference="xEp-oq-phK"/>
<exclude reference="fNo-Ba-KRO"/>
<exclude reference="ieA-8B-e1X"/>
<exclude reference="xcv-M9-m5f"/>
<exclude reference="j9u-OA-K4W"/>
<exclude reference="6b5-8X-7aD"/>
<exclude reference="AwJ-A8-0MO"/>
<exclude reference="JwF-38-cyF"/>
<exclude reference="V1f-UR-jH8"/>
<exclude reference="c3k-qN-lYX"/>
<exclude reference="qvn-rd-wza"/>
<exclude reference="wIQ-Lv-buV"/>
</mask>
</variation>
<variation key="widthClass=compact">
<mask key="subviews">
<include reference="r0g-Y2-P3v"/>
<include reference="K9J-LG-g2K"/>
</mask>
<mask key="constraints">
<include reference="fNo-Ba-KRO"/>
<include reference="ieA-8B-e1X"/>
<include reference="xcv-M9-m5f"/>
<include reference="Gde-Fa-kB8"/>
<include reference="AwJ-A8-0MO"/>
<include reference="V1f-UR-jH8"/>
<include reference="c3k-qN-lYX"/>
<include reference="qvn-rd-wza"/>
</mask>
</variation>
<variation key="widthClass=regular">
<mask key="subviews">
<include reference="r0g-Y2-P3v"/>
</mask>
<mask key="constraints">
<exclude reference="Gde-Fa-kB8"/>
<include reference="j9u-OA-K4W"/>
<include reference="6b5-8X-7aD"/>
<include reference="JwF-38-cyF"/>
<include reference="wIQ-Lv-buV"/>
</mask>
</variation>
</view>
<navigationItem key="navigationItem" id="kQs-hp-Q5P"/>
<connections>
<outlet property="dimView" destination="K9J-LG-g2K" id="SPt-Ms-JL3"/>
<outlet property="tocHeightConstraint" destination="Hbh-Zr-Fie" id="P3a-0z-laX"/>
<outlet property="tocLeadSpacing" destination="6b5-8X-7aD" id="YTL-Lm-2aX"/>
<outlet property="tocTopToSuperViewBottomSpacing" destination="c3k-qN-lYX" id="5Vf-Kg-W55"/>
<outlet property="tocVisiualEffectView" destination="r0g-Y2-P3v" id="USv-AV-zg4"/>
<outlet property="webView" destination="hIy-lu-2F6" id="77z-Ea-aVH"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="Gtk-Xb-X35" userLabel="First Responder" sceneMemberID="firstResponder"/>
<tapGestureRecognizer id="NUn-UO-p8Y">
<connections>
<action selector="dimViewTapGestureRecognizer:" destination="vVc-as-aAx" id="9Rr-IW-Grc"/>
</connections>
</tapGestureRecognizer>
</objects>
<point key="canvasLocation" x="1853" y="433"/>
<point key="canvasLocation" x="1852.5" y="419"/>
</scene>
<!--Navigation Controller-->
<scene sceneID="eEd-4G-vNS">

8
Kiwix-iOS/Storyboard/Search.storyboard
View File

@ -350,9 +350,9 @@
</constraints>
<variation key="default">
<mask key="constraints">
<exclude reference="fDA-LM-lcf"/>
<exclude reference="8lb-a8-xTs"/>
<exclude reference="3S1-5g-X0w"/>
<exclude reference="8lb-a8-xTs"/>
<exclude reference="fDA-LM-lcf"/>
</mask>
</variation>
</view>
@ -908,11 +908,11 @@
<mask key="constraints">
<exclude reference="2rE-mi-bUD"/>
<exclude reference="jIE-XR-rHH"/>
<exclude reference="NfO-bn-5dt"/>
<exclude reference="F2r-2c-fkA"/>
<exclude reference="zU7-ob-SeR"/>
<exclude reference="NfO-bn-5dt"/>
<exclude reference="Z8p-xl-SLH"/>
<exclude reference="rgv-ga-dhh"/>
<exclude reference="zU7-ob-SeR"/>
</mask>
</variation>
</view>

8
Kiwix.xcodeproj/project.pbxproj
View File

@ -259,7 +259,7 @@
97BA32A51CEBC36300339A47 /* RootWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97BA32A31CEBC29500339A47 /* RootWindowController.swift */; };
97D452BC1D16FF010033666F /* RecentSearchCVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97D452BB1D16FF010033666F /* RecentSearchCVC.swift */; };
97D452BE1D1723FF0033666F /* CollectionViewCells.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97D452BD1D1723FF0033666F /* CollectionViewCells.swift */; };
97D55EF61D2075180081B523 /* TableOfContentController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97D55EF51D2075180081B523 /* TableOfContentController.swift */; };
97D55EF61D2075180081B523 /* TableOfContentsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97D55EF51D2075180081B523 /* TableOfContentsController.swift */; };
97DF23551CE807A1003E1E5A /* GlobalOperationQueue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97DF23541CE807A1003E1E5A /* GlobalOperationQueue.swift */; };
97E609F11D103DED00EBCB9D /* NotificationCenter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97E609F01D103DED00EBCB9D /* NotificationCenter.framework */; };
97E609F41D103DED00EBCB9D /* TodayViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97E609F31D103DED00EBCB9D /* TodayViewController.swift */; };
@ -537,7 +537,7 @@
97D452BD1D1723FF0033666F /* CollectionViewCells.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CollectionViewCells.swift; sourceTree = "<group>"; };
97D452C01D1871E70033666F /* SearchLocalBooksCVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = SearchLocalBooksCVC.swift; path = "Kiwix-iOS/Controller/Search/SearchLocalBooksCVC.swift"; sourceTree = SOURCE_ROOT; };
97D452C11D1871E70033666F /* SearchTabController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = SearchTabController.swift; path = "Kiwix-iOS/Controller/Search/SearchTabController.swift"; sourceTree = SOURCE_ROOT; };
97D55EF51D2075180081B523 /* TableOfContentController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TableOfContentController.swift; path = "Kiwix-iOS/Controller/TableOfContentController.swift"; sourceTree = SOURCE_ROOT; };
97D55EF51D2075180081B523 /* TableOfContentsController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TableOfContentsController.swift; path = "Kiwix-iOS/Controller/TableOfContentsController.swift"; sourceTree = SOURCE_ROOT; };
97DF23541CE807A1003E1E5A /* GlobalOperationQueue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GlobalOperationQueue.swift; sourceTree = "<group>"; };
97E609EF1D103DED00EBCB9D /* Kiwix-iOSWidget.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "Kiwix-iOSWidget.appex"; sourceTree = BUILT_PRODUCTS_DIR; };
97E609F01D103DED00EBCB9D /* NotificationCenter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NotificationCenter.framework; path = System/Library/Frameworks/NotificationCenter.framework; sourceTree = SDKROOT; };
@ -1028,7 +1028,7 @@
972B007D1C35DBAB00B5FDC5 /* MainVC */,
97E108221C5D5A0D00E27FD3 /* Search */,
9771DC4B1C37278E009ECFF0 /* Setting */,
97D55EF51D2075180081B523 /* TableOfContentController.swift */,
97D55EF51D2075180081B523 /* TableOfContentsController.swift */,
971A10691D022E15007FC62C /* BookmarkHUDVC.swift */,
);
name = Controllers;
@ -1890,7 +1890,7 @@
979CB6B71D05C520005E1BA1 /* LocationOperation.swift in Sources */,
971A102F1D022AD5007FC62C /* Logo.swift in Sources */,
979CB6451D05C44F005E1BA1 /* Capability.swift in Sources */,
97D55EF61D2075180081B523 /* TableOfContentController.swift in Sources */,
97D55EF61D2075180081B523 /* TableOfContentsController.swift in Sources */,
971A104B1D022CBE007FC62C /* SearchBooksVC.swift in Sources */,
977998771C1E0B7900B1DD5E /* Article+CoreDataProperties.swift in Sources */,
971187301CEB50FC00B9909D /* ZimReader.mm in Sources */,