Skip to content

Commit f48afce

Browse files
committed
Bumbped to 5.0.0! Bumped min supported target to 12.0
Removed separate project for Example. Updated swiftlint due to deprecated rule and Pods folder. Added Example target to the root project. Pods now in root project. Added Launch screen. Sorted files in project. Fixed swiftlint issues.
1 parent cc5c085 commit f48afce

File tree

80 files changed

+766
-1221
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+766
-1221
lines changed

.swiftlint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
disabled_rules:
22
- trailing_whitespace
3-
- variable_name
43
- type_body_length
54
- function_body_length
65
- file_length
@@ -9,3 +8,4 @@ disabled_rules:
98

109
excluded:
1110
- YPImagePickerExample/Localize.swift
11+
- Pods

YPImagePickerExample/YPImagePickerExample/AppDelegate.swift renamed to Example/AppDelegate.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
//
22
// AppDelegate.swift
3-
// YPImagePickerExample
3+
// YPIPExample
44
//
5-
// Created by Sacha DSO on 17/03/2017.
6-
// Copyright © 2017 Octopepper. All rights reserved.
5+
// Created by Nik Kov on 19.09.2021.
6+
// Copyright © 2021 Yummypets. All rights reserved.
77
//
88

99
import UIKit
Original file line numberDiff line numberDiff line change
@@ -1,158 +1,158 @@
11
{
22
"images" : [
33
{
4-
"size" : "20x20",
5-
"idiom" : "iphone",
64
"filename" : "[email protected]",
7-
"scale" : "2x"
5+
"idiom" : "iphone",
6+
"scale" : "2x",
7+
"size" : "20x20"
88
},
99
{
10-
"size" : "20x20",
11-
"idiom" : "iphone",
1210
"filename" : "[email protected]",
13-
"scale" : "3x"
11+
"idiom" : "iphone",
12+
"scale" : "3x",
13+
"size" : "20x20"
1414
},
1515
{
16-
"size" : "29x29",
17-
"idiom" : "iphone",
1816
"filename" : "[email protected]",
19-
"scale" : "1x"
17+
"idiom" : "iphone",
18+
"scale" : "1x",
19+
"size" : "29x29"
2020
},
2121
{
22-
"size" : "29x29",
23-
"idiom" : "iphone",
2422
"filename" : "[email protected]",
25-
"scale" : "2x"
23+
"idiom" : "iphone",
24+
"scale" : "2x",
25+
"size" : "29x29"
2626
},
2727
{
28-
"size" : "29x29",
29-
"idiom" : "iphone",
3028
"filename" : "[email protected]",
31-
"scale" : "3x"
29+
"idiom" : "iphone",
30+
"scale" : "3x",
31+
"size" : "29x29"
3232
},
3333
{
34-
"size" : "40x40",
35-
"idiom" : "iphone",
3634
"filename" : "[email protected]",
37-
"scale" : "2x"
35+
"idiom" : "iphone",
36+
"scale" : "2x",
37+
"size" : "40x40"
3838
},
3939
{
40-
"size" : "40x40",
41-
"idiom" : "iphone",
4240
"filename" : "[email protected]",
43-
"scale" : "3x"
41+
"idiom" : "iphone",
42+
"scale" : "3x",
43+
"size" : "40x40"
4444
},
4545
{
46-
"size" : "57x57",
47-
"idiom" : "iphone",
4846
"filename" : "[email protected]",
49-
"scale" : "1x"
47+
"idiom" : "iphone",
48+
"scale" : "1x",
49+
"size" : "57x57"
5050
},
5151
{
52-
"size" : "57x57",
53-
"idiom" : "iphone",
5452
"filename" : "[email protected]",
55-
"scale" : "2x"
53+
"idiom" : "iphone",
54+
"scale" : "2x",
55+
"size" : "57x57"
5656
},
5757
{
58-
"size" : "60x60",
59-
"idiom" : "iphone",
6058
"filename" : "[email protected]",
61-
"scale" : "2x"
59+
"idiom" : "iphone",
60+
"scale" : "2x",
61+
"size" : "60x60"
6262
},
6363
{
64-
"size" : "60x60",
65-
"idiom" : "iphone",
6664
"filename" : "[email protected]",
67-
"scale" : "3x"
65+
"idiom" : "iphone",
66+
"scale" : "3x",
67+
"size" : "60x60"
6868
},
6969
{
70-
"size" : "20x20",
71-
"idiom" : "ipad",
7270
"filename" : "[email protected]",
73-
"scale" : "1x"
71+
"idiom" : "ipad",
72+
"scale" : "1x",
73+
"size" : "20x20"
7474
},
7575
{
76-
"size" : "20x20",
77-
"idiom" : "ipad",
7876
"filename" : "[email protected]",
79-
"scale" : "2x"
77+
"idiom" : "ipad",
78+
"scale" : "2x",
79+
"size" : "20x20"
8080
},
8181
{
82-
"size" : "29x29",
83-
"idiom" : "ipad",
8482
"filename" : "[email protected]",
85-
"scale" : "1x"
83+
"idiom" : "ipad",
84+
"scale" : "1x",
85+
"size" : "29x29"
8686
},
8787
{
88-
"size" : "29x29",
89-
"idiom" : "ipad",
9088
"filename" : "[email protected]",
91-
"scale" : "2x"
89+
"idiom" : "ipad",
90+
"scale" : "2x",
91+
"size" : "29x29"
9292
},
9393
{
94-
"size" : "40x40",
95-
"idiom" : "ipad",
9694
"filename" : "[email protected]",
97-
"scale" : "1x"
95+
"idiom" : "ipad",
96+
"scale" : "1x",
97+
"size" : "40x40"
9898
},
9999
{
100-
"size" : "40x40",
101-
"idiom" : "ipad",
102100
"filename" : "[email protected]",
103-
"scale" : "2x"
101+
"idiom" : "ipad",
102+
"scale" : "2x",
103+
"size" : "40x40"
104104
},
105105
{
106-
"size" : "50x50",
107-
"idiom" : "ipad",
108106
"filename" : "[email protected]",
109-
"scale" : "1x"
107+
"idiom" : "ipad",
108+
"scale" : "1x",
109+
"size" : "50x50"
110110
},
111111
{
112-
"size" : "50x50",
113-
"idiom" : "ipad",
114112
"filename" : "[email protected]",
115-
"scale" : "2x"
113+
"idiom" : "ipad",
114+
"scale" : "2x",
115+
"size" : "50x50"
116116
},
117117
{
118-
"size" : "72x72",
119-
"idiom" : "ipad",
120118
"filename" : "[email protected]",
121-
"scale" : "1x"
119+
"idiom" : "ipad",
120+
"scale" : "1x",
121+
"size" : "72x72"
122122
},
123123
{
124-
"size" : "72x72",
125-
"idiom" : "ipad",
126124
"filename" : "[email protected]",
127-
"scale" : "2x"
125+
"idiom" : "ipad",
126+
"scale" : "2x",
127+
"size" : "72x72"
128128
},
129129
{
130-
"size" : "76x76",
131-
"idiom" : "ipad",
132130
"filename" : "[email protected]",
133-
"scale" : "1x"
131+
"idiom" : "ipad",
132+
"scale" : "1x",
133+
"size" : "76x76"
134134
},
135135
{
136-
"size" : "76x76",
137-
"idiom" : "ipad",
138136
"filename" : "[email protected]",
139-
"scale" : "2x"
137+
"idiom" : "ipad",
138+
"scale" : "2x",
139+
"size" : "76x76"
140140
},
141141
{
142-
"size" : "83.5x83.5",
143-
"idiom" : "ipad",
144142
"filename" : "[email protected]",
145-
"scale" : "2x"
143+
"idiom" : "ipad",
144+
"scale" : "2x",
145+
"size" : "83.5x83.5"
146146
},
147147
{
148-
"size" : "1024x1024",
149-
"idiom" : "ios-marketing",
150148
"filename" : "[email protected]",
151-
"scale" : "1x"
149+
"idiom" : "ios-marketing",
150+
"scale" : "1x",
151+
"size" : "1024x1024"
152152
}
153153
],
154154
"info" : {
155-
"version" : 1,
156-
"author" : "xcode"
155+
"author" : "xcode",
156+
"version" : 1
157157
}
158-
}
158+
}

