Merge pull request #422 from razeware/development

v1.0.0: 🐼 Express

Emitron/Emitron.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -6,26 +6,26 @@
         "repositoryURL": "https://github.com/groue/CombineExpectations.git",
         "state": {
           "branch": null,
-          "revision": "40d564be8decfc9a3e8acfec56a42dd845e5c420",
-          "version": "0.3.0"
+          "revision": "3250715d3f1b12754c84e7952c7bbb716f4a4dc4",
+          "version": "0.4.0"
         }
       },
       {
         "package": "GRDB",
         "repositoryURL": "https://github.com/groue/GRDB.swift.git",
         "state": {
           "branch": null,
-          "revision": "a67070dd9a08dad455e9f2895a0c40921d31fa1c",
-          "version": "4.6.2"
+          "revision": "4c8574aa4c08ff715ce0e63b38502ac1e8529069",
+          "version": "4.10.0"
         }
       },
       {
         "package": "GRDBCombine",
         "repositoryURL": "https://github.com/groue/GRDBCombine",
         "state": {
           "branch": null,
-          "revision": "c155a5738448490832c068427b5eec2e4b5f65e3",
-          "version": "0.7.1"
+          "revision": "3cab1d74e6ed0a5c5cca5b13dfeaa2ec5158f983",
+          "version": "0.8.0"
         }
       },
       {
@@ -42,8 +42,8 @@
         "repositoryURL": "https://github.com/onevcat/Kingfisher",
         "state": {
           "branch": null,
-          "revision": "2f9d171f17869768f6dbec1d039b851e2503af35",
-          "version": "5.12.0"
+          "revision": "56075f629bc3915e1bfa876d175df67e1a7cbe3c",
+          "version": "5.13.2"
         }
       },
       {

Emitron/Emitron.xcodeproj/xcshareddata/xcschemes/Emitron.xcscheme

@@ -30,7 +30,8 @@
       codeCoverageEnabled = "YES">
       <Testables>
          <TestableReference
-            skipped = "NO">
+            skipped = "NO"
+            testExecutionOrdering = "random">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "22D176BC23460A060038333D"
@@ -39,6 +40,16 @@
                ReferencedContainer = "container:Emitron.xcodeproj">
             </BuildableReference>
          </TestableReference>
+         <TestableReference
+            skipped = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "225670A6240AFD3100BD05AE"
+               BuildableName = "emitronScreenshots.xctest"
+               BlueprintName = "emitronScreenshots"
+               ReferencedContainer = "container:Emitron.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction
@@ -61,6 +72,12 @@
             ReferencedContainer = "container:Emitron.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <CommandLineArguments>
+         <CommandLineArgument
+            argument = "-userBackdoorToken FILL_THIS_IN"
+            isEnabled = "NO">
+         </CommandLineArgument>
+      </CommandLineArguments>
       <EnvironmentVariables>
          <EnvironmentVariable
             key = "OS_ACTIVITY_MODE"

Emitron/Emitron/AppDelegate.swift

@@ -42,6 +42,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
   fileprivate var downloadService: DownloadService!
   fileprivate var messageBus = MessageBus()
   fileprivate var settingsManager: SettingsManager!
+  fileprivate var iconManager = IconManager()
 
   func application(_ application: UIApplication,
                    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
@@ -162,3 +163,9 @@ extension SettingsManager {
     (UIApplication.shared.delegate as! AppDelegate).settingsManager
   }
 }
+
+extension IconManager {
+  static var current: IconManager {
+    (UIApplication.shared.delegate as! AppDelegate).iconManager
+  }
+}

Emitron/Emitron/Assets.xcassets/App Icons/AppIcon.appiconset/Contents.json

@@ -3,109 +3,115 @@
     {
       "size" : "20x20",
       "idiom" : "iphone",
-      "filename" : "notificationsIconIphone40.png",
+      "filename" : "Icon-App-20x20@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "20x20",
       "idiom" : "iphone",
-      "filename" : "notificationsIconIphone60.png",
+      "filename" : "Icon-App-20x20@3x.png",
       "scale" : "3x"
     },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "settingsIconIpad58.png",
+      "filename" : "[email protected]",
+      "scale" : "1x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "[email protected]",
       "scale" : "2x"
     },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "settingsIconIphone87.png",
