Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
tankista committed Oct 20, 2017
2 parents cdf8326 + 57b6230 commit 8174281
Show file tree
Hide file tree
Showing 60 changed files with 1,264 additions and 645 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "background-rounded.pdf",
"resizing" : {
"mode" : "9-part",
"center" : {
"mode" : "tile",
"width" : 1,
"height" : 1
},
"cap-insets" : {
"bottom" : 12,
"top" : 12,
"right" : 12,
"left" : 12
}
}
}
],
"info" : {
"version" : 1,
"author" : "xcode"
},
"properties" : {
"template-rendering-intent" : "template"
}
}
Binary file not shown.
15 changes: 15 additions & 0 deletions ExampleApp/Assets.xcassets/button-camera.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "button-camera.pdf"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
},
"properties" : {
"template-rendering-intent" : "template"
}
}
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "button-photo-library.pdf"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
},
"properties" : {
"template-rendering-intent" : "template"
}
}
Binary file not shown.
Binary file modified ExampleApp/Assets.xcassets/icon-live.imageset/icon-live.pdf
Binary file not shown.
26 changes: 0 additions & 26 deletions ExampleApp/Custom Views/CameraCell.swift

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import Foundation
import UIKit
import ImagePicker

class ImageCell : UICollectionViewCell, ImagePickerAssetCell {
class CustomImageCell : UICollectionViewCell, ImagePickerAssetCell {

@IBOutlet weak var imageView: UIImageView!

Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13178.6" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13156.2"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="Gxi-EQ-8gg" customClass="ImageCell" customModule="ExampleApp" customModuleProvider="target">
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="Gxi-EQ-8gg" customClass="CustomImageCell" customModule="Image_Picker" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="105" height="105"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import UIKit
import ImagePicker

class VideoCell: UICollectionViewCell, ImagePickerAssetCell {
class CustomVideoCell: UICollectionViewCell, ImagePickerAssetCell {

@IBOutlet weak var imageView: UIImageView!

Expand All @@ -21,5 +21,4 @@ class VideoCell: UICollectionViewCell, ImagePickerAssetCell {
super.awakeFromNib()
// Initialization code
}

}
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12121" systemVersion="16G29" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="Y0q-yh-mx2" customClass="VideoCell" customModule="ExampleApp" customModuleProvider="target">
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="Y0q-yh-mx2" customClass="CustomVideoCell" customModule="Image_Picker" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="112" height="134"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
Expand Down
3 changes: 2 additions & 1 deletion ExampleApp/Custom Views/IconWithTextCell.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@
import Foundation
import UIKit

//example of action cell that can be used by ImagePickerController
class IconWithTextCell : UICollectionViewCell {

@IBOutlet weak var titleLabel: UILabel!
@IBOutlet weak var imageView: UIImageView!
@IBOutlet weak var topOffset: NSLayoutConstraint!
@IBOutlet weak var bottomOffset: NSLayoutConstraint!

private var originalBackgroundColor: UIColor?

Expand Down
79 changes: 53 additions & 26 deletions ExampleApp/Custom Views/IconWithTextCell.xib
Original file line number Diff line number Diff line change
@@ -1,52 +1,79 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12121" systemVersion="16G29" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="ki2-gi-o6k" customClass="IconWithTextCell" customModule="ExampleApp" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="130" height="128"/>
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="ki2-gi-o6k" customClass="IconWithTextCell" customModule="Image_Picker" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="139" height="181"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
<rect key="frame" x="0.0" y="0.0" width="130" height="128"/>
<rect key="frame" x="0.0" y="0.0" width="139" height="181"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="TqH-DD-Z09">
<rect key="frame" x="53" y="52" width="24" height="24"/>
<color key="backgroundColor" red="0.078431372550000003" green="0.078431372550000003" blue="0.078431372550000003" alpha="1" colorSpace="calibratedRGB"/>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bVr-oh-tyw" userLabel="Container">
<rect key="frame" x="6" y="9" width="127" height="167"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="background-rounded" translatesAutoresizingMaskIntoConstraints="NO" id="2Y0-M9-BCi">
<rect key="frame" x="0.0" y="0.0" width="127" height="167"/>
<color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</imageView>
<imageView opaque="NO" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="QFV-TK-kB2">
<rect key="frame" x="45.5" y="59.5" width="36" height="28"/>
<color key="tintColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="width" constant="36" id="6YY-OR-F7r"/>
<constraint firstAttribute="height" constant="28" id="isH-pb-akg"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Title Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fTM-DB-qg8">
<rect key="frame" x="34" y="93.5" width="59" height="15"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="width" constant="24" id="NKT-1h-Ed5"/>
<constraint firstAttribute="height" constant="24" id="rM0-AQ-zQQ"/>
<constraint firstItem="QFV-TK-kB2" firstAttribute="centerX" secondItem="2Y0-M9-BCi" secondAttribute="centerX" id="5v9-qb-Lg7"/>
<constraint firstAttribute="bottom" secondItem="2Y0-M9-BCi" secondAttribute="bottom" id="Cs4-ew-pwy"/>
<constraint firstItem="fTM-DB-qg8" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="bVr-oh-tyw" secondAttribute="leading" constant="10" id="HSn-96-N7w"/>
<constraint firstItem="2Y0-M9-BCi" firstAttribute="leading" secondItem="bVr-oh-tyw" secondAttribute="leading" id="P1M-QR-roG"/>
<constraint firstItem="QFV-TK-kB2" firstAttribute="centerY" secondItem="2Y0-M9-BCi" secondAttribute="centerY" constant="-10" id="PAY-Oc-XfA"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="fTM-DB-qg8" secondAttribute="trailing" constant="10" id="UUd-Lz-ddF"/>
<constraint firstItem="2Y0-M9-BCi" firstAttribute="top" secondItem="bVr-oh-tyw" secondAttribute="top" id="g6m-o8-fjg"/>
<constraint firstAttribute="trailing" secondItem="2Y0-M9-BCi" secondAttribute="trailing" id="q0U-gv-8ju"/>
<constraint firstItem="fTM-DB-qg8" firstAttribute="centerX" secondItem="2Y0-M9-BCi" secondAttribute="centerX" id="tJ0-bb-gki"/>
<constraint firstItem="fTM-DB-qg8" firstAttribute="top" secondItem="QFV-TK-kB2" secondAttribute="bottom" constant="6" id="xhp-cM-wEv"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Title label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5vY-pq-zu7">
<rect key="frame" x="32" y="79" width="66.5" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
</view>
</subviews>
</view>
<color key="backgroundColor" red="0.94509803920000002" green="0.72941176470000002" blue="0.062745098040000002" alpha="1" colorSpace="calibratedRGB"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="5vY-pq-zu7" firstAttribute="centerX" secondItem="ki2-gi-o6k" secondAttribute="centerX" id="26S-TA-yr8"/>
<constraint firstItem="TqH-DD-Z09" firstAttribute="centerY" secondItem="ki2-gi-o6k" secondAttribute="centerY" id="9jY-ft-w0H"/>
<constraint firstItem="5vY-pq-zu7" firstAttribute="top" secondItem="TqH-DD-Z09" secondAttribute="bottom" constant="3" id="AU6-us-zMx"/>
<constraint firstItem="TqH-DD-Z09" firstAttribute="centerX" secondItem="ki2-gi-o6k" secondAttribute="centerX" id="Zhc-XI-6Sl"/>
<constraint firstItem="bVr-oh-tyw" firstAttribute="top" secondItem="ki2-gi-o6k" secondAttribute="top" constant="9" id="Amb-iR-O9X"/>
<constraint firstAttribute="trailing" secondItem="bVr-oh-tyw" secondAttribute="trailing" constant="6" id="DFS-RJ-T7h"/>
<constraint firstAttribute="bottom" secondItem="bVr-oh-tyw" secondAttribute="bottom" constant="5" id="ilP-SX-9Wg"/>
<constraint firstItem="bVr-oh-tyw" firstAttribute="leading" secondItem="ki2-gi-o6k" secondAttribute="leading" constant="6" id="wms-ci-rUR"/>
</constraints>
<size key="customSize" width="130" height="128"/>
<size key="customSize" width="139" height="181"/>
<connections>
<outlet property="imageView" destination="TqH-DD-Z09" id="lIW-le-Edb"/>
<outlet property="titleLabel" destination="5vY-pq-zu7" id="Wfx-GW-Efr"/>
<outlet property="bottomOffset" destination="ilP-SX-9Wg" id="qNi-Su-YId"/>
<outlet property="imageView" destination="QFV-TK-kB2" id="fJi-8h-Qb5"/>
<outlet property="titleLabel" destination="fTM-DB-qg8" id="YY2-xP-27A"/>
<outlet property="topOffset" destination="Amb-iR-O9X" id="huv-jt-DUQ"/>
</connections>
<point key="canvasLocation" x="-316" y="-67"/>
<point key="canvasLocation" x="-311.5" y="-40.5"/>
</collectionViewCell>
</objects>
<resources>
<image name="background-rounded" width="25" height="25"/>
</resources>
</document>
Loading

0 comments on commit 8174281

Please sign in to comment.