From f12f5d3b31292da5966c08a4918a04959b3de63d Mon Sep 17 00:00:00 2001 From: NikKovIos Date: Sun, 19 Sep 2021 14:46:21 +0300 Subject: [PATCH] SPM implemetation. Thx to @RomanTysiachnik Added Package file. Updated readme. Added Bundle.local. Moved Resources folder to Sources. --- Package.swift | 33 ++++++++ README.md | 29 ++++--- Source/Filters/Crop/YPCropView.swift | 4 +- .../Photo/YPFilterCollectionViewCell.swift | 3 +- Source/Filters/Photo/YPFiltersView.swift | 1 + Source/Filters/Video/YPVideoFiltersVC.swift | 2 +- Source/Filters/Video/YPVideoFiltersVC.xib | 30 ++++--- .../Extensions/Bundle+Extensions.swift | 21 +++++ Source/Helpers/YPHelper.swift | 4 +- .../Gallery/BottomPager/YPBottomPager.swift | 2 +- Source/Pages/Gallery/YPGridView.swift | 3 +- Source/Pages/Gallery/YPLibraryView.swift | 3 +- .../Resources}/Assets.xcassets/Contents.json | 0 .../yp_arrow_down.imageset/Arrow.pdf | Bin .../yp_arrow_down.imageset/Contents.json | 0 .../yp_arrow_left.imageset/Contents.json | 0 .../yp_arrow_left.imageset/arrow_left.png | Bin .../yp_arrow_left.imageset/arrow_left@2x.png | Bin .../yp_arrow_left.imageset/arrow_left@3x.png | Bin .../yp_iconCapture.imageset/Contents.json | 0 .../yp_iconCapture.imageset/iconCapture2.pdf | Bin .../yp_iconCrop.imageset/Contents.json | 0 .../yp_iconCrop.imageset/yp_iconCrop2.png | Bin .../yp_iconCrop.imageset/yp_iconCrop2@2x.png | Bin .../yp_iconCrop.imageset/yp_iconCrop2@3x.png | Bin .../yp_iconFlash_auto.imageset/Contents.json | 0 .../yp_iconFlash_auto.pdf | Bin .../yp_iconFlash_off.imageset/Contents.json | 0 .../yp_icon_flash_off.pdf | Bin .../yp_iconFlash_on.imageset/Contents.json | 0 .../yp_iconFlash_on.imageset/yp_iconFlash.pdf | Bin .../yp_iconLoop.imageset/Contents.json | 0 .../yp_iconLoop.imageset/yp_iconLoop.pdf | Bin .../Contents.json | 0 .../iconCapture Copy.pdf | Bin .../Contents.json | 0 .../iconCapture Copy 2.pdf | Bin .../yp_multiple.imageset/Contents.json | 0 .../yp_multiple.imageset/yp_multiple.png | Bin .../yp_multiple.imageset/yp_multiple@2x.png | Bin .../yp_multiple.imageset/yp_multiple@3x.png | Bin .../Contents.json | 0 .../yp_multiple_colored.png | Bin .../yp_multiple_colored@2x.png | Bin .../yp_multiple_colored@3x.png | Bin .../yp_play.imageset/Contents.json | 0 .../Assets.xcassets/yp_play.imageset/play.png | Bin .../yp_play.imageset/play@2x.png | Bin .../yp_play.imageset/play@3x.png | Bin .../yp_remove.imageset/Contents.json | 0 .../yp_remove.imageset/yp_remove@1x.png | Bin .../yp_remove.imageset/yp_remove@2x.png | Bin .../yp_remove.imageset/yp_remove@3x.png | Bin .../ar.lproj/YPImagePickerLocalizable.strings | 0 .../bg.lproj/YPImagePickerLocalizable.strings | 0 .../cs.lproj/YPImagePickerLocalizable.strings | 0 .../da.lproj/YPImagePickerLocalizable.strings | 0 .../de.lproj/YPImagePickerLocalizable.strings | 0 .../en.lproj/YPImagePickerLocalizable.strings | 0 .../es.lproj/YPImagePickerLocalizable.strings | 0 .../fa.lproj/YPImagePickerLocalizable.strings | 0 .../fr.lproj/YPImagePickerLocalizable.strings | 0 .../id.lproj/YPImagePickerLocalizable.strings | 0 .../it.lproj/YPImagePickerLocalizable.strings | 0 .../ja.lproj/YPImagePickerLocalizable.strings | 0 .../YPImagePickerLocalizable.strings | 0 .../km.lproj/YPImagePickerLocalizable.strings | 0 .../ko.lproj/YPImagePickerLocalizable.strings | 0 .../nb.lproj/YPImagePickerLocalizable.strings | 0 .../nl.lproj/YPImagePickerLocalizable.strings | 0 .../pl.lproj/YPImagePickerLocalizable.strings | 0 .../YPImagePickerLocalizable.strings | 0 .../YPImagePickerLocalizable.strings | 0 .../ro.lproj/YPImagePickerLocalizable.strings | 0 .../ru.lproj/YPImagePickerLocalizable.strings | 0 .../sv.lproj/YPImagePickerLocalizable.strings | 0 .../th.lproj/YPImagePickerLocalizable.strings | 0 .../tr.lproj/YPImagePickerLocalizable.strings | 0 .../vi.lproj/YPImagePickerLocalizable.strings | 0 .../YPImagePickerLocalizable.strings | 0 .../YPImagePickerLocalizable.strings | 0 Source/YPPickerVC.swift | 2 +- YPImagePicker.podspec | 2 +- YPImagePicker.xcodeproj/project.pbxproj | 79 ++++++++++++++++-- .../xcshareddata/swiftpm/Package.resolved | 25 ++++++ 85 files changed, 198 insertions(+), 45 deletions(-) create mode 100644 Package.swift create mode 100644 Source/Helpers/Extensions/Bundle+Extensions.swift rename {Resources => Source/Resources}/Assets.xcassets/Contents.json (100%) rename {Resources => Source/Resources}/Assets.xcassets/yp_arrow_down.imageset/Arrow.pdf (100%) rename {Resources => Source/Resources}/Assets.xcassets/yp_arrow_down.imageset/Contents.json (100%) rename {Resources => Source/Resources}/Assets.xcassets/yp_arrow_left.imageset/Contents.json (100%) rename {Resources => Source/Resources}/Assets.xcassets/yp_arrow_left.imageset/arrow_left.png (100%) rename {Resources => Source/Resources}/Assets.xcassets/yp_arrow_left.imageset/arrow_left@2x.png (100%) rename {Resources => Source/Resources}/Assets.xcassets/yp_arrow_left.imageset/arrow_left@3x.png (100%) rename {Resources => Source/Resources}/Assets.xcassets/yp_iconCapture.imageset/Contents.json (100%) rename {Resources => Source/Resources}/Assets.xcassets/yp_iconCapture.imageset/iconCapture2.pdf (100%) rename {Resources => Source/Resources}/Assets.xcassets/yp_iconCrop.imageset/Contents.json (100%) rename {Resources => Source/Resources}/Assets.xcassets/yp_iconCrop.imageset/yp_iconCrop2.png (100%) rename {Resources => Source/Resources}/Assets.xcassets/yp_iconCrop.imageset/yp_iconCrop2@2x.png (100%) rename {Resources => Source/Resources}/Assets.xcassets/yp_iconCrop.imageset/yp_iconCrop2@3x.png (100%) rename {Resources => Source/Resources}/Assets.xcassets/yp_iconFlash_auto.imageset/Contents.json (100%) rename {Resources => Source/Resources}/Assets.xcassets/yp_iconFlash_auto.imageset/yp_iconFlash_auto.pdf (100%) rename {Resources => Source/Resources}/Assets.xcassets/yp_iconFlash_off.imageset/Contents.json (100%) rename {Resources => Source/Resources}/Assets.xcassets/yp_iconFlash_off.imageset/yp_icon_flash_off.pdf (100%) rename {Resources => Source/Resources}/Assets.xcassets/yp_iconFlash_on.imageset/Contents.json (100%) rename {Resources => Source/Resources}/Assets.xcassets/yp_iconFlash_on.imageset/yp_iconFlash.pdf (100%) rename {Resources => Source/Resources}/Assets.xcassets/yp_iconLoop.imageset/Contents.json (100%) rename {Resources => Source/Resources}/Assets.xcassets/yp_iconLoop.imageset/yp_iconLoop.pdf (100%) rename {Resources => Source/Resources}/Assets.xcassets/yp_iconVideoCapture.imageset/Contents.json (100%) rename {Resources => Source/Resources}/Assets.xcassets/yp_iconVideoCapture.imageset/iconCapture Copy.pdf (100%) rename {Resources => Source/Resources}/Assets.xcassets/yp_iconVideoCaptureRecording.imageset/Contents.json (100%) rename {Resources => Source/Resources}/Assets.xcassets/yp_iconVideoCaptureRecording.imageset/iconCapture Copy 2.pdf (100%) rename {Resources => Source/Resources}/Assets.xcassets/yp_multiple.imageset/Contents.json (100%) rename {Resources => Source/Resources}/Assets.xcassets/yp_multiple.imageset/yp_multiple.png (100%) rename {Resources => Source/Resources}/Assets.xcassets/yp_multiple.imageset/yp_multiple@2x.png (100%) rename {Resources => Source/Resources}/Assets.xcassets/yp_multiple.imageset/yp_multiple@3x.png (100%) rename {Resources => Source/Resources}/Assets.xcassets/yp_multiple_colored.imageset/Contents.json (100%) rename {Resources => Source/Resources}/Assets.xcassets/yp_multiple_colored.imageset/yp_multiple_colored.png (100%) rename {Resources => Source/Resources}/Assets.xcassets/yp_multiple_colored.imageset/yp_multiple_colored@2x.png (100%) rename {Resources => Source/Resources}/Assets.xcassets/yp_multiple_colored.imageset/yp_multiple_colored@3x.png (100%) rename {Resources => Source/Resources}/Assets.xcassets/yp_play.imageset/Contents.json (100%) rename {Resources => Source/Resources}/Assets.xcassets/yp_play.imageset/play.png (100%) rename {Resources => Source/Resources}/Assets.xcassets/yp_play.imageset/play@2x.png (100%) rename {Resources => Source/Resources}/Assets.xcassets/yp_play.imageset/play@3x.png (100%) rename {Resources => Source/Resources}/Assets.xcassets/yp_remove.imageset/Contents.json (100%) rename {Resources => Source/Resources}/Assets.xcassets/yp_remove.imageset/yp_remove@1x.png (100%) rename {Resources => Source/Resources}/Assets.xcassets/yp_remove.imageset/yp_remove@2x.png (100%) rename {Resources => Source/Resources}/Assets.xcassets/yp_remove.imageset/yp_remove@3x.png (100%) rename {Resources => Source/Resources}/ar.lproj/YPImagePickerLocalizable.strings (100%) rename {Resources => Source/Resources}/bg.lproj/YPImagePickerLocalizable.strings (100%) rename {Resources => Source/Resources}/cs.lproj/YPImagePickerLocalizable.strings (100%) rename {Resources => Source/Resources}/da.lproj/YPImagePickerLocalizable.strings (100%) rename {Resources => Source/Resources}/de.lproj/YPImagePickerLocalizable.strings (100%) rename {Resources => Source/Resources}/en.lproj/YPImagePickerLocalizable.strings (100%) rename {Resources => Source/Resources}/es.lproj/YPImagePickerLocalizable.strings (100%) rename {Resources => Source/Resources}/fa.lproj/YPImagePickerLocalizable.strings (100%) rename {Resources => Source/Resources}/fr.lproj/YPImagePickerLocalizable.strings (100%) rename {Resources => Source/Resources}/id.lproj/YPImagePickerLocalizable.strings (100%) rename {Resources => Source/Resources}/it.lproj/YPImagePickerLocalizable.strings (100%) rename {Resources => Source/Resources}/ja.lproj/YPImagePickerLocalizable.strings (100%) rename {Resources => Source/Resources}/km-KH.lproj/YPImagePickerLocalizable.strings (100%) rename {Resources => Source/Resources}/km.lproj/YPImagePickerLocalizable.strings (100%) rename {Resources => Source/Resources}/ko.lproj/YPImagePickerLocalizable.strings (100%) rename {Resources => Source/Resources}/nb.lproj/YPImagePickerLocalizable.strings (100%) rename {Resources => Source/Resources}/nl.lproj/YPImagePickerLocalizable.strings (100%) rename {Resources => Source/Resources}/pl.lproj/YPImagePickerLocalizable.strings (100%) rename {Resources => Source/Resources}/pt-BR.lproj/YPImagePickerLocalizable.strings (100%) rename {Resources => Source/Resources}/pt-PT.lproj/YPImagePickerLocalizable.strings (100%) rename {Resources => Source/Resources}/ro.lproj/YPImagePickerLocalizable.strings (100%) rename {Resources => Source/Resources}/ru.lproj/YPImagePickerLocalizable.strings (100%) rename {Resources => Source/Resources}/sv.lproj/YPImagePickerLocalizable.strings (100%) rename {Resources => Source/Resources}/th.lproj/YPImagePickerLocalizable.strings (100%) rename {Resources => Source/Resources}/tr.lproj/YPImagePickerLocalizable.strings (100%) rename {Resources => Source/Resources}/vi.lproj/YPImagePickerLocalizable.strings (100%) rename {Resources => Source/Resources}/zh-Hans.lproj/YPImagePickerLocalizable.strings (100%) rename {Resources => Source/Resources}/zh-Hant.lproj/YPImagePickerLocalizable.strings (100%) create mode 100644 YPImagePicker.xcworkspace/xcshareddata/swiftpm/Package.resolved diff --git a/Package.swift b/Package.swift new file mode 100644 index 000000000..6a9baa13b --- /dev/null +++ b/Package.swift @@ -0,0 +1,33 @@ +// swift-tools-version:5.3 +// The swift-tools-version declares the minimum version of Swift required to build this package. +import PackageDescription + +let package = Package( + name: "YPImagePicker", + defaultLocalization: "en", + platforms: [ + .iOS(.v12) + ], + products: [ + .library(name: "YPImagePicker", targets: ["YPImagePicker"]) + ], + dependencies: [ + .package( + url: "https://github.com/freshOS/Stevia", + .exact("5.1.0") + ), + .package( + url: "https://github.com/HHK1/PryntTrimmerView", + .exact("4.0.2") + ) + + ], + targets: [ + .target( + name: "YPImagePicker", + dependencies: ["Stevia", "PryntTrimmerView"], + path: "Source", + exclude: ["Info.plist", "YPImagePickerHeader.h"] + ) + ] +) diff --git a/README.md b/README.md index eb7580458..4fd55960a 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,7 @@ YPImagePicker is an instagram-like photo/video picker for iOS written in pure Sw [![Language: Swift 5](https://img.shields.io/badge/language-swift%205-f48041.svg?style=flat)](https://developer.apple.com/swift) [![Version](https://img.shields.io/cocoapods/v/YPImagePicker.svg?style=flat)](http://cocoapods.org/pods/YPImagePicker) [![Platform](https://img.shields.io/cocoapods/p/YPImagePicker.svg?style=flat)](http://cocoapods.org/pods/YPImagePicker) +[![SPM compatible](https://img.shields.io/badge/SPM-compatible-4BC51D.svg?style=flat)](https://swift.org/package-manager/) [![codebeat badge](https://codebeat.co/badges/9710a89d-b1e2-4e55-a4a2-3ae1f98f4c53)](https://codebeat.co/projects/github-com-yummypets-ypimagepicker-master) [![License: MIT](http://img.shields.io/badge/license-MIT-lightgrey.svg?style=flat)](https://github.com/Yummypets/YPImagePicker/blob/master/LICENSE) [![GitHub tag](https://img.shields.io/github/release/Yummypets/YPImagePicker.svg)]() @@ -40,16 +41,6 @@ And many more... ## Installation -## Experimental Swift Package Manager (SPM) Support -A first version of SPM support is available : -package `https://github.com/Yummypets/YPImagePicker` branch `spm`. -This has a minimum target iOS version of `12.0`. -This is an early release so be sure to thoroughly test the integration and report any issues you'd encounter. - -Side note: -Swift package manager is the future and I would strongly recommend you to migrate as soon as possible. -Once this integration is stable, the other packager managers will be deprecated. - #### Using [CocoaPods](http://cocoapods.org/) First be sure to run `pod repo update` to get the latest version available. @@ -62,6 +53,24 @@ pod 'YPImagePicker' use_frameworks! ``` +#### Using [Swift Package Manager](https://swift.org/package-manager/) + +Open SPM dependency manager through `File > Swift Pakcages > Add Package Dependency...`. + +and insert repository URL: + +``https://github.com/Yummypets/YPImagePicker.git`` + +To add dependency in your own package, just specify a package in dependencies of your `Package.swift`: +```swift +.package( +name: "YPImagePicker", +url: "https://github.com/Yummypets/YPImagePicker.git", +.upToNextMajor(from: "4.5.0") +) +``` +Note: This has a minimum target iOS version of `12.0`. + ## Plist entries In order for your app to access camera and photo libraries, diff --git a/Source/Filters/Crop/YPCropView.swift b/Source/Filters/Crop/YPCropView.swift index 23bc428df..78f0de1b2 100644 --- a/Source/Filters/Crop/YPCropView.swift +++ b/Source/Filters/Crop/YPCropView.swift @@ -9,7 +9,7 @@ import UIKit import Stevia -class YPCropView: UIView { +final class YPCropView: UIView { let containerView = UIView() let imageView = UIImageView() @@ -171,7 +171,7 @@ class YPCropView: UIView { } } -class YPCropAreaView: UIView { +final class YPCropAreaView: UIView { var isCircle = false { didSet { diff --git a/Source/Filters/Photo/YPFilterCollectionViewCell.swift b/Source/Filters/Photo/YPFilterCollectionViewCell.swift index 99ec555b6..c532877f1 100644 --- a/Source/Filters/Photo/YPFilterCollectionViewCell.swift +++ b/Source/Filters/Photo/YPFilterCollectionViewCell.swift @@ -6,9 +6,10 @@ // Copyright © 2016 octopepper. All rights reserved. // +import UIKit import Stevia -class YPFilterCollectionViewCell: UICollectionViewCell { +final class YPFilterCollectionViewCell: UICollectionViewCell { let name = UILabel() let imageView = UIImageView() diff --git a/Source/Filters/Photo/YPFiltersView.swift b/Source/Filters/Photo/YPFiltersView.swift index 7d7917e05..d5f37b254 100644 --- a/Source/Filters/Photo/YPFiltersView.swift +++ b/Source/Filters/Photo/YPFiltersView.swift @@ -6,6 +6,7 @@ // Copyright © 2016 octopepper. All rights reserved. // +import UIKit import Stevia class YPFiltersView: UIView { diff --git a/Source/Filters/Video/YPVideoFiltersVC.swift b/Source/Filters/Video/YPVideoFiltersVC.swift index 74d255b78..1db6c5eeb 100644 --- a/Source/Filters/Video/YPVideoFiltersVC.swift +++ b/Source/Filters/Video/YPVideoFiltersVC.swift @@ -34,7 +34,7 @@ public class YPVideoFiltersVC: UIViewController, IsMediaFilterVC { /// Designated initializer public class func initWith(video: YPMediaVideo, isFromSelectionVC: Bool) -> YPVideoFiltersVC { - let vc = YPVideoFiltersVC(nibName: "YPVideoFiltersVC", bundle: Bundle(for: YPVideoFiltersVC.self)) + let vc = YPVideoFiltersVC(nibName: "YPVideoFiltersVC", bundle: Bundle.local) vc.inputVideo = video vc.isFromSelectionVC = isFromSelectionVC diff --git a/Source/Filters/Video/YPVideoFiltersVC.xib b/Source/Filters/Video/YPVideoFiltersVC.xib index 50ca4f1e5..771c3ee08 100644 --- a/Source/Filters/Video/YPVideoFiltersVC.xib +++ b/Source/Filters/Video/YPVideoFiltersVC.xib @@ -1,14 +1,13 @@ - + - - + - + @@ -24,18 +23,18 @@ - + - + - + @@ -69,26 +68,25 @@ - - + + - + - + - - + + - - + + - diff --git a/Source/Helpers/Extensions/Bundle+Extensions.swift b/Source/Helpers/Extensions/Bundle+Extensions.swift new file mode 100644 index 000000000..4575e5acc --- /dev/null +++ b/Source/Helpers/Extensions/Bundle+Extensions.swift @@ -0,0 +1,21 @@ +// +// Bundle+Extensions.swift +// YPImagePicker +// +// Created by Nik Kov on 19.09.2021. +// Copyright © 2021 Yummypets. All rights reserved. +// + +import UIKit + +extension Bundle { + static var local: Bundle { + #if SWIFT_PACKAGE + return Bundle.module + #else + return Bundle(for: BundleToken.self) + #endif + } +} + +private class BundleToken {} diff --git a/Source/Helpers/YPHelper.swift b/Source/Helpers/YPHelper.swift index 641fd2786..84d559a34 100644 --- a/Source/Helpers/YPHelper.swift +++ b/Source/Helpers/YPHelper.swift @@ -13,13 +13,13 @@ import Photos internal func ypLocalized(_ str: String) -> String { return NSLocalizedString(str, tableName: "YPImagePickerLocalizable", - bundle: Bundle(for: YPPickerVC.self), + bundle: Bundle.local, value: "", comment: "") } internal func imageFromBundle(_ named: String) -> UIImage { - return UIImage(named: named, in: Bundle(for: YPPickerVC.self), compatibleWith: nil) ?? UIImage() + return UIImage(named: named, in: Bundle.local, compatibleWith: nil) ?? UIImage() } struct YPHelper { diff --git a/Source/Pages/Gallery/BottomPager/YPBottomPager.swift b/Source/Pages/Gallery/BottomPager/YPBottomPager.swift index 0a4ab9088..7b1bbd729 100644 --- a/Source/Pages/Gallery/BottomPager/YPBottomPager.swift +++ b/Source/Pages/Gallery/BottomPager/YPBottomPager.swift @@ -27,7 +27,7 @@ open class YPBottomPager: UIViewController, UIScrollViewDelegate { } override open func loadView() { - self.automaticallyAdjustsScrollViewInsets = false + v.scrollView.contentInsetAdjustmentBehavior = .never v.scrollView.delegate = self view = v } diff --git a/Source/Pages/Gallery/YPGridView.swift b/Source/Pages/Gallery/YPGridView.swift index a16632bc6..ad8362d8e 100644 --- a/Source/Pages/Gallery/YPGridView.swift +++ b/Source/Pages/Gallery/YPGridView.swift @@ -6,9 +6,10 @@ // Copyright © 2016 Yummypets. All rights reserved. // +import UIKit import Stevia -class YPGridView: UIView { +final class YPGridView: UIView { let line1 = UIView() let line2 = UIView() diff --git a/Source/Pages/Gallery/YPLibraryView.swift b/Source/Pages/Gallery/YPLibraryView.swift index 34de9959a..359a893ea 100644 --- a/Source/Pages/Gallery/YPLibraryView.swift +++ b/Source/Pages/Gallery/YPLibraryView.swift @@ -99,8 +99,7 @@ final class YPLibraryView: UIView { extension YPLibraryView { class func xibView() -> YPLibraryView? { - let bundle = Bundle(for: YPPickerVC.self) - let nib = UINib(nibName: "YPLibraryView", bundle: bundle) + let nib = UINib(nibName: "YPLibraryView", bundle: Bundle.local) let xibView = nib.instantiate(withOwner: self, options: nil)[0] as? YPLibraryView return xibView } diff --git a/Resources/Assets.xcassets/Contents.json b/Source/Resources/Assets.xcassets/Contents.json similarity index 100% rename from Resources/Assets.xcassets/Contents.json rename to Source/Resources/Assets.xcassets/Contents.json diff --git a/Resources/Assets.xcassets/yp_arrow_down.imageset/Arrow.pdf b/Source/Resources/Assets.xcassets/yp_arrow_down.imageset/Arrow.pdf similarity index 100% rename from Resources/Assets.xcassets/yp_arrow_down.imageset/Arrow.pdf rename to Source/Resources/Assets.xcassets/yp_arrow_down.imageset/Arrow.pdf diff --git a/Resources/Assets.xcassets/yp_arrow_down.imageset/Contents.json b/Source/Resources/Assets.xcassets/yp_arrow_down.imageset/Contents.json similarity index 100% rename from Resources/Assets.xcassets/yp_arrow_down.imageset/Contents.json rename to Source/Resources/Assets.xcassets/yp_arrow_down.imageset/Contents.json diff --git a/Resources/Assets.xcassets/yp_arrow_left.imageset/Contents.json b/Source/Resources/Assets.xcassets/yp_arrow_left.imageset/Contents.json similarity index 100% rename from Resources/Assets.xcassets/yp_arrow_left.imageset/Contents.json rename to Source/Resources/Assets.xcassets/yp_arrow_left.imageset/Contents.json diff --git a/Resources/Assets.xcassets/yp_arrow_left.imageset/arrow_left.png b/Source/Resources/Assets.xcassets/yp_arrow_left.imageset/arrow_left.png similarity index 100% rename from Resources/Assets.xcassets/yp_arrow_left.imageset/arrow_left.png rename to Source/Resources/Assets.xcassets/yp_arrow_left.imageset/arrow_left.png diff --git a/Resources/Assets.xcassets/yp_arrow_left.imageset/arrow_left@2x.png b/Source/Resources/Assets.xcassets/yp_arrow_left.imageset/arrow_left@2x.png similarity index 100% rename from Resources/Assets.xcassets/yp_arrow_left.imageset/arrow_left@2x.png rename to Source/Resources/Assets.xcassets/yp_arrow_left.imageset/arrow_left@2x.png diff --git a/Resources/Assets.xcassets/yp_arrow_left.imageset/arrow_left@3x.png b/Source/Resources/Assets.xcassets/yp_arrow_left.imageset/arrow_left@3x.png similarity index 100% rename from Resources/Assets.xcassets/yp_arrow_left.imageset/arrow_left@3x.png rename to Source/Resources/Assets.xcassets/yp_arrow_left.imageset/arrow_left@3x.png diff --git a/Resources/Assets.xcassets/yp_iconCapture.imageset/Contents.json b/Source/Resources/Assets.xcassets/yp_iconCapture.imageset/Contents.json similarity index 100% rename from Resources/Assets.xcassets/yp_iconCapture.imageset/Contents.json rename to Source/Resources/Assets.xcassets/yp_iconCapture.imageset/Contents.json diff --git a/Resources/Assets.xcassets/yp_iconCapture.imageset/iconCapture2.pdf b/Source/Resources/Assets.xcassets/yp_iconCapture.imageset/iconCapture2.pdf similarity index 100% rename from Resources/Assets.xcassets/yp_iconCapture.imageset/iconCapture2.pdf rename to Source/Resources/Assets.xcassets/yp_iconCapture.imageset/iconCapture2.pdf diff --git a/Resources/Assets.xcassets/yp_iconCrop.imageset/Contents.json b/Source/Resources/Assets.xcassets/yp_iconCrop.imageset/Contents.json similarity index 100% rename from Resources/Assets.xcassets/yp_iconCrop.imageset/Contents.json rename to Source/Resources/Assets.xcassets/yp_iconCrop.imageset/Contents.json diff --git a/Resources/Assets.xcassets/yp_iconCrop.imageset/yp_iconCrop2.png b/Source/Resources/Assets.xcassets/yp_iconCrop.imageset/yp_iconCrop2.png similarity index 100% rename from Resources/Assets.xcassets/yp_iconCrop.imageset/yp_iconCrop2.png rename to Source/Resources/Assets.xcassets/yp_iconCrop.imageset/yp_iconCrop2.png diff --git a/Resources/Assets.xcassets/yp_iconCrop.imageset/yp_iconCrop2@2x.png b/Source/Resources/Assets.xcassets/yp_iconCrop.imageset/yp_iconCrop2@2x.png similarity index 100% rename from Resources/Assets.xcassets/yp_iconCrop.imageset/yp_iconCrop2@2x.png rename to Source/Resources/Assets.xcassets/yp_iconCrop.imageset/yp_iconCrop2@2x.png diff --git a/Resources/Assets.xcassets/yp_iconCrop.imageset/yp_iconCrop2@3x.png b/Source/Resources/Assets.xcassets/yp_iconCrop.imageset/yp_iconCrop2@3x.png similarity index 100% rename from Resources/Assets.xcassets/yp_iconCrop.imageset/yp_iconCrop2@3x.png rename to Source/Resources/Assets.xcassets/yp_iconCrop.imageset/yp_iconCrop2@3x.png diff --git a/Resources/Assets.xcassets/yp_iconFlash_auto.imageset/Contents.json b/Source/Resources/Assets.xcassets/yp_iconFlash_auto.imageset/Contents.json similarity index 100% rename from Resources/Assets.xcassets/yp_iconFlash_auto.imageset/Contents.json rename to Source/Resources/Assets.xcassets/yp_iconFlash_auto.imageset/Contents.json diff --git a/Resources/Assets.xcassets/yp_iconFlash_auto.imageset/yp_iconFlash_auto.pdf b/Source/Resources/Assets.xcassets/yp_iconFlash_auto.imageset/yp_iconFlash_auto.pdf similarity index 100% rename from Resources/Assets.xcassets/yp_iconFlash_auto.imageset/yp_iconFlash_auto.pdf rename to Source/Resources/Assets.xcassets/yp_iconFlash_auto.imageset/yp_iconFlash_auto.pdf diff --git a/Resources/Assets.xcassets/yp_iconFlash_off.imageset/Contents.json b/Source/Resources/Assets.xcassets/yp_iconFlash_off.imageset/Contents.json similarity index 100% rename from Resources/Assets.xcassets/yp_iconFlash_off.imageset/Contents.json rename to Source/Resources/Assets.xcassets/yp_iconFlash_off.imageset/Contents.json diff --git a/Resources/Assets.xcassets/yp_iconFlash_off.imageset/yp_icon_flash_off.pdf b/Source/Resources/Assets.xcassets/yp_iconFlash_off.imageset/yp_icon_flash_off.pdf similarity index 100% rename from Resources/Assets.xcassets/yp_iconFlash_off.imageset/yp_icon_flash_off.pdf rename to Source/Resources/Assets.xcassets/yp_iconFlash_off.imageset/yp_icon_flash_off.pdf diff --git a/Resources/Assets.xcassets/yp_iconFlash_on.imageset/Contents.json b/Source/Resources/Assets.xcassets/yp_iconFlash_on.imageset/Contents.json similarity index 100% rename from Resources/Assets.xcassets/yp_iconFlash_on.imageset/Contents.json rename to Source/Resources/Assets.xcassets/yp_iconFlash_on.imageset/Contents.json diff --git a/Resources/Assets.xcassets/yp_iconFlash_on.imageset/yp_iconFlash.pdf b/Source/Resources/Assets.xcassets/yp_iconFlash_on.imageset/yp_iconFlash.pdf similarity index 100% rename from Resources/Assets.xcassets/yp_iconFlash_on.imageset/yp_iconFlash.pdf rename to Source/Resources/Assets.xcassets/yp_iconFlash_on.imageset/yp_iconFlash.pdf diff --git a/Resources/Assets.xcassets/yp_iconLoop.imageset/Contents.json b/Source/Resources/Assets.xcassets/yp_iconLoop.imageset/Contents.json similarity index 100% rename from Resources/Assets.xcassets/yp_iconLoop.imageset/Contents.json rename to Source/Resources/Assets.xcassets/yp_iconLoop.imageset/Contents.json diff --git a/Resources/Assets.xcassets/yp_iconLoop.imageset/yp_iconLoop.pdf b/Source/Resources/Assets.xcassets/yp_iconLoop.imageset/yp_iconLoop.pdf similarity index 100% rename from Resources/Assets.xcassets/yp_iconLoop.imageset/yp_iconLoop.pdf rename to Source/Resources/Assets.xcassets/yp_iconLoop.imageset/yp_iconLoop.pdf diff --git a/Resources/Assets.xcassets/yp_iconVideoCapture.imageset/Contents.json b/Source/Resources/Assets.xcassets/yp_iconVideoCapture.imageset/Contents.json similarity index 100% rename from Resources/Assets.xcassets/yp_iconVideoCapture.imageset/Contents.json rename to Source/Resources/Assets.xcassets/yp_iconVideoCapture.imageset/Contents.json diff --git a/Resources/Assets.xcassets/yp_iconVideoCapture.imageset/iconCapture Copy.pdf b/Source/Resources/Assets.xcassets/yp_iconVideoCapture.imageset/iconCapture Copy.pdf similarity index 100% rename from Resources/Assets.xcassets/yp_iconVideoCapture.imageset/iconCapture Copy.pdf rename to Source/Resources/Assets.xcassets/yp_iconVideoCapture.imageset/iconCapture Copy.pdf diff --git a/Resources/Assets.xcassets/yp_iconVideoCaptureRecording.imageset/Contents.json b/Source/Resources/Assets.xcassets/yp_iconVideoCaptureRecording.imageset/Contents.json similarity index 100% rename from Resources/Assets.xcassets/yp_iconVideoCaptureRecording.imageset/Contents.json rename to Source/Resources/Assets.xcassets/yp_iconVideoCaptureRecording.imageset/Contents.json diff --git a/Resources/Assets.xcassets/yp_iconVideoCaptureRecording.imageset/iconCapture Copy 2.pdf b/Source/Resources/Assets.xcassets/yp_iconVideoCaptureRecording.imageset/iconCapture Copy 2.pdf similarity index 100% rename from Resources/Assets.xcassets/yp_iconVideoCaptureRecording.imageset/iconCapture Copy 2.pdf rename to Source/Resources/Assets.xcassets/yp_iconVideoCaptureRecording.imageset/iconCapture Copy 2.pdf diff --git a/Resources/Assets.xcassets/yp_multiple.imageset/Contents.json b/Source/Resources/Assets.xcassets/yp_multiple.imageset/Contents.json similarity index 100% rename from Resources/Assets.xcassets/yp_multiple.imageset/Contents.json rename to Source/Resources/Assets.xcassets/yp_multiple.imageset/Contents.json diff --git a/Resources/Assets.xcassets/yp_multiple.imageset/yp_multiple.png b/Source/Resources/Assets.xcassets/yp_multiple.imageset/yp_multiple.png similarity index 100% rename from Resources/Assets.xcassets/yp_multiple.imageset/yp_multiple.png rename to Source/Resources/Assets.xcassets/yp_multiple.imageset/yp_multiple.png diff --git a/Resources/Assets.xcassets/yp_multiple.imageset/yp_multiple@2x.png b/Source/Resources/Assets.xcassets/yp_multiple.imageset/yp_multiple@2x.png similarity index 100% rename from Resources/Assets.xcassets/yp_multiple.imageset/yp_multiple@2x.png rename to Source/Resources/Assets.xcassets/yp_multiple.imageset/yp_multiple@2x.png diff --git a/Resources/Assets.xcassets/yp_multiple.imageset/yp_multiple@3x.png b/Source/Resources/Assets.xcassets/yp_multiple.imageset/yp_multiple@3x.png similarity index 100% rename from Resources/Assets.xcassets/yp_multiple.imageset/yp_multiple@3x.png rename to Source/Resources/Assets.xcassets/yp_multiple.imageset/yp_multiple@3x.png diff --git a/Resources/Assets.xcassets/yp_multiple_colored.imageset/Contents.json b/Source/Resources/Assets.xcassets/yp_multiple_colored.imageset/Contents.json similarity index 100% rename from Resources/Assets.xcassets/yp_multiple_colored.imageset/Contents.json rename to Source/Resources/Assets.xcassets/yp_multiple_colored.imageset/Contents.json diff --git a/Resources/Assets.xcassets/yp_multiple_colored.imageset/yp_multiple_colored.png b/Source/Resources/Assets.xcassets/yp_multiple_colored.imageset/yp_multiple_colored.png similarity index 100% rename from Resources/Assets.xcassets/yp_multiple_colored.imageset/yp_multiple_colored.png rename to Source/Resources/Assets.xcassets/yp_multiple_colored.imageset/yp_multiple_colored.png diff --git a/Resources/Assets.xcassets/yp_multiple_colored.imageset/yp_multiple_colored@2x.png b/Source/Resources/Assets.xcassets/yp_multiple_colored.imageset/yp_multiple_colored@2x.png similarity index 100% rename from Resources/Assets.xcassets/yp_multiple_colored.imageset/yp_multiple_colored@2x.png rename to Source/Resources/Assets.xcassets/yp_multiple_colored.imageset/yp_multiple_colored@2x.png diff --git a/Resources/Assets.xcassets/yp_multiple_colored.imageset/yp_multiple_colored@3x.png b/Source/Resources/Assets.xcassets/yp_multiple_colored.imageset/yp_multiple_colored@3x.png similarity index 100% rename from Resources/Assets.xcassets/yp_multiple_colored.imageset/yp_multiple_colored@3x.png rename to Source/Resources/Assets.xcassets/yp_multiple_colored.imageset/yp_multiple_colored@3x.png diff --git a/Resources/Assets.xcassets/yp_play.imageset/Contents.json b/Source/Resources/Assets.xcassets/yp_play.imageset/Contents.json similarity index 100% rename from Resources/Assets.xcassets/yp_play.imageset/Contents.json rename to Source/Resources/Assets.xcassets/yp_play.imageset/Contents.json diff --git a/Resources/Assets.xcassets/yp_play.imageset/play.png b/Source/Resources/Assets.xcassets/yp_play.imageset/play.png similarity index 100% rename from Resources/Assets.xcassets/yp_play.imageset/play.png rename to Source/Resources/Assets.xcassets/yp_play.imageset/play.png diff --git a/Resources/Assets.xcassets/yp_play.imageset/play@2x.png b/Source/Resources/Assets.xcassets/yp_play.imageset/play@2x.png similarity index 100% rename from Resources/Assets.xcassets/yp_play.imageset/play@2x.png rename to Source/Resources/Assets.xcassets/yp_play.imageset/play@2x.png diff --git a/Resources/Assets.xcassets/yp_play.imageset/play@3x.png b/Source/Resources/Assets.xcassets/yp_play.imageset/play@3x.png similarity index 100% rename from Resources/Assets.xcassets/yp_play.imageset/play@3x.png rename to Source/Resources/Assets.xcassets/yp_play.imageset/play@3x.png diff --git a/Resources/Assets.xcassets/yp_remove.imageset/Contents.json b/Source/Resources/Assets.xcassets/yp_remove.imageset/Contents.json similarity index 100% rename from Resources/Assets.xcassets/yp_remove.imageset/Contents.json rename to Source/Resources/Assets.xcassets/yp_remove.imageset/Contents.json diff --git a/Resources/Assets.xcassets/yp_remove.imageset/yp_remove@1x.png b/Source/Resources/Assets.xcassets/yp_remove.imageset/yp_remove@1x.png similarity index 100% rename from Resources/Assets.xcassets/yp_remove.imageset/yp_remove@1x.png rename to Source/Resources/Assets.xcassets/yp_remove.imageset/yp_remove@1x.png diff --git a/Resources/Assets.xcassets/yp_remove.imageset/yp_remove@2x.png b/Source/Resources/Assets.xcassets/yp_remove.imageset/yp_remove@2x.png similarity index 100% rename from Resources/Assets.xcassets/yp_remove.imageset/yp_remove@2x.png rename to Source/Resources/Assets.xcassets/yp_remove.imageset/yp_remove@2x.png diff --git a/Resources/Assets.xcassets/yp_remove.imageset/yp_remove@3x.png b/Source/Resources/Assets.xcassets/yp_remove.imageset/yp_remove@3x.png similarity index 100% rename from Resources/Assets.xcassets/yp_remove.imageset/yp_remove@3x.png rename to Source/Resources/Assets.xcassets/yp_remove.imageset/yp_remove@3x.png diff --git a/Resources/ar.lproj/YPImagePickerLocalizable.strings b/Source/Resources/ar.lproj/YPImagePickerLocalizable.strings similarity index 100% rename from Resources/ar.lproj/YPImagePickerLocalizable.strings rename to Source/Resources/ar.lproj/YPImagePickerLocalizable.strings diff --git a/Resources/bg.lproj/YPImagePickerLocalizable.strings b/Source/Resources/bg.lproj/YPImagePickerLocalizable.strings similarity index 100% rename from Resources/bg.lproj/YPImagePickerLocalizable.strings rename to Source/Resources/bg.lproj/YPImagePickerLocalizable.strings diff --git a/Resources/cs.lproj/YPImagePickerLocalizable.strings b/Source/Resources/cs.lproj/YPImagePickerLocalizable.strings similarity index 100% rename from Resources/cs.lproj/YPImagePickerLocalizable.strings rename to Source/Resources/cs.lproj/YPImagePickerLocalizable.strings diff --git a/Resources/da.lproj/YPImagePickerLocalizable.strings b/Source/Resources/da.lproj/YPImagePickerLocalizable.strings similarity index 100% rename from Resources/da.lproj/YPImagePickerLocalizable.strings rename to Source/Resources/da.lproj/YPImagePickerLocalizable.strings diff --git a/Resources/de.lproj/YPImagePickerLocalizable.strings b/Source/Resources/de.lproj/YPImagePickerLocalizable.strings similarity index 100% rename from Resources/de.lproj/YPImagePickerLocalizable.strings rename to Source/Resources/de.lproj/YPImagePickerLocalizable.strings diff --git a/Resources/en.lproj/YPImagePickerLocalizable.strings b/Source/Resources/en.lproj/YPImagePickerLocalizable.strings similarity index 100% rename from Resources/en.lproj/YPImagePickerLocalizable.strings rename to Source/Resources/en.lproj/YPImagePickerLocalizable.strings diff --git a/Resources/es.lproj/YPImagePickerLocalizable.strings b/Source/Resources/es.lproj/YPImagePickerLocalizable.strings similarity index 100% rename from Resources/es.lproj/YPImagePickerLocalizable.strings rename to Source/Resources/es.lproj/YPImagePickerLocalizable.strings diff --git a/Resources/fa.lproj/YPImagePickerLocalizable.strings b/Source/Resources/fa.lproj/YPImagePickerLocalizable.strings similarity index 100% rename from Resources/fa.lproj/YPImagePickerLocalizable.strings rename to Source/Resources/fa.lproj/YPImagePickerLocalizable.strings diff --git a/Resources/fr.lproj/YPImagePickerLocalizable.strings b/Source/Resources/fr.lproj/YPImagePickerLocalizable.strings similarity index 100% rename from Resources/fr.lproj/YPImagePickerLocalizable.strings rename to Source/Resources/fr.lproj/YPImagePickerLocalizable.strings diff --git a/Resources/id.lproj/YPImagePickerLocalizable.strings b/Source/Resources/id.lproj/YPImagePickerLocalizable.strings similarity index 100% rename from Resources/id.lproj/YPImagePickerLocalizable.strings rename to Source/Resources/id.lproj/YPImagePickerLocalizable.strings diff --git a/Resources/it.lproj/YPImagePickerLocalizable.strings b/Source/Resources/it.lproj/YPImagePickerLocalizable.strings similarity index 100% rename from Resources/it.lproj/YPImagePickerLocalizable.strings rename to Source/Resources/it.lproj/YPImagePickerLocalizable.strings diff --git a/Resources/ja.lproj/YPImagePickerLocalizable.strings b/Source/Resources/ja.lproj/YPImagePickerLocalizable.strings similarity index 100% rename from Resources/ja.lproj/YPImagePickerLocalizable.strings rename to Source/Resources/ja.lproj/YPImagePickerLocalizable.strings diff --git a/Resources/km-KH.lproj/YPImagePickerLocalizable.strings b/Source/Resources/km-KH.lproj/YPImagePickerLocalizable.strings similarity index 100% rename from Resources/km-KH.lproj/YPImagePickerLocalizable.strings rename to Source/Resources/km-KH.lproj/YPImagePickerLocalizable.strings diff --git a/Resources/km.lproj/YPImagePickerLocalizable.strings b/Source/Resources/km.lproj/YPImagePickerLocalizable.strings similarity index 100% rename from Resources/km.lproj/YPImagePickerLocalizable.strings rename to Source/Resources/km.lproj/YPImagePickerLocalizable.strings diff --git a/Resources/ko.lproj/YPImagePickerLocalizable.strings b/Source/Resources/ko.lproj/YPImagePickerLocalizable.strings similarity index 100% rename from Resources/ko.lproj/YPImagePickerLocalizable.strings rename to Source/Resources/ko.lproj/YPImagePickerLocalizable.strings diff --git a/Resources/nb.lproj/YPImagePickerLocalizable.strings b/Source/Resources/nb.lproj/YPImagePickerLocalizable.strings similarity index 100% rename from Resources/nb.lproj/YPImagePickerLocalizable.strings rename to Source/Resources/nb.lproj/YPImagePickerLocalizable.strings diff --git a/Resources/nl.lproj/YPImagePickerLocalizable.strings b/Source/Resources/nl.lproj/YPImagePickerLocalizable.strings similarity index 100% rename from Resources/nl.lproj/YPImagePickerLocalizable.strings rename to Source/Resources/nl.lproj/YPImagePickerLocalizable.strings diff --git a/Resources/pl.lproj/YPImagePickerLocalizable.strings b/Source/Resources/pl.lproj/YPImagePickerLocalizable.strings similarity index 100% rename from Resources/pl.lproj/YPImagePickerLocalizable.strings rename to Source/Resources/pl.lproj/YPImagePickerLocalizable.strings diff --git a/Resources/pt-BR.lproj/YPImagePickerLocalizable.strings b/Source/Resources/pt-BR.lproj/YPImagePickerLocalizable.strings similarity index 100% rename from Resources/pt-BR.lproj/YPImagePickerLocalizable.strings rename to Source/Resources/pt-BR.lproj/YPImagePickerLocalizable.strings diff --git a/Resources/pt-PT.lproj/YPImagePickerLocalizable.strings b/Source/Resources/pt-PT.lproj/YPImagePickerLocalizable.strings similarity index 100% rename from Resources/pt-PT.lproj/YPImagePickerLocalizable.strings rename to Source/Resources/pt-PT.lproj/YPImagePickerLocalizable.strings diff --git a/Resources/ro.lproj/YPImagePickerLocalizable.strings b/Source/Resources/ro.lproj/YPImagePickerLocalizable.strings similarity index 100% rename from Resources/ro.lproj/YPImagePickerLocalizable.strings rename to Source/Resources/ro.lproj/YPImagePickerLocalizable.strings diff --git a/Resources/ru.lproj/YPImagePickerLocalizable.strings b/Source/Resources/ru.lproj/YPImagePickerLocalizable.strings similarity index 100% rename from Resources/ru.lproj/YPImagePickerLocalizable.strings rename to Source/Resources/ru.lproj/YPImagePickerLocalizable.strings diff --git a/Resources/sv.lproj/YPImagePickerLocalizable.strings b/Source/Resources/sv.lproj/YPImagePickerLocalizable.strings similarity index 100% rename from Resources/sv.lproj/YPImagePickerLocalizable.strings rename to Source/Resources/sv.lproj/YPImagePickerLocalizable.strings diff --git a/Resources/th.lproj/YPImagePickerLocalizable.strings b/Source/Resources/th.lproj/YPImagePickerLocalizable.strings similarity index 100% rename from Resources/th.lproj/YPImagePickerLocalizable.strings rename to Source/Resources/th.lproj/YPImagePickerLocalizable.strings diff --git a/Resources/tr.lproj/YPImagePickerLocalizable.strings b/Source/Resources/tr.lproj/YPImagePickerLocalizable.strings similarity index 100% rename from Resources/tr.lproj/YPImagePickerLocalizable.strings rename to Source/Resources/tr.lproj/YPImagePickerLocalizable.strings diff --git a/Resources/vi.lproj/YPImagePickerLocalizable.strings b/Source/Resources/vi.lproj/YPImagePickerLocalizable.strings similarity index 100% rename from Resources/vi.lproj/YPImagePickerLocalizable.strings rename to Source/Resources/vi.lproj/YPImagePickerLocalizable.strings diff --git a/Resources/zh-Hans.lproj/YPImagePickerLocalizable.strings b/Source/Resources/zh-Hans.lproj/YPImagePickerLocalizable.strings similarity index 100% rename from Resources/zh-Hans.lproj/YPImagePickerLocalizable.strings rename to Source/Resources/zh-Hans.lproj/YPImagePickerLocalizable.strings diff --git a/Resources/zh-Hant.lproj/YPImagePickerLocalizable.strings b/Source/Resources/zh-Hant.lproj/YPImagePickerLocalizable.strings similarity index 100% rename from Resources/zh-Hant.lproj/YPImagePickerLocalizable.strings rename to Source/Resources/zh-Hant.lproj/YPImagePickerLocalizable.strings diff --git a/Source/YPPickerVC.swift b/Source/YPPickerVC.swift index b6cbb66d1..ac0a49241 100644 --- a/Source/YPPickerVC.swift +++ b/Source/YPPickerVC.swift @@ -6,7 +6,7 @@ // Copyright © 2016 Yummypets. All rights reserved. // -import Foundation +import UIKit import Stevia import Photos diff --git a/YPImagePicker.podspec b/YPImagePicker.podspec index 72f97bf3c..15addf3cc 100644 --- a/YPImagePicker.podspec +++ b/YPImagePicker.podspec @@ -13,7 +13,7 @@ Pod::Spec.new do |s| s.source_files = 'Source/**/*.swift' s.dependency 'SteviaLayout', '= 4.7.3' s.dependency 'PryntTrimmerView', '= 4.0.2' - s.resources = ['Resources/*', 'Source/**/*.xib'] + s.resources = ['Source/Resources/*', 'Source/**/*.xib'] s.description = "Instagram-like image picker & filters for iOS supporting videos and albums" s.swift_versions = ['5.0', '5.1', '5.2', '5.3'] end diff --git a/YPImagePicker.xcodeproj/project.pbxproj b/YPImagePicker.xcodeproj/project.pbxproj index d9d0583e9..b5cf4b4d7 100644 --- a/YPImagePicker.xcodeproj/project.pbxproj +++ b/YPImagePicker.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 52; objects = { /* Begin PBXBuildFile section */ @@ -183,6 +183,10 @@ EBA37BC526F750DE005DAAD4 /* YPVideoFiltersVC.xib in Resources */ = {isa = PBXBuildFile; fileRef = EB59F451208766B800811B7B /* YPVideoFiltersVC.xib */; }; EBA37BC626F75144005DAAD4 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 99C6D6981F1FB5C100711DB2 /* Assets.xcassets */; }; EBA37BC726F75151005DAAD4 /* YPImagePickerLocalizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 99C6D6991F1FB5C100711DB2 /* YPImagePickerLocalizable.strings */; }; + EBA37BC926F757FF005DAAD4 /* Bundle+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBA37BC826F757FF005DAAD4 /* Bundle+Extensions.swift */; }; + EBA37BCA26F757FF005DAAD4 /* Bundle+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBA37BC826F757FF005DAAD4 /* Bundle+Extensions.swift */; }; + EBA37BCD26F75BCC005DAAD4 /* Stevia in Frameworks */ = {isa = PBXBuildFile; productRef = EBA37BCC26F75BCC005DAAD4 /* Stevia */; }; + EBA37BD026F75C67005DAAD4 /* PryntTrimmerView in Frameworks */ = {isa = PBXBuildFile; productRef = EBA37BCF26F75C67005DAAD4 /* PryntTrimmerView */; }; EBB0FF7A20877A7500C84E25 /* YPVideoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBB0FF7920877A7500C84E25 /* YPVideoView.swift */; }; EBD2B641207B7D7400E711C2 /* YPMediaItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBD2B640207B7D7400E711C2 /* YPMediaItem.swift */; }; EBD66105208104EA00EA276E /* YPIcons.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBD66104208104EA00EA276E /* YPIcons.swift */; }; @@ -327,6 +331,7 @@ EBA37BB826F74CE0005DAAD4 /* YPFilterCollectionViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YPFilterCollectionViewCell.swift; sourceTree = ""; }; EBA37BB926F74CE0005DAAD4 /* YPFiltersView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YPFiltersView.swift; sourceTree = ""; }; EBA37BBA26F74CE0005DAAD4 /* YPFilter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YPFilter.swift; sourceTree = ""; }; + EBA37BC826F757FF005DAAD4 /* Bundle+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Bundle+Extensions.swift"; sourceTree = ""; }; EBB0FF7920877A7500C84E25 /* YPVideoView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YPVideoView.swift; sourceTree = ""; }; EBD2B640207B7D7400E711C2 /* YPMediaItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YPMediaItem.swift; sourceTree = ""; }; EBD66104208104EA00EA276E /* YPIcons.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YPIcons.swift; sourceTree = ""; }; @@ -346,6 +351,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + EBA37BCD26F75BCC005DAAD4 /* Stevia in Frameworks */, + EBA37BD026F75C67005DAAD4 /* PryntTrimmerView in Frameworks */, 4500082B3B62CA66D64563BC /* Pods_Example.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -360,7 +367,6 @@ EBA37B1426F737CE005DAAD4 /* Podfile */, EB5ACE2B2620802A00C3288D /* README.md */, 99C6D69D1F1FB5C100711DB2 /* Source */, - 99C6D6971F1FB5C100711DB2 /* Resources */, EBA37B5026F749C6005DAAD4 /* Example */, 52412A941CA6114A0073C4BE /* Products */, 7BB1F1913DC57A6D502383F0 /* Pods */, @@ -458,6 +464,7 @@ EBD2B639207B7B1100E711C2 /* SelectionsGallery */, 99019E542018CECC007325C2 /* Helpers */, EBD2B63D207B7D4E00E711C2 /* Models */, + 99C6D6971F1FB5C100711DB2 /* Resources */, 99C6D6B31F1FB5C100711DB2 /* Info.plist */, 99C6D6B21F1FB5C100711DB2 /* YPImagePickerHeader.h */, ); @@ -546,6 +553,7 @@ 9911FA23203C3A31000E9B06 /* UIImage+Extensions.swift */, 321E6D86240CFABC00D76CD8 /* UINavigationBar+Extensions.swift */, EB473E16208E192800D16105 /* URL+Extensions.swift */, + EBA37BC826F757FF005DAAD4 /* Bundle+Extensions.swift */, ); path = Extensions; sourceTree = ""; @@ -688,6 +696,10 @@ dependencies = ( ); name = Example; + packageProductDependencies = ( + EBA37BCC26F75BCC005DAAD4 /* Stevia */, + EBA37BCF26F75C67005DAAD4 /* PryntTrimmerView */, + ); productName = YPIPExample; productReference = EBA37B4F26F749C6005DAAD4 /* Example.app */; productType = "com.apple.product-type.application"; @@ -748,6 +760,10 @@ cs, ); mainGroup = 52412A891CA6114A0073C4BE; + packageReferences = ( + EBA37BCB26F75BCC005DAAD4 /* XCRemoteSwiftPackageReference "Stevia" */, + EBA37BCE26F75C67005DAAD4 /* XCRemoteSwiftPackageReference "PryntTrimmerView" */, + ); productRefGroup = 52412A941CA6114A0073C4BE /* Products */; projectDirPath = ""; projectRoot = ""; @@ -876,6 +892,7 @@ EB5B07C4209146F00099C1FA /* UIButton+Extensions.swift in Sources */, 99019E532018CE19007325C2 /* YPPickerScreen.swift in Sources */, 327D7B69240CEF2F00B9C368 /* UIBarButtonItem+Extensions.swift in Sources */, + EBA37BCA26F757FF005DAAD4 /* Bundle+Extensions.swift in Sources */, 99CF6D1F201B6B9E00487F77 /* CGRect+Extensions.swift in Sources */, 99CF6D1D201B6ABA00487F77 /* IndexSet+Extensions.swift in Sources */, EB59F452208766B800811B7B /* YPVideoFiltersVC.swift in Sources */, @@ -962,6 +979,7 @@ EBA37BAD26F74CBA005DAAD4 /* YPPermissionManager.swift in Sources */, EBA37B7B26F74CBA005DAAD4 /* AVCaptureSession+Extensions.swift in Sources */, EBA37B6F26F74CBA005DAAD4 /* UIImage+Extensions.swift in Sources */, + EBA37BC926F757FF005DAAD4 /* Bundle+Extensions.swift in Sources */, EBA37BA226F74CBA005DAAD4 /* YPDeviceOrientationHelper.swift in Sources */, EBA37B9326F74CBA005DAAD4 /* YPBottomPagerView.swift in Sources */, EBA37B7226F74CBA005DAAD4 /* YPPickerScreen.swift in Sources */, @@ -1186,7 +1204,8 @@ MTL_ENABLE_DEBUG_INFO = NO; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; @@ -1215,7 +1234,11 @@ INFOPLIST_FILE = Source/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 12.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); MARKETING_VERSION = 4.5.0; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.yummypets.YPImagePicker; @@ -1248,7 +1271,11 @@ INFOPLIST_FILE = Source/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 12.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); MARKETING_VERSION = 4.5.0; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = com.yummypets.YPImagePicker; @@ -1276,7 +1303,10 @@ GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = Example/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.yummypets.YPIPExample; @@ -1304,7 +1334,10 @@ GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = Example/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.yummypets.YPIPExample; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1345,6 +1378,38 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCRemoteSwiftPackageReference section */ + EBA37BCB26F75BCC005DAAD4 /* XCRemoteSwiftPackageReference "Stevia" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/freshOS/Stevia"; + requirement = { + kind = exactVersion; + version = 5.1.1; + }; + }; + EBA37BCE26F75C67005DAAD4 /* XCRemoteSwiftPackageReference "PryntTrimmerView" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/HHK1/PryntTrimmerView"; + requirement = { + kind = exactVersion; + version = 4.0.2; + }; + }; +/* End XCRemoteSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + EBA37BCC26F75BCC005DAAD4 /* Stevia */ = { + isa = XCSwiftPackageProductDependency; + package = EBA37BCB26F75BCC005DAAD4 /* XCRemoteSwiftPackageReference "Stevia" */; + productName = Stevia; + }; + EBA37BCF26F75C67005DAAD4 /* PryntTrimmerView */ = { + isa = XCSwiftPackageProductDependency; + package = EBA37BCE26F75C67005DAAD4 /* XCRemoteSwiftPackageReference "PryntTrimmerView" */; + productName = PryntTrimmerView; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 52412A8A1CA6114A0073C4BE /* Project object */; } diff --git a/YPImagePicker.xcworkspace/xcshareddata/swiftpm/Package.resolved b/YPImagePicker.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 000000000..bfcc5b2b3 --- /dev/null +++ b/YPImagePicker.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,25 @@ +{ + "object": { + "pins": [ + { + "package": "PryntTrimmerView", + "repositoryURL": "https://github.com/HHK1/PryntTrimmerView", + "state": { + "branch": null, + "revision": "ac1b60a22c7e6a6514de7a66d2f3d5b537c956d5", + "version": "4.0.2" + } + }, + { + "package": "Stevia", + "repositoryURL": "https://github.com/freshOS/Stevia", + "state": { + "branch": null, + "revision": "a32dc3c015fe583080f4947edf795bced9a11108", + "version": "5.1.1" + } + } + ] + }, + "version": 1 +}