ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-22 22:25:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Camera and editor improvements

Browse Source
This commit is contained in:
Ilya Laktyushin
2023-06-14 16:42:55 +04:00
parent e3222ca460
commit b6420c4405
19 changed files with 997 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

138
submodules/DrawingUI/Sources/DrawingEntitiesView.swift
View File

@@ -334,68 +334,68 @@ public final class DrawingEntitiesView: UIView, TGPhotoDrawingEntitiesView {
}
view.containerView = self
let processSnap: (Bool, UIView) -> Void = { [weak self] snapped, snapView in
guard let self else {
return
}
let transition = ContainedViewLayoutTransition.animated(duration: 0.2, curve: .easeInOut)
if snapped {
self.insertSubview(snapView, belowSubview: view)
if snapView.alpha < 1.0 {
self.hapticFeedback.impact(.light)
}
transition.updateAlpha(layer: snapView.layer, alpha: 1.0)
} else {
transition.updateAlpha(layer: snapView.layer, alpha: 0.0)
}
}
view.onSnapUpdated = { [weak self, weak view] type, snapped in
guard let self else {
return
}
switch type {
case .centerX:
processSnap(snapped, self.xAxisView)
case .centerY:
processSnap(snapped, self.yAxisView)
case .top:
processSnap(snapped, self.topEdgeView)
self.edgePreviewUpdated(snapped)
case .left:
processSnap(snapped, self.leftEdgeView)
self.edgePreviewUpdated(snapped)
case .right:
processSnap(snapped, self.rightEdgeView)
self.edgePreviewUpdated(snapped)
case .bottom:
processSnap(snapped, self.bottomEdgeView)
self.edgePreviewUpdated(snapped)
case let .rotation(angle):
let transition = ContainedViewLayoutTransition.animated(duration: 0.2, curve: .easeInOut)
if let angle, let view {
self.layer.insertSublayer(self.angleLayer, below: view.layer)
self.angleLayer.transform = CATransform3DMakeRotation(angle, 0.0, 0.0, 1.0)
if self.angleLayer.opacity < 1.0 {
self.hapticFeedback.impact(.light)
}
transition.updateAlpha(layer: self.angleLayer, alpha: 1.0)
} else {
transition.updateAlpha(layer: self.angleLayer, alpha: 0.0)
}
}
}
view.onPositionUpdated = { [weak self] position in
if let self {
self.angleLayer.position = position
}
}
view.onInteractionUpdated = { [weak self] interacting in
if let self {
self.onInteractionUpdated(interacting)
}
}
// let processSnap: (Bool, UIView) -> Void = { [weak self] snapped, snapView in
// guard let self else {
// return
// }
// let transition = ContainedViewLayoutTransition.animated(duration: 0.2, curve: .easeInOut)
// if snapped {
// self.insertSubview(snapView, belowSubview: view)
// if snapView.alpha < 1.0 {
// self.hapticFeedback.impact(.light)
// }
// transition.updateAlpha(layer: snapView.layer, alpha: 1.0)
// } else {
// transition.updateAlpha(layer: snapView.layer, alpha: 0.0)
// }
// }
//
// view.onSnapUpdated = { [weak self, weak view] type, snapped in
// guard let self else {
// return
// }
// switch type {
// case .centerX:
// processSnap(snapped, self.xAxisView)
// case .centerY:
// processSnap(snapped, self.yAxisView)
// case .top:
// processSnap(snapped, self.topEdgeView)
// self.edgePreviewUpdated(snapped)
// case .left:
// processSnap(snapped, self.leftEdgeView)
// self.edgePreviewUpdated(snapped)
// case .right:
// processSnap(snapped, self.rightEdgeView)
// self.edgePreviewUpdated(snapped)
// case .bottom:
// processSnap(snapped, self.bottomEdgeView)
// self.edgePreviewUpdated(snapped)
// case let .rotation(angle):
// let transition = ContainedViewLayoutTransition.animated(duration: 0.2, curve: .easeInOut)
// if let angle, let view {
// self.layer.insertSublayer(self.angleLayer, below: view.layer)
// self.angleLayer.transform = CATransform3DMakeRotation(angle, 0.0, 0.0, 1.0)
// if self.angleLayer.opacity < 1.0 {
// self.hapticFeedback.impact(.light)
// }
// transition.updateAlpha(layer: self.angleLayer, alpha: 1.0)
// } else {
// transition.updateAlpha(layer: self.angleLayer, alpha: 0.0)
// }
// }
// }
// view.onPositionUpdated = { [weak self] position in
// if let self {
// self.angleLayer.position = position
// }
// }
// view.onInteractionUpdated = { [weak self] interacting in
// if let self {
// self.onInteractionUpdated(interacting)
// }
// }
//
view.update()
self.addSubview(view)
@@ -405,6 +405,12 @@ public final class DrawingEntitiesView: UIView, TGPhotoDrawingEntitiesView {
return view
}
public func invalidate() {
for case let view as DrawingEntityView in self.subviews {
view.invalidate()
}
}
func duplicate(_ entity: DrawingEntity) -> DrawingEntity {
let newEntity = entity.duplicate()
self.prepareNewEntity(newEntity, setup: false, relativeTo: entity)
@@ -714,6 +720,14 @@ public class DrawingEntityView: UIView {
}
func invalidate() {
self.selectionView = nil
self.containerView = nil
self.onSnapUpdated = { _, _ in }
self.onPositionUpdated = { _ in }
self.onInteractionUpdated = { _ in }
}
public func update(animated: Bool = false) {
self.updateSelectionView()
}