Skip to content

Commit 6b47996

Browse files
author
Jordy van Kuijk
committed
amost done, total rewrite to swift
1 parent 3070509 commit 6b47996

26 files changed

Lines changed: 1536 additions & 46 deletions

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ Carthage
3030
# Note: if you ignore the Pods directory, make sure to uncomment
3131
# `pod install` in .travis.yml
3232
#
33-
# Pods/
33+
Pods/

Example/Podfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,5 @@ end
77

88
target 'RFDuino_Tests', :exclusive => true do
99
pod 'RFDuino', :path => '../'
10-
1110

1211
end

Example/Podfile.lock

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
PODS:
2+
- RFDuino (0.1.0)
3+
4+
DEPENDENCIES:
5+
- RFDuino (from `../`)
6+
7+
EXTERNAL SOURCES:
8+
RFDuino:
9+
:path: ../
10+
11+
SPEC CHECKSUMS:
12+
RFDuino: 83a58b25852a355979b237a30f232dd134c879af
13+
14+
COCOAPODS: 0.39.0

Example/RFDuino.xcodeproj/project.pbxproj

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@
88

99
/* Begin PBXBuildFile section */
1010
607FACD61AFB9204008FA782 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACD51AFB9204008FA782 /* AppDelegate.swift */; };
11-
607FACD81AFB9204008FA782 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACD71AFB9204008FA782 /* ViewController.swift */; };
1211
607FACDB1AFB9204008FA782 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 607FACD91AFB9204008FA782 /* Main.storyboard */; };
1312
607FACDD1AFB9204008FA782 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 607FACDC1AFB9204008FA782 /* Images.xcassets */; };
1413
607FACE01AFB9204008FA782 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 607FACDE1AFB9204008FA782 /* LaunchScreen.xib */; };
1514
607FACEC1AFB9204008FA782 /* Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACEB1AFB9204008FA782 /* Tests.swift */; };
1615
7C649C9CEF43D1297534BCDE /* Pods_RFDuino_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29C5E0C6161B892EF3A4AD70 /* Pods_RFDuino_Tests.framework */; };
16+
E5E52A721C58D2CF00D2691B /* DiscoveryTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E5E52A711C58D2CF00D2691B /* DiscoveryTableViewController.swift */; };
17+
E5E52A761C590B7500D2691B /* DetailsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E5E52A751C590B7500D2691B /* DetailsViewController.swift */; };
1718
E6FF88E4FD755D457A8B04C0 /* Pods_RFDuino_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EF7C6AEF16870AAB5FB61DF0 /* Pods_RFDuino_Example.framework */; };
1819
/* End PBXBuildFile section */
1920

@@ -35,7 +36,6 @@
3536
607FACD01AFB9204008FA782 /* RFDuino_Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RFDuino_Example.app; sourceTree = BUILT_PRODUCTS_DIR; };
3637
607FACD41AFB9204008FA782 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
3738
607FACD51AFB9204008FA782 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
38-
607FACD71AFB9204008FA782 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
3939
607FACDA1AFB9204008FA782 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
4040
607FACDC1AFB9204008FA782 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
4141
607FACDF1AFB9204008FA782 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
@@ -45,6 +45,8 @@
4545
94258A1AC7231AA53B94EC25 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
4646
B44FAA30EEB267354A75F92A /* Pods-RFDuino_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RFDuino_Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-RFDuino_Tests/Pods-RFDuino_Tests.release.xcconfig"; sourceTree = "<group>"; };
4747
CAE5079C6EF7BECE65C754CE /* Pods-RFDuino_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RFDuino_Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RFDuino_Tests/Pods-RFDuino_Tests.debug.xcconfig"; sourceTree = "<group>"; };
48+
E5E52A711C58D2CF00D2691B /* DiscoveryTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DiscoveryTableViewController.swift; sourceTree = "<group>"; };
49+
E5E52A751C590B7500D2691B /* DetailsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DetailsViewController.swift; sourceTree = "<group>"; };
4850
EF7C6AEF16870AAB5FB61DF0 /* Pods_RFDuino_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RFDuino_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
4951
F4FC882241EE5C48741225CE /* Pods-RFDuino_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RFDuino_Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-RFDuino_Example/Pods-RFDuino_Example.release.xcconfig"; sourceTree = "<group>"; };
5052
/* End PBXFileReference section */
@@ -103,7 +105,8 @@
103105
isa = PBXGroup;
104106
children = (
105107
607FACD51AFB9204008FA782 /* AppDelegate.swift */,
106-
607FACD71AFB9204008FA782 /* ViewController.swift */,
108+
E5E52A711C58D2CF00D2691B /* DiscoveryTableViewController.swift */,
109+
E5E52A751C590B7500D2691B /* DetailsViewController.swift */,
107110
607FACD91AFB9204008FA782 /* Main.storyboard */,
108111
607FACDC1AFB9204008FA782 /* Images.xcassets */,
109112
607FACDE1AFB9204008FA782 /* LaunchScreen.xib */,
@@ -359,8 +362,9 @@
359362
isa = PBXSourcesBuildPhase;
360363
buildActionMask = 2147483647;
361364
files = (
362-
607FACD81AFB9204008FA782 /* ViewController.swift in Sources */,
365+
E5E52A721C58D2CF00D2691B /* DiscoveryTableViewController.swift in Sources */,
363366
607FACD61AFB9204008FA782 /* AppDelegate.swift in Sources */,
367+
E5E52A761C590B7500D2691B /* DetailsViewController.swift in Sources */,
364368
);
365369
runOnlyForDeploymentPostprocessing = 0;
366370
};
@@ -406,6 +410,7 @@
406410
isa = XCBuildConfiguration;
407411
buildSettings = {
408412
ALWAYS_SEARCH_USER_PATHS = NO;
413+
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
409414
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
410415
CLANG_CXX_LIBRARY = "libc++";
411416
CLANG_ENABLE_MODULES = YES;
@@ -451,6 +456,7 @@
451456
isa = XCBuildConfiguration;
452457
buildSettings = {
453458
ALWAYS_SEARCH_USER_PATHS = NO;
459+
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
454460
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
455461
CLANG_CXX_LIBRARY = "libc++";
456462
CLANG_ENABLE_MODULES = YES;

Example/RFDuino.xcworkspace/contents.xcworkspacedata

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/RFDuino/AppDelegate.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
1313

1414
var window: UIWindow?
1515

16-
1716
func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
1817
// Override point for customization after application launch.
1918
return true

Example/RFDuino/Base.lproj/LaunchScreen.xib

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6214" systemVersion="14A314h" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15C50" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
33
<dependencies>
4-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6207"/>
4+
<deployment identifier="iOS"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
56
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
67
</dependencies>
78
<objects>
@@ -14,13 +15,13 @@
1415
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" Copyright (c) 2015 CocoaPods. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
1516
<rect key="frame" x="20" y="439" width="441" height="21"/>
1617
<fontDescription key="fontDescription" type="system" pointSize="17"/>
17-
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
18+
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
1819
<nil key="highlightedColor"/>
1920
</label>
2021
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="RFDuino" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
2122
<rect key="frame" x="20" y="140" width="441" height="43"/>
2223
<fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
23-
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
24+
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
2425
<nil key="highlightedColor"/>
2526
</label>
2627
</subviews>

0 commit comments

Comments
 (0)