浏览代码

coding

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>
Marino Faggiana 2 年之前
父节点
当前提交
33861c4cc8
共有 2 个文件被更改,包括 5 次插入8 次删除
  1. 3 3
      iOSClient/Main/Create cloud/NCUploadAssets.swift
  2. 2 5
      iOSClient/Main/NCPickerViewController.swift

+ 3 - 3
iOSClient/Main/Create cloud/NCUploadAssets.swift

@@ -15,7 +15,6 @@ class NCHostingUploadAssetsView: NSObject {
         let uploadAssets = NCUploadAssets(assets: assets, cryptated: cryptated, session: session, userBaseUrl: userBaseUrl, serverUrl: serverUrl)
         let details = UploadAssetsView(uploadAssets)
         let vc = UIHostingController(rootView: details)
-        vc.title = NSLocalizedString("_upload_photos_videos_", comment: "")
         return vc
     }
 }
@@ -28,7 +27,6 @@ class NCUploadAssets: ObservableObject {
     internal var userBaseUrl: NCUserBaseUrl
 
     @Published var serverUrl: String
-    @Published var fileName: String?
 
     init(assets: [PHAsset], cryptated: Bool, session: String, userBaseUrl: NCUserBaseUrl, serverUrl: String) {
         self.assets = assets
@@ -38,7 +36,7 @@ class NCUploadAssets: ObservableObject {
         self.serverUrl = serverUrl
     }
 
-    func previewFileName() -> String {
+    func previewFileName(fileName: String?) -> String {
 
         var returnString: String = ""
         let asset = assets[0]
@@ -114,6 +112,8 @@ struct UploadAssetsView: View {
     @State var isPresentedSelect = false
     @State var isMaintainOriginalFilename: Bool = false
     @State var isAddFilenametype: Bool = false
+    @State var fileNameonChange: Bool = true
+    @State var example: String = ""
 
     @ObservedObject var uploadAssets: NCUploadAssets
 

+ 2 - 5
iOSClient/Main/NCPickerViewController.swift

@@ -47,12 +47,9 @@ class NCPhotosPickerViewController: NSObject {
         self.openPhotosPickerViewController { assets in
             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)
-                let navigationController = UINavigationController(rootViewController: form)
-
+                let vc = NCHostingUploadAssetsView().makeShipDetailsUI(assets: assets, cryptated: false, session: NCNetworking.shared.sessionIdentifierBackground, userBaseUrl: self.appDelegate, serverUrl: self.appDelegate.activeServerUrl)
                 DispatchQueue.main.asyncAfter(deadline: .now() + 0.4) {
-                    viewController.present(navigationController, animated: true, completion: nil)
+                    viewController.present(vc, animated: true, completion: nil)
                 }
             }
         }