From 6478a57bbaecd107048005ef6fd3cc408b2a08b2 Mon Sep 17 00:00:00 2001 From: Javier Cicchelli Date: Tue, 13 Dec 2022 00:20:23 +0100 Subject: [PATCH] Defined the Folder model and integrated it to the BrowseView view for the Browse module. --- BeReal/UI/Views/ContentView.swift | 5 +++- Modules/Sources/Browse/UI/Models/Folder.swift | 26 +++++++++++++++++++ .../Sources/Browse/UI/Views/BrowseView.swift | 10 +++++-- 3 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 Modules/Sources/Browse/UI/Models/Folder.swift diff --git a/BeReal/UI/Views/ContentView.swift b/BeReal/UI/Views/ContentView.swift index 94b4f2a..8a840d9 100644 --- a/BeReal/UI/Views/ContentView.swift +++ b/BeReal/UI/Views/ContentView.swift @@ -33,7 +33,10 @@ struct ContentView: View { var body: some View { NavigationView { - BrowseView { + BrowseView(folder: .init( + id: user?.rootFolder.id, + name: user?.rootFolder.name + )) { // ... } uploadFile: { // ... diff --git a/Modules/Sources/Browse/UI/Models/Folder.swift b/Modules/Sources/Browse/UI/Models/Folder.swift new file mode 100644 index 0000000..1c2596b --- /dev/null +++ b/Modules/Sources/Browse/UI/Models/Folder.swift @@ -0,0 +1,26 @@ +// +// Folder.swift +// Browse +// +// Created by Javier Cicchelli on 13/12/2022. +// Copyright © 2022 Röck+Cöde. All rights reserved. +// + +public struct Folder { + + // MARK: Properties + + public let id: String + public let name: String + + // MARK: Initialisers + + public init( + id: String? = nil, + name: String? = nil + ) { + self.id = id ?? "-" + self.name = name ?? "-" + } + +} diff --git a/Modules/Sources/Browse/UI/Views/BrowseView.swift b/Modules/Sources/Browse/UI/Views/BrowseView.swift index 2ee78a4..b13754a 100644 --- a/Modules/Sources/Browse/UI/Views/BrowseView.swift +++ b/Modules/Sources/Browse/UI/Views/BrowseView.swift @@ -13,6 +13,7 @@ public struct BrowseView: View { // MARK: Properties + private let folder: Folder private let createFolder: ActionClosure private let uploadFile: ActionClosure private let showProfile: ActionClosure @@ -20,10 +21,12 @@ public struct BrowseView: View { // MARK: Initialisers public init( + folder: Folder, createFolder: @escaping ActionClosure, uploadFile: @escaping ActionClosure, showProfile: @escaping ActionClosure ) { + self.folder = folder self.createFolder = createFolder self.uploadFile = uploadFile self.showProfile = showProfile @@ -119,7 +122,7 @@ public struct BrowseView: View { } .listStyle(.inset) .background(Color.red) - .navigationTitle("Folder name") + .navigationTitle(folder.name) .toolbar { BrowseToolbar( createFolder: createFolder, @@ -142,7 +145,10 @@ private extension Image { struct BrowseView_Previews: PreviewProvider { static var previews: some View { NavigationView { - BrowseView { + BrowseView(folder: .init( + id: UUID().uuidString, + name: "Some folder name" + )) { // ... } uploadFile: { // ...