Update SDLLockScreenManager

* Add SDLFakeViewControllerPresenter that helps unit tests
* Update the SDL Logo to be used on the lock screen
* Add additional Lock Screen Manager tests
* Fix a conflict between SDLLockScreenManagerSpec and the old spec of the same name that was testing the lock screen status manager spec
* SDLLockScreenPresenter protocol now has a dismiss method that’s now implemented in real and fake classes for testing

7 files changed, 24 insertions, 13 deletions

diff --git a/SmartDeviceLink/Assets/SDLAssets.xcassets/sdl-logo.imageset/Contents.json b/SmartDeviceLink/Assets/SDLAssets.xcassets/sdl-logo.imageset/Contents.json
new file mode 100644
index 000000000..f53dcd7d8
--- /dev/null
+++ b/SmartDeviceLink/Assets/SDLAssets.xcassets/sdl-logo.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "sdl-logo.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "sdl-logo@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "sdl-logo@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/SmartDeviceLink/Assets/SDLAssets.xcassets/sdl-logo.imageset/sdl-logo.png b/SmartDeviceLink/Assets/SDLAssets.xcassets/sdl-logo.imageset/sdl-logo.png
new file mode 100644
index 000000000..77a8b4419
--- /dev/null
+++ b/SmartDeviceLink/Assets/SDLAssets.xcassets/sdl-logo.imageset/sdl-logo.png
diff --git a/SmartDeviceLink/Assets/SDLAssets.xcassets/sdl-logo.imageset/sdl-logo@2x.png b/SmartDeviceLink/Assets/SDLAssets.xcassets/sdl-logo.imageset/sdl-logo@2x.png
new file mode 100644
index 000000000..b2eeed120
--- /dev/null
+++ b/SmartDeviceLink/Assets/SDLAssets.xcassets/sdl-logo.imageset/sdl-logo@2x.png
diff --git a/SmartDeviceLink/Assets/SDLAssets.xcassets/sdl-logo.imageset/sdl-logo@3x.png b/SmartDeviceLink/Assets/SDLAssets.xcassets/sdl-logo.imageset/sdl-logo@3x.png
new file mode 100644
index 000000000..3c6e6be86
--- /dev/null
+++ b/SmartDeviceLink/Assets/SDLAssets.xcassets/sdl-logo.imageset/sdl-logo@3x.png
diff --git a/SmartDeviceLink/Assets/SDLAssets.xcassets/sdl_logo.imageset/Contents.json b/SmartDeviceLink/Assets/SDLAssets.xcassets/sdl_logo.imageset/Contents.json
deleted file mode 100644
index 17bed6395..000000000
--- a/SmartDeviceLink/Assets/SDLAssets.xcassets/sdl_logo.imageset/Contents.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "sdl_logo.pdf"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/SmartDeviceLink/Assets/SDLAssets.xcassets/sdl_logo.imageset/sdl_logo.pdf b/SmartDeviceLink/Assets/SDLAssets.xcassets/sdl_logo.imageset/sdl_logo.pdf
deleted file mode 100644
index ebe802c72..000000000
--- a/SmartDeviceLink/Assets/SDLAssets.xcassets/sdl_logo.imageset/sdl_logo.pdf
+++ /dev/null
diff --git a/SmartDeviceLink/Assets/SDLLockScreen.storyboard b/SmartDeviceLink/Assets/SDLLockScreen.storyboard
index 24fa86a13..8231135b1 100644
--- a/SmartDeviceLink/Assets/SDLLockScreen.storyboard
+++ b/SmartDeviceLink/Assets/SDLLockScreen.storyboard
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="KFL-L4-LT4">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="KFL-L4-LT4">
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>