Skip to content

Commit

Permalink
Stevia version bumped from 4.8.0 to 5.1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
NikKovIos committed Jun 10, 2022
1 parent 74b395a commit 7e48bf1
Show file tree
Hide file tree
Showing 26 changed files with 62 additions and 64 deletions.
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ let package = Package(
dependencies: [
.package(
url: "https://github.com/freshOS/Stevia",
.exact("4.8.0")
.exact("5.1.2")
),
.package(
url: "https://github.com/HHK1/PryntTrimmerView",
Expand Down
2 changes: 1 addition & 1 deletion Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use_frameworks!
target 'Example' do

# Pods for YPImagePickerExample
pod 'SteviaLayout', '= 4.7.3'
pod 'SteviaLayout', '= 5.1.2'
pod 'PryntTrimmerView', '= 4.0.2'

end
4 changes: 2 additions & 2 deletions Source/Filters/Crop/YPCropView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ final class YPCropView: UIView {

private func setupViewHierarchy() {

sv(
containerView.sv(
subviews(
containerView.subviews(
imageView,
topCurtain,
leadingCurtain,
Expand Down
2 changes: 1 addition & 1 deletion Source/Filters/Photo/YPFilterCollectionViewCell.swift
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ final class YPFilterCollectionViewCell: UICollectionViewCell {
override init(frame: CGRect) {
super.init(frame: frame)

sv(
subviews(
name,
imageView
)
Expand Down
4 changes: 2 additions & 2 deletions Source/Filters/Photo/YPFiltersView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ class YPFiltersView: UIView {
filtersLoader.startAnimating()
filtersLoader.color = YPConfig.colors.tintColor

sv(
subviews(
imageView,
collectionViewContainer.sv(
collectionViewContainer.subviews(
filtersLoader,
collectionView
)
Expand Down
10 changes: 5 additions & 5 deletions Source/Filters/Video/YPVideoFiltersVC.swift
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@ public final class YPVideoFiltersVC: UIViewController, IsMediaFilterVC {
v.isHidden = true
return v
}()
private let trimBottomItem: YPMenuItem = {
private lazy var trimBottomItem: YPMenuItem = {
let v = YPMenuItem()
v.textLabel.text = YPConfig.wordings.trim
v.button.addTarget(self, action: #selector(selectTrim), for: .touchUpInside)
return v
}()
private let coverBottomItem: YPMenuItem = {
private lazy var coverBottomItem: YPMenuItem = {
let v = YPMenuItem()
v.textLabel.text = YPConfig.wordings.cover
v.button.addTarget(self, action: #selector(selectCover), for: .touchUpInside)
Expand Down Expand Up @@ -147,12 +147,12 @@ public final class YPVideoFiltersVC: UIViewController, IsMediaFilterVC {
}

private func setupLayout() {
view.sv(
view.subviews(
trimBottomItem,
coverBottomItem,
videoView,
coverImageView,
trimmerContainerView.sv(
trimmerContainerView.subviews(
trimmerView,
coverThumbSelectorView
)
Expand All @@ -174,7 +174,7 @@ public final class YPVideoFiltersVC: UIViewController, IsMediaFilterVC {
trimmerContainerView.Top == videoView.Bottom
trimmerContainerView.Bottom == trimBottomItem.Top

trimmerView.fillHorizontally(m: 30).centerVertically()
trimmerView.fillHorizontally(padding: 30).centerVertically()
trimmerView.Height == trimmerContainerView.Height / 3

coverThumbSelectorView.followEdges(trimmerView)
Expand Down
2 changes: 1 addition & 1 deletion Source/Filters/Video/YPVideoView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public class YPVideoView: UIView {
playerLayer.videoGravity = .resizeAspect
previewImageView.contentMode = .scaleAspectFit

sv(
subviews(
previewImageView,
playerView,
playImageView
Expand Down
2 changes: 1 addition & 1 deletion Source/Helpers/YPLoadingView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class YPLoadingView: UIView {
let stack = UIStackView(arrangedSubviews: [spinner, processingLabel])
stack.axis = .vertical
stack.spacing = 20
sv(
subviews(
stack
)

Expand Down
2 changes: 1 addition & 1 deletion Source/Pages/Gallery/Album/YPAlbumCell.swift
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class YPAlbumCell: UITableViewCell {
stackView.addArrangedSubview(title)
stackView.addArrangedSubview(numberOfItems)

sv(
subviews(
thumbnail,
stackView
)
Expand Down
2 changes: 1 addition & 1 deletion Source/Pages/Gallery/Album/YPAlbumView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class YPAlbumView: UIView {
convenience init() {
self.init(frame: .zero)

sv(
subviews(
tableView,
spinner
)
Expand Down
2 changes: 1 addition & 1 deletion Source/Pages/Gallery/BottomPager/YPBottomPager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ open class YPBottomPager: UIViewController, UIScrollViewDelegate {
c.willMove(toParent: self)
addChild(c)
let x: CGFloat = CGFloat(index) * viewWidth
v.scrollView.sv(c.view)
v.scrollView.subviews(c.view)
c.didMove(toParent: self)
c.view.left(x)
c.view.top(0)
Expand Down
2 changes: 1 addition & 1 deletion Source/Pages/Gallery/BottomPager/YPBottomPagerView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ final class YPBottomPagerView: UIView {
self.init(frame: .zero)
backgroundColor = .offWhiteOrBlack

sv(
subviews(
scrollView,
header
)
Expand Down
2 changes: 1 addition & 1 deletion Source/Pages/Gallery/BottomPager/YPMenuItem.swift
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ final class YPMenuItem: UIView {
func setup() {
backgroundColor = YPImagePickerConfiguration.shared.colors.bottomMenuItemBackgroundColor

sv(
subviews(
textLabel,
button
)
Expand Down
2 changes: 1 addition & 1 deletion Source/Pages/Gallery/BottomPager/YPPagerMenu.swift
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ final class YPPagerMenu: UIView {
let menuItemWidth: CGFloat = screenWidth / CGFloat(menuItems.count)
var previousMenuItem: YPMenuItem?
for m in menuItems {
sv(
subviews(
m
)

Expand Down
8 changes: 4 additions & 4 deletions Source/Pages/Gallery/YPAssetViewContainer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ final class YPAssetViewContainer: UIView {

// TODO: Add tap gesture to play/pause. Add double tap gesture to square/unsquare

sv(
spinnerView.sv(
subviews(
spinnerView.subviews(
spinner
),
curtain
Expand All @@ -81,14 +81,14 @@ final class YPAssetViewContainer: UIView {
if !onlySquare {
// Crop Button
squareCropButton.setImage(YPConfig.icons.cropIcon, for: .normal)
sv(squareCropButton)
subviews(squareCropButton)
squareCropButton.size(42)
|-15-squareCropButton
squareCropButton.Bottom == self.Bottom - 15
}

// Multiple selection button
sv(multipleSelectionButton)
subviews(multipleSelectionButton)
multipleSelectionButton.size(42).trailing(15)
multipleSelectionButton.Bottom == self.Bottom - 15
}
Expand Down
2 changes: 1 addition & 1 deletion Source/Pages/Gallery/YPGridView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ final class YPGridView: UIView {
convenience init() {
self.init(frame: .zero)
isUserInteractionEnabled = false
sv(
subviews(
line1,
line2,
line3,
Expand Down
8 changes: 4 additions & 4 deletions Source/Pages/Gallery/YPLibraryView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -167,16 +167,16 @@ internal final class YPLibraryView: UIView {
// MARK: - Private Methods

private func setupLayout() {
sv(
collectionContainerView.sv(
subviews(
collectionContainerView.subviews(
collectionView
),
line,
assetViewContainer.sv(
assetViewContainer.subviews(
assetZoomableView
),
progressView,
maxNumberWarningView.sv(
maxNumberWarningView.subviews(
maxNumberWarningLabel
)
)
Expand Down
4 changes: 2 additions & 2 deletions Source/Pages/Gallery/YPLibraryViewCell.swift
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class YPMultipleSelectionIndicator: UIView {

let size: CGFloat = 20

sv(
subviews(
circle,
label
)
Expand Down Expand Up @@ -65,7 +65,7 @@ class YPLibraryViewCell: UICollectionViewCell {
override init(frame: CGRect) {
super.init(frame: frame)

sv(
subviews(
imageView,
durationLabel,
selectionOverlay,
Expand Down
8 changes: 4 additions & 4 deletions Source/Pages/Photo/YPCameraView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -24,26 +24,26 @@ internal class YPCameraView: UIView, UIGestureRecognizerDelegate {

if let overlayView = overlayView {
// View Hierarchy
sv(
subviews(
previewViewContainer,
overlayView,
progressBar,
timeElapsedLabel,
flashButton,
flipButton,
buttonsContainer.sv(
buttonsContainer.subviews(
shotButton
)
)
} else {
// View Hierarchy
sv(
subviews(
previewViewContainer,
progressBar,
timeElapsedLabel,
flashButton,
flipButton,
buttonsContainer.sv(
buttonsContainer.subviews(
shotButton
)
)
Expand Down
2 changes: 1 addition & 1 deletion Source/SelectionsGallery/YPSelectionsGalleryCell.swift
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public class YPSelectionsGalleryCell: UICollectionViewCell {
override init(frame: CGRect) {
super.init(frame: frame)

sv(
subviews(
imageView,
editIcon,
editSquare,
Expand Down
2 changes: 1 addition & 1 deletion Source/SelectionsGallery/YPSelectionsGalleryView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class YPSelectionsGalleryView: UIView {
convenience init() {
self.init(frame: .zero)

sv(
subviews(
collectionView
)

Expand Down
2 changes: 1 addition & 1 deletion Source/YPImagePicker.swift
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ open class YPImagePicker: UINavigationController {
}

private func setupLoadingView() {
view.sv(
view.subviews(
loadingView
)
loadingView.fillContainer()
Expand Down
4 changes: 2 additions & 2 deletions Source/YPPickerVC.swift
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ open class YPPickerVC: YPBottomPager, YPBottomPagerDelegate {
}

if YPConfig.library.options != nil {
titleView.sv(
titleView.subviews(
label
)
|-(>=8)-label.centerHorizontally()-(>=8)-|
Expand All @@ -253,7 +253,7 @@ open class YPPickerVC: YPBottomPager, YPBottomPagerDelegate {
button.addTarget(self, action: #selector(navBarTapped), for: .touchUpInside)
button.setBackgroundColor(UIColor.white.withAlphaComponent(0.5), forState: .highlighted)

titleView.sv(
titleView.subviews(
label,
arrow,
button
Expand Down
2 changes: 1 addition & 1 deletion YPImagePicker.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Pod::Spec.new do |s|
:tag => s.version.to_s }
s.ios.deployment_target = "12.0"
s.source_files = 'Source/**/*.swift'
s.dependency 'SteviaLayout', '= 4.7.3'
s.dependency 'SteviaLayout', '= 5.1.2'
s.dependency 'PryntTrimmerView', '= 4.0.2'
s.resources = ['Source/Resources/*', 'Source/**/*.xib']
s.description = "Instagram-like image picker & filters for iOS supporting videos and albums"
Expand Down
2 changes: 1 addition & 1 deletion YPImagePicker.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1387,7 +1387,7 @@
repositoryURL = "https://github.com/freshOS/Stevia";
requirement = {
kind = exactVersion;
version = 4.8.0;
version = 5.1.2;
};
};
EBA37BCE26F75C67005DAAD4 /* XCRemoteSwiftPackageReference "PryntTrimmerView" */ = {
Expand Down
42 changes: 20 additions & 22 deletions YPImagePicker.xcworkspace/xcshareddata/swiftpm/Package.resolved
Original file line number Diff line number Diff line change
@@ -1,25 +1,23 @@
{
"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": "87dd17a86240f16788239a78dd8be11c4b013150",
"version": "4.8.0"
}
"pins" : [
{
"identity" : "prynttrimmerview",
"kind" : "remoteSourceControl",
"location" : "https://github.com/HHK1/PryntTrimmerView",
"state" : {
"revision" : "ac1b60a22c7e6a6514de7a66d2f3d5b537c956d5",
"version" : "4.0.2"
}
]
},
"version": 1
},
{
"identity" : "stevia",
"kind" : "remoteSourceControl",
"location" : "https://github.com/freshOS/Stevia",
"state" : {
"revision" : "cfb1a1d2159277bb553c3dc46f3f742c0275566d",
"version" : "5.1.2"
}
}
],
"version" : 2
}

0 comments on commit 7e48bf1

Please sign in to comment.