Skip to content

Commit

Permalink
Merge branch 'release/0.1.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
Ricardo Santos committed Aug 18, 2016
2 parents e7aa19d + a9676ec commit 9b59622
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 51 deletions.
20 changes: 4 additions & 16 deletions Example/FazeKit.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
/* Begin PBXBuildFile section */
001E08B093E8C3424128E837 /* Pods_FazeKit_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C5F04A4E1B4661BFB20EEE1D /* Pods_FazeKit_Example.framework */; };
607FACD61AFB9204008FA782 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACD51AFB9204008FA782 /* AppDelegate.swift */; };
607FACD81AFB9204008FA782 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACD71AFB9204008FA782 /* ViewController.swift */; };
607FACDB1AFB9204008FA782 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 607FACD91AFB9204008FA782 /* Main.storyboard */; };
607FACD81AFB9204008FA782 /* MenuViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACD71AFB9204008FA782 /* MenuViewController.swift */; };
607FACDD1AFB9204008FA782 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 607FACDC1AFB9204008FA782 /* Images.xcassets */; };
607FACE01AFB9204008FA782 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 607FACDE1AFB9204008FA782 /* LaunchScreen.xib */; };
607FACEC1AFB9204008FA782 /* UIViewAdditionsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACEB1AFB9204008FA782 /* UIViewAdditionsTests.swift */; };
Expand All @@ -36,8 +35,7 @@
607FACD01AFB9204008FA782 /* FazeKit_Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FazeKit_Example.app; sourceTree = BUILT_PRODUCTS_DIR; };
607FACD41AFB9204008FA782 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
607FACD51AFB9204008FA782 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
607FACD71AFB9204008FA782 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
607FACDA1AFB9204008FA782 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
607FACD71AFB9204008FA782 /* MenuViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuViewController.swift; sourceTree = "<group>"; };
607FACDC1AFB9204008FA782 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
607FACDF1AFB9204008FA782 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
607FACE51AFB9204008FA782 /* FazeKit_Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = FazeKit_Tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down Expand Up @@ -105,8 +103,7 @@
isa = PBXGroup;
children = (
607FACD51AFB9204008FA782 /* AppDelegate.swift */,
607FACD71AFB9204008FA782 /* ViewController.swift */,
607FACD91AFB9204008FA782 /* Main.storyboard */,
607FACD71AFB9204008FA782 /* MenuViewController.swift */,
607FACDC1AFB9204008FA782 /* Images.xcassets */,
607FACDE1AFB9204008FA782 /* LaunchScreen.xib */,
607FACD31AFB9204008FA782 /* Supporting Files */,
Expand Down Expand Up @@ -249,7 +246,6 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
607FACDB1AFB9204008FA782 /* Main.storyboard in Resources */,
607FACE01AFB9204008FA782 /* LaunchScreen.xib in Resources */,
607FACDD1AFB9204008FA782 /* Images.xcassets in Resources */,
);
Expand Down Expand Up @@ -362,7 +358,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
607FACD81AFB9204008FA782 /* ViewController.swift in Sources */,
607FACD81AFB9204008FA782 /* MenuViewController.swift in Sources */,
607FACD61AFB9204008FA782 /* AppDelegate.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -387,14 +383,6 @@
/* End PBXTargetDependency section */

/* Begin PBXVariantGroup section */
607FACD91AFB9204008FA782 /* Main.storyboard */ = {
isa = PBXVariantGroup;
children = (
607FACDA1AFB9204008FA782 /* Base */,
);
name = Main.storyboard;
sourceTree = "<group>";
};
607FACDE1AFB9204008FA782 /* LaunchScreen.xib */ = {
isa = PBXVariantGroup;
children = (
Expand Down
7 changes: 6 additions & 1 deletion Example/FazeKit/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate {


func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
// Override point for customization after application launch.
self.window = UIWindow(frame: UIScreen.mainScreen().bounds)

self.window?.rootViewController = UINavigationController(rootViewController: MenuViewController())
self.window?.backgroundColor = UIColor.blackColor()
self.window?.makeKeyAndVisible()

return true
}

Expand Down
25 changes: 0 additions & 25 deletions Example/FazeKit/Base.lproj/Main.storyboard

This file was deleted.

3 changes: 1 addition & 2 deletions Example/FazeKit/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
<true/>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>
<string>Main</string>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>armv7</string>
Expand All @@ -34,6 +32,7 @@
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
</dict>
</plist>
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,13 @@
import UIKit
import FazeKit

class ViewController: UIViewController {
class MenuViewController: UIViewController {

override func viewDidLoad() {
super.viewDidLoad()

let testView = UIView(frame: CGRectMake(20.0, 40.0, 120.0, 32.0))
testView.backgroundColor = UIColor.redColor()
testView.origin = CGPointMake(40.0, 50.0)
self.view.addSubview(testView)
self.title = "FazeKit"
self.view.backgroundColor = UIColor.whiteColor()
}

override func didReceiveMemoryWarning() {
Expand Down
2 changes: 1 addition & 1 deletion FazeKit.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'FazeKit'
s.version = '0.1.1'
s.version = '0.1.2'
s.summary = 'A collection of helper functions and extensions for Swift iOS apps'
s.description = 'A collection of extensions and convenience functions on Foundation, UIKit and other Cocoa Frameworks, built in Swift for iOS development'
s.homepage = 'https://github.com/NextFaze/FazeKit'
Expand Down
2 changes: 1 addition & 1 deletion FazeKit/Classes/UIDeviceAdditions.swift
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public extension UIDevice {
let filenames = ["/Applications/Cydia.app", "/Library/MobileSubstrate/MobileSubstrate.dylib", "/bin/bash", "/usr/sbin/sshd", "/etc/apt", "/usr/bin/ssh"]
let fileManager = NSFileManager.defaultManager()
guard filenames.firstMatch({fileManager.fileExistsAtPath($0)}) == nil else { return true }
guard url = NSURL(string: "cydia://package/com.example.package") else { return false }
guard let url = NSURL(string: "cydia://package/com.example.package") else { return false }
return UIApplication.sharedApplication().canOpenURL(url)
#endif
}
Expand Down

0 comments on commit 9b59622

Please sign in to comment.