Merge pull request #11 from tryboxx/develop

Develop

Author: tryboxx

SnippetsLibrary.xcodeproj/project.pbxproj

@@ -51,9 +51,9 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Release"
-      selectedDebuggerIdentifier = ""
-      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

SnippetsLibrary.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -11,8 +11,7 @@ import SwiftUI
 struct SnippetsLibraryApp: App {
 
     // MARK: - Stored Properties
-    
-    @Environment(\.scenePhase) var scenePhase
+
     @Environment(\.openURL) var openURL
 
     @NSApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
@@ -25,7 +24,11 @@ struct SnippetsLibraryApp: App {
 
     var body: some Scene {
         WindowGroup {
-            showActiveAppView()
+            AppView(
+                activeAppView: $activeAppView,
+                activeAppSheet: $activeAppSheet,
+                shouldBeDisabled: $shouldBeDisabled
+            )
         }
         .windowStyle(HiddenTitleBarWindowStyle())
         .onChange(of: activeAppView) {
@@ -79,44 +82,6 @@ struct SnippetsLibraryApp: App {
 
     // MARK: - Methods
 
-    @ViewBuilder
-    private func showActiveAppView() -> some View {
-        switch activeAppView {
-        case .create:
-            SnippetsLibraryView(
-                viewModel: SnippetsLibraryViewModel(),
-                activeSheet: $activeAppSheet
-            )
-        case .importSnippet:
-            SnippetImportView(viewModel: SnippetImportViewModel(activeAppView: $activeAppView))
-        case let .snippetsLibrary(snippetId):
-            SnippetsLibraryView(
-                viewModel: SnippetsLibraryViewModel(activeSnippetId: snippetId),
-                activeSheet: $activeAppSheet
-            )
-        case .none:
-            StartView(
-                viewModel: StartViewModel(
-                    activeAppView: $activeAppView,
-                    activeAppSheet: $activeAppSheet
-                )
-            )
-            .onChange(of: scenePhase) {
-                guard $0 == .active else { return }
-                
-                updateSystemButtons(hidden: true)
-            }
-        }
-    }
-    
-    private func updateSystemButtons(hidden: Bool) {
-        for window in NSApplication.shared.windows {
-            window.standardWindowButton(.zoomButton)?.isHidden = hidden
-            window.standardWindowButton(.miniaturizeButton)?.isHidden = hidden
-            window.standardWindowButton(.closeButton)?.isHidden = hidden
-        }
-    }
-    
     private func composeEmail() {
         let service = NSSharingService(named: NSSharingService.Name.composeEmail)
         service?.recipients = ["[email protected]"]

SnippetsLibrary.xcodeproj/xcshareddata/xcschemes/SnippetsLibrary.xcscheme

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.837",
+          "green" : "0.837",
+          "red" : "0.837"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.261",
+          "green" : "0.261",
+          "red" : "0.261"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

SnippetsLibrary/Application/SnippetsLibraryApp.swift

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.754",
+          "green" : "0.754",
+          "red" : "0.754"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.371",
+          "green" : "0.371",
+          "red" : "0.371"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

SnippetsLibrary/Assets.xcassets/Colors/skeletonLight.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "display-p3",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.894",
+          "green" : "0.895",
+          "red" : "0.894"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.130",
+          "green" : "0.130",
+          "red" : "0.130"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

SnippetsLibrary/Assets.xcassets/Colors/skeletonRegular.colorset/Contents.json

@@ -15,6 +15,7 @@ final class DependencyContainer {
 
     lazy var snippetsParserService: SnippetsParserService = SnippetsParserServiceImpl()
     lazy var urlFactory: URLFactory = URLFactoryImpl()
+    lazy var networkServcie: NetworkService = NetworkServiceImpl()
 
     lazy var databaseService: DatabaseService = DatabaseServiceImpl(
         logsService: logsService,

SnippetsLibrary/Assets.xcassets/Colors/skeletonThin.colorset/Contents.json

@@ -0,0 +1,35 @@
+//
+//  DatabaseReference+Timeout.swift
+//  SnippetsLibrary
+//
+//  Created by Krzysztof Łowiec on 25/09/2021.
+//
+
+import FirebaseDatabase
+
+extension DatabaseReference {
+
+    func observe(
+        _ eventType: DataEventType,
+        timeout: TimeInterval,
+        with block: @escaping (DataSnapshot?) -> Void
+    ) -> UInt {
+        var handle: UInt!
+
+        let timer = Timer.scheduledTimer(
+            withTimeInterval: timeout,
+            repeats: false
+        ) { _ in
+            self.removeObserver(withHandle: handle)
+            block(nil)
+        }
+
+        handle = observe(eventType) { snapshot in
+            timer.invalidate()
+            block(snapshot)
+        }
+
+        return handle
+    }
+
+}

SnippetsLibrary/Dependencies/DependencyContainer.swift

@@ -0,0 +1,16 @@
+//
+//  SnippetsLibraryView+Equatable.swift
+//  SnippetsLibrary
+//
+//  Created by Krzysztof Łowiec on 25/09/2021.
+//
+
+import Foundation
+
+extension SnippetsLibraryView: Equatable {
+    
+    static func == (lhs: SnippetsLibraryView, rhs: SnippetsLibraryView) -> Bool {
+        return lhs.viewModel.snippets != rhs.viewModel.snippets
+    }
+    
+}