From 2e3e7b506df74bff6a0b71089b642b4494098abc Mon Sep 17 00:00:00 2001 From: zcohen Date: Fri, 13 Dec 2024 10:21:56 -0500 Subject: [PATCH 01/12] fix: update prynttrimmerview version --- YPImagePicker.xcodeproj/project.pbxproj | 4 ++-- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/YPImagePicker.xcodeproj/project.pbxproj b/YPImagePicker.xcodeproj/project.pbxproj index 9f48c4ad2..bedad630b 100644 --- a/YPImagePicker.xcodeproj/project.pbxproj +++ b/YPImagePicker.xcodeproj/project.pbxproj @@ -1372,8 +1372,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/rewardstyle/prynttrimmerview"; requirement = { - kind = exactVersion; - version = 4.0.3; + branch = "uat-1-low-priority-issues"; + kind = branch; }; }; EBA37BCB26F75BCC005DAAD4 /* XCRemoteSwiftPackageReference "Stevia" */ = { diff --git a/YPImagePicker.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/YPImagePicker.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 979e0742d..1db554ff4 100644 --- a/YPImagePicker.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/YPImagePicker.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -5,8 +5,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/rewardstyle/prynttrimmerview", "state" : { - "revision" : "267a4b08213af5d8803e849c6ba7399928628752", - "version" : "4.0.3" + "branch" : "uat-1-low-priority-issues", + "revision" : "7887d04be58f1cde565ec25e56f123c47fe2b420" } }, { From 7b978122a581371d05f5c24086effd2f18ccadc7 Mon Sep 17 00:00:00 2001 From: zcohen Date: Fri, 13 Dec 2024 10:28:55 -0500 Subject: [PATCH 02/12] update prynttrimmerview in package.swift --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index b244e1c4a..c11a6f60e 100644 --- a/Package.swift +++ b/Package.swift @@ -18,7 +18,7 @@ let package = Package( ), .package( url: "https://github.com/rewardStyle/PryntTrimmerView", - .exact("4.0.3") + .branch("uat-1-low-priority-issues") ) ], From 599ba39492f8f7d83b208b512d4f921e7326eb8f Mon Sep 17 00:00:00 2001 From: zcohen Date: Fri, 13 Dec 2024 11:00:40 -0500 Subject: [PATCH 03/12] chore: update prynttrimmerview --- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/YPImagePicker.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/YPImagePicker.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 1db554ff4..b8c9669ca 100644 --- a/YPImagePicker.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/YPImagePicker.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -6,7 +6,7 @@ "location" : "https://github.com/rewardstyle/prynttrimmerview", "state" : { "branch" : "uat-1-low-priority-issues", - "revision" : "7887d04be58f1cde565ec25e56f123c47fe2b420" + "revision" : "b2fbff49c693d010d1fbb9d5b8a102e5e28391a1" } }, { From 68ca10de9ee4a0700780af8bbb229e2a396b1d54 Mon Sep 17 00:00:00 2001 From: zcohen Date: Fri, 13 Dec 2024 11:21:22 -0500 Subject: [PATCH 04/12] fix: reset thumb selector border color + update printtrymmerview --- Source/Filters/Video/YPVideoFiltersVC.swift | 1 + .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/Filters/Video/YPVideoFiltersVC.swift b/Source/Filters/Video/YPVideoFiltersVC.swift index 2128792e7..d387659c9 100644 --- a/Source/Filters/Video/YPVideoFiltersVC.swift +++ b/Source/Filters/Video/YPVideoFiltersVC.swift @@ -627,6 +627,7 @@ extension YPVideoFiltersVC: YPTimeStampTrimmerViewDelegate { // MARK: - ThumbSelectorViewDelegate extension YPVideoFiltersVC: ThumbSelectorViewDelegate { public func didChangeThumbPosition(_ imageTime: CMTime) { + coverThumbSelectorView.resetThumbViewBorderColor() // fetch new image if !isUsingCustomCoverImage || vcType == .Cover { generateCoverImageAtTime(imageTime) diff --git a/YPImagePicker.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/YPImagePicker.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index b8c9669ca..783783882 100644 --- a/YPImagePicker.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/YPImagePicker.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -6,7 +6,7 @@ "location" : "https://github.com/rewardstyle/prynttrimmerview", "state" : { "branch" : "uat-1-low-priority-issues", - "revision" : "b2fbff49c693d010d1fbb9d5b8a102e5e28391a1" + "revision" : "77797688c45f9af75ff2cbc7e2c91e97e9c042a7" } }, { From 9e6369400d2952cf039873b03f0d15dd5d3b90d6 Mon Sep 17 00:00:00 2001 From: zcohen Date: Tue, 17 Dec 2024 10:11:40 -0500 Subject: [PATCH 05/12] fix: provide mechanism to communicate custom cover photo replacement --- Source/Filters/Video/YPVideoFiltersVC.swift | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Source/Filters/Video/YPVideoFiltersVC.swift b/Source/Filters/Video/YPVideoFiltersVC.swift index d387659c9..427769187 100644 --- a/Source/Filters/Video/YPVideoFiltersVC.swift +++ b/Source/Filters/Video/YPVideoFiltersVC.swift @@ -54,6 +54,7 @@ open class YPVideoFiltersVC: UIViewController, IsMediaFilterVC { public var shouldShowDone = false public weak var videoProcessingDelegate: YPVideoProcessingDelegate? public var isUsingCustomCoverImage = false + public var customCoverImageReplacedHandler: (() -> Void)? var coverImageTime: CMTime? var coverTrimTimes: (startTime: CMTime, endTime: CMTime)? @@ -551,6 +552,8 @@ open class YPVideoFiltersVC: UIViewController, IsMediaFilterVC { self?.imageGenerator?.cancelAllCGImageGeneration() self?.coverImageView.image = UIImage(cgImage: image) self?.coverImageTime = time + self?.isUsingCustomCoverImage = false + self?.customCoverImageReplacedHandler?() } }) } From badabf939c992d54dbdc172f32ce0f30cd12b2ff Mon Sep 17 00:00:00 2001 From: zcohen Date: Wed, 18 Dec 2024 10:43:37 -0500 Subject: [PATCH 06/12] update prynttrimmerview --- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/YPImagePicker.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/YPImagePicker.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 783783882..88c56c04e 100644 --- a/YPImagePicker.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/YPImagePicker.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -6,7 +6,7 @@ "location" : "https://github.com/rewardstyle/prynttrimmerview", "state" : { "branch" : "uat-1-low-priority-issues", - "revision" : "77797688c45f9af75ff2cbc7e2c91e97e9c042a7" + "revision" : "fffeab2adb5779de9b9cb828de4f44d5da400855" } }, { From 2cc6fd794fb8ad7fe354e04a8ec29f1277d928cc Mon Sep 17 00:00:00 2001 From: zcohen Date: Wed, 18 Dec 2024 11:23:19 -0500 Subject: [PATCH 07/12] update prynttrimmerview --- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/YPImagePicker.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/YPImagePicker.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 88c56c04e..65ab82542 100644 --- a/YPImagePicker.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/YPImagePicker.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -6,7 +6,7 @@ "location" : "https://github.com/rewardstyle/prynttrimmerview", "state" : { "branch" : "uat-1-low-priority-issues", - "revision" : "fffeab2adb5779de9b9cb828de4f44d5da400855" + "revision" : "05d8e36f479ebf5fe87405fba10958c38ab15691" } }, { From 746eed6a4da1c87156d92473d266be619e57b224 Mon Sep 17 00:00:00 2001 From: zcohen Date: Wed, 18 Dec 2024 11:59:15 -0500 Subject: [PATCH 08/12] update image picker --- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/YPImagePicker.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/YPImagePicker.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 65ab82542..df3d70edc 100644 --- a/YPImagePicker.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/YPImagePicker.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -6,7 +6,7 @@ "location" : "https://github.com/rewardstyle/prynttrimmerview", "state" : { "branch" : "uat-1-low-priority-issues", - "revision" : "05d8e36f479ebf5fe87405fba10958c38ab15691" + "revision" : "f421a4e45a2ead43e9bb798870064c418658ae15" } }, { From 37ba49119804245883d067bf1b7b2648e2dff26a Mon Sep 17 00:00:00 2001 From: zcohen Date: Fri, 20 Dec 2024 10:15:55 -0500 Subject: [PATCH 09/12] update prynttrimmerview --- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/YPImagePicker.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/YPImagePicker.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index df3d70edc..27e6a8cec 100644 --- a/YPImagePicker.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/YPImagePicker.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -6,7 +6,7 @@ "location" : "https://github.com/rewardstyle/prynttrimmerview", "state" : { "branch" : "uat-1-low-priority-issues", - "revision" : "f421a4e45a2ead43e9bb798870064c418658ae15" + "revision" : "06f86027c0612fe3e0498b2f0c556f3f6095f46d" } }, { From 37432281be83e64bf7a5cd8d866efcb99946b8da Mon Sep 17 00:00:00 2001 From: zcohen Date: Fri, 20 Dec 2024 10:53:47 -0500 Subject: [PATCH 10/12] fix: update prynttrimmerview reference --- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/YPImagePicker.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/YPImagePicker.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 27e6a8cec..1b4c50ad1 100644 --- a/YPImagePicker.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/YPImagePicker.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -6,7 +6,7 @@ "location" : "https://github.com/rewardstyle/prynttrimmerview", "state" : { "branch" : "uat-1-low-priority-issues", - "revision" : "06f86027c0612fe3e0498b2f0c556f3f6095f46d" + "revision" : "c9077653c3af4786fbb2c52367d1fece5dc6dadc" } }, { From 08cf9139fb4ebfa7e9a3c4719c8dc3481d2504b4 Mon Sep 17 00:00:00 2001 From: zcohen Date: Fri, 20 Dec 2024 11:02:22 -0500 Subject: [PATCH 11/12] update trimmer --- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/YPImagePicker.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/YPImagePicker.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 1b4c50ad1..eeddb292d 100644 --- a/YPImagePicker.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/YPImagePicker.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -6,7 +6,7 @@ "location" : "https://github.com/rewardstyle/prynttrimmerview", "state" : { "branch" : "uat-1-low-priority-issues", - "revision" : "c9077653c3af4786fbb2c52367d1fece5dc6dadc" + "revision" : "e51d5001b4798c3fa9235b549add38cecee538e8" } }, { From deda417badf6724177c08806ac44b6eb3775f970 Mon Sep 17 00:00:00 2001 From: zcohen Date: Fri, 20 Dec 2024 16:33:52 -0500 Subject: [PATCH 12/12] update to final prynttrimmerview reference --- Package.swift | 2 +- YPImagePicker.xcodeproj/project.pbxproj | 4 ++-- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Package.swift b/Package.swift index c11a6f60e..c7dec2a7f 100644 --- a/Package.swift +++ b/Package.swift @@ -18,7 +18,7 @@ let package = Package( ), .package( url: "https://github.com/rewardStyle/PryntTrimmerView", - .branch("uat-1-low-priority-issues") + .exact("4.0.4") ) ], diff --git a/YPImagePicker.xcodeproj/project.pbxproj b/YPImagePicker.xcodeproj/project.pbxproj index bedad630b..84adb0a87 100644 --- a/YPImagePicker.xcodeproj/project.pbxproj +++ b/YPImagePicker.xcodeproj/project.pbxproj @@ -1372,8 +1372,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/rewardstyle/prynttrimmerview"; requirement = { - branch = "uat-1-low-priority-issues"; - kind = branch; + kind = exactVersion; + version = 4.0.4; }; }; EBA37BCB26F75BCC005DAAD4 /* XCRemoteSwiftPackageReference "Stevia" */ = { diff --git a/YPImagePicker.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/YPImagePicker.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index eeddb292d..9d7731844 100644 --- a/YPImagePicker.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/YPImagePicker.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -5,8 +5,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/rewardstyle/prynttrimmerview", "state" : { - "branch" : "uat-1-low-priority-issues", - "revision" : "e51d5001b4798c3fa9235b549add38cecee538e8" + "revision" : "59379933130df86e35b6f6a60aefa7262368854a", + "version" : "4.0.4" } }, {