NMC 1988 - Scan customisation changes

Author: harshada-15-tsys

iOSClient/Scan document/NCCreateFormUploadScanDocument.swift

@@ -71,6 +71,10 @@ class NCCreateFormUploadScanDocument: XLFormViewController, NCSelectDelegate, NC
 
         self.init()
 
+        if serverUrl == utilityFileSystem.getHomeServer(urlBase: appDelegate?.urlBase ?? "", userId: appDelegate?.userId ?? "") {
+            titleServerUrl = "/"
+        } else {
+            titleServerUrl = (serverUrl as NSString).lastPathComponent
         if serverUrl == utilityFileSystem.getHomeServer(session: session) {
             titleServerUrl = "/"
         } else {
@@ -508,12 +512,18 @@ class NCCreateFormUploadScanDocument: XLFormViewController, NCSelectDelegate, NC
 
     // MARK: - Action
 
+    func dismissSelect(serverUrl: String?, metadata: tableMetadata?, type: String, items: [Any], indexPath: [IndexPath], overwrite: Bool, copy: Bool, move: Bool) {
+        
+    func dismissSelect(serverUrl: String?, metadata: tableMetadata?, type: String, items: [Any], overwrite: Bool, copy: Bool, move: Bool) {
+        
+    
     func dismissSelect(serverUrl: String?, metadata: tableMetadata?, type: String, items: [Any], overwrite: Bool, copy: Bool, move: Bool) {
 
         if serverUrl != nil {
 
             self.serverUrl = serverUrl!
 
+            if serverUrl == utilityFileSystem.getHomeServer(urlBase: appDelegate?.urlBase ?? "", userId: appDelegate?.userId ?? "") {
             if serverUrl == utilityFileSystem.getHomeServer(session: session) {
                 self.titleServerUrl = "/"
             } else {
@@ -746,11 +756,18 @@ class NCCreateFormUploadScanDocument: XLFormViewController, NCSelectDelegate, NC
                 }
             }
 
+            
+            let metadataForUpload = NCManageDatabase.shared.createMetadata(account: appDelegate?.account ?? "", user: appDelegate?.user ?? "", userId: appDelegate?.userId ?? "", fileName: fileNameSave, fileNameView: fileNameSave, ocId: UUID().uuidString, serverUrl: serverUrl, urlBase: appDelegate?.urlBase ?? "", url: "", contentType: "")
+            
+//            let metadataForUpload = NCManageDatabase.shared.createMetadata(account: appDelegate?.account ?? "", user: appDelegate?.user ?? "", userId: appDelegate?.userId ?? "", fileName: fileNameSave, fileNameView: fileNameSave, ocId: UUID().uuidString, serverUrl: serverUrl, urlBase: appDelegate?.urlBase ?? "", url: "", contentType: "")
             let metadataForUpload = NCManageDatabase.shared.createMetadata(fileName: fileNameSave, fileNameView: fileNameSave, ocId: UUID().uuidString, serverUrl: serverUrl, url: "", contentType: "", session: session, sceneIdentifier: self.appDelegate?.sceneIdentifier)
 
             metadataForUpload.session = NCNetworking.shared.sessionUploadBackground
             metadataForUpload.sessionSelector = NCGlobal.shared.selectorUploadFile
             metadataForUpload.status = NCGlobal.shared.metadataStatusWaitUpload
+            
+            if NCManageDatabase.shared.getMetadataConflict(account: appDelegate?.account ?? "", serverUrl: serverUrl, fileNameView: fileNameSave) != nil {
+                
 
             if NCManageDatabase.shared.getMetadataConflict(account: session.account, serverUrl: serverUrl, fileNameView: fileNameSave, nativeFormat: false) != nil {
 
@@ -882,11 +899,17 @@ class NCCreateFormUploadScanDocument: XLFormViewController, NCSelectDelegate, NC
 
                 let image = changeCompressionImage(arrayImages[count])
 
+                let metadataForUpload = NCManageDatabase.shared.createMetadata(account: appDelegate?.account ?? "", user: appDelegate?.user ?? "", userId: appDelegate?.userId ?? "", fileName: fileNameSave, fileNameView: fileNameSave, ocId: UUID().uuidString, serverUrl: serverUrl, urlBase: appDelegate?.urlBase ?? "", url: "", contentType: "")
+                
+//                let metadataForUpload = NCManageDatabase.shared.createMetadata(account: appDelegate?.account ?? "", user: appDelegate?.user ?? "", userId: appDelegate?.userId ?? "", fileName: fileNameSave, fileNameView: fileNameSave, ocId: UUID().uuidString, serverUrl: serverUrl, urlBase: appDelegate?.urlBase ?? "", url: "", contentType: "")
                 let metadataForUpload = NCManageDatabase.shared.createMetadata(fileName: fileNameSave, fileNameView: fileNameSave, ocId: UUID().uuidString, serverUrl: serverUrl, url: "", contentType: "", session: session, sceneIdentifier: self.appDelegate?.sceneIdentifier)
 
                 metadataForUpload.session = NCNetworking.shared.sessionUploadBackground
                 metadataForUpload.sessionSelector = NCGlobal.shared.selectorUploadFile
                 metadataForUpload.status = NCGlobal.shared.metadataStatusWaitUpload
+                
+                if NCManageDatabase.shared.getMetadataConflict(account: appDelegate?.account ?? "", serverUrl: serverUrl, fileNameView: fileNameSave) != nil {
+                    
 
                 if NCManageDatabase.shared.getMetadataConflict(account: session.account, serverUrl: serverUrl, fileNameView: fileNameSave, nativeFormat: false) != nil {
 

iOSClient/Scan document/NCScan.swift

@@ -27,6 +27,7 @@ import EasyTipView
 import SwiftUI
 
 class NCScan: UIViewController, NCScanCellCellDelegate {
+
     @IBOutlet weak var collectionViewSource: UICollectionView!
     @IBOutlet weak var collectionViewDestination: UICollectionView!
     @IBOutlet weak var cancel: UIBarButtonItem!
@@ -51,10 +52,6 @@ class NCScan: UIViewController, NCScanCellCellDelegate {
     internal let utility = NCUtility()
     internal let database = NCManageDatabase.shared
     internal var filter: NCGlobal.TypeFilterScanDocument = NCPreferences().typeFilterScanDocument
-
-    private var editMenuInteraction: UIEditMenuInteraction?
-    private var traitRegistration: UITraitChangeRegistration?
-
     @MainActor
     internal var session: NCSession.Session {
         NCSession.shared.getSession(controller: controller)
@@ -70,14 +67,6 @@ class NCScan: UIViewController, NCScanCellCellDelegate {
         view.backgroundColor = .secondarySystemGroupedBackground
         navigationItem.title = NSLocalizedString("_scanned_images_", comment: "")
 
-        let interaction = UIEditMenuInteraction(delegate: self)
-        view.addInteraction(interaction)
-        self.editMenuInteraction = interaction
-
-        traitRegistration = registerForTraitChanges([UITraitUserInterfaceStyle.self]) { (self: Self, _) in
-            self.updateIcons()
-        }
-
         collectionViewSource.dragInteractionEnabled = true
         collectionViewSource.dragDelegate = self
         collectionViewSource.dropDelegate = self
@@ -122,6 +111,10 @@ class NCScan: UIViewController, NCScanCellCellDelegate {
 
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
+        
+        // Re-evaluate in-app messages after viewDidAppear
+        MoEngageAnalytics.shared.displayInAppNotificationSafely(reason: "viewDidAppear")
+
         showTip()
     }
 
@@ -137,7 +130,9 @@ class NCScan: UIViewController, NCScanCellCellDelegate {
 
     // MARK: -
 
-    private func updateIcons() {
+    override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+        super.traitCollectionDidChange(previousTraitCollection)
+
         add.setImage(utility.loadImage(named: "plus", colors: [NCBrandColor.shared.iconImageColor]), for: .normal)
         transferDown.setImage(utility.loadImage(named: "arrow.down", colors: [NCBrandColor.shared.iconImageColor]), for: .normal)
     }
@@ -294,31 +289,33 @@ class NCScan: UIViewController, NCScanCellCellDelegate {
     }
 
     @objc func handleLongPressGesture(recognizer: UIGestureRecognizer) {
-        guard recognizer.state == .began else { return }
-        becomeFirstResponder()
-
-        guard let recognizerView = recognizer.view,
-              UIPasteboard.general.hasImages else {
-//        if recognizer.state == UIGestureRecognizer.State.began {
-//            self.becomeFirstResponder()
-//            let pasteboard = UIPasteboard.general
-//            if let recognizerView = recognizer.view, let recognizerSuperView = recognizerView.superview, pasteboard.hasImages {
-//                UIMenuController.shared.menuItems = [UIMenuItem(title: "Paste", action: #selector(pasteImage))]
-//                UIMenuController.shared.showMenu(from: recognizerSuperView, rect: recognizerView.frame)
-//            }
+        if recognizer.state == UIGestureRecognizer.State.began {
+            self.becomeFirstResponder()
+            let pasteboard = UIPasteboard.general
+            if let recognizerView = recognizer.view, let recognizerSuperView = recognizerView.superview, pasteboard.hasImages {
+                UIMenuController.shared.menuItems = [UIMenuItem(title: "Paste", action: #selector(pasteImage(_:)))]
+                UIMenuController.shared.showMenu(from: recognizerSuperView, rect: recognizerView.frame)
+            }
             // TIP
             dismissTip()
-            return
         }
+    }
 
-        let sourcePoint = recognizer.location(in: recognizerView)
-        let configuration = UIEditMenuConfiguration(
-            identifier: nil,
-            sourcePoint: sourcePoint
-        )
+    @objc func pasteImage(_ sender: Any?) {
+        let pasteboard = UIPasteboard.general
+        if pasteboard.hasImages {
+            guard let image = pasteboard.image?.fixedOrientation() else { return }
+            let fileName = utilityFileSystem.createFileName("scan.png", fileDate: Date(), fileType: PHAssetMediaType.image, notUseMask: true)
+            let fileNamePath = utilityFileSystem.createServerUrl(serverUrl: utilityFileSystem.directoryScan, fileName: fileName)
+
+            do {
+                try image.pngData()?.write(to: NSURL.fileURL(withPath: fileNamePath), options: .atomic)
+            } catch {
+                return
+            }
 
-        editMenuInteraction?.presentEditMenu(with: configuration)
-        dismissTip()
+            loadImage()
+        }
     }
 
     func delete(with imageIndex: Int, sender: Any) {
@@ -399,54 +396,3 @@ extension NCScan: NCViewerQuickLookDelegate {
         collectionViewDestination.reloadData()
     }
 }
-
-extension NCScan: UIEditMenuInteractionDelegate {
-    func editMenuInteraction(
-        _ interaction: UIEditMenuInteraction,
-        menuFor configuration: UIEditMenuConfiguration,
-        suggestedActions: [UIMenuElement]
-    ) -> UIMenu? {
-        guard UIPasteboard.general.hasImages else { return nil }
-
-        let pasteAction = UIAction(
-            title: NSLocalizedString("_paste_file_", comment: ""),
-            image: UIImage(systemName: "doc.on.clipboard")
-        ) { [weak self] _ in
-            self?.pasteImage()
-        }
-
-        return UIMenu(children: [pasteAction])
-    }
-
-    func pasteImage() {
-        let pasteboard = UIPasteboard.general
-
-        guard pasteboard.hasImages,
-              let image = pasteboard.image?.fixedOrientation(),
-              let data = image.pngData() else {
-            return
-        }
-
-        let fileName = utilityFileSystem.createFileName(
-            "scan.png",
-            fileDate: Date(),
-            fileType: .image,
-            notUseMask: true
-        )
-
-        let fileNamePath = utilityFileSystem.createServerUrl(
-            serverUrl: utilityFileSystem.directoryScan,
-            fileName: fileName
-        )
-
-        do {
-            try data.write(
-                to: URL(fileURLWithPath: fileNamePath),
-                options: .atomic
-            )
-            loadImage()
-        } catch {
-            return
-        }
-    }
-}

iOSClient/Scan document/NCUploadScanDocument.swift

@@ -286,7 +286,7 @@ class NCUploadScanDocument: ObservableObject {
 // MARK: - Delegate
 
 extension NCUploadScanDocument: NCSelectDelegate {
-    func dismissSelect(serverUrl: String?, metadata: tableMetadata?, type: String, items: [Any], overwrite: Bool, copy: Bool, move: Bool, session: NCSession.Session, controller: NCMainTabBarController?) {
+    func dismissSelect(serverUrl: String?, metadata: tableMetadata?, type: String, items: [Any], overwrite: Bool, copy: Bool, move: Bool, session: NCSession.Session) {
         if let serverUrl = serverUrl {
             self.serverUrl = serverUrl
         }

iOSClient/Scan document/PasswordInputField.swift

@@ -0,0 +1,76 @@
+//
+//  PasswordInputField.swift
+//  Nextcloud
+//
+//  Created by Sumit on 10/06/21.
+//  Copyright © 2021 Marino Faggiana. All rights reserved.
+//
+
+import Foundation
+import XLForm
+
+class PasswordInputField: XLFormBaseCell,UITextFieldDelegate {
+    
+    @IBOutlet weak var fileNameInputTextField: UITextField!
+    @IBOutlet weak var separatorBottom: UIView!
+    
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        // Initialization code
+        fileNameInputTextField.isSecureTextEntry = true
+        fileNameInputTextField.delegate = self
+        separatorBottom.backgroundColor = NCBrandColor.shared.systemGray4
+        self.selectionStyle = .none
+//        fileNameInputTextField.inputAccessoryView = UIToolbar.doneToolbar {
+//            self.fileNameInputTextField.resignFirstResponder()
+//        }
+    }
+
+    override func setSelected(_ selected: Bool, animated: Bool) {
+        super.setSelected(selected, animated: animated)
+
+        // Configure the view for the selected state
+    }
+    
+    override func configure() {
+        super.configure()
+       // fileNameInputTextField.isEnabled = false
+        
+    }
+    
+    override func update() {
+        super.update()
+    }
+    
+    func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {
+
+        if fileNameInputTextField == textField {
+            if let rowDescriptor = rowDescriptor, let text = self.fileNameInputTextField.text {
+
+                if (text + " ").isEmpty == false {
+                    rowDescriptor.value = self.fileNameInputTextField.text! + string
+                } else {
+                    rowDescriptor.value = nil
+                }
+            }
+        }
+
+         self.formViewController().textField(textField, shouldChangeCharactersIn: range, replacementString: string)
+        
+        return true
+    }
+    
+    func textFieldShouldReturn(_ textField: UITextField) -> Bool {
+        self.formViewController()?.textFieldShouldReturn(fileNameInputTextField)
+        return true
+    }
+    
+    func textFieldShouldClear(_ textField: UITextField) -> Bool {
+        self.formViewController()?.textFieldShouldClear(fileNameInputTextField)
+        return true
+    }
+    
+    override class func formDescriptorCellHeight(for rowDescriptor: XLFormRowDescriptor!) -> CGFloat {
+        return 45
+    }
+}