Example/Assets.xcassets/Contents.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"info" : {
3+
"author" : "xcode",
4+
"version" : 1
5+
}
6+
}
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "[email protected]",
5+
"idiom" : "universal",
6+
"scale" : "1x"
7+
},
8+
{
9+
"filename" : "[email protected]",
10+
"idiom" : "universal",
11+
"scale" : "2x"
12+
},
13+
{
14+
"filename" : "[email protected]",
15+
"idiom" : "universal",
16+
"scale" : "3x"
17+
}
18+
],
19+
"info" : {
20+
"author" : "xcode",
21+
"version" : 1
22+
}
23+
}
Loading
Loading
Loading
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
3+
<device id="retina6_1" orientation="portrait" appearance="light"/>
4+
<dependencies>
5+
<deployment identifier="iOS"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
7+
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
8+
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
9+
</dependencies>
10+
<scenes>
11+
<!--View Controller-->
12+
<scene sceneID="EHf-IW-A2E">
13+
<objects>
14+
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
15+
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
16+
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
17+
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
18+
<subviews>
19+
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Launching YPImagePickerExample.." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nGt-qI-SwA">
20+
<rect key="frame" x="56.5" y="264" width="301.5" height="21.5"/>
21+
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="18"/>
22+
<color key="textColor" red="0.96862745100000003" green="0.79215686269999996" blue="0.2470588235" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
23+
<nil key="highlightedColor"/>
24+
</label>
25+
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Launch_image" translatesAutoresizingMaskIntoConstraints="NO" id="6me-FB-95E">
26+
<rect key="frame" x="50" y="344.5" width="314" height="315.5"/>
27+
<constraints>
28+
<constraint firstAttribute="width" secondItem="6me-FB-95E" secondAttribute="height" multiplier="215:216" id="1sY-JY-qZH"/>
29+
</constraints>
30+
</imageView>
31+
</subviews>
32+
<viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
33+
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
34+
<constraints>
35+
<constraint firstItem="6me-FB-95E" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="7px-1y-xNw"/>
36+
<constraint firstItem="6Tk-OE-BBY" firstAttribute="trailing" secondItem="6me-FB-95E" secondAttribute="trailing" constant="50" id="eQ0-by-PNt"/>
37+
<constraint firstItem="nGt-qI-SwA" firstAttribute="top" secondItem="6Tk-OE-BBY" secondAttribute="top" constant="220" id="oMG-cB-XNA"/>
38+
<constraint firstItem="nGt-qI-SwA" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="oys-pV-fAv"/>
39+
<constraint firstItem="6me-FB-95E" firstAttribute="top" secondItem="nGt-qI-SwA" secondAttribute="bottom" constant="59" id="rJf-gH-gRJ"/>
40+
</constraints>
41+
</view>
42+
</viewController>
43+
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
44+
</objects>
45+
<point key="canvasLocation" x="52.173913043478265" y="375"/>
46+
</scene>
47+
</scenes>
48+
<resources>
49+
<image name="Launch_image" width="83.5" height="83.5"/>
50+
</resources>
51+
</document>

Example/Base.lproj/Main.storyboard

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13122.16" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
3+
<dependencies>
4+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/>
5+
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
6+
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
7+
</dependencies>
8+
<scenes>
9+
<!--View Controller-->
10+
<scene sceneID="tne-QT-ifu">
11+
<objects>
12+
<viewController id="BYZ-38-t0r" customClass="ViewController" customModuleProvider="target" sceneMemberID="viewController">
13+
<view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
14+
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
15+
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
16+
<color key="backgroundColor" xcode11CocoaTouchSystemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
17+
<viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
18+
</view>
19+
</viewController>
20+
<placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
21+
</objects>
22+
</scene>
23+
</scenes>
24+
</document>
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
//
88

99
import UIKit
10-
import YPImagePicker
1110
import AVFoundation
1211
import AVKit
1312
import Photos

0 commit comments

Comments
 (0)