Side by side preview

marshallino16 · marshallino16 · commit bfdff6cae53c · 2020-12-07T16:07:38.000+01:00
diff --git a/Snip/Components/CodeViewer/CodeViewer.swift b/Snip/Components/CodeViewer/CodeViewer.swift
@@ -61,29 +61,31 @@ struct CodeViewer: View {
                                                                                                  tag: tag))
                                                           }))
       
-      CodeView(theme: settings.codeViewTheme,
-               code: .constant(viewModel.snipItem.snippet),
-               mode: .constant(viewModel.snipItem.mode),
-               fontSize: settings.codeViewTextSize,
-               showInvisibleCharacters: settings.codeViewShowInvisibleCharacters,
-               lineWrapping: settings.codeViewLineWrapping,
-               onContentChange: { newCode in
-                viewModel.saveNewCodeSnippet(newCode)
-               })
-        .frame(minWidth: 100,
-               maxWidth: .infinity,
-               minHeight: 100,
-               maxHeight: .infinity)
-        .overlay(
-          MarkdownHTMLViewer(code: viewModel.snipItem.snippet, mode: viewModel.snipItem.mode)
-            .frame(minWidth: 100,
-                   maxWidth: .infinity,
-                   minHeight: 100,
-                   maxHeight: .infinity)
-            .background(Color.GREY_200)
-            .offset(x: self.shouldShowPreview ? 0 : 10000, y: 0)
-            .transition(AnyTransition.move(edge: .trailing)), alignment: .topLeading)
       
+      GeometryReader { reader in
+        HStack {
+          CodeView(theme: settings.codeViewTheme,
+                   code: .constant(viewModel.snipItem.snippet),
+                   mode: .constant(viewModel.snipItem.mode),
+                   fontSize: settings.codeViewTextSize,
+                   showInvisibleCharacters: settings.codeViewShowInvisibleCharacters,
+                   lineWrapping: settings.codeViewLineWrapping,
+                   onContentChange: { newCode in
+                    viewModel.saveNewCodeSnippet(newCode)
+                   })
+            .frame(width: self.shouldShowPreview ? reader.size.width / 2 : reader.size.width, height: reader.size.height)
+          
+          
+          if self.shouldShowPreview {
+            Divider()
+            
+            MarkdownHTMLViewer(code: viewModel.snipItem.snippet, mode: viewModel.snipItem.mode)
+              .frame(width: reader.size.width / 2, height: reader.size.height)
+              .background(Color.GREY_200)
+              .transition(AnyTransition.move(edge: .trailing))
+          }
+        }
+      }
       
       Divider()
       
diff --git a/Snip/Components/Welcome/WelcomeView.swift b/Snip/Components/Welcome/WelcomeView.swift
@@ -54,7 +54,7 @@ struct WelcomeView: View {
           .font(.title)
         Spacer()
       }
-      Text("Changelog Ver. 1.5.0")
+      Text("Changelog Ver. \(Bundle.main.releaseVersionNumber)")
         .font(.subheadline)
         .foregroundColor(themeTextColor)
         .padding(EdgeInsets(top: 16, leading: 0, bottom: 16, trailing: 0))
diff --git a/Snip/Representables/MarkdownHTMLViewer.swift b/Snip/Representables/MarkdownHTMLViewer.swift
@@ -56,7 +56,14 @@ struct MarkdownHTMLViewer: NSViewRepresentable {
     var htmlSource = ""
     
     if mode == CodeMode.html.mode() {
-      htmlSource = code
+      
+      if !code.contains("<head>") {
+        htmlSource = "<head><meta name=\"viewport\" content=\"initial-scale=1.0\" /></head>" + code
+      }
+      else {
+        htmlSource = code
+      }
+      
     }
     else if mode == CodeMode.markdown.mode() {
       

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ struct WelcomeView: View {`
`54`	`54`	`.font(.title)`
`55`	`55`	`Spacer()`
`56`	`56`	`}`
`57`		`- Text("Changelog Ver. 1.5.0")`
	`57`	`+ Text("Changelog Ver. \(Bundle.main.releaseVersionNumber)")`
`58`	`58`	`.font(.subheadline)`
`59`	`59`	`.foregroundColor(themeTextColor)`
`60`	`60`	`.padding(EdgeInsets(top: 16, leading: 0, bottom: 16, trailing: 0))`