Add new view

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>

iOSClient/Main/Create cloud/NCCreateFormUploadAssets.swift

@@ -27,10 +27,6 @@ import NextcloudKit
 import XLForm
 import Photos
 
-protocol createFormUploadAssetsDelegate: AnyObject {
-    func dismissFormUploadAssets()
-}
-
 class NCCreateFormUploadAssets: XLFormViewController, NCSelectDelegate {
 
     var serverUrl: String = ""
@@ -38,7 +34,6 @@ class NCCreateFormUploadAssets: XLFormViewController, NCSelectDelegate {
     var assets: [PHAsset] = []
     var cryptated: Bool = false
     var session: String = ""
-    weak var delegate: createFormUploadAssetsDelegate?
     let requestOptions = PHImageRequestOptions()
     var imagePreview: UIImage?
     let targetSizeImagePreview = CGSize(width: 100, height: 100)
@@ -48,7 +43,7 @@ class NCCreateFormUploadAssets: XLFormViewController, NCSelectDelegate {
 
     // MARK: - View Life Cycle
 
-    convenience init(serverUrl: String, assets: [PHAsset], cryptated: Bool, session: String, delegate: createFormUploadAssetsDelegate?) {
+    convenience init(serverUrl: String, assets: [PHAsset], cryptated: Bool, session: String) {
 
         self.init()
 
@@ -66,7 +61,6 @@ class NCCreateFormUploadAssets: XLFormViewController, NCSelectDelegate {
         self.assets = assets
         self.cryptated = cryptated
         self.session = session
-        self.delegate = delegate
 
         requestOptions.resizeMode = PHImageRequestOptionsResizeMode.exact
         requestOptions.deliveryMode = PHImageRequestOptionsDeliveryMode.highQualityFormat
@@ -98,12 +92,6 @@ class NCCreateFormUploadAssets: XLFormViewController, NCSelectDelegate {
         reloadForm()
     }
 
-    override func viewWillDisappear(_ animated: Bool) {
-        super.viewWillDisappear(animated)
-
-        self.delegate?.dismissFormUploadAssets()
-    }
-
     // MARK: XLForm
 
     func initializeForm() {

iOSClient/Main/Create cloud/NCUploadAssets.swift

@@ -10,9 +10,9 @@ import SwiftUI
 
 class NCHostingUploadAssetsView: NSObject {
 
-    @objc func makeShipDetailsUI(userBaseUrl: NCUserBaseUrl, serverUrl: String) -> UIViewController {
+    @objc func makeShipDetailsUI(assets: [PHAsset], cryptated: Bool, session: String ,userBaseUrl: NCUserBaseUrl, serverUrl: String) -> UIViewController {
 
-        let uploadAssets = NCUploadAssets(userBaseUrl: userBaseUrl, serverUrl: serverUrl)
+        let uploadAssets = NCUploadAssets(assets: assets, cryptated: cryptated, session: session, userBaseUrl: userBaseUrl, serverUrl: serverUrl)
         let details = UploadAssetsView(uploadAssets: uploadAssets)
         let vc = UIHostingController(rootView: details)
         vc.title = NSLocalizedString("_upload_photos_videos_", comment: "")
@@ -22,10 +22,16 @@ class NCHostingUploadAssetsView: NSObject {
 
 class NCUploadAssets: ObservableObject {
 
+    internal var assets: [PHAsset]
+    internal var cryptated: Bool
+    internal var session: String
     internal var userBaseUrl: NCUserBaseUrl
     internal var serverUrl: String
 
-    init(userBaseUrl: NCUserBaseUrl, serverUrl: String) {
+    init(assets: [PHAsset], cryptated: Bool, session: String, userBaseUrl: NCUserBaseUrl, serverUrl: String) {
+        self.assets = assets
+        self.cryptated = cryptated
+        self.session = session
         self.userBaseUrl = userBaseUrl
         self.serverUrl = serverUrl
     }
@@ -45,7 +51,7 @@ struct UploadAssetsView: View {
 struct UploadAssetsView_Previews: PreviewProvider {
     static var previews: some View {
         if let appDelegate = UIApplication.shared.delegate as? AppDelegate {
-            let uploadAssets = NCUploadAssets(userBaseUrl: appDelegate, serverUrl: "ABCD")
+            let uploadAssets = NCUploadAssets(assets: [], cryptated: false, session: "", userBaseUrl: appDelegate, serverUrl: "ABCD")
             UploadAssetsView(uploadAssets: uploadAssets)
         }
     }

iOSClient/Main/NCPickerViewController.swift

@@ -48,7 +48,7 @@ class NCPhotosPickerViewController: NSObject {
             guard let assets = assets else { return }
             if assets.count > 0 {
 
-                let form = NCCreateFormUploadAssets(serverUrl: self.appDelegate.activeServerUrl, assets: assets, cryptated: false, session: NCNetworking.shared.sessionIdentifierBackground, delegate: nil)
+                let form = NCCreateFormUploadAssets(serverUrl: self.appDelegate.activeServerUrl, assets: assets, cryptated: false, session: NCNetworking.shared.sessionIdentifierBackground)
                 let navigationController = UINavigationController(rootViewController: form)
 
                 DispatchQueue.main.asyncAfter(deadline: .now() + 0.4) {