diff --git a/MiniScanner/Modules/EditViewController/CustomViews/BannerView.swift b/MiniScanner/Modules/EditViewController/CustomViews/BannerView.swift
index ed7e66c7c4b887cae8727cf056bf98459b0cbc47..05c8df210c387c9955a93f34a5ad6e99d4a81941 100644
--- a/MiniScanner/Modules/EditViewController/CustomViews/BannerView.swift
+++ b/MiniScanner/Modules/EditViewController/CustomViews/BannerView.swift
@@ -17,7 +17,6 @@ protocol BannerViewDelegate {
func deleteSignAt(index: Int)
func posChangedTo(pos: CGPoint, at: Int)
func sizeChanged(size: CGSize,angle: CGFloat, at: Int)
- func updateImage(screenShot: UIImage, at: Int)
}
class BannerView: UIView {
@@ -178,10 +177,6 @@ extension BannerView: FSPagerViewDataSource,FSPagerViewDelegate {
extension BannerView: FSPagerViewCellDelegate {
- func updateScreenShots(image: UIImage, at: Int) {
- delegate?.updateImage(screenShot: image, at: at)
- }
-
func sizeChangedto(size: CGSize, angle: CGFloat, at: Int) {
delegate?.sizeChanged(size: size, angle: angle, at: at)
}
@@ -229,8 +224,6 @@ extension BannerView {
if !subviews.contains(cell.selectedStickerView1 ?? UIView()) {
configure(cell: cell, with: scannedItem, position: position, signature: signature)
-
- updateImage(cell: cell, at: index)
}
}
else {
@@ -250,18 +243,4 @@ extension BannerView {
cell.rotation = scannedItem.rotate ?? 0
cell.sign = signature
}
-
- private func updateImage(cell: FSPagerViewCell, at index: Int) {
-
- DispatchQueue.main.async {
-
- cell.prepareCellForScreenshot()
-
- let image = cell.contentView.TakeScreenshot()
-
- cell.restoreCellAfterScreenshot()
-
- self.delegate?.updateImage(screenShot: image, at: index)
- }
- }
}
diff --git a/MiniScanner/Modules/EditViewController/EditViewController.swift b/MiniScanner/Modules/EditViewController/EditViewController.swift
index b2081f733be6ef1d9e8ed0ffa3b11f0a826a6adf..b165036c46155427f4c21cd3571303f75053b4d1 100644
--- a/MiniScanner/Modules/EditViewController/EditViewController.swift
+++ b/MiniScanner/Modules/EditViewController/EditViewController.swift
@@ -852,12 +852,6 @@ extension EditViewController {
// MARK: - BannerViewDelegate
extension EditViewController: BannerViewDelegate {
- func updateImage(screenShot: UIImage, at: Int) {
- scanSession.scannedItems[at].addScreenShot(screen: screenShot)
- // banner.pagerView.reloadData()
- // updatePageLabel()
- }
-
func sizeChanged(size: CGSize, angle: CGFloat, at: Int) {
scanSession.scannedItems[at].size = size
scanSession.scannedItems[at].rotate = angle
diff --git a/MiniScanner/Supporting Files/Frameworks/CustomWeScan/MultiPageSession/MultiPageScanSession.swift b/MiniScanner/Supporting Files/Frameworks/CustomWeScan/MultiPageSession/MultiPageScanSession.swift
index 4f87409e2f28320d6038df8438c53f8b054ec655..8f66bc450999a620694af084d41499f610f529dd 100644
--- a/MiniScanner/Supporting Files/Frameworks/CustomWeScan/MultiPageSession/MultiPageScanSession.swift
+++ b/MiniScanner/Supporting Files/Frameworks/CustomWeScan/MultiPageSession/MultiPageScanSession.swift
@@ -59,7 +59,6 @@ public class ScannedItem: Codable, Identifiable {
var signaturePosition: CGPoint?
var size: CGSize?
var rotate: CGFloat?
- var screenShot: UIImage?
init(originalImage:UIImage, quad:Quadrilateral? = nil, colorOption:ScannedItemColorOption = .color, type: ScannedItemType = .temp) {
self.type = type
@@ -82,6 +81,7 @@ public class ScannedItem: Codable, Identifiable {
completion(self.renderedImage)
}
}
+
public func getRender(completion: @escaping (_ image:UIImage?)->Void){
ScannedItemRenderer().render(scannedItem: self) { (image) in
self.renderedImage = self.filePath().saveImage(image: image?.withFixedOrientation())
@@ -94,7 +94,6 @@ public class ScannedItem: Codable, Identifiable {
self.signaturePosition = position
self.size = size
self.rotate = rotate
- self.screenShot = self.newRenderedImage?.retrieveImage()
}
public func removeSign() {
@@ -102,12 +101,8 @@ public class ScannedItem: Codable, Identifiable {
self.signaturePosition = nil
self.size = nil
self.rotate = nil
- self.screenShot = nil
}
- public func addScreenShot(screen: UIImage) {
- self.screenShot = screen
- }
enum CodingKeys: CodingKey {
case originalImage, quad, rotation, colorOption, renderedImage, signaturePosition, size, rotate
}
diff --git a/MiniScanner/Supporting Files/Frameworks/FSPager/FSPagerViewCell.swift b/MiniScanner/Supporting Files/Frameworks/FSPager/FSPagerViewCell.swift
index 075b8fbcd889314723a23e2f7a3948a0724a477a..af3b2d795b199cf7a5ed672e3ef3462bee9290eb 100644
--- a/MiniScanner/Supporting Files/Frameworks/FSPager/FSPagerViewCell.swift
+++ b/MiniScanner/Supporting Files/Frameworks/FSPager/FSPagerViewCell.swift
@@ -13,7 +13,6 @@ public protocol FSPagerViewCellDelegate {
func deleteSign(at: Int)
func positionChangedTo(pos: CGPoint, at: Int)
func sizeChangedto(size: CGSize, angle: CGFloat, at: Int)
- func updateScreenShots(image: UIImage, at: Int)
}
open class FSPagerViewCell: UICollectionViewCell {
var trashButton: UIButton!
@@ -295,26 +294,6 @@ open class FSPagerViewCell: UICollectionViewCell {
}
}
- func prepareCellForScreenshot() {
-
- selectedStickerView1?.showEditing = false
-
- trashButton.isHidden = true
- previewButton.isHidden = true
-
- removeBorder()
- }
-
- func restoreCellAfterScreenshot() {
-
- selectedStickerView1?.showEditing = true
-
- trashButton.isHidden = false
- previewButton.isHidden = false
-
- addBorder()
- }
-
func removeBorder() {
contentView.borderColor = .clear
@@ -342,8 +321,7 @@ extension FSPagerViewCell: StickerViewDelegate {
func stickerViewDidEndMoving(_ stickerView: StickerView) {
delegate?.positionChangedTo(pos: stickerView.layer.position, at: index ?? 0)
-// delegate?.updateScreenShots(image: contentView.TakeScreenshot(), at: index ?? 0)
-
+
return
}
@@ -360,7 +338,6 @@ extension FSPagerViewCell: StickerViewDelegate {
let stickerTest = stickerView
stickerTest.transform = stickerView.transform.rotated(by: -angle)
delegate?.sizeChangedto(size: CGSize(width: stickerTest.layer.frame.size.width , height: stickerTest.layer.frame.size.height ) , angle: angle, at: index ?? 0)
-// delegate?.updateScreenShots(image: contentView.TakeScreenshot(), at: index ?? 0)
return
}