Skip to content

Commit 9b59622

Browse files
author
Ricardo Santos
committed
Merge branch 'release/0.1.2'
2 parents e7aa19d + a9676ec commit 9b59622

File tree

7 files changed

+16
-51
lines changed

7 files changed

+16
-51
lines changed

Example/FazeKit.xcodeproj/project.pbxproj

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
/* Begin PBXBuildFile section */
1010
001E08B093E8C3424128E837 /* Pods_FazeKit_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C5F04A4E1B4661BFB20EEE1D /* Pods_FazeKit_Example.framework */; };
1111
607FACD61AFB9204008FA782 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACD51AFB9204008FA782 /* AppDelegate.swift */; };
12-
607FACD81AFB9204008FA782 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACD71AFB9204008FA782 /* ViewController.swift */; };
13-
607FACDB1AFB9204008FA782 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 607FACD91AFB9204008FA782 /* Main.storyboard */; };
12+
607FACD81AFB9204008FA782 /* MenuViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACD71AFB9204008FA782 /* MenuViewController.swift */; };
1413
607FACDD1AFB9204008FA782 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 607FACDC1AFB9204008FA782 /* Images.xcassets */; };
1514
607FACE01AFB9204008FA782 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 607FACDE1AFB9204008FA782 /* LaunchScreen.xib */; };
1615
607FACEC1AFB9204008FA782 /* UIViewAdditionsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACEB1AFB9204008FA782 /* UIViewAdditionsTests.swift */; };
@@ -36,8 +35,7 @@
3635
607FACD01AFB9204008FA782 /* FazeKit_Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FazeKit_Example.app; sourceTree = BUILT_PRODUCTS_DIR; };
3736
607FACD41AFB9204008FA782 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
3837
607FACD51AFB9204008FA782 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
39-
607FACD71AFB9204008FA782 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
40-
607FACDA1AFB9204008FA782 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
38+
607FACD71AFB9204008FA782 /* MenuViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuViewController.swift; sourceTree = "<group>"; };
4139
607FACDC1AFB9204008FA782 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
4240
607FACDF1AFB9204008FA782 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
4341
607FACE51AFB9204008FA782 /* FazeKit_Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = FazeKit_Tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -105,8 +103,7 @@
105103
isa = PBXGroup;
106104
children = (
107105
607FACD51AFB9204008FA782 /* AppDelegate.swift */,
108-
607FACD71AFB9204008FA782 /* ViewController.swift */,
109-
607FACD91AFB9204008FA782 /* Main.storyboard */,
106+
607FACD71AFB9204008FA782 /* MenuViewController.swift */,
110107
607FACDC1AFB9204008FA782 /* Images.xcassets */,
111108
607FACDE1AFB9204008FA782 /* LaunchScreen.xib */,
112109
607FACD31AFB9204008FA782 /* Supporting Files */,
@@ -249,7 +246,6 @@
249246
isa = PBXResourcesBuildPhase;
250247
buildActionMask = 2147483647;
251248
files = (
252-
607FACDB1AFB9204008FA782 /* Main.storyboard in Resources */,
253249
607FACE01AFB9204008FA782 /* LaunchScreen.xib in Resources */,
254250
607FACDD1AFB9204008FA782 /* Images.xcassets in Resources */,
255251
);
@@ -362,7 +358,7 @@
362358
isa = PBXSourcesBuildPhase;
363359
buildActionMask = 2147483647;
364360
files = (
365-
607FACD81AFB9204008FA782 /* ViewController.swift in Sources */,
361+
607FACD81AFB9204008FA782 /* MenuViewController.swift in Sources */,
366362
607FACD61AFB9204008FA782 /* AppDelegate.swift in Sources */,
367363
);
368364
runOnlyForDeploymentPostprocessing = 0;
@@ -387,14 +383,6 @@
387383
/* End PBXTargetDependency section */
388384

389385
/* Begin PBXVariantGroup section */
390-
607FACD91AFB9204008FA782 /* Main.storyboard */ = {
391-
isa = PBXVariantGroup;
392-
children = (
393-
607FACDA1AFB9204008FA782 /* Base */,
394-
);
395-
name = Main.storyboard;
396-
sourceTree = "<group>";
397-
};
398386
607FACDE1AFB9204008FA782 /* LaunchScreen.xib */ = {
399387
isa = PBXVariantGroup;
400388
children = (

Example/FazeKit/AppDelegate.swift

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
2828

2929

3030
func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
31-
// Override point for customization after application launch.
31+
self.window = UIWindow(frame: UIScreen.mainScreen().bounds)
32+
33+
self.window?.rootViewController = UINavigationController(rootViewController: MenuViewController())
34+
self.window?.backgroundColor = UIColor.blackColor()
35+
self.window?.makeKeyAndVisible()
36+
3237
return true
3338
}
3439

Example/FazeKit/Base.lproj/Main.storyboard

Lines changed: 0 additions & 25 deletions
This file was deleted.

Example/FazeKit/Info.plist

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424
<true/>
2525
<key>UILaunchStoryboardName</key>
2626
<string>LaunchScreen</string>
27-
<key>UIMainStoryboardFile</key>
28-
<string>Main</string>
2927
<key>UIRequiredDeviceCapabilities</key>
3028
<array>
3129
<string>armv7</string>
@@ -34,6 +32,7 @@
3432
<array>
3533
<string>UIInterfaceOrientationPortrait</string>
3634
<string>UIInterfaceOrientationLandscapeLeft</string>
35+
<string>UIInterfaceOrientationLandscapeRight</string>
3736
</array>
3837
</dict>
3938
</plist>
Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,13 @@
2222
import UIKit
2323
import FazeKit
2424

25-
class ViewController: UIViewController {
25+
class MenuViewController: UIViewController {
2626

2727
override func viewDidLoad() {
2828
super.viewDidLoad()
2929

30-
let testView = UIView(frame: CGRectMake(20.0, 40.0, 120.0, 32.0))
31-
testView.backgroundColor = UIColor.redColor()
32-
testView.origin = CGPointMake(40.0, 50.0)
33-
self.view.addSubview(testView)
30+
self.title = "FazeKit"
31+
self.view.backgroundColor = UIColor.whiteColor()
3432
}
3533

3634
override func didReceiveMemoryWarning() {

FazeKit.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'FazeKit'
3-
s.version = '0.1.1'
3+
s.version = '0.1.2'
44
s.summary = 'A collection of helper functions and extensions for Swift iOS apps'
55
s.description = 'A collection of extensions and convenience functions on Foundation, UIKit and other Cocoa Frameworks, built in Swift for iOS development'
66
s.homepage = 'https://github.com/NextFaze/FazeKit'

FazeKit/Classes/UIDeviceAdditions.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public extension UIDevice {
5757
let filenames = ["/Applications/Cydia.app", "/Library/MobileSubstrate/MobileSubstrate.dylib", "/bin/bash", "/usr/sbin/sshd", "/etc/apt", "/usr/bin/ssh"]
5858
let fileManager = NSFileManager.defaultManager()
5959
guard filenames.firstMatch({fileManager.fileExistsAtPath($0)}) == nil else { return true }
60-
guard url = NSURL(string: "cydia://package/com.example.package") else { return false }
60+
guard let url = NSURL(string: "cydia://package/com.example.package") else { return false }
6161
return UIApplication.sharedApplication().canOpenURL(url)
6262
#endif
6363
}

0 commit comments

Comments
 (0)