Merge pull request #25 from tryboxx/SNLB-24/feature/detailedPreview

[SNLB-24] Add more details to preview view

Author: tryboxx

SnippetsLibrary.xcodeproj/project.pbxproj

@@ -106,6 +106,8 @@
 		B8C549BC26FFA71300720E62 /* AppView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8C549BB26FFA71300720E62 /* AppView.swift */; };
 		B8C549C426FFBA8600720E62 /* View+Skeletonable.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8C549C326FFBA8600720E62 /* View+Skeletonable.swift */; };
 		B8C8755926FD2AB600DE4474 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = B88D4A3526F4E34900164BF5 /* GoogleService-Info.plist */; };
+		B8CB01072716613F00D3A6DD /* String+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8CB01062716613F00D3A6DD /* String+Extensions.swift */; };
+		B8CB01092716681700D3A6DD /* AppAlert.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8CB01082716681700D3A6DD /* AppAlert.swift */; };
 		B8CE1CAB26FD4193004AD5D5 /* DisabledCommandGroupButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8CE1CAA26FD4193004AD5D5 /* DisabledCommandGroupButton.swift */; };
 		B8CE1CAE26FD431E004AD5D5 /* URLFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8CE1CAD26FD431E004AD5D5 /* URLFactory.swift */; };
 		B8CE1CB026FD43B5004AD5D5 /* URLType.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8CE1CAF26FD43B5004AD5D5 /* URLType.swift */; };
@@ -259,6 +261,8 @@
 		B8C549B926FF9C0800720E62 /* NetworkObserver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkObserver.swift; sourceTree = "<group>"; };
 		B8C549BB26FFA71300720E62 /* AppView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppView.swift; sourceTree = "<group>"; };
 		B8C549C326FFBA8600720E62 /* View+Skeletonable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "View+Skeletonable.swift"; sourceTree = "<group>"; };
+		B8CB01062716613F00D3A6DD /* String+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+Extensions.swift"; sourceTree = "<group>"; };
+		B8CB01082716681700D3A6DD /* AppAlert.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppAlert.swift; sourceTree = "<group>"; };
 		B8CE1CAA26FD4193004AD5D5 /* DisabledCommandGroupButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DisabledCommandGroupButton.swift; sourceTree = "<group>"; };
 		B8CE1CAD26FD431E004AD5D5 /* URLFactory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URLFactory.swift; sourceTree = "<group>"; };
 		B8CE1CAF26FD43B5004AD5D5 /* URLType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URLType.swift; sourceTree = "<group>"; };
@@ -472,6 +476,7 @@
 				B82561EC26E8C89A0040A67E /* AppSheet.swift */,
 				B8C549BB26FFA71300720E62 /* AppView.swift */,
 				B85AC92D2702153E00A008A6 /* AppMenu.swift */,
+				B8CB01082716681700D3A6DD /* AppAlert.swift */,
 			);
 			path = Application;
 			sourceTree = "<group>";
@@ -523,6 +528,7 @@
 				B85AC92F2702158300A008A6 /* AppDelegate+NSMenuDelegate.swift */,
 				B81B0876270232B600E59F86 /* NSNotification+Name.swift */,
 				B81B0878270245CE00E59F86 /* AppMenu+HideWindow.swift */,
+				B8CB01062716613F00D3A6DD /* String+Extensions.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -1015,6 +1021,7 @@
 				B8EB5ADB26F0076C00BE3EF6 /* PlistCodingKeys.swift in Sources */,
 				B82B5586270007C500DE4766 /* DatabaseReference+Timeout.swift in Sources */,
 				B82B55822700014600DE4766 /* StartView+Equatable.swift in Sources */,
+				B8CB01092716681700D3A6DD /* AppAlert.swift in Sources */,
 				B88D7A6126F797F000B114F6 /* UserDefaultsService.swift in Sources */,
 				B82B55802700011000DE4766 /* SnippetsLibraryView+Equatable.swift in Sources */,
 				B82561EB26E8C7F00040A67E /* SnippetsLibraryViewModel.swift in Sources */,
@@ -1079,6 +1086,7 @@
 				B88BB45626F55DDB00747631 /* LogsService.swift in Sources */,
 				B88D7A6326F7A5C000B114F6 /* SnippetPlist+Dictonary.swift in Sources */,
 				B832886D27160F17006BD465 /* SnippetsFetchingType.swift in Sources */,
+				B8CB01072716613F00D3A6DD /* String+Extensions.swift in Sources */,
 				B8546F3C27077C310043A99F /* SnippetsLibraryListViewModel.swift in Sources */,
 				B8CE1CAB26FD4193004AD5D5 /* DisabledCommandGroupButton.swift in Sources */,
 				B85D1A9D26FA8EA50053FF3C /* SnippetsLibraryListSectionView.swift in Sources */,

SnippetsLibrary.xcodeproj/xcshareddata/xcschemes/SnippetsLibrary.xcscheme

@@ -51,7 +51,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"

SnippetsLibrary.xcodeproj/xcuserdata/krzysztoflowiec.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -54,7 +54,7 @@
 		<key>SnippetsLibraryWidgetExtension.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>23</integer>
+			<integer>1</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>

SnippetsLibrary/Application/AppAlert.swift

@@ -0,0 +1,18 @@
+//
+//  AppAlert.swift
+//  SnippetsLibrary
+//
+//  Created by Krzysztof Łowiec on 12/10/2021.
+//
+
+import Foundation
+
+enum AppAlert: Identifiable {
+    case snippetDownload
+    
+    var id: Int {
+        switch self {
+        case .snippetDownload: return 0
+        }
+    }
+}

SnippetsLibrary/Extensions/String+Extensions.swift

@@ -0,0 +1,20 @@
+//
+//  String+Extensions.swift
+//  SnippetsLibrary
+//
+//  Created by Krzysztof Łowiec on 12/10/2021.
+//
+
+import Foundation
+
+extension String {
+    
+    func numberOfLines() -> Int {
+        return numberOfOccurrencesOf(string: "\n") + 1
+    }
+
+    func numberOfOccurrencesOf(string: String) -> Int {
+        return components(separatedBy: string).count - 1
+    }
+    
+}

SnippetsLibrary/Models/Snippet.swift

@@ -21,6 +21,7 @@ struct Snippet: Codable, Identifiable, Hashable {
     var completion: String
     var platform: SnippetPlatform
     var availability: SnippetAvailability
+    var tags: [String]?
 
     // MARK: - Computed Properties
 
@@ -35,7 +36,7 @@ struct Snippet: Codable, Identifiable, Hashable {
     // MARK: - CodingKeys
 
     enum CodingKeys: String, CodingKey {
-        case id, title, summary, content, author, completion, platform, availability
+        case id, title, summary, content, author, completion, platform, availability, tags
     }
 
     // MARK: - Initialization
@@ -70,7 +71,8 @@ struct Snippet: Codable, Identifiable, Hashable {
         author: String,
         completion: String,
         platform: SnippetPlatform,
-        availability: SnippetAvailability
+        availability: SnippetAvailability,
+        tags: [String] = []
     ) {
         self.id = id
         self.title = title
@@ -80,6 +82,7 @@ struct Snippet: Codable, Identifiable, Hashable {
         self.completion = completion
         self.platform = platform
         self.availability = availability
+        self.tags = tags
     }
 
     init(from snippetPlist: SnippetPlist) {
@@ -91,6 +94,7 @@ struct Snippet: Codable, Identifiable, Hashable {
         completion = snippetPlist.completion
         platform = SnippetPlatform.allCases.first(where: { $0.rawValue == snippetPlist.platform }) ?? SnippetPlatform.all
         availability = SnippetAvailability.allCases.first(where: { $0.string == snippetPlist.availability.first }) ?? SnippetAvailability.allScopes
+        tags = []
     }
 
     init(from decoder: Decoder) throws {
@@ -107,6 +111,7 @@ struct Snippet: Codable, Identifiable, Hashable {
 
         let availabilityName = try values.decode([String].self, forKey: .availability)
         availability = SnippetAvailability.allCases.first { $0.string == availabilityName.first } ?? .allScopes
+        tags = try? values.decode([String].self, forKey: .tags)
     }
 
     // MARK: - Methods
@@ -121,6 +126,7 @@ struct Snippet: Codable, Identifiable, Hashable {
         try container.encode(completion, forKey: .completion)
         try container.encode(platform.title, forKey: .platform)
         try container.encode(availability.title, forKey: .availability)
+        try? container.encode(tags, forKey: .tags)
     }
 
 }

SnippetsLibrary/Modules/SnippetsLibrary/SnippetLibraryList/SnippetsLibraryListView.swift

@@ -34,20 +34,26 @@ struct SnippetsLibraryListView: View {
                 } label: {
                     Image(systemName: "line.horizontal.3.decrease.circle")
                         .font(.system(size: 15, weight: .light))
-                        .foregroundColor(Color.primary.opacity(Layout.mediumOpacity))
+                        .foregroundColor(
+                            Color.primary
+                                .opacity(Layout.mediumOpacity)
+                        )
                 }
                 .buttonStyle(PlainButtonStyle())
-                .help("Choose the filters.")
+                .help("Choose the filters")
 
                 Button {
                     viewModel.onReload()
                 } label: {
-                    Image(systemName: "arrow.down.circle")
+                    Image(systemName: "arrow.counterclockwise.circle")
                         .font(.system(size: 15, weight: .light))
-                        .foregroundColor(Color.primary.opacity(Layout.mediumOpacity))
+                        .foregroundColor(
+                            Color.primary
+                                .opacity(Layout.mediumOpacity)
+                        )
                 }
                 .buttonStyle(PlainButtonStyle())
-                .help("Pull all changes from remote.")
+                .help("Pull all changes from remote")
                 .padding(.trailing, Layout.smallPadding)
             }
             .padding(.top, Layout.largePadding)

SnippetsLibrary/Modules/SnippetsLibrary/SnippetsLibraryPreview/SnippetsLibraryPreviewView.swift

@@ -14,43 +14,50 @@ struct SnippetsLibraryPreviewView: View {
     @Binding internal var snippets: [Snippet]
     @Binding internal var selectedSnippetId: SnippetId?
     @Binding internal var activeSheet: AppSheet?
+    @Binding internal var appAlert: AppAlert?
 
     private(set) var onTap: (_ snippet: Snippet) -> Void
 
     // MARK: - Views
 
     var body: some View {
-        VStack {
-            VStack {
-                Spacer()
-                
-                Text("Tap the snippet on the left to preview")
-                    .font(.system(size: 17.0))
-                    .foregroundColor(
-                        Color.primary
-                            .opacity(Layout.mediumOpacity)
-                    )
+        VStack(spacing: .zero) {
+            Spacer()
+                .makeVisible(
+                    selectedSnippetId == nil,
+                    removed: true
+                )
+            
+            Text("Tap the snippet on the left to preview")
+                .font(.system(size: 17.0))
+                .foregroundColor(
+                    Color.primary
+                        .opacity(Layout.mediumOpacity)
+                )
+                .makeVisible(
+                    selectedSnippetId == nil,
+                    removed: true
+                )
+            
+            SnippetFileCardView(
+                viewModel: SnippetFileCardViewModel(
+                    snippet: snippets.first(where: { $0.id == selectedSnippetId }),
+                    state: .preview,
+                    activeSheet: $activeSheet,
+                    appAlert: $appAlert
+                )
+            )
+            .padding()
+            .onTapGesture {
+                guard let snippet = snippets.first(where: { $0.id == selectedSnippetId }) else { return }
+                activeSheet = .snippetDetails(snippet, .edit)
+                onTap(snippet)
             }
             .makeVisible(
-                selectedSnippetId == nil,
+                selectedSnippetId != nil,
                 removed: true
             )
-            
-            List(snippets.filter({ $0.id == selectedSnippetId })) {
-                SnippetFileCardView(
-                    viewModel: SnippetFileCardViewModel(
-                        snippet: $0,
-                        state: .preview
-                    )
-                )
-                .onTapGesture {
-                    guard let snippet = snippets.first(where: { $0.id == selectedSnippetId }) else { return }
-                    activeSheet = .snippetDetails(snippet, .edit)
-                    onTap(snippet)
-                }
-            }
-            .makeVisible(selectedSnippetId != nil)
-            
+
             Spacer()
         }
         .frame(minWidth: Layout.defaultWindowSize.width * 0.65)

SnippetsLibrary/Modules/SnippetsLibrary/SnippetsLibraryView.swift

@@ -6,7 +6,6 @@
 //
 
 import SwiftUI
-import Combine
 
 struct SnippetsLibraryView: View {
 
@@ -15,6 +14,7 @@ struct SnippetsLibraryView: View {
     @ObservedObject private(set) var viewModel: SnippetsLibraryViewModel
 
     @Binding internal var activeSheet: AppSheet?
+    @State private var appAlert: AppAlert? = nil
 
     // MARK: - Views
 
@@ -34,7 +34,8 @@ struct SnippetsLibraryView: View {
             SnippetsLibraryPreviewView(
                 snippets: $viewModel.snippets,
                 selectedSnippetId: $viewModel.selectedSnippetId,
-                activeSheet: $activeSheet
+                activeSheet: $activeSheet,
+                appAlert: $appAlert
             ) {
                 viewModel.saveSnippetToRecentSnippets($0)
             }
@@ -65,6 +66,16 @@ struct SnippetsLibraryView: View {
                 SnippetsUploadView(viewModel: SnippetsUploadViewModel(snippets: viewModel.snippets))
             }
         }
+        .alert(item: $appAlert) {
+            switch $0 {
+            case .snippetDownload:
+                return Alert(
+                    title: Text("Unexpected error"),
+                    message: Text("Unable to download the snippet. Please try again later."),
+                    dismissButton: .cancel()
+                )
+            }
+        }
         .makeDisplayed(
             with: $viewModel.shouldShowErrorAlert,
             imageName: "network",

SnippetsLibrary/Supporting Files/Enums/PlistCodingKeys.swift

@@ -19,4 +19,5 @@ enum PlistCodingKeys: String, CodingKey {
     case userSnippet = "IDECodeSnippetUserSnippet"
     case version = "IDECodeSnippetVersion"
     case author = "IDECodeSnippetAuthor"
+    case tags = "IDECodeSnippetTags"
 }