Merge pull request #110 from JanGorman/v6

V6
JanGorman · Mar 1, 2020 · 82305c3 · 82305c3
2 parents 40fcab9 + 715df84
commit 82305c3
Show file tree

Hide file tree

Showing 61 changed files with 1,788 additions and 2,555 deletions.
diff --git a/Example/MapleBacon Example.xcodeproj/project.pbxproj b/Example/MapleBacon Example.xcodeproj/project.pbxproj
diff --git a/Example/MapleBacon Example.xcodeproj/xcshareddata/xcschemes/MapleBacon Example.xcscheme b/Example/MapleBacon Example.xcodeproj/xcshareddata/xcschemes/MapleBacon Example.xcscheme
diff --git a/Example/MapleBacon Example.xcodeproj/xcshareddata/xcschemes/MapleBacon.xcscheme b/Example/MapleBacon Example.xcodeproj/xcshareddata/xcschemes/MapleBacon.xcscheme
diff --git a/Example/MapleBacon Example/AppDelegate.swift b/Example/MapleBacon Example/AppDelegate.swift
@@ -1,17 +1,10 @@
 //
-//  Copyright © 2017 Jan Gorman. All rights reserved.
+//  Copyright © 2020 Schnaub. All rights reserved.
 //
 
 import UIKit
 
 @UIApplicationMain
-final class AppDelegate: UIResponder, UIApplicationDelegate {
-
-  var window: UIWindow?
-
-  func application(_ application: UIApplication,
-                   didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
-    return true
-  }
+class AppDelegate: UIResponder, UIApplicationDelegate {
 
 }
diff --git a/Example/MapleBacon Example/Assets.xcassets/AppIcon.appiconset/Contents.json b/Example/MapleBacon Example/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -2,97 +2,97 @@
   "images" : [
     {
       "idiom" : "iphone",
-      "size" : "20x20",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "20x20"
     },
     {
       "idiom" : "iphone",
-      "size" : "20x20",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "20x20"
     },
     {
       "idiom" : "iphone",
-      "size" : "29x29",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "29x29"
     },
     {
       "idiom" : "iphone",
-      "size" : "29x29",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "29x29"
     },
     {
       "idiom" : "iphone",
-      "size" : "40x40",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "40x40"
     },
     {
       "idiom" : "iphone",
-      "size" : "40x40",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "40x40"
     },
     {
       "idiom" : "iphone",
-      "size" : "60x60",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "60x60"
     },
     {
       "idiom" : "iphone",
-      "size" : "60x60",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "60x60"
     },
     {
       "idiom" : "ipad",
-      "size" : "20x20",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "20x20"
     },
     {
       "idiom" : "ipad",
-      "size" : "20x20",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "20x20"
     },
     {
       "idiom" : "ipad",
-      "size" : "29x29",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "29x29"
     },
     {
       "idiom" : "ipad",
-      "size" : "29x29",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "29x29"
     },
     {
       "idiom" : "ipad",
-      "size" : "40x40",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "40x40"
     },
     {
       "idiom" : "ipad",
-      "size" : "40x40",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "40x40"
     },
     {
       "idiom" : "ipad",
-      "size" : "76x76",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "76x76"
     },
     {
       "idiom" : "ipad",
-      "size" : "76x76",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "76x76"
     },
     {
       "idiom" : "ipad",
-      "size" : "83.5x83.5",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "83.5x83.5"
     },
     {
       "idiom" : "ios-marketing",
-      "size" : "1024x1024",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "1024x1024"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}
diff --git a/Example/MapleBacon Example/Assets.xcassets/Contents.json b/Example/MapleBacon Example/Assets.xcassets/Contents.json
@@ -1,6 +1,6 @@
 {
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}
diff --git a/Example/MapleBacon Example/Assets.xcassets/placeholder.imageset/Contents.json b/Example/MapleBacon Example/Assets.xcassets/placeholder.imageset/Contents.json
diff --git a/Example/MapleBacon Example/Assets.xcassets/placeholder.imageset/placeholder.pdf b/Example/MapleBacon Example/Assets.xcassets/placeholder.imageset/placeholder.pdf