update project config

This commit is contained in:
Chris Li 2016-08-30 15:04:45 -04:00
parent 6543c2e1c4
commit 3acc1ddf08
8 changed files with 26 additions and 27 deletions

View File

@ -26,8 +26,8 @@ class CloudBooksController: UITableViewController, NSFetchedResultsControllerDel
override func viewDidLoad() {
super.viewDidLoad()
tableView.emptyDataSetSource = self
tableView.emptyDataSetDelegate = self
// tableView.emptyDataSetSource = self
// tableView.emptyDataSetDelegate = self
tableView.tableFooterView = UIView()
refreshControl = RefreshLibControl()
@ -91,6 +91,10 @@ class CloudBooksController: UITableViewController, NSFetchedResultsControllerDel
NSOperationQueue.mainQueue().addOperationWithBlock({
self.refreshControl?.endRefreshing()
})
let t = ReachabilityCondition.Error.NotReachable
// if let error = errors.first {
// guard error == ReachabilityCondition.Error.NotReachable else {return}
// }
})
GlobalOperationQueue.sharedInstance.addOperation(operation)
}

View File

@ -12,7 +12,7 @@ import DZNEmptyDataSet
extension CloudBooksController {
func titleForEmptyDataSet(scrollView: UIScrollView!) -> NSAttributedString! {
let string = NSLocalizedString("", comment: "")
let string = NSLocalizedString("Library is Empty", comment: "")
let attributes = [NSFontAttributeName: UIFont.systemFontOfSize(18), NSForegroundColorAttributeName: UIColor.darkGrayColor()]
return NSAttributedString(string: string, attributes: attributes)
}
@ -21,7 +21,7 @@ extension CloudBooksController {
extension DownloadTasksController {
func titleForEmptyDataSet(scrollView: UIScrollView!) -> NSAttributedString! {
let string = NSLocalizedString("No task", comment: "")
let string = NSLocalizedString("No Download Tasks", comment: "")
let attributes = [NSFontAttributeName: UIFont.systemFontOfSize(18), NSForegroundColorAttributeName: UIColor.darkGrayColor()]
return NSAttributedString(string: string, attributes: attributes)
}
@ -33,7 +33,7 @@ extension DownloadTasksController {
extension LocalBooksController {
func titleForEmptyDataSet(scrollView: UIScrollView!) -> NSAttributedString! {
let string = NSLocalizedString("No Local Books", comment: "")
let string = NSLocalizedString("No Local Books on Device", comment: "")
let attributes = [NSFontAttributeName: UIFont.systemFontOfSize(18), NSForegroundColorAttributeName: UIColor.darkGrayColor()]
return NSAttributedString(string: string, attributes: attributes)
}

View File

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

View File

@ -219,7 +219,7 @@
</view>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="RightDetailCell" textLabel="iyO-rf-lDN" detailTextLabel="iHv-oK-qrR" style="IBUITableViewCellStyleValue1" id="eB8-dt-BPR">
<rect key="frame" x="0.0" y="185" width="375" height="44"/>
<rect key="frame" x="0.0" y="184.5" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="eB8-dt-BPR" id="KR4-kV-SZd">
<frame key="frameInset" width="375" height="43.5"/>
@ -243,10 +243,10 @@
</tableViewCellContentView>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="CenterButtonCell" id="B0D-Hu-sVM" customClass="CenterButtonCell" customModule="Kiwix" customModuleProvider="target">
<rect key="frame" x="0.0" y="229" width="375" height="44"/>
<rect key="frame" x="0.0" y="228.5" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="B0D-Hu-sVM" id="Fhf-jb-Urf">
<frame key="frameInset" width="375" height="43"/>
<frame key="frameInset" width="375" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="TLs-eg-B0R">
@ -271,7 +271,7 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="TextSwitchCell" id="c4v-9p-eEF" customClass="TextSwitchCell" customModule="Kiwix" customModuleProvider="target">
<rect key="frame" x="0.0" y="273" width="375" height="44"/>
<rect key="frame" x="0.0" y="272.5" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="c4v-9p-eEF" id="Lt6-0C-r4i">
<frame key="frameInset" width="375" height="43.5"/>
@ -315,7 +315,7 @@
</tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="mqT-2V-BJm" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="1644" y="-1203"/>
<point key="canvasLocation" x="1644" y="-1203.1484257871066"/>
</scene>
<!--Navigation Controller-->
<scene sceneID="gvc-DO-J6G">

View File

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

View File

@ -1888,7 +1888,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = DA0AB5D61F19BE37BD0AFA0A /* Pods-Kiwix-iOS.debug.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ALWAYS_SEARCH_USER_PATHS = NO;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
@ -1925,7 +1925,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 5B9300794E7F4EFE5B3E8F19 /* Pods-Kiwix-iOS.release.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ALWAYS_SEARCH_USER_PATHS = NO;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";

View File

@ -5,7 +5,6 @@ target 'Kiwix-iOS' do
platform :ios, '9.0'
pod 'DateTools'
pod 'DZNEmptyDataSet'
pod 'SwiftyUserDefaults'
pod 'Operations', :git => 'https://github.com/ProcedureKit/ProcedureKit.git', :branch => 'swift/2.3'
@ -16,7 +15,6 @@ target 'Kiwix-OSX' do
platform :osx, '10.10'
pod 'DateTools'
pod 'Operations', :git => 'https://github.com/ProcedureKit/ProcedureKit.git', :branch => 'swift/2.3'
end

View File

@ -1,13 +1,11 @@
PODS:
- DateTools (1.7.0)
- DZNEmptyDataSet (1.8.1)
- Operations (3.1.0):
- Operations/Standard (= 3.1.0)
- Operations/Standard (3.1.0)
- SwiftyUserDefaults (2.2.0)
- Operations (3.2.0):
- Operations/Standard (= 3.2.0)
- Operations/Standard (3.2.0)
- SwiftyUserDefaults (2.2.1)
DEPENDENCIES:
- DateTools
- DZNEmptyDataSet
- Operations (from `https://github.com/ProcedureKit/ProcedureKit.git`, branch `swift/2.3`)
- SwiftyUserDefaults
@ -19,15 +17,14 @@ EXTERNAL SOURCES:
CHECKOUT OPTIONS:
Operations:
:commit: 5964aebb4abd76c466232c6477fcfdded2395cdc
:commit: 9761166587775ac75230df4b72a883392e5d35e5
:git: https://github.com/ProcedureKit/ProcedureKit.git
SPEC CHECKSUMS:
DateTools: 53288ee8b905fdc75897a1e6b5cc0144b14cba60
DZNEmptyDataSet: 9525833b9e68ac21c30253e1d3d7076cc828eaa7
Operations: d09dbb1c32ce01061ebbb022c8a955b34fd9ec35
SwiftyUserDefaults: e7c8197a9d4068702e7f2406a968cae413b8de27
Operations: 4c5f06d7328f1b097d5dac5c0d614917ecbc96e7
SwiftyUserDefaults: 7abdba50a50ea0c18ee8903af3c88e4c1cb8448d
PODFILE CHECKSUM: dafe7442de9229d78c81ec09646e9230caf12c71
PODFILE CHECKSUM: 385ab6f80e54cf2d2a029ad39e3ce32eaa738fcc
COCOAPODS: 1.0.1