Skip to content

Commit

Permalink
Merge pull request #10 from transloadit/development
Browse files Browse the repository at this point in the history
1.0.4
  • Loading branch information
MMasterson authored May 6, 2018
2 parents 8db082a + 2fbddda commit a6abc62
Show file tree
Hide file tree
Showing 25 changed files with 596 additions and 499 deletions.
4 changes: 2 additions & 2 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ PODS:
- FBSnapshotTestCase/Core (2.1.4)
- FBSnapshotTestCase/SwiftSupport (2.1.4):
- FBSnapshotTestCase/Core
- Transloadit (1.0.1):
- Transloadit (1.0.3):
- TUSKit
- TUSKit (1.3.10)

Expand All @@ -18,7 +18,7 @@ EXTERNAL SOURCES:

SPEC CHECKSUMS:
FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a
Transloadit: 8aaca46072fe2a4ae387c348b0343172417bd62c
Transloadit: 37dbabad37d654b623ea2733d6c2b45d604bc214
TUSKit: 20493740fd099eccc529014ae0a32230b4b9a7a0

PODFILE CHECKSUM: 1a3d11a4b32f23ad1fa04200c3d1b012c1b2fce7
Expand Down
4 changes: 2 additions & 2 deletions Example/Pods/Local Podspecs/Transloadit.podspec.json

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

4 changes: 2 additions & 2 deletions Example/Pods/Manifest.lock

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

278 changes: 139 additions & 139 deletions Example/Pods/Pods.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

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

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

12 changes: 8 additions & 4 deletions Example/Transloadit.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@
/* Begin PBXBuildFile section */
20D2CCD5F9B4E4DD7A240B0E /* Pods_Transloadit_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 88F9C60B95E8311E4F861123 /* Pods_Transloadit_Tests.framework */; };
28123E881F832782004CD204 /* Transloadit.podspec in Resources */ = {isa = PBXBuildFile; fileRef = 28123E871F832782004CD204 /* Transloadit.podspec */; };
28296E871F5DFB36006892E3 /* TransloaditViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28296E861F5DFB36006892E3 /* TransloaditViewController.swift */; };
28296E871F5DFB36006892E3 /* TransloaditViewControllerSwifty.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28296E861F5DFB36006892E3 /* TransloaditViewControllerSwifty.swift */; };
2858DA351F68BF7D005325A3 /* test.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 2858DA341F68BF7D005325A3 /* test.jpg */; };
28615CFE209F8AD000E3D237 /* transloadit.png in Resources */ = {isa = PBXBuildFile; fileRef = 28615CFD209F8AD000E3D237 /* transloadit.png */; };
289616D2203D1EBE0023EE37 /* CommonCrypto.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 289616C9203D1EBD0023EE37 /* CommonCrypto.framework */; };
289616D9203D1EBE0023EE37 /* CommonCryptoTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 289616D8203D1EBE0023EE37 /* CommonCryptoTests.swift */; };
289616DB203D1EBE0023EE37 /* CommonCrypto.h in Headers */ = {isa = PBXBuildFile; fileRef = 289616CB203D1EBE0023EE37 /* CommonCrypto.h */; settings = {ATTRIBUTES = (Public, ); }; };
Expand Down Expand Up @@ -110,9 +111,10 @@
/* Begin PBXFileReference section */
00527FF412666775D11D7EF3 /* Pods-Transloadit_MacOS_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Transloadit_MacOS_Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-Transloadit_MacOS_Example/Pods-Transloadit_MacOS_Example.release.xcconfig"; sourceTree = "<group>"; };
28123E871F832782004CD204 /* Transloadit.podspec */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Transloadit.podspec; path = ../Transloadit.podspec; sourceTree = "<group>"; };
28296E861F5DFB36006892E3 /* TransloaditViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransloaditViewController.swift; sourceTree = "<group>"; };
28296E861F5DFB36006892E3 /* TransloaditViewControllerSwifty.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransloaditViewControllerSwifty.swift; sourceTree = "<group>"; };
2858DA341F68BF7D005325A3 /* test.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = test.jpg; sourceTree = "<group>"; };
2858DA361F68C27C005325A3 /* test.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = test.jpg; path = ../../../../../Downloads/mpdf60/examples/test.jpg; sourceTree = "<group>"; };
28615CFD209F8AD000E3D237 /* transloadit.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = transloadit.png; sourceTree = "<group>"; };
289616C9203D1EBD0023EE37 /* CommonCrypto.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CommonCrypto.framework; sourceTree = BUILT_PRODUCTS_DIR; };
289616CB203D1EBE0023EE37 /* CommonCrypto.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CommonCrypto.h; sourceTree = "<group>"; };
289616CC203D1EBE0023EE37 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
Expand Down Expand Up @@ -360,14 +362,15 @@
6003F593195388D20070C39A /* Example for Transloadit */ = {
isa = PBXGroup;
children = (
28615CFD209F8AD000E3D237 /* transloadit.png */,
6003F59C195388D20070C39A /* TransloaditAppDelegate.h */,
6003F59D195388D20070C39A /* TransloaditAppDelegate.m */,
873B8AEA1B1F5CCA007FD442 /* Main.storyboard */,
6003F5A5195388D20070C39A /* TransloaditViewController.h */,
6003F5A6195388D20070C39A /* TransloaditViewController.m */,
6003F5A8195388D20070C39A /* Images.xcassets */,
6003F594195388D20070C39A /* Supporting Files */,
28296E861F5DFB36006892E3 /* TransloaditViewController.swift */,
28296E861F5DFB36006892E3 /* TransloaditViewControllerSwifty.swift */,
);
name = "Example for Transloadit";
path = Transloadit;
Expand Down Expand Up @@ -690,6 +693,7 @@
289616E8203D1EF00023EE37 /* CommonCrypto.xcconfig in Resources */,
28123E881F832782004CD204 /* Transloadit.podspec in Resources */,
6003F5A9195388D20070C39A /* Images.xcassets in Resources */,
28615CFE209F8AD000E3D237 /* transloadit.png in Resources */,
6003F598195388D20070C39A /* InfoPlist.strings in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -891,7 +895,7 @@
files = (
6003F59E195388D20070C39A /* TransloaditAppDelegate.m in Sources */,
6003F5A7195388D20070C39A /* TransloaditViewController.m in Sources */,
28296E871F5DFB36006892E3 /* TransloaditViewController.swift in Sources */,
28296E871F5DFB36006892E3 /* TransloaditViewControllerSwifty.swift in Sources */,
6003F59A195388D20070C39A /* main.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,11 @@
"idiom" : "ipad",
"size" : "83.5x83.5",
"scale" : "2x"
},
{
"idiom" : "ios-marketing",
"size" : "1024x1024",
"scale" : "1x"
}
],
"info" : {
Expand Down
6 changes: 6 additions & 0 deletions Example/Transloadit/Images.xcassets/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "transloadit.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
37 changes: 31 additions & 6 deletions Example/Transloadit/Main.storyboard
Original file line number Diff line number Diff line change
@@ -1,28 +1,53 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11201" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="whP-gf-Uak">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="whP-gf-Uak">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--Transloadit View Controller-->
<!--Transloadit View Controller Swifty-->
<scene sceneID="wQg-tq-qST">
<objects>
<viewController id="whP-gf-Uak" customClass="TransloaditViewController" sceneMemberID="viewController">
<viewController id="whP-gf-Uak" customClass="TransloaditViewControllerSwifty" customModule="Transloadit_Example" customModuleProvider="target" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="uEw-UM-LJ8"/>
<viewControllerLayoutGuide type="bottom" id="Mvr-aV-6Um"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="TpU-gO-2f1">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="H6s-P0-0Wk">
<rect key="frame" x="109" y="518" width="156" height="30"/>
<state key="normal" title="Run Template Example"/>
<connections>
<action selector="runTemplate:" destination="whP-gf-Uak" eventType="touchUpInside" id="yUA-eH-t4c"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DJe-IQ-aha">
<rect key="frame" x="107" y="118" width="160" height="30"/>
<state key="normal" title="Run Assembly Example"/>
<connections>
<action selector="runAssembly:" destination="whP-gf-Uak" eventType="touchUpInside" id="yz1-wg-ysP"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="Mvr-aV-6Um" firstAttribute="top" secondItem="H6s-P0-0Wk" secondAttribute="bottom" constant="119" id="1Zw-ZS-GDV"/>
<constraint firstItem="DJe-IQ-aha" firstAttribute="centerX" secondItem="TpU-gO-2f1" secondAttribute="centerX" id="1mr-9y-lbM"/>
<constraint firstItem="DJe-IQ-aha" firstAttribute="centerX" secondItem="H6s-P0-0Wk" secondAttribute="centerX" id="Va9-qe-O6Q"/>
<constraint firstItem="DJe-IQ-aha" firstAttribute="top" secondItem="uEw-UM-LJ8" secondAttribute="bottom" constant="98" id="q56-6h-vQq"/>
</constraints>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="tc2-Qw-aMS" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="305" y="433"/>
<point key="canvasLocation" x="8.8000000000000007" y="429.53523238380814"/>
</scene>
</scenes>
</document>
Loading

0 comments on commit a6abc62

Please sign in to comment.