diff --git a/MiniScanner/Modules/EditViewController/EditViewController.swift b/MiniScanner/Modules/EditViewController/EditViewController.swift index aaf37c2c1e34c478fbafeab5aad1250a2fdd4e4a..19fc55e6d8d478c5c33f50c4c46eef600a1b0560 100644 --- a/MiniScanner/Modules/EditViewController/EditViewController.swift +++ b/MiniScanner/Modules/EditViewController/EditViewController.swift @@ -486,28 +486,17 @@ extension EditViewController { activityIndicator.startAnimating() Task { - if !banner.signAllDoc { - - let selectedIndex = banner.pagerView.currentIndex - - await applySignatureToScannedItem(at: selectedIndex) - - await MainActor.run { - banner.pagerView.reloadData(at: selectedIndex) - } - } else { + + for (index, item) in items.enumerated() { - for (index, _) in items.enumerated() { - + if item.hasSignature { await applySignatureToScannedItem(at: index) } - - await MainActor.run { - banner.pagerView.reloadData() - } } await MainActor.run { + banner.pagerView.reloadData() + activityIndicator.stopAnimating() } } @@ -868,7 +857,7 @@ extension EditViewController: BannerViewDelegate { func deleteSignAt(index: Int) { scanSession.scannedItems[index].removeSign() - let signaturesCount = scanSession.scannedItems.filter { $0.signtureImage != nil }.count + let signaturesCount = scanSession.scannedItems.filter { $0.hasSignature }.count if signaturesCount == 0 { screenMode = .normal diff --git a/MiniScanner/Supporting Files/Frameworks/CustomWeScan/MultiPageSession/MultiPageScanSession.swift b/MiniScanner/Supporting Files/Frameworks/CustomWeScan/MultiPageSession/MultiPageScanSession.swift index 8f66bc450999a620694af084d41499f610f529dd..9ea942b4537985acadd6e7cc2ea6481d8d56a242 100644 --- a/MiniScanner/Supporting Files/Frameworks/CustomWeScan/MultiPageSession/MultiPageScanSession.swift +++ b/MiniScanner/Supporting Files/Frameworks/CustomWeScan/MultiPageSession/MultiPageScanSession.swift @@ -55,6 +55,8 @@ public class ScannedItem: Codable, Identifiable { return folderUrl.appendingPathComponent(name) } + var hasSignature: Bool { signtureImage != nil } + var signtureImage: UIImage? var signaturePosition: CGPoint? var size: CGSize?