Fix document browser presentation (implemented using SwiftUI now)

kean · Jul 2, 2021 · 239e74d · 239e74d
1 parent 4e8993f
commit 239e74d
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 11 deletions.
diff --git a/Pulse.xcodeproj/xcshareddata/xcschemes/Pulse Demo watchOS.xcscheme b/Pulse.xcodeproj/xcshareddata/xcschemes/Pulse Demo watchOS.xcscheme
@@ -54,33 +54,46 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
+      <RemoteRunnable
+         runnableDebuggingMode = "2"
+         BundleIdentifier = "com.apple.Carousel"
+         RemotePath = "/Pulse">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "0CEAB3D925FE862D00F09B0F"
             BuildableName = "Pulse Demo watchOS.app"
             BlueprintName = "Pulse Demo watchOS"
             ReferencedContainer = "container:Pulse.xcodeproj">
          </BuildableReference>
-      </BuildableProductRunnable>
+      </RemoteRunnable>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
+      <RemoteRunnable
+         runnableDebuggingMode = "2"
+         BundleIdentifier = "com.apple.Carousel"
+         RemotePath = "/Pulse">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "0CEAB3D925FE862D00F09B0F"
             BuildableName = "Pulse Demo watchOS.app"
             BlueprintName = "Pulse Demo watchOS"
             ReferencedContainer = "container:Pulse.xcodeproj">
          </BuildableReference>
-      </BuildableProductRunnable>
+      </RemoteRunnable>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "0CEAB3D925FE862D00F09B0F"
+            BuildableName = "Pulse Demo watchOS.app"
+            BlueprintName = "Pulse Demo watchOS"
+            ReferencedContainer = "container:Pulse.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

diff --git a/Pulse/Sources/PulseUI/Features/Settings/SettingsView-ios.swift b/Pulse/Sources/PulseUI/Features/Settings/SettingsView-ios.swift
@@ -13,6 +13,8 @@ struct SettingsView: View {
     @ObservedObject var model: SettingsViewModel
     @ObservedObject var console: ConsoleViewModel
 
+    @State private var isDocumentBrowserPresented = false
+
     var body: some View {
         NavigationView {
             Form {
@@ -33,11 +35,7 @@ struct SettingsView: View {
                     Section {
                         if #available(iOS 14.0, *) {
                             Button(action: {
-                                UIViewController.present { dismiss in
-                                    let vc = DocumentBrowserViewController(forOpeningContentTypes: [UTType(filenameExtension: "pulse")].compactMap { $0 })
-                                    vc.modalPresentationStyle = .fullScreen
-                                    return vc
-                                }
+                                isDocumentBrowserPresented = true
                             }) {
                                 HStack {
                                     Image(systemName: "doc")
@@ -46,6 +44,9 @@ struct SettingsView: View {
                                         .foregroundColor(Color.primary)
                                 }
                             }
+                            .fullScreenCover(isPresented: $isDocumentBrowserPresented) {
+                                DocumentBrowser()
+                            }
                         }
 
                         ButtonRemoveAll(action: console.buttonRemoveAllMessagesTapped)
@@ -77,6 +78,17 @@ struct SettingsView: View {
     }
 }
 
+@available(iOS 14.0, *)
+private struct DocumentBrowser: UIViewControllerRepresentable {
+    func makeUIViewController(context: Context) -> DocumentBrowserViewController {
+        DocumentBrowserViewController(forOpeningContentTypes: [UTType(filenameExtension: "pulse")].compactMap { $0 })
+    }
+
+    func updateUIViewController(_ uiViewController: DocumentBrowserViewController, context: Context) {
+
+    }
+}
+
 // MARK: - Settings
 
 @available(iOS 13.0, *)