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

Base for new library

Browse Source
This commit is contained in:
Chris Li 2016-08-19 14:43:43 -04:00
parent c0e879bedb
commit ce328ac85c
10 changed files with 99 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Kiwix-iOS/Assets.xcassets/Cross.imageset/Contents.json vendored
View File

@ -10,7 +10,7 @@
},
{
"idiom" : "universal",
"filename" : "multiply.png",
"filename" : "close copy.png",
"scale" : "3x"
}
],

BIN
Kiwix-iOS/Assets.xcassets/Cross.imageset/close copy.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

BIN
Kiwix-iOS/Assets.xcassets/Cross.imageset/multiply.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 419 B

11
Kiwix-iOS/Controller/Library/CloudBooksController.swift
View File

@ -10,14 +10,13 @@ import UIKit
import CoreData
class CloudBooksController: UITableViewController, NSFetchedResultsControllerDelegate {
var bookDetailController = UIStoryboard.libraryNew.initViewController(BookDetailController.self)!
override func viewDidLoad() {
super.viewDidLoad()
title = ""
navigationController?.view.backgroundColor = UIColor.whiteColor()
tabBarItem.title = "Cloud"
tabBarController?.navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .Add)
}
override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) {
@ -29,16 +28,10 @@ class CloudBooksController: UITableViewController, NSFetchedResultsControllerDel
let cell = sender as? UITableViewCell,
let indexPath = tableView.indexPathForCell(cell),
let book = fetchedResultController.objectAtIndexPath(indexPath) as? Book else {return}
// navController.setViewControllers([bookDetailController], animated: false)
bookDetailController.book = book
default:
break
}
}
@IBAction func dismissSelf(sender: UIBarButtonItem) {
dismissViewControllerAnimated(true, completion: nil)
}
// MARK: - TableView Data Source

13
Kiwix-iOS/Controller/Library/LibrarySplitViewController.swift
View File

@ -11,9 +11,22 @@ import UIKit
class LibrarySplitViewController: UISplitViewController, UISplitViewControllerDelegate {
override func viewDidLoad() {
super.viewDidLoad()
preferredDisplayMode = .AllVisible
minimumPrimaryColumnWidth = 320.0
delegate = self
configureDismissButton()
}
func configureDismissButton() {
guard let master = viewControllers.first as? UINavigationController else {return}
let barButtonItem = UIBarButtonItem(image: UIImage(named: "Cross"), style: .Plain, target: self, action: #selector(LibrarySplitViewController.dismiss))
master.topViewController?.navigationItem.leftBarButtonItem = barButtonItem
}
func dismiss() {
dismissViewControllerAnimated(true, completion: nil)
}
func splitViewController(splitViewController: UISplitViewController, collapseSecondaryViewController secondaryViewController: UIViewController, ontoPrimaryViewController primaryViewController: UIViewController) -> Bool {

2
Kiwix-iOS/Controller/LibraryTabBarController.swift
View File

@ -9,6 +9,8 @@
import UIKit
class LibraryTabBarController: UITabBarController {
@IBAction func dismissSelf(sender: UIBarButtonItem) {
}
override func viewWillLayoutSubviews() {
super.viewWillLayoutSubviews()

2
Kiwix-iOS/Info.plist
View File

@ -49,7 +49,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>1.7.921</string>
<string>1.7.955</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSRequiresIPhoneOS</key>

59
Kiwix-iOS/Storyboard/LibraryNew.storyboard
View File

@ -7,7 +7,26 @@
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
</dependencies>
<scenes>
<!--Cloud Books Controller-->
<!--Item-->
<scene sceneID="Z94-UE-SvI">
<objects>
<viewController id="p0I-zU-5qV" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="nu8-CK-H36"/>
<viewControllerLayoutGuide type="bottom" id="p6q-cA-WGU"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="oMN-bs-dxj">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</view>
<tabBarItem key="tabBarItem" title="Item" id="5Bd-ZA-ldb"/>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="ZlT-CK-dem" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="1269" y="-3073"/>
</scene>
<!--Item-->
<scene sceneID="x2g-Rm-HUS">
<objects>
<tableViewController clearsSelectionOnViewWillAppear="NO" id="NBP-9l-DA2" customClass="CloudBooksController" customModule="Kiwix" customModuleProvider="target" sceneMemberID="viewController">
@ -132,16 +151,30 @@
<outlet property="delegate" destination="NBP-9l-DA2" id="sqX-J8-zlB"/>
</connections>
</tableView>
<navigationItem key="navigationItem" id="JNh-sG-ihV">
<barButtonItem key="leftBarButtonItem" image="Cross" id="D4H-l5-1nf">
<connections>
<action selector="dismissSelf:" destination="NBP-9l-DA2" id="h1L-7d-KgQ"/>
</connections>
</barButtonItem>
</navigationItem>
<tabBarItem key="tabBarItem" title="Item" id="f2P-kQ-k9n"/>
<navigationItem key="navigationItem" id="JNh-sG-ihV"/>
</tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="TMf-0g-nhn" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="1302" y="-2382"/>
</scene>
<!--Tab Bar Controller-->
<scene sceneID="agT-3o-3JF">
<objects>
<tabBarController id="3ak-pB-UJc" sceneMemberID="viewController">
<navigationItem key="navigationItem" id="S1d-mX-z4c"/>
<tabBar key="tabBar" contentMode="scaleToFill" id="dzD-NJ-YZo">
<rect key="frame" x="0.0" y="0.0" width="320" height="49"/>
<autoresizingMask key="autoresizingMask"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</tabBar>
<connections>
<segue destination="NBP-9l-DA2" kind="relationship" relationship="viewControllers" id="Zb0-fu-dUz"/>
<segue destination="p0I-zU-5qV" kind="relationship" relationship="viewControllers" id="RKJ-7Q-QsH"/>
</connections>
</tabBarController>
<placeholder placeholderIdentifier="IBFirstResponder" id="fdG-uk-I8F" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="549" y="-2382"/>
</scene>
<!--Book Detail Controller-->
@ -301,11 +334,12 @@
<scene sceneID="iPB-M6-tf1">
<objects>
<navigationController title="Master" id="aoH-fG-6vF" sceneMemberID="viewController">
<tabBarItem key="tabBarItem" title="Item" id="7ri-BN-A3S"/>
<navigationBar key="navigationBar" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" id="ZxN-DM-Axu">
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
<connections>
<segue destination="NBP-9l-DA2" kind="relationship" relationship="rootViewController" id="nHF-I8-OHT"/>
<segue destination="3ak-pB-UJc" kind="relationship" relationship="rootViewController" id="SAi-fH-E9p"/>
</connections>
</navigationController>
<placeholder placeholderIdentifier="IBFirstResponder" id="Otv-ep-Zn3" sceneMemberID="firstResponder"/>
@ -350,8 +384,8 @@
<splitViewController id="NKc-wz-xqy" customClass="LibrarySplitViewController" customModule="Kiwix" customModuleProvider="target" sceneMemberID="viewController">
<toolbarItems/>
<connections>
<segue destination="aoH-fG-6vF" kind="relationship" relationship="masterViewController" id="zLO-fk-Yq7"/>
<segue destination="5Sz-gR-dgz" kind="relationship" relationship="detailViewController" id="hUB-db-MDL"/>
<segue destination="aoH-fG-6vF" kind="relationship" relationship="masterViewController" id="DQx-ad-mEu"/>
</connections>
</splitViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="169-23-fJy" sceneMemberID="firstResponder"/>
@ -359,10 +393,7 @@
<point key="canvasLocation" x="-1016" y="-2082"/>
</scene>
</scenes>
<resources>
<image name="Cross" width="21" height="21"/>
</resources>
<inferredMetricsTieBreakers>
<segue reference="hUB-db-MDL"/>
<segue reference="N3M-rH-rAM"/>
</inferredMetricsTieBreakers>
</document>

2
Kiwix-iOSWidgets/Bookmarks/Info.plist
View File

@ -21,7 +21,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.7.992</string>
<string>1.7.1032</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionMainStoryboard</key>

34
Kiwix.xcworkspace/xcuserdata/chrisli.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View File

@ -2,4 +2,38 @@
<Bucket
type = "0"
version = "2.0">
<Breakpoints>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Kiwix-iOS/Controller/Library/LibraryTabBarController.swift"
timestampString = "493314092.554991"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "14"
endingLineNumber = "14"
landmarkName = "viewDidLoad(_:)"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Kiwix-iOS/Controller/Library/LibrarySplitViewController.swift"
timestampString = "493324179.523606"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "29"
endingLineNumber = "29"
landmarkName = "dismiss()"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>