Fix macOS Platform, Custom URL Scheme Handler, Polish Demos. (#110)

* Fix 'DownView' for the macOS platform. * Remove unnecessary 'markdownString' property and refactoring (back to original). * Add 'configuration' parameter to 'DownView' initializer. * Support custom URL scheme handlers (macOS 10.13+, iOS 11+) * Move DownView's init 'didLoadSuccessfully' parameter to end to allow trailing closures. * Document DownView's 'configuration' parameter. * Add test case for custom URL scheme handler. * Polish macOS demo * Polish iOS Demo * Revert bundle IDs * Throw '.nonStandardBundleFormatError' instead of ☠️ * Update demos * Set macOS deployment target to '10.11'
johnxnguyen · Nov 23, 2018 · 0c5cd04 · 0c5cd04
1 parent d753044
commit 0c5cd04
Show file tree

Hide file tree

Showing 27 changed files with 1,834 additions and 100 deletions.
diff --git a/Down-Example/Down-Example.xcodeproj/project.pbxproj b/Down-Example/Down-Example.xcodeproj/project.pbxproj
diff --git a/...-Example/Down-Example.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/...-Example/Down-Example.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Down-Example/Down-Example.xcodeproj/xcshareddata/xcschemes/Down-Example.xcscheme b/Down-Example/Down-Example.xcodeproj/xcshareddata/xcschemes/Down-Example.xcscheme
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1010"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "8A07D7CE1F085EC6004D7141"
+               BuildableName = "Down-Example.app"
+               BlueprintName = "Down-Example"
+               ReferencedContainer = "container:Down-Example.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "8A07D7CE1F085EC6004D7141"
+            BuildableName = "Down-Example.app"
+            BlueprintName = "Down-Example"
+            ReferencedContainer = "container:Down-Example.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "8A07D7CE1F085EC6004D7141"
+            BuildableName = "Down-Example.app"
+            BlueprintName = "Down-Example"
+            ReferencedContainer = "container:Down-Example.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "8A07D7CE1F085EC6004D7141"
+            BuildableName = "Down-Example.app"
+            BlueprintName = "Down-Example"
+            ReferencedContainer = "container:Down-Example.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Down-Example/Down-Example.xcodeproj/xcshareddata/xcschemes/macOS Demo.xcscheme b/Down-Example/Down-Example.xcodeproj/xcshareddata/xcschemes/macOS Demo.xcscheme
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1010"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "14090A482185411800503C06"
+               BuildableName = "macOS Demo.app"
+               BlueprintName = "macOS Demo"
+               ReferencedContainer = "container:Down-Example.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "14090A482185411800503C06"
+            BuildableName = "macOS Demo.app"
+            BlueprintName = "macOS Demo"
+            ReferencedContainer = "container:Down-Example.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "14090A482185411800503C06"
+            BuildableName = "macOS Demo.app"
+            BlueprintName = "macOS Demo"
+            ReferencedContainer = "container:Down-Example.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "14090A482185411800503C06"
+            BuildableName = "macOS Demo.app"
+            BlueprintName = "macOS Demo"
+            ReferencedContainer = "container:Down-Example.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Down-Example/Down-Example/Assets.xcassets/AppIcon.appiconset/Contents.json b/Down-Example/Down-Example/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,5 +1,15 @@
 {
   "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
     {
       "idiom" : "iphone",
       "size" : "29x29",
@@ -30,6 +40,16 @@
       "size" : "60x60",
       "scale" : "3x"
     },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
     {
       "idiom" : "ipad",
       "size" : "29x29",
@@ -59,6 +79,16 @@
       "idiom" : "ipad",
       "size" : "76x76",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "83.5x83.5",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
     }
   ],
   "info" : {

diff --git a/Down-Example/Down-Example/Base.lproj/Main.storyboard b/Down-Example/Down-Example/Base.lproj/Main.storyboard
@@ -1,19 +1,23 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11134" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11106"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
         <scene sceneID="tne-QT-ifu">
             <objects>
-                <viewController id="BYZ-38-t0r" customClass="ViewController" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController id="BYZ-38-t0r" customClass="ViewController" customModule="Down_Example" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
                         <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
                     </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
+                    <view key="view" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" id="8bC-Xf-vdC">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>

diff --git a/Down-Example/Down-Example/Info.plist b/Down-Example/Down-Example/Info.plist
@@ -28,6 +28,10 @@
 	<array>
 		<string>armv7</string>
 	</array>
+	<key>UIStatusBarHidden</key>
+	<false/>
+	<key>UIStatusBarStyle</key>
+	<string>UIStatusBarStyleDefault</string>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>

diff --git a/Down-Example/Down-Example/ViewController.swift b/Down-Example/Down-Example/ViewController.swift
@@ -11,66 +11,43 @@ import Down
 
 class ViewController: UIViewController {
 
+    var downView: DownView!
+
     override func viewDidLoad() {
         super.viewDidLoad()
-
-        guard let downView = try? DownView(frame: self.view.bounds, markdownString: markdownString, didLoadSuccessfully: {
-            // Optional callback for loading finished
-            print("Markdown was rendered.")
-        }) else { return }
+
+        let readMeURL = Bundle.main.url(forResource: nil, withExtension: "md")!
+        let readMeContents = try! String(contentsOf: readMeURL)
+
+        do {
+            downView = try DownView(frame: view.bounds, markdownString: readMeContents, didLoadSuccessfully: {
+                print("Markdown was rendered.")
+            })
+        } catch {
+            let alertController = UIAlertController(title: "DownView Render Error",
+                                                    message: error.localizedDescription,
+                                                    preferredStyle: .alert)
+            self.present(alertController, animated: true, completion: nil)
+        }
+
         view.addSubview(downView)
+
+        createStatusBarBackgrounds()
+    }
+
+    func createStatusBarBackgrounds() {
+        let blurEffect = UIBlurEffect(style: .prominent)
+        let blurEffectView = UIVisualEffectView(effect: blurEffect)
+        blurEffectView.translatesAutoresizingMaskIntoConstraints = false
+        view.insertSubview(blurEffectView, aboveSubview: downView)
+
+        NSLayoutConstraint.activate([
+            blurEffectView.leadingAnchor.constraint(equalTo: view.leadingAnchor),
+            blurEffectView.trailingAnchor.constraint(equalTo: view.trailingAnchor),
+            blurEffectView.topAnchor.constraint(equalTo: topLayoutGuide.topAnchor),
+            blurEffectView.bottomAnchor.constraint(equalTo: topLayoutGuide.bottomAnchor)
+            ])
     }
-
-    fileprivate let markdownString = """
-    ## Down
-    [![Build Status](https://travis-ci.org/iwasrobbed/Down.svg?branch=master)](https://travis-ci.org/iwasrobbed/Down)
-    [![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/iwasrobbed/Down/blob/master/LICENSE)
-    [![CocoaPods](https://img.shields.io/cocoapods/v/Down.svg?maxAge=10800)]()
-    [![Swift 4](https://img.shields.io/badge/language-Swift-blue.svg)](https://swift.org)
-    [![macOS](https://img.shields.io/badge/OS-macOS-orange.svg)](https://developer.apple.com/macos/)
-    [![iOS](https://img.shields.io/badge/OS-iOS-orange.svg)](https://developer.apple.com/ios/)
-    [![tvOS](https://img.shields.io/badge/OS-tvOS-orange.svg)](https://developer.apple.com/tvos/)
-    [![Coverage Status](https://coveralls.io/repos/github/iwasrobbed/Down/badge.svg?branch=master)](https://coveralls.io/github/iwasrobbed/Down?branch=master)
-    
-    Blazing fast Markdown rendering in Swift, built upon [cmark](https://github.com/jgm/cmark).
-    
-    Is your app using it? [Let us know!](mailto:rob@robphillips.me)
-    
-    #### Maintainers
-    
-    - [Rob Phillips](https://github.com/iwasrobbed)
-    - [Keaton Burleson](https://github.com/128keaton)
-    - [Other contributors](https://github.com/iwasrobbed/Down/graphs/contributors) 🙌
-    
-    ### Installation
-    
-    Note: Swift 4 support is now on the `master` branch and any tag >= 0.4.x (Swift 3 is 0.3.x)
-    
-    Quickly install using [CocoaPods](https://cocoapods.org):
-    
-    ```ruby
-    pod 'Down'
-    ```
-    
-    Or [Carthage](https://github.com/Carthage/Carthage):
-    
-    ```
-    github "iwasrobbed/Down"
-    ```
-    Due to limitations in Carthage regarding platform specification, you need to define the platform with Carthage.
-    
-    e.g.
-    
-    ```carthage update --platform iOS```
-    
-    Or manually install:
-    
-    1. Clone this repository
-    2. Build the Down project
-    3. Add the resulting framework file to your project
-    4. ?
-    5. Profit
-    """
 
 }