Skip to content

Commit

Permalink
Merge branch 'feature/ISD-222-update-example' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
stason314 committed Oct 29, 2020
2 parents a7e26b8 + 0113b31 commit 5a23823
Show file tree
Hide file tree
Showing 18 changed files with 873 additions and 229 deletions.
72 changes: 68 additions & 4 deletions Example/FramezillaExample.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,22 @@
841354611FCFEC02009F2947 /* Framezilla.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8413545E1FCFEA51009F2947 /* Framezilla.framework */; };
841354621FCFEC02009F2947 /* Framezilla.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 8413545E1FCFEA51009F2947 /* Framezilla.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
8442F9531EC75C9C00B72551 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8442F9521EC75C9C00B72551 /* AppDelegate.swift */; };
8442F9551EC75C9C00B72551 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8442F9541EC75C9C00B72551 /* ViewController.swift */; };
8442F9581EC75C9C00B72551 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8442F9561EC75C9C00B72551 /* Main.storyboard */; };
8442F95A1EC75C9C00B72551 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8442F9591EC75C9C00B72551 /* Assets.xcassets */; };
8442F95D1EC75C9C00B72551 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8442F95B1EC75C9C00B72551 /* LaunchScreen.storyboard */; };
850401DE2536EC0600B5D6C1 /* StackFeatureView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 850401DD2536EC0600B5D6C1 /* StackFeatureView.swift */; };
850401E12536F8F400B5D6C1 /* SafeAreaFeatureView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 850401E02536F8F400B5D6C1 /* SafeAreaFeatureView.swift */; };
850401E4253700E900B5D6C1 /* SliderFeatureView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 850401E3253700E900B5D6C1 /* SliderFeatureView.swift */; };
850401E6253702DC00B5D6C1 /* ArcCenterFeature.swift in Sources */ = {isa = PBXBuildFile; fileRef = 850401E5253702DC00B5D6C1 /* ArcCenterFeature.swift */; };
8561A1B82508868200EB4F8A /* KeyboardFeatureView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8561A1B72508868200EB4F8A /* KeyboardFeatureView.swift */; };
85647C862549A3A800D2CA42 /* SizeFeatureView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85647C852549A3A800D2CA42 /* SizeFeatureView.swift */; };
85647C892549A3B600D2CA42 /* MinMaxFeatureView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85647C882549A3B600D2CA42 /* MinMaxFeatureView.swift */; };
8588E99F2507835900B8DA97 /* ExampleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8588E99E2507835900B8DA97 /* ExampleViewController.swift */; };
8588E9A325078CDE00B8DA97 /* FeatureViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8588E9A225078CDE00B8DA97 /* FeatureViewController.swift */; };
8588E9A525078DB000B8DA97 /* EdgesFeatureView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8588E9A425078DB000B8DA97 /* EdgesFeatureView.swift */; };
85A128AB2507A27E0030F6A8 /* Feature.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85A128AA2507A27E0030F6A8 /* Feature.swift */; };
85A128AE2507A2A30030F6A8 /* FeatureView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85A128AD2507A2A30030F6A8 /* FeatureView.swift */; };
85A128B02507A2ED0030F6A8 /* SideRelationFeatureView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85A128AF2507A2ED0030F6A8 /* SideRelationFeatureView.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -58,11 +70,23 @@
841354581FCFEA51009F2947 /* Framezilla.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Framezilla.xcodeproj; path = ../Framezilla.xcodeproj; sourceTree = "<group>"; };
8442F94F1EC75C9C00B72551 /* FramezillaExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FramezillaExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
8442F9521EC75C9C00B72551 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
8442F9541EC75C9C00B72551 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
8442F9571EC75C9C00B72551 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
8442F9591EC75C9C00B72551 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
8442F95C1EC75C9C00B72551 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
8442F95E1EC75C9C00B72551 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
850401DD2536EC0600B5D6C1 /* StackFeatureView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StackFeatureView.swift; sourceTree = "<group>"; };
850401E02536F8F400B5D6C1 /* SafeAreaFeatureView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SafeAreaFeatureView.swift; sourceTree = "<group>"; };
850401E3253700E900B5D6C1 /* SliderFeatureView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SliderFeatureView.swift; sourceTree = "<group>"; };
850401E5253702DC00B5D6C1 /* ArcCenterFeature.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArcCenterFeature.swift; sourceTree = "<group>"; };
8561A1B72508868200EB4F8A /* KeyboardFeatureView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyboardFeatureView.swift; sourceTree = "<group>"; };
85647C852549A3A800D2CA42 /* SizeFeatureView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SizeFeatureView.swift; sourceTree = "<group>"; };
85647C882549A3B600D2CA42 /* MinMaxFeatureView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MinMaxFeatureView.swift; sourceTree = "<group>"; };
8588E99E2507835900B8DA97 /* ExampleViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExampleViewController.swift; sourceTree = "<group>"; };
8588E9A225078CDE00B8DA97 /* FeatureViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeatureViewController.swift; sourceTree = "<group>"; };
8588E9A425078DB000B8DA97 /* EdgesFeatureView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EdgesFeatureView.swift; sourceTree = "<group>"; };
85A128AA2507A27E0030F6A8 /* Feature.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Feature.swift; sourceTree = "<group>"; };
85A128AD2507A2A30030F6A8 /* FeatureView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeatureView.swift; sourceTree = "<group>"; };
85A128AF2507A2ED0030F6A8 /* SideRelationFeatureView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SideRelationFeatureView.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -106,8 +130,10 @@
8442F9511EC75C9C00B72551 /* FramezillaExample */ = {
isa = PBXGroup;
children = (
8588E9A12507891000B8DA97 /* Features */,
8442F9521EC75C9C00B72551 /* AppDelegate.swift */,
8442F9541EC75C9C00B72551 /* ViewController.swift */,
8588E9A225078CDE00B8DA97 /* FeatureViewController.swift */,
8588E99E2507835900B8DA97 /* ExampleViewController.swift */,
8442F9561EC75C9C00B72551 /* Main.storyboard */,
8442F9591EC75C9C00B72551 /* Assets.xcassets */,
8442F95B1EC75C9C00B72551 /* LaunchScreen.storyboard */,
Expand All @@ -116,6 +142,32 @@
path = FramezillaExample;
sourceTree = "<group>";
};
850401E2253700D500B5D6C1 /* Base */ = {
isa = PBXGroup;
children = (
85A128AA2507A27E0030F6A8 /* Feature.swift */,
85A128AD2507A2A30030F6A8 /* FeatureView.swift */,
850401E3253700E900B5D6C1 /* SliderFeatureView.swift */,
);
path = Base;
sourceTree = "<group>";
};
8588E9A12507891000B8DA97 /* Features */ = {
isa = PBXGroup;
children = (
850401E2253700D500B5D6C1 /* Base */,
8588E9A425078DB000B8DA97 /* EdgesFeatureView.swift */,
85A128AF2507A2ED0030F6A8 /* SideRelationFeatureView.swift */,
850401DD2536EC0600B5D6C1 /* StackFeatureView.swift */,
850401E02536F8F400B5D6C1 /* SafeAreaFeatureView.swift */,
850401E5253702DC00B5D6C1 /* ArcCenterFeature.swift */,
8561A1B72508868200EB4F8A /* KeyboardFeatureView.swift */,
85647C852549A3A800D2CA42 /* SizeFeatureView.swift */,
85647C882549A3B600D2CA42 /* MinMaxFeatureView.swift */,
);
path = Features;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand Down Expand Up @@ -214,8 +266,20 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
8442F9551EC75C9C00B72551 /* ViewController.swift in Sources */,
85A128AE2507A2A30030F6A8 /* FeatureView.swift in Sources */,
85A128AB2507A27E0030F6A8 /* Feature.swift in Sources */,
85647C862549A3A800D2CA42 /* SizeFeatureView.swift in Sources */,
850401DE2536EC0600B5D6C1 /* StackFeatureView.swift in Sources */,
85A128B02507A2ED0030F6A8 /* SideRelationFeatureView.swift in Sources */,
850401E4253700E900B5D6C1 /* SliderFeatureView.swift in Sources */,
850401E6253702DC00B5D6C1 /* ArcCenterFeature.swift in Sources */,
8588E9A325078CDE00B8DA97 /* FeatureViewController.swift in Sources */,
8588E9A525078DB000B8DA97 /* EdgesFeatureView.swift in Sources */,
8442F9531EC75C9C00B72551 /* AppDelegate.swift in Sources */,
8588E99F2507835900B8DA97 /* ExampleViewController.swift in Sources */,
8561A1B82508868200EB4F8A /* KeyboardFeatureView.swift in Sources */,
85647C892549A3B600D2CA42 /* MinMaxFeatureView.swift in Sources */,
850401E12536F8F400B5D6C1 /* SafeAreaFeatureView.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1170"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "8442F94E1EC75C9C00B72551"
BuildableName = "FramezillaExample.app"
BlueprintName = "FramezillaExample"
ReferencedContainer = "container:FramezillaExample.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "8442F94E1EC75C9C00B72551"
BuildableName = "FramezillaExample.app"
BlueprintName = "FramezillaExample"
ReferencedContainer = "container:FramezillaExample.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "8442F94E1EC75C9C00B72551"
BuildableName = "FramezillaExample.app"
BlueprintName = "FramezillaExample"
ReferencedContainer = "container:FramezillaExample.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
32 changes: 26 additions & 6 deletions Example/FramezillaExample/Base.lproj/Main.storyboard
Original file line number Diff line number Diff line change
@@ -1,26 +1,46 @@
<?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" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17154" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="GvZ-Pf-xXs">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11106"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17124"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
<!--Navigation Controller-->
<scene sceneID="WO8-Es-jXz">
<objects>
<navigationController id="GvZ-Pf-xXs" sceneMemberID="viewController">
<navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="uv9-nj-AM0">
<rect key="frame" x="0.0" y="44" width="414" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
<connections>
<segue destination="BYZ-38-t0r" kind="relationship" relationship="rootViewController" id="w5d-V4-W5B"/>
</connections>
</navigationController>
<placeholder placeholderIdentifier="IBFirstResponder" id="7m5-Cq-afm" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-700" y="114"/>
</scene>
<!--Example View Controller-->
<scene sceneID="tne-QT-ifu">
<objects>
<viewController id="BYZ-38-t0r" customClass="ViewController" customModuleProvider="target" sceneMemberID="viewController">
<viewController id="BYZ-38-t0r" customClass="ExampleViewController" customModule="FramezillaExample" customModuleProvider="target" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
<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="375" height="667"/>
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view>
<navigationItem key="navigationItem" id="0xy-n0-ocw"/>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="139" y="114"/>
</scene>
</scenes>
</document>
Loading

0 comments on commit 5a23823

Please sign in to comment.