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

Camera and media editor improvements

Browse Source
This commit is contained in:
Ilya Laktyushin
2023-05-12 21:14:19 +04:00
parent d15c48ff07 e8dab90584
commit 01fb5954df
96 changed files with 8029 additions and 3232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,8 @@ public protocol DrawingEntity: AnyObject {
var isAnimated: Bool { get }
var center: CGPoint { get }
var isMedia: Bool { get }
var lineWidth: CGFloat { get set }
var color: DrawingColor { get set }
@@ -250,7 +252,7 @@ public final class DrawingEntitiesView: UIView, TGPhotoDrawingEntitiesView {
let entitiesData = self.entitiesData
return entitiesData != initialEntitiesData
} else {
let filteredEntities = self.entities.filter { !($0 is DrawingMediaEntity) }
let filteredEntities = self.entities.filter { !$0.isMedia }
return !filteredEntities.isEmpty
}
}
@@ -267,7 +269,7 @@ public final class DrawingEntitiesView: UIView, TGPhotoDrawingEntitiesView {
while true {
var occupied = false
for case let view as DrawingEntityView in self.subviews {
if view is DrawingMediaEntityView {
if view.entity.isMedia {
continue
}
let location = view.entity.center
@@ -466,7 +468,7 @@ public final class DrawingEntitiesView: UIView, TGPhotoDrawingEntitiesView {
private func clear(animated: Bool = false) {
if animated {
for case let view as DrawingEntityView in self.subviews {
if view is DrawingMediaEntityView {
if view.entity.isMedia {
continue
}
if let selectionView = view.selectionView {
@@ -484,7 +486,7 @@ public final class DrawingEntitiesView: UIView, TGPhotoDrawingEntitiesView {
} else {
for case let view as DrawingEntityView in self.subviews {
if view is DrawingMediaEntityView {
if view.entity.isMedia {
continue
}
view.selectionView?.removeFromSuperview()
@@ -554,7 +556,7 @@ public final class DrawingEntitiesView: UIView, TGPhotoDrawingEntitiesView {
}
func selectEntity(_ entity: DrawingEntity?) {
if entity is DrawingMediaEntity {
if entity?.isMedia == true {
return
}
if entity !== self.selectedEntityView?.entity {
@@ -631,13 +633,13 @@ public final class DrawingEntitiesView: UIView, TGPhotoDrawingEntitiesView {
}
public func handlePan(_ gestureRecognizer: UIPanGestureRecognizer) {
if !self.hasSelection, let mediaEntityView = self.subviews.first(where: { $0 is DrawingMediaEntityView }) as? DrawingMediaEntityView {
if !self.hasSelection, let mediaEntityView = self.subviews.first(where: { $0 is DrawingEntityMediaView }) as? DrawingEntityMediaView {
mediaEntityView.handlePan(gestureRecognizer)
}
}
public func handlePinch(_ gestureRecognizer: UIPinchGestureRecognizer) {
if !self.hasSelection, let mediaEntityView = self.subviews.first(where: { $0 is DrawingMediaEntityView }) as? DrawingMediaEntityView {
if !self.hasSelection, let mediaEntityView = self.subviews.first(where: { $0 is DrawingEntityMediaView }) as? DrawingEntityMediaView {
mediaEntityView.handlePinch(gestureRecognizer)
} else if let selectedEntityView = self.selectedEntityView, let selectionView = selectedEntityView.selectionView {
selectionView.handlePinch(gestureRecognizer)
@@ -645,7 +647,7 @@ public final class DrawingEntitiesView: UIView, TGPhotoDrawingEntitiesView {
}
public func handleRotate(_ gestureRecognizer: UIRotationGestureRecognizer) {
if !self.hasSelection, let mediaEntityView = self.subviews.first(where: { $0 is DrawingMediaEntityView }) as? DrawingMediaEntityView {
if !self.hasSelection, let mediaEntityView = self.subviews.first(where: { $0 is DrawingEntityMediaView }) as? DrawingEntityMediaView {
mediaEntityView.handleRotate(gestureRecognizer)
} else if let selectedEntityView = self.selectedEntityView, let selectionView = selectedEntityView.selectionView {
selectionView.handleRotate(gestureRecognizer)
@@ -653,6 +655,12 @@ public final class DrawingEntitiesView: UIView, TGPhotoDrawingEntitiesView {
}
}
protocol DrawingEntityMediaView: DrawingEntityView {
func handlePan(_ gestureRecognizer: UIPanGestureRecognizer)
func handlePinch(_ gestureRecognizer: UIPinchGestureRecognizer)
func handleRotate(_ gestureRecognizer: UIRotationGestureRecognizer)
}
public class DrawingEntityView: UIView {
let context: AccountContext
let entity: DrawingEntity