+      "filename" : "Icon-App-29x29@3x.png",
       "scale" : "3x"
     },
     {
       "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "notificationsIconIphone40@2x.png",
+      "filename" : "Icon-App-40x40@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "notificationsIconIphone40@3x.png",
+      "filename" : "Icon-App-40x40@3x.png",
       "scale" : "3x"
     },
     {
       "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "notificationsIconIphone60@2x.png",
+      "filename" : "Icon-App-60x60@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "notificationsIconIphone60@3x.png",
+      "filename" : "Icon-App-60x60@3x.png",
       "scale" : "3x"
     },
     {
       "size" : "20x20",
       "idiom" : "ipad",
-      "filename" : "notificationsIconIpad20.png",
+      "filename" : "Icon-App-20x20@1x.png",
       "scale" : "1x"
     },
     {
       "size" : "20x20",
       "idiom" : "ipad",
-      "filename" : "notificationsIconIphone40-1.png",
+      "filename" : "Icon-App-20x20@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "29x29",
       "idiom" : "ipad",
-      "filename" : "settingsIconIpad29.png",
+      "filename" : "Icon-App-29x29@1x.png",
       "scale" : "1x"
     },
     {
       "size" : "29x29",
       "idiom" : "ipad",
-      "filename" : "settingsIconIpad58-1.png",
+      "filename" : "Icon-App-29x29@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "40x40",
       "idiom" : "ipad",
-      "filename" : "notificationsIconIphone40-2.png",
+      "filename" : "Icon-App-40x40@1x.png",
       "scale" : "1x"
     },
     {
       "size" : "40x40",
       "idiom" : "ipad",
-      "filename" : "notificationsIconIphone40@2x-1.png",
+      "filename" : "Icon-App-40x40@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "76x76",
       "idiom" : "ipad",
-      "filename" : "appIconIpad76.png",
+      "filename" : "Icon-App-76x76@1x.png",
       "scale" : "1x"
     },
     {
       "size" : "76x76",
       "idiom" : "ipad",
-      "filename" : "appIconIpad76@2x.png",
+      "filename" : "Icon-App-76x76@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "83.5x83.5",
       "idiom" : "ipad",
-      "filename" : "appIconIpadPro167.png",
+      "filename" : "Icon-App-83.5x83.5@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "1024x1024",
       "idiom" : "ios-marketing",
-      "filename" : "appStore1024.png",
+      "filename" : "ItunesArtwork@2x.png",
       "scale" : "1x"
     }
   ],

Emitron/Emitron/Assets.xcassets/App Icons/AppIcon.dev.appiconset/Contents.json

@@ -39,7 +39,7 @@
     {
       "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "120.png",
+      "filename" : "app-icon--default.dev@2x-1.png",
       "scale" : "3x"
     },
     {
@@ -57,13 +57,13 @@
     {
       "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "120.png",
+      "filename" : "app-icon--default.dev@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "180.png",
+      "filename" : "app-icon--default.dev@3x.png",
       "scale" : "3x"
     },
     {

Emitron/Emitron/Assets.xcassets/Colours/App Icons/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Emitron/Emitron/Assets.xcassets/Colours/Tags/filterTagShadow.colorset/Contents.json → Emitron/Emitron/Assets.xcassets/Colours/App Icons/appIconBorder.colorset/Contents.json

@@ -9,10 +9,10 @@
       "color" : {
         "color-space" : "srgb",
         "components" : {
-          "red" : "0.000",
-          "alpha" : "0.150",
-          "blue" : "0.000",
-          "green" : "0.000"
+          "red" : "0.843",
+          "alpha" : "1.000",
+          "blue" : "0.937",
+          "green" : "0.878"
         }
       }
     },
@@ -27,10 +27,10 @@
       "color" : {
         "color-space" : "srgb",
         "components" : {
-          "red" : "0.000",
-          "alpha" : "0.150",
-          "blue" : "0.000",
-          "green" : "0.000"
+          "red" : "0.843",
+          "alpha" : "1.000",
+          "blue" : "0.937",
+          "green" : "0.878"
         }
       }
     },
@@ -45,10 +45,10 @@
       "color" : {
         "color-space" : "srgb",
         "components" : {
-          "red" : "0.000",
-          "alpha" : "0.000",
-          "blue" : "0.000",
-          "green" : "0.000"
+          "red" : "0.231",
+          "alpha" : "1.000",
+          "blue" : "0.282",
+          "green" : "0.251"
         }
       }
     }

Emitron/Emitron/Assets.xcassets/Colours/Download Button/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Emitron/Emitron/Assets.xcassets/Colours/Download Button/downloadButtonDownloaded.colorset/Contents.json

@@ -0,0 +1,20 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "colors" : [
+    {
+      "idiom" : "universal",
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "0.082",
+          "alpha" : "1.000",
+          "blue" : "0.263",
+          "green" : "0.518"
+        }
+      }
+    }
+  ]
+}

Emitron/Emitron/Assets.xcassets/Colours/Download Button/downloadButtonDownloadingBackground.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "colors" : [
+    {
+      "idiom" : "universal",
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "0.655",
+          "alpha" : "1.000",
+          "blue" : "0.706",
+          "green" : "0.678"
+        }
+      }
+    },
+    {
+      "idiom" : "universal",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "0.655",
+          "alpha" : "0.200",
+          "blue" : "0.706",
+          "green" : "0.678"
+        }
+      }
+    }
+  ]
+}