Skip to content

Commit

Permalink
Update Near for beta 5. (#1)
Browse files Browse the repository at this point in the history 
Add table views, make UI nicer.
  • Loading branch information
@logancautrell
logancautrell authored Aug 23, 2017
1 parent 9754da9 commit 4c55f9b
Show file tree
Hide file tree
Showing 9 changed files with 351 additions and 117 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.DS_Store
34 changes: 21 additions & 13 deletions Near.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,25 @@
objects = {

/* Begin PBXBuildFile section */
B2378A7D1F4DDF2F003050FD /* TableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2378A7C1F4DDF2F003050FD /* TableViewCell.swift */; };
B2378A7F1F4DE0F6003050FD /* DetailsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2378A7E1F4DE0F6003050FD /* DetailsViewController.swift */; };
B27DAC8C1EE6FD1D009A9653 /* CoreNFC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B28DF23F1EE6FB42005EA143 /* CoreNFC.framework */; };
B28DF22B1EE6F845005EA143 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B28DF22A1EE6F845005EA143 /* AppDelegate.swift */; };
B28DF22D1EE6F845005EA143 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B28DF22C1EE6F845005EA143 /* ViewController.swift */; };
B28DF22D1EE6F845005EA143 /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B28DF22C1EE6F845005EA143 /* MainViewController.swift */; };
B28DF2301EE6F845005EA143 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B28DF22E1EE6F845005EA143 /* Main.storyboard */; };
B28DF2321EE6F845005EA143 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B28DF2311EE6F845005EA143 /* Assets.xcassets */; };
B28DF2351EE6F845005EA143 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B28DF2331EE6F845005EA143 /* LaunchScreen.storyboard */; };
B28DF23D1EE6F875005EA143 /* NearFieldCommunicator.swift in Sources */ = {isa = PBXBuildFile; fileRef = B28DF23C1EE6F875005EA143 /* NearFieldCommunicator.swift */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
B24196011EF2E3480051437F /* NFCReader.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; name = NFCReader.entitlements; path = "../../../../Downloads/NFC-Reader-for-iPhone-CoreNFC--master/NFCReader.entitlements"; sourceTree = "<group>"; };
B2378A7A1F4CA1D4003050FD /* NFCReader.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = NFCReader.entitlements; sourceTree = "<group>"; };
B2378A7C1F4DDF2F003050FD /* TableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TableViewCell.swift; sourceTree = "<group>"; };
B2378A7E1F4DE0F6003050FD /* DetailsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetailsViewController.swift; sourceTree = "<group>"; };
B27DAC8B1EE6FCBB009A9653 /* FileProvider.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FileProvider.framework; path = System/Library/Frameworks/FileProvider.framework; sourceTree = SDKROOT; };
B28DF2271EE6F845005EA143 /* Near.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Near.app; sourceTree = BUILT_PRODUCTS_DIR; };
B28DF22A1EE6F845005EA143 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
B28DF22C1EE6F845005EA143 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
B28DF22C1EE6F845005EA143 /* MainViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainViewController.swift; sourceTree = "<group>"; };
B28DF22F1EE6F845005EA143 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
B28DF2311EE6F845005EA143 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
B28DF2341EE6F845005EA143 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
Expand Down Expand Up @@ -62,14 +66,16 @@
B28DF2291EE6F845005EA143 /* Near */ = {
isa = PBXGroup;
children = (
B24196011EF2E3480051437F /* NFCReader.entitlements */,
B28DF22A1EE6F845005EA143 /* AppDelegate.swift */,
B28DF22C1EE6F845005EA143 /* ViewController.swift */,
B2378A7A1F4CA1D4003050FD /* NFCReader.entitlements */,
B28DF22C1EE6F845005EA143 /* MainViewController.swift */,
B2378A7E1F4DE0F6003050FD /* DetailsViewController.swift */,
B28DF22E1EE6F845005EA143 /* Main.storyboard */,
B28DF2311EE6F845005EA143 /* Assets.xcassets */,
B28DF2331EE6F845005EA143 /* LaunchScreen.storyboard */,
B28DF2361EE6F845005EA143 /* Info.plist */,
B28DF23C1EE6F875005EA143 /* NearFieldCommunicator.swift */,
B2378A7C1F4DDF2F003050FD /* TableViewCell.swift */,
);
path = Near;
sourceTree = "<group>";
Expand Down Expand Up @@ -115,7 +121,7 @@
TargetAttributes = {
B28DF2261EE6F845005EA143 = {
CreatedOnToolsVersion = 9.0;
ProvisioningStyle = Manual;
ProvisioningStyle = Automatic;
};
};
};
Expand Down Expand Up @@ -155,9 +161,11 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
B28DF22D1EE6F845005EA143 /* ViewController.swift in Sources */,
B28DF22D1EE6F845005EA143 /* MainViewController.swift in Sources */,
B2378A7D1F4DDF2F003050FD /* TableViewCell.swift in Sources */,
B28DF22B1EE6F845005EA143 /* AppDelegate.swift in Sources */,
B28DF23D1EE6F875005EA143 /* NearFieldCommunicator.swift in Sources */,
B2378A7F1F4DE0F6003050FD /* DetailsViewController.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -292,15 +300,15 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = Near/NFCReader.entitlements;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = R5JUTH26F4;
INFOPLIST_FILE = Near/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.punchthrough.Near;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "93658457-b763-4f75-a739-ae8fa5648b75";
PROVISIONING_PROFILE_SPECIFIER = near;
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
SDKROOT = iphoneos11.0;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
Expand All @@ -312,15 +320,15 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = R5JUTH26F4;
INFOPLIST_FILE = Near/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.punchthrough.Near;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "93658457-b763-4f75-a739-ae8fa5648b75";
PROVISIONING_PROFILE_SPECIFIER = near;
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
SDKROOT = iphoneos11.0;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
Expand Down
Binary file modified ...j/project.xcworkspace/xcuserdata/logancautrell.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
24 changes: 21 additions & 3 deletions Near/Base.lproj/LaunchScreen.storyboard
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11134" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13178.6" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11106"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13156.2"/>
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
Expand All @@ -16,7 +20,21 @@
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Core NFC Example" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3J2-aL-Gbu">
<rect key="frame" x="16" y="20" width="343" height="647"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleTitle1"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="3J2-aL-Gbu" firstAttribute="top" secondItem="Llm-lL-Icb" secondAttribute="bottom" id="96W-Df-eY3"/>
<constraint firstAttribute="trailingMargin" secondItem="3J2-aL-Gbu" secondAttribute="trailing" id="Uqo-fg-Hgy"/>
<constraint firstItem="xb3-aO-Qok" firstAttribute="top" secondItem="3J2-aL-Gbu" secondAttribute="bottom" id="fZI-tF-6fc"/>
<constraint firstItem="3J2-aL-Gbu" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leadingMargin" id="lEp-Rr-0rF"/>
</constraints>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
Expand Down
Loading

0 comments on commit 4c55f9b

Please sign in to comment.