Skip to content

Commit

Permalink
Merge pull request #6 from RobinChao/develop
Browse files Browse the repository at this point in the history 
Develop
  • Loading branch information
@Yak0xff
Yak0xff authored Nov 23, 2017
2 parents 31e2075 + e0982b1 commit 4afa692
Show file tree
Hide file tree
Showing 7 changed files with 460 additions and 191 deletions.
Binary file added .DS_Store
View file
Binary file not shown.
22 changes: 15 additions & 7 deletions AnimatedPaths.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
009F0CBC1FC67E060096B0E3 /* RCAnimatedPath.swift in Sources */ = {isa = PBXBuildFile; fileRef = 009F0CBB1FC67E060096B0E3 /* RCAnimatedPath.swift */; };
00B299751C7C413400521D96 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00B299741C7C413400521D96 /* AppDelegate.swift */; };
00B299771C7C413400521D96 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00B299761C7C413400521D96 /* ViewController.swift */; };
00B2997A1C7C413400521D96 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 00B299781C7C413400521D96 /* Main.storyboard */; };
Expand All @@ -15,6 +16,7 @@
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
009F0CBB1FC67E060096B0E3 /* RCAnimatedPath.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RCAnimatedPath.swift; sourceTree = "<group>"; };
00B299711C7C413400521D96 /* AnimatedPaths.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = AnimatedPaths.app; sourceTree = BUILT_PRODUCTS_DIR; };
00B299741C7C413400521D96 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
00B299761C7C413400521D96 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -55,6 +57,7 @@
isa = PBXGroup;
children = (
00B299741C7C413400521D96 /* AppDelegate.swift */,
009F0CBB1FC67E060096B0E3 /* RCAnimatedPath.swift */,
00B299761C7C413400521D96 /* ViewController.swift */,
00B299781C7C413400521D96 /* Main.storyboard */,
00B2997B1C7C413400521D96 /* Assets.xcassets */,
Expand Down Expand Up @@ -98,7 +101,7 @@
CreatedOnToolsVersion = 7.2.1;
DevelopmentTeam = W7YDEDGW4E;
LastSwiftMigration = 0820;
ProvisioningStyle = Manual;
ProvisioningStyle = Automatic;
};
};
};
Expand Down Expand Up @@ -140,6 +143,7 @@
files = (
00B299771C7C413400521D96 /* ViewController.swift in Sources */,
00B299751C7C413400521D96 /* AppDelegate.swift in Sources */,
009F0CBC1FC67E060096B0E3 /* RCAnimatedPath.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -252,14 +256,16 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = W7YDEDGW4E;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = AnimatedPaths/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.Robin.AnimatedPaths;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "3a51cda8-3387-4c26-a945-c8fb51508664";
PROVISIONING_PROFILE_SPECIFIER = "Development: Wildcard";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 3.0;
TARGETED_DEVICE_FAMILY = 1;
};
Expand All @@ -269,14 +275,16 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = W7YDEDGW4E;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = AnimatedPaths/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.Robin.AnimatedPaths;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "3a51cda8-3387-4c26-a945-c8fb51508664";
PROVISIONING_PROFILE_SPECIFIER = "Development: Wildcard";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 3.0;
TARGETED_DEVICE_FAMILY = 1;
};
Expand Down
7 changes: 7 additions & 0 deletions AnimatedPaths.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 10 additions & 6 deletions AnimatedPaths/Base.lproj/LaunchScreen.storyboard
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8150" systemVersion="15A204g" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13529" 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="8122"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
Expand All @@ -13,10 +18,9 @@
<viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<animations/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
Expand Down
34 changes: 19 additions & 15 deletions AnimatedPaths/Base.lproj/Main.storyboard
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
Expand All @@ -14,28 +18,25 @@
<viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hic-yA-ytg">
<rect key="frame" x="0.0" y="20" width="600" height="44"/>
<rect key="frame" x="0.0" y="20" width="375" height="44"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="DcU-ST-XUj"/>
</constraints>
<items>
<barButtonItem title="Replay" id="l0K-l3-84B">
<connections>
<action selector="replayAction:" destination="BYZ-38-t0r" id="KlL-8q-nne"/>
</connections>
</barButtonItem>
<barButtonItem style="plain" systemItem="flexibleSpace" id="Ylx-2F-BQB"/>
<barButtonItem style="plain" id="XDF-ou-h4x">
<segmentedControl key="customView" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="bar" selectedSegmentIndex="0" id="S6v-6g-7Iz">
<rect key="frame" x="200" y="7" width="200" height="30"/>
<segmentedControl key="customView" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="bar" id="S6v-6g-7Iz">
<rect key="frame" x="16" y="6.5" width="343" height="31"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<segments>
<segment title="Drawing"/>
<segment title="Rectangle"/>
<segment title="Polygon"/>
<segment title="Text"/>
<segment title="Custom"/>
</segments>
<connections>
<action selector="drawingTypeSelector:" destination="BYZ-38-t0r" eventType="valueChanged" id="WpK-RX-UYa"/>
Expand All @@ -46,17 +47,20 @@
</items>
</toolbar>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="hic-yA-ytg" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leading" id="LUh-j3-2jp"/>
<constraint firstAttribute="trailing" secondItem="hic-yA-ytg" secondAttribute="trailing" id="OHa-ks-ccF"/>
<constraint firstItem="hic-yA-ytg" firstAttribute="top" secondItem="y3c-jy-aDJ" secondAttribute="bottom" id="P8C-6K-yHl"/>
</constraints>
</view>
<connections>
<outlet property="Segment" destination="S6v-6g-7Iz" id="rLD-eX-lmk"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-2" y="268"/>
<point key="canvasLocation" x="-420" y="-36.431784107946029"/>
</scene>
</scenes>
</document>
Loading

0 comments on commit 4afa692

Please sign in to comment.