Add welcome modal

Author: marshallino16

Snip.xcodeproj/project.pbxproj

@@ -18,6 +18,7 @@
 		791B8D7824E2C6C200851E2A /* SharePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 791B8D7724E2C6C200851E2A /* SharePicker.swift */; };
 		79284D6B2507CCDC00210E61 /* WelcomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79284D6A2507CCDC00210E61 /* WelcomeView.swift */; };
 		79284D6D2507DE7F00210E61 /* PagerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79284D6C2507DE7F00210E61 /* PagerView.swift */; };
+		79284D6F250A23E900210E61 /* Bundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79284D6E250A23E900210E61 /* Bundle.swift */; };
 		7936F88F24D450B900F09AE7 /* SnipItemsList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7936F88E24D450B900F09AE7 /* SnipItemsList.swift */; };
 		7936F89324D6377D00F09AE7 /* List.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7936F89224D6377D00F09AE7 /* List.swift */; };
 		7936F89624D637D800F09AE7 /* Introspect in Frameworks */ = {isa = PBXBuildFile; productRef = 7936F89524D637D800F09AE7 /* Introspect */; };
@@ -90,6 +91,7 @@
 		791B8D7724E2C6C200851E2A /* SharePicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SharePicker.swift; sourceTree = "<group>"; };
 		79284D6A2507CCDC00210E61 /* WelcomeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WelcomeView.swift; sourceTree = "<group>"; };
 		79284D6C2507DE7F00210E61 /* PagerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PagerView.swift; sourceTree = "<group>"; };
+		79284D6E250A23E900210E61 /* Bundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Bundle.swift; sourceTree = "<group>"; };
 		7936F88E24D450B900F09AE7 /* SnipItemsList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SnipItemsList.swift; sourceTree = "<group>"; };
 		7936F89224D6377D00F09AE7 /* List.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = List.swift; sourceTree = "<group>"; };
 		7936F89924D845B600F09AE7 /* SnipItemsListAction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SnipItemsListAction.swift; sourceTree = "<group>"; };
@@ -344,6 +346,7 @@
 				79956A4824E57AD900B823E1 /* CharacterSet.swift */,
 				79956A4F24E5BC2300B823E1 /* URL.swift */,
 				794D27DA24F6A19C006E3B3D /* Data.swift */,
+				79284D6E250A23E900210E61 /* Bundle.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -536,6 +539,7 @@
 				791B8D7624E28EF800851E2A /* AppState.swift in Sources */,
 				79F07A2924D3050500469324 /* ImageButton.swift in Sources */,
 				791AC9BE24DAA4FD00CAB87C /* TagView.swift in Sources */,
+				79284D6F250A23E900210E61 /* Bundle.swift in Sources */,
 				796B092924D1B563006904C4 /* Settings.swift in Sources */,
 				79956A4924E57AD900B823E1 /* CharacterSet.swift in Sources */,
 				79956A4E24E5A4A200B823E1 /* OAuth.swift in Sources */,

Snip/Components/Welcome/WelcomeView.swift

@@ -17,40 +17,69 @@ struct WelcomeView: View {
     ZStack {
 
       backgroundView
-      .frame(width: viewModel.size.width, height: viewModel.size.height)
-      .transition(AnyTransition.opacity)
+        .frame(width: viewModel.size.width, height: viewModel.size.height)
+        .transition(AnyTransition.opacity)
 
       VStack(alignment: .leading) {
         PagerView(pageCount: 3, currentIndex: $currentPage) {
-            firstView
-            secondView
+          firstView
+          secondView
         }
       }
       .frame(width: viewModel.size.width / 2.5,
              height: viewModel.size.height / 1.5,
              alignment: .center)
-      .background(Color.secondary)
-      .cornerRadius(4.0)
-      .offset(x: 0,
-              y: viewModel.isVisible ? ((viewModel.size.height / 2) - ((viewModel.size.height / 1.5) / 1.5)) : 10000)
-      .transition(AnyTransition.move(edge: .bottom))
+        .background(Color.BLACK_500)
+        .cornerRadius(4.0)
+        .offset(x: 0,
+                y: viewModel.isVisible ? ((viewModel.size.height / 2) - ((viewModel.size.height / 1.5) / 1.5)) : 10000)
+        .transition(AnyTransition.move(edge: .bottom))
     }
   }
 
   var firstView: some View {
     VStack {
-      Spacer()
-      Text("Test 1")
+      HStack {
+        Spacer()
+        Text("Welcome!")
+          .foregroundColor(.text)
+          .font(.title)
+        Spacer()
+      }
+      Text("Changelog Ver. 1.2")
+        .font(.subheadline)
+        .foregroundColor(.text)
+        .padding(EdgeInsets(top: 16, leading: 0, bottom: 16, trailing: 0))
+      HStack {
+        Text("- Fix 'non clickable' area\n- Add snippet from StackOverflow via a Chrome Ext.\n- A StackOverflow snippet has a special top bar button to open the dedicated StackOverflow Post")
+          .font(Font.custom("CourierNewPSMT", size: 12))
+          .foregroundColor(.text)
+        Spacer()
+      }
+      .padding(EdgeInsets(top: 16, leading: 8, bottom: 16, trailing: 8))
+      .background(Color.BLACK_200)
+      Text("We Need Your Help!")
+      .font(.subheadline)
+      .foregroundColor(.text)
+      .padding(EdgeInsets(top: 16, leading: 0, bottom: 16, trailing: 0))
+      CodeView(code: .constant("Snip needs your help to grow!\n\nWant to translate snip into your native language?\nWant to have first-day in our next features?\n\nJOIN US now!"), mode: .constant(CodeMode.text.mode()))
+        .frame(maxWidth: .infinity)
       Spacer()
       HStack {
         Spacer()
         Button(action: {
-          self.currentPage += 1
+          self.viewModel.isVisible = false
         }) {
-          Text("Next")
-          .padding(EdgeInsets(top: 8, leading: 20, bottom: 8, trailing: 20))
-          .background(Color.accent)
-          .cornerRadius(4)
+          Text("Close")
+            .padding(EdgeInsets(top: 8, leading: 20, bottom: 8, trailing: 20))
+            .background(Color.transparent)
+        }
+        .buttonStyle(PlainButtonStyle())
+        Button(action: self.viewModel.openSnipWebsite) {
+          Text("JOIN US")
+            .padding(EdgeInsets(top: 8, leading: 20, bottom: 8, trailing: 20))
+            .background(Color.accentDark)
+            .cornerRadius(4)
         }
         .buttonStyle(PlainButtonStyle())
       }
@@ -74,18 +103,23 @@ struct WelcomeView: View {
 
 final class WelcomeViewModel: ObservableObject {
 
-  var isVisible: Bool
+  @Binding var isVisible: Bool
   var size: CGSize
 
-  init(isVisible: Bool, readerSize: CGSize) {
-    self.isVisible = isVisible
+  init(isVisible: Binding<Bool>, readerSize: CGSize) {
+    self._isVisible = isVisible
     self.size = readerSize
   }
+  
+  func openSnipWebsite() {
+    guard let url = URL(string: "https://snip.picta-hub.io") else { return }
+    NSWorkspace.shared.open(url)
+  }
 }
 
 struct WelcomeView_Previews: PreviewProvider {
   static var previews: some View {
-    WelcomeView(viewModel: WelcomeViewModel(isVisible: true,
+    WelcomeView(viewModel: WelcomeViewModel(isVisible: .constant(true),
                                             readerSize: CGSize(width: 300, height: 400)))
   }
 }

Snip/Extensions/Bundle.swift

@@ -0,0 +1,21 @@
+//
+//  Bundle.swift
+//  Snip
+//
+//  Created by Anthony Fernandez on 9/10/20.
+//  Copyright © 2020 pictarine. All rights reserved.
+//
+
+import Foundation
+
+
+extension Bundle {
+  
+  var releaseVersionNumber: String {
+    return (infoDictionary!["CFBundleShortVersionString"] as! String)
+  }
+  var buildVersionNumber: String {
+      return (infoDictionary!["CFBundleVersion"] as! String)
+  }
+  
+}

Snip/Extensions/Color.swift

@@ -39,6 +39,8 @@ extension Color {
 
   static let GREY_200 = Color.init(hex: "F6F8FA")
 
+  static let BLUE_700 = Color.init(hex: "0C1021")
+  
   init(hex: String) {
     let hex = hex.trimmingCharacters(in: CharacterSet.alphanumerics.inverted)
     var int: UInt64 = 0

Snip/Model/AppState.swift

@@ -13,4 +13,14 @@ class AppState: ObservableObject {
 
   @Published var selectedSnippetId: String? = ""
   @Published var selectedSnippetFilter: ModelFilter = .all
+  
+  @Published var shouldShowChangelogModel: Bool {
+    didSet {
+      UserDefaults.standard.set(Bundle.main.buildVersionNumber, forKey: "previous_launched_version")
+    }
+  }
+  
+  init() {
+    self.shouldShowChangelogModel = (UserDefaults.standard.object(forKey: "previous_launched_version") as? String ?? "") != Bundle.main.buildVersionNumber
+  }
 }

Snip/SnipViewApp.swift

@@ -14,6 +14,7 @@ struct SnipViewApp: View {
   @ObservedObject var snippetManager = SnippetManager.shared
   @ObservedObject var viewModel : SnipViewAppViewModel
   @EnvironmentObject var settings: Settings
+  @EnvironmentObject var appState: AppState
 
   var body: some View {
     appNavigation
@@ -78,7 +79,7 @@ struct SnipViewApp: View {
 
   var welcomePanel: some View {
     GeometryReader { reader in
-      WelcomeView(viewModel: WelcomeViewModel(isVisible: true, readerSize: reader.size))
+      WelcomeView(viewModel: WelcomeViewModel(isVisible: self.$appState.shouldShowChangelogModel, readerSize: reader.size))
     }
   }