-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
datt
authored and
datt
committed
Jan 28, 2019
1 parent
f2c8a57
commit 7ce74ee
Showing
11 changed files
with
338 additions
and
55 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 8 additions & 0 deletions
8
...oMerger/DPVideoMerger.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> | ||
| <plist version="1.0"> | ||
| <dict> | ||
| <key>IDEDidComputeMac32BitWarning</key> | ||
| <true/> | ||
| </dict> | ||
| </plist> |
Binary file modified
BIN
+12.8 KB
(130%)
....xcodeproj/project.xcworkspace/xcuserdata/datt.xcuserdatad/UserInterfaceState.xcuserstate
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,50 +1,93 @@ | ||
| <?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" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r"> | ||
| <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="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="13772"/> | ||
| <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/> | ||
| <capability name="Safe area layout guides" minToolsVersion="9.0"/> | ||
| <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> | ||
| </dependencies> | ||
| <scenes> | ||
| <!--View Controller--> | ||
| <scene sceneID="tne-QT-ifu"> | ||
| <objects> | ||
| <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/> | ||
| <viewController id="BYZ-38-t0r" customClass="ViewController" customModule="DPVideoMerger" customModuleProvider="target" sceneMemberID="viewController"> | ||
| <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC"> | ||
| <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="LNp-cl-F5b"> | ||
| <rect key="frame" x="139.5" y="318.5" width="96" height="30"/> | ||
| <rect key="frame" x="15" y="20" width="96" height="30"/> | ||
| <state key="normal" title="Merage Video"/> | ||
| <connections> | ||
| <action selector="btnMergeVideoAction:" destination="BYZ-38-t0r" eventType="touchUpInside" id="xYy-gc-CYV"/> | ||
| </connections> | ||
| </button> | ||
| <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="tGh-fG-U9l"> | ||
| <rect key="frame" x="15" y="65" width="345" height="602"/> | ||
| <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | ||
| <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="gdd-AR-Mmk"> | ||
| <size key="itemSize" width="117" height="116"/> | ||
| <size key="headerReferenceSize" width="0.0" height="0.0"/> | ||
| <size key="footerReferenceSize" width="0.0" height="0.0"/> | ||
| <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/> | ||
| </collectionViewFlowLayout> | ||
| <cells> | ||
| <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" restorationIdentifier="VideoImgCell" reuseIdentifier="VideoImgCell" id="4LU-or-GTz" customClass="VideoImgCell" customModule="DPVideoMerger" customModuleProvider="target"> | ||
| <rect key="frame" x="0.0" y="0.0" width="117" height="116"/> | ||
| <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> | ||
| <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO"> | ||
| <rect key="frame" x="0.0" y="0.0" width="117" height="116"/> | ||
| <autoresizingMask key="autoresizingMask"/> | ||
| <subviews> | ||
| <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="AZL-4g-9Sc"> | ||
| <rect key="frame" x="0.0" y="0.0" width="117" height="116"/> | ||
| </imageView> | ||
| </subviews> | ||
| </view> | ||
| <constraints> | ||
| <constraint firstAttribute="trailing" secondItem="AZL-4g-9Sc" secondAttribute="trailing" id="2qD-nh-oM9"/> | ||
| <constraint firstItem="AZL-4g-9Sc" firstAttribute="leading" secondItem="4LU-or-GTz" secondAttribute="leading" id="3kJ-4a-dgM"/> | ||
| <constraint firstItem="AZL-4g-9Sc" firstAttribute="top" secondItem="4LU-or-GTz" secondAttribute="top" id="P34-uu-2f0"/> | ||
| <constraint firstAttribute="bottom" secondItem="AZL-4g-9Sc" secondAttribute="bottom" id="rwW-E1-Fy4"/> | ||
| </constraints> | ||
| <connections> | ||
| <outlet property="img" destination="AZL-4g-9Sc" id="x0v-CP-0qV"/> | ||
| </connections> | ||
| </collectionViewCell> | ||
| </cells> | ||
| <connections> | ||
| <outlet property="dataSource" destination="BYZ-38-t0r" id="AUb-oR-mH7"/> | ||
| <outlet property="delegate" destination="BYZ-38-t0r" id="xRM-Cn-9s8"/> | ||
| </connections> | ||
| </collectionView> | ||
| <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="q1t-LM-rN3"> | ||
| <rect key="frame" x="169" y="315" width="37" height="37"/> | ||
| <color key="color" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | ||
| </activityIndicatorView> | ||
| </subviews> | ||
| <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> | ||
| <constraints> | ||
| <constraint firstItem="LNp-cl-F5b" firstAttribute="centerY" secondItem="8bC-Xf-vdC" secondAttribute="centerY" id="4fV-V3-9Ic"/> | ||
| <constraint firstItem="LNp-cl-F5b" firstAttribute="leading" secondItem="6Tk-OE-BBY" secondAttribute="leading" constant="15" id="0p6-g9-hIt"/> | ||
| <constraint firstItem="LNp-cl-F5b" firstAttribute="top" secondItem="6Tk-OE-BBY" secondAttribute="top" id="3NN-KA-1uW"/> | ||
| <constraint firstItem="6Tk-OE-BBY" firstAttribute="bottom" secondItem="tGh-fG-U9l" secondAttribute="bottom" id="Ab6-9A-QhR"/> | ||
| <constraint firstItem="q1t-LM-rN3" firstAttribute="centerX" secondItem="8bC-Xf-vdC" secondAttribute="centerX" id="L4y-xR-dUA"/> | ||
| <constraint firstItem="tGh-fG-U9l" firstAttribute="top" secondItem="LNp-cl-F5b" secondAttribute="bottom" constant="15" id="MCN-Cz-Akp"/> | ||
| <constraint firstItem="tGh-fG-U9l" firstAttribute="leading" secondItem="6Tk-OE-BBY" secondAttribute="leading" constant="15" id="MQf-4J-CI3"/> | ||
| <constraint firstItem="q1t-LM-rN3" firstAttribute="centerY" secondItem="8bC-Xf-vdC" secondAttribute="centerY" id="be8-A2-rf1"/> | ||
| <constraint firstItem="LNp-cl-F5b" firstAttribute="centerX" secondItem="8bC-Xf-vdC" secondAttribute="centerX" id="jki-Ji-vsV"/> | ||
| <constraint firstItem="6Tk-OE-BBY" firstAttribute="trailing" secondItem="tGh-fG-U9l" secondAttribute="trailing" constant="15" id="lEM-J3-7bP"/> | ||
| </constraints> | ||
| <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/> | ||
| </view> | ||
| <connections> | ||
| <outlet property="activityIndicatorView" destination="q1t-LM-rN3" id="Sne-UT-E1Z"/> | ||
| </connections> | ||
| </viewController> | ||
| <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/> | ||
| </objects> | ||
| <point key="canvasLocation" x="133.59999999999999" y="133.5832083958021"/> | ||
| </scene> | ||
| </scenes> | ||
| </document> |
Oops, something went wrong.