Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Re-Enable camera and shoot button after taking photo. #797

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Re-Enable camera and shoot button after taking photo. #797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
463f80b
Enable camera button after taking photo.
lopper Sep 9, 2023
286a6cf
Removed old obsoleted properties in order to fix xcode 15 error.
NikKovIos Sep 21, 2023
d1e81de
Package resolved fix.
NikKovIos Sep 21, 2023
baf53d2
Version bump to 5.2.2
NikKovIos Sep 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"repositoryURL": "https://github.com/freshOS/Stevia",
"state": {
"branch": null,
"revision": "87dd17a86240f16788239a78dd8be11c4b013150",
"version": "4.8.0"
"revision": "cfb1a1d2159277bb553c3dc46f3f742c0275566d",
"version": "5.1.2"
}
}
]
Expand Down
42 changes: 0 additions & 42 deletions Source/Configuration/YPImagePickerConfiguration.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,48 +138,6 @@ public struct YPImagePickerConfiguration {
YPFilter(name: "Sepia", coreImageFilterName: "CISepiaTone"),
YPFilter(name: "XRay", coreImageFilterName: "CIXRay")
]

/// Migration

@available(iOS, obsoleted: 3.0.0, renamed: "video.compression")
public var videoCompression: String = AVAssetExportPresetHighestQuality

@available(iOS, obsoleted: 3.0.0, renamed: "video.fileType")
public var videoExtension: AVFileType = .mov

@available(iOS, obsoleted: 3.0.0, renamed: "video.recordingTimeLimit")
public var videoRecordingTimeLimit: TimeInterval = 60.0

@available(iOS, obsoleted: 3.0.0, renamed: "video.libraryTimeLimit")
public var videoFromLibraryTimeLimit: TimeInterval = 60.0

@available(iOS, obsoleted: 3.0.0, renamed: "video.minimumTimeLimit")
public var videoMinimumTimeLimit: TimeInterval = 3.0

@available(iOS, obsoleted: 3.0.0, renamed: "video.trimmerMaxDuration")
public var trimmerMaxDuration: Double = 60.0

@available(iOS, obsoleted: 3.0.0, renamed: "video.trimmerMinDuration")
public var trimmerMinDuration: Double = 3.0

@available(iOS, obsoleted: 3.0.0, renamed: "library.onlySquare")
public var onlySquareImagesFromLibrary = false

@available(iOS, obsoleted: 3.0.0, renamed: "library.onlySquare")
public var onlySquareFromLibrary = false

@available(iOS, obsoleted: 3.0.0, renamed: "targetImageSize")
public var libraryTargetImageSize = YPImageSize.original

@available(iOS, obsoleted: 3.0.0, renamed: "library.mediaType")
public var showsVideoInLibrary = false

@available(iOS, obsoleted: 3.0.0, renamed: "library.mediaType")
public var libraryMediaType = YPlibraryMediaType.photo

@available(iOS, obsoleted: 3.0.0, renamed: "library.maxNumberOfItems")
public var maxNumberOfItems = 1

}

/// Encapsulates library specific settings.
Expand Down
3 changes: 3 additions & 0 deletions Source/Pages/Photo/YPCameraVC.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ internal final class YPCameraVC: UIViewController, UIGestureRecognizerDelegate,
self?.shoot()
}
}


func shoot() {
// Prevent from tapping multiple times in a row
Expand Down Expand Up @@ -161,6 +162,8 @@ internal final class YPCameraVC: UIViewController, UIGestureRecognizerDelegate,
let noOrietationImage = image.resetOrientation()

DispatchQueue.main.async {
self.v.shotButton.isEnabled = true
self.start()
self.didCapturePhoto?(noOrietationImage.resizedImageIfNeeded())
}
}
Expand Down
2 changes: 1 addition & 1 deletion YPImagePicker.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'YPImagePicker'
s.version = "5.2.1"
s.version = "5.2.2"
s.summary = "Instagram-like image picker & filters for iOS"
s.homepage = "https://github.com/Yummypets/YPImagePicker"
s.license = { :type => "MIT", :file => "LICENSE" }
Expand Down
4 changes: 2 additions & 2 deletions YPImagePicker.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1241,7 +1241,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 5.2.1;
MARKETING_VERSION = 5.2.2;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.yummypets.YPImagePicker;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -1278,7 +1278,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 5.2.1;
MARKETING_VERSION = 5.2.2;
ONLY_ACTIVE_ARCH = NO;
PRODUCT_BUNDLE_IDENTIFIER = com.yummypets.YPImagePicker;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down