소스 검색

coding

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>
Marino Faggiana 2 년 전
부모
커밋
df6d2a7fd4
2개의 변경된 파일3개의 추가작업 그리고 8개의 파일을 삭제
  1. 2 7
      iOSClient/Main/Create cloud/NCUploadAssets.swift
  2. 1 1
      iOSClient/Scan document/NCUploadScanDocument.swift

+ 2 - 7
iOSClient/Main/Create cloud/NCUploadAssets.swift

@@ -66,10 +66,6 @@ struct UploadAssetsView: View {
     @ObservedObject var uploadAssets: NCUploadAssets
     @ObservedObject var uploadAssets: NCUploadAssets
     @Environment(\.presentationMode) var presentationMode
     @Environment(\.presentationMode) var presentationMode
 
 
-    @State private var metadatasNOConflict: [tableMetadata]
-    @State private var metadatasUploadInConflict: [tableMetadata]
-    @State private var metadatasToUpload: [tableMetadata]
-
     init(uploadAssets: NCUploadAssets) {
     init(uploadAssets: NCUploadAssets) {
         self.uploadAssets = uploadAssets
         self.uploadAssets = uploadAssets
     }
     }
@@ -248,8 +244,7 @@ struct UploadAssetsView: View {
                         if metadatasUploadInConflict.isEmpty {
                         if metadatasUploadInConflict.isEmpty {
                             self.presentationMode.wrappedValue.dismiss()
                             self.presentationMode.wrappedValue.dismiss()
                         } else {
                         } else {
-                            self.metadatasNOConflict = metadatasNOConflict
-                            self.metadatasUploadInConflict = metadatasUploadInConflict
+                           
                         }
                         }
                     }
                     }
                 }
                 }
@@ -264,7 +259,7 @@ struct UploadAssetsView: View {
             SelectView(serverUrl: $uploadAssets.serverUrl)
             SelectView(serverUrl: $uploadAssets.serverUrl)
         }
         }
         .sheet(isPresented: $isPresentedUploadConflict) {
         .sheet(isPresented: $isPresentedUploadConflict) {
-            
+
         }
         }
     }
     }
 }
 }

+ 1 - 1
iOSClient/Scan document/NCUploadScanDocument.swift

@@ -500,7 +500,7 @@ struct UploadScanDocumentView: View {
             NCSelectViewControllerRepresentable(delegate: uploadScanDocument)
             NCSelectViewControllerRepresentable(delegate: uploadScanDocument)
         }
         }
         .sheet(isPresented: $isPresentedUploadConflict) {
         .sheet(isPresented: $isPresentedUploadConflict) {
-            NCUploadConflictRepresentedView(delegate: uploadScanDocument, serverUrl: uploadScanDocument.serverUrl, metadatasUploadInConflict: [uploadScanDocument.metadata])
+            UploadConflictView(delegate: uploadScanDocument, serverUrl: uploadScanDocument.serverUrl, metadatasUploadInConflict: [uploadScanDocument.metadata])
         }.onTapGesture {
         }.onTapGesture {
             dismissKeyboard()
             dismissKeyboard()
         }
         }