diff --git a/BeReal/UI/Views/ContentView.swift b/BeReal/UI/Views/ContentView.swift index a3d61da..4af869e 100644 --- a/BeReal/UI/Views/ContentView.swift +++ b/BeReal/UI/Views/ContentView.swift @@ -85,7 +85,6 @@ private extension ContentView { id: user.rootFolder.id, name: user.rootFolder.name ), - uploadFile: uploadFile, showProfile: showProfile, login: login ) diff --git a/Modules/Sources/Browse/UI/Views/BrowseView.swift b/Modules/Sources/Browse/UI/Views/BrowseView.swift index 4e13ccd..c493659 100644 --- a/Modules/Sources/Browse/UI/Views/BrowseView.swift +++ b/Modules/Sources/Browse/UI/Views/BrowseView.swift @@ -23,11 +23,11 @@ public struct BrowseView: View { @State private var stack: Stack? @State private var itemToDelete: (any FileSystemItem)? @State private var showCreateFolder: Bool = false + @State private var showUploadFile: Bool = false // MARK: Properties private let folder: Folder - private let uploadFile: ActionClosure private let showProfile: ActionClosure private let login: ActionClosure @@ -37,12 +37,10 @@ public struct BrowseView: View { public init( folder: Folder, - uploadFile: @escaping ActionClosure, showProfile: @escaping ActionClosure, login: @escaping ActionClosure ) { self.folder = folder - self.uploadFile = uploadFile self.showProfile = showProfile self.login = login } @@ -57,10 +55,17 @@ public struct BrowseView: View { createFolder: { showCreateFolder = true }, - uploadFile: uploadFile, + uploadFile: { + showUploadFile = true + }, showProfile: showProfile ) } + .sheet(isPresented: $showUploadFile) { + UploadView(id: folder.id) { + Task { await loadItems() } + } + } .createFolder( isPresenting: $showCreateFolder, id: folder.id @@ -112,7 +117,9 @@ private extension BrowseView { case .empty: MessageView( type: .empty, - action: uploadFile + action: { + showUploadFile = true + } ) case .error: MessageView(type: .error) { @@ -137,7 +144,6 @@ private extension BrowseView { .navigate( to: BrowseView( folder: folder, - uploadFile: uploadFile, showProfile: showProfile, login: login ), @@ -214,8 +220,6 @@ struct BrowseView_Previews: PreviewProvider { id: UUID().uuidString, name: "Some folder name" )) { - // upload file closure. - } showProfile: { // show profile closure. } login: { // login closure.