Skip to content

Commit

Permalink
Enhance the user experience of the image cropping interface and optim…
Browse files Browse the repository at this point in the history
…ize the animation effects
  • Loading branch information
longitachi committed Jul 4, 2024
1 parent d3afb0f commit ab8c48e
Show file tree
Hide file tree
Showing 9 changed files with 639 additions and 432 deletions.
1 change: 0 additions & 1 deletion Example/Example/FontChooserContainerView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ class FontChooserContainerView: UIView, ZLTextFontChooserDelegate {
}
}


func setupUI() {
importFonts()
self.baseView = UIView()
Expand Down
1 change: 1 addition & 0 deletions Example/Example/ViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ class ViewController: UIViewController {
// Provide a image sticker container view
.imageStickerContainerView(ImageStickerContainerView())
.fontChooserContainerView(FontChooserContainerView())
.clipRatios(ZLImageClipRatio.all)
// Custom filter
// .filters = [.normal]
}
Expand Down
55 changes: 55 additions & 0 deletions Sources/General/ZLAnimationUtils.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
//
// ZLAnimationUtils.swift
// ZLImageEditor
//
// Created by long on 2023/1/13.
//
// Copyright (c) 2020 Long Zhang <495181165@qq.com>
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.

import UIKit

class ZLAnimationUtils: NSObject {
enum AnimationType: String {
case fade = "opacity"
case scale = "transform.scale"
case rotate = "transform.rotation"
case path
}

class func animation(
type: ZLAnimationUtils.AnimationType,
fromValue: Any?,
toValue: Any?,
duration: TimeInterval,
fillMode: CAMediaTimingFillMode = .forwards,
isRemovedOnCompletion: Bool = false,
timingFunction: CAMediaTimingFunction? = nil
) -> CAAnimation {
let animation = CABasicAnimation(keyPath: type.rawValue)
animation.fromValue = fromValue
animation.toValue = toValue
animation.duration = duration
animation.fillMode = fillMode
animation.isRemovedOnCompletion = isRemovedOnCompletion
animation.timingFunction = timingFunction
return animation
}
}
6 changes: 3 additions & 3 deletions Sources/General/ZLBaseStickerView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ protocol ZLStickerViewAdditional: NSObject {
func addScale(_ scale: CGFloat)
}

public class ZLBaseStickerView: UIView, UIGestureRecognizerDelegate {
class ZLBaseStickerView: UIView, UIGestureRecognizerDelegate {
private enum Direction: Int {
case up = 0
case right = 90
Expand Down Expand Up @@ -171,7 +171,7 @@ public class ZLBaseStickerView: UIView, UIGestureRecognizerDelegate {
fatalError("init(coder:) has not been implemented")
}

override public func layoutSubviews() {
override func layoutSubviews() {
super.layoutSubviews()

guard firstLayout else {
Expand Down Expand Up @@ -348,7 +348,7 @@ public class ZLBaseStickerView: UIView, UIGestureRecognizerDelegate {

// MARK: UIGestureRecognizerDelegate

public func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
return true
}
}
Expand Down
Loading

0 comments on commit ab8c48e

Please sign in to comment.