Merge branch 'develop' into feature/issue_8_json_encoder_decoder

37 files changed, 55 insertions, 53 deletions

diff --git a/SmartDeviceLink/Assets/Base.lproj/SDLLockScreen.storyboard b/SmartDeviceLink/Assets/Base.lproj/SDLLockScreen.storyboard
index bed60e2bc..4743ae983 100644
--- a/SmartDeviceLink/Assets/Base.lproj/SDLLockScreen.storyboard
+++ b/SmartDeviceLink/Assets/Base.lproj/SDLLockScreen.storyboard
@@ -1,9 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="sao-xX-Ugl">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11201" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="sao-xX-Ugl">
     <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+        <deployment version="1536" identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--Lock Screen View Controller-->
@@ -15,76 +16,59 @@
                         <viewControllerLayoutGuide type="bottom" id="wh4-r5-yql"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="daa-1b-9se">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="480"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="fyC-E0-YKF">
-                                <rect key="frame" x="240" y="527" width="120" height="36"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="120" id="Pm5-yr-PT3"/>
                                     <constraint firstAttribute="height" constant="36" id="yVy-ww-yMp"/>
                                 </constraints>
-                                <variation key="widthClass=compact" fixedFrame="YES">
-                                    <rect key="frame" x="140" y="531" width="120" height="36"/>
-                                </variation>
                             </imageView>
                             <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="qlE-SZ-K9i">
-                                <rect key="frame" x="180" y="122" width="240" height="128"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="240" id="Bk8-YV-DHy"/>
                                     <constraint firstAttribute="height" constant="128" id="boE-Tt-Ols"/>
                                 </constraints>
                             </imageView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Locked for your safety" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2GC-iG-Bjq">
-                                <rect key="frame" x="20" y="575" width="560" height="17"/>
                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="14"/>
-                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
-                                <variation key="widthClass=compact" fixedFrame="YES">
-                                    <rect key="frame" x="20" y="575" width="360" height="17"/>
-                                </variation>
                             </label>
                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="lock_arrow_up_black" translatesAutoresizingMaskIntoConstraints="NO" id="bgC-hp-jto">
-                                <rect key="frame" x="261" y="266" width="30" height="68"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="68" id="TX0-CV-jWt"/>
                                     <constraint firstAttribute="width" constant="30" id="qg1-7M-JOH"/>
                                 </constraints>
                             </imageView>
                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="lock_arrow_down_black" translatesAutoresizingMaskIntoConstraints="NO" id="QwS-i6-nIR">
-                                <rect key="frame" x="309" y="266" width="30" height="68"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="30" id="dH7-wX-ij9"/>
                                     <constraint firstAttribute="height" constant="68" id="hm6-eY-q7P"/>
                                 </constraints>
                             </imageView>
                             <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="M7Q-8D-weT">
-                                <rect key="frame" x="180" y="350" width="240" height="128"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="128" id="1Px-le-yzw"/>
                                     <constraint firstAttribute="width" constant="240" id="eVl-bJ-3TM"/>
                                 </constraints>
-                                <variation key="widthClass=compact" ambiguous="YES" misplaced="YES">
-                                    <rect key="frame" x="80" y="309" width="240" height="126"/>
-                                </variation>
                             </imageView>
                             <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="b2o-8D-i9T">
-                                <rect key="frame" x="208" y="262" width="185" height="76"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="185" id="CE6-0z-Lmn"/>
                                     <constraint firstAttribute="height" constant="76" id="emS-mJ-Ryy"/>
                                 </constraints>
                             </imageView>
                             <view opaque="NO" alpha="0.0" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yyo-mJ-82g" userLabel="Center Spacer View">
-                                <rect key="frame" x="299" y="299" width="2" height="2"/>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="2" id="1D8-iN-cG4"/>
                                     <constraint firstAttribute="width" constant="2" id="BOG-80-2W5"/>
                                 </constraints>
                             </view>
                         </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="bgC-hp-jto" firstAttribute="centerY" secondItem="daa-1b-9se" secondAttribute="centerY" id="3M5-ke-rxH"/>
                             <constraint firstAttribute="trailingMargin" secondItem="2GC-iG-Bjq" secondAttribute="trailing" id="8ye-Ub-7tt"/>
@@ -117,7 +101,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="Wfa-ZV-GKT" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="976" y="843"/>
+            <point key="canvasLocation" x="639" y="866"/>
         </scene>
     </scenes>
     <resources>
diff --git a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_black.imageset/Contents.json b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_black.imageset/Contents.json
index 8288dcde7..85553c22d 100644
--- a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_black.imageset/Contents.json
+++ b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_black.imageset/Contents.json
@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "lock_arrow_down.png",
+      "filename" : "lock_arrow_down_black.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "lock_arrow_down@2x.png",
+      "filename" : "lock_arrow_down_black@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "lock_arrow_down@3x.png",
+      "filename" : "lock_arrow_down_black@3x.png",
       "scale" : "3x"
     }
   ],
diff --git a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_black.imageset/lock_arrow_down.png b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_black.imageset/lock_arrow_down_black.png
index 68f1c3ca7..68f1c3ca7 100644
--- a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_black.imageset/lock_arrow_down.png
+++ b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_black.imageset/lock_arrow_down_black.png
diff --git a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_black.imageset/lock_arrow_down@2x.png b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_black.imageset/lock_arrow_down_black@2x.png
index 85fbc3446..85fbc3446 100644
--- a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_black.imageset/lock_arrow_down@2x.png
+++ b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_black.imageset/lock_arrow_down_black@2x.png
diff --git a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_black.imageset/lock_arrow_down@3x.png b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_black.imageset/lock_arrow_down_black@3x.png
index af14aa8bb..af14aa8bb 100644
--- a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_black.imageset/lock_arrow_down@3x.png
+++ b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_black.imageset/lock_arrow_down_black@3x.png
diff --git a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_white.imageset/Contents.json b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_white.imageset/Contents.json
index 8288dcde7..765c60c66 100644
--- a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_white.imageset/Contents.json
+++ b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_white.imageset/Contents.json
@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "lock_arrow_down.png",
+      "filename" : "lock_arrow_down_white.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "lock_arrow_down@2x.png",
+      "filename" : "lock_arrow_down_white@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "lock_arrow_down@3x.png",
+      "filename" : "lock_arrow_down_white@3x.png",
       "scale" : "3x"
     }
   ],
diff --git a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_white.imageset/lock_arrow_down.png b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_white.imageset/lock_arrow_down_white.png
index 07e620d05..07e620d05 100644
--- a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_white.imageset/lock_arrow_down.png
+++ b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_white.imageset/lock_arrow_down_white.png
diff --git a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_white.imageset/lock_arrow_down@2x.png b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_white.imageset/lock_arrow_down_white@2x.png
index 57fa8120f..57fa8120f 100644
--- a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_white.imageset/lock_arrow_down@2x.png
+++ b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_white.imageset/lock_arrow_down_white@2x.png
diff --git a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_white.imageset/lock_arrow_down@3x.png b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_white.imageset/lock_arrow_down_white@3x.png
index b354c1a13..b354c1a13 100644
--- a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_white.imageset/lock_arrow_down@3x.png
+++ b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_white.imageset/lock_arrow_down_white@3x.png
diff --git a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_black.imageset/Contents.json b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_black.imageset/Contents.json
index 5e604bca6..2a088dfef 100644
--- a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_black.imageset/Contents.json
+++ b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_black.imageset/Contents.json
@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "lock_arrow_up.png",
+      "filename" : "lock_arrow_up_black.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "lock_arrow_up@2x.png",
+      "filename" : "lock_arrow_up_black@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "lock_arrow_up@3x.png",
+      "filename" : "lock_arrow_up_black@3x.png",
       "scale" : "3x"
     }
   ],
diff --git a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_black.imageset/lock_arrow_up.png b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_black.imageset/lock_arrow_up_black.png
index ecc048331..ecc048331 100644
--- a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_black.imageset/lock_arrow_up.png
+++ b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_black.imageset/lock_arrow_up_black.png
diff --git a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_black.imageset/lock_arrow_up@2x.png b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_black.imageset/lock_arrow_up_black@2x.png
index fa38a0772..fa38a0772 100644
--- a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_black.imageset/lock_arrow_up@2x.png
+++ b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_black.imageset/lock_arrow_up_black@2x.png
diff --git a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_black.imageset/lock_arrow_up@3x.png b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_black.imageset/lock_arrow_up_black@3x.png
index b59bda372..b59bda372 100644
--- a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_black.imageset/lock_arrow_up@3x.png
+++ b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_black.imageset/lock_arrow_up_black@3x.png
diff --git a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_white.imageset/Contents.json b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_white.imageset/Contents.json
index 5e604bca6..3140e0f82 100644
--- a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_white.imageset/Contents.json
+++ b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_white.imageset/Contents.json
@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "lock_arrow_up.png",
+      "filename" : "lock_arrow_up_white.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "lock_arrow_up@2x.png",
+      "filename" : "lock_arrow_up_white@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "lock_arrow_up@3x.png",
+      "filename" : "lock_arrow_up_white@3x.png",
       "scale" : "3x"
     }
   ],
diff --git a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_white.imageset/lock_arrow_up.png b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_white.imageset/lock_arrow_up_white.png
index bb0662fe5..bb0662fe5 100644
--- a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_white.imageset/lock_arrow_up.png
+++ b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_white.imageset/lock_arrow_up_white.png
diff --git a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_white.imageset/lock_arrow_up@2x.png b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_white.imageset/lock_arrow_up_white@2x.png
index f45e6b299..f45e6b299 100644
--- a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_white.imageset/lock_arrow_up@2x.png
+++ b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_white.imageset/lock_arrow_up_white@2x.png
diff --git a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_white.imageset/lock_arrow_up@3x.png b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_white.imageset/lock_arrow_up_white@3x.png
index d30fc404c..d30fc404c 100644
--- a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_white.imageset/lock_arrow_up@3x.png
+++ b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_white.imageset/lock_arrow_up_white@3x.png
diff --git a/SmartDeviceLink/SDLLockScreenViewController.m b/SmartDeviceLink/SDLLockScreenViewController.m
index d7028b4c9..eb2722207 100644
--- a/SmartDeviceLink/SDLLockScreenViewController.m
+++ b/SmartDeviceLink/SDLLockScreenViewController.m
@@ -9,6 +9,7 @@
 #import "SDLLockScreenViewController.h"
 
 #import "NSBundle+SDLBundle.h"
+#import "SDLGlobals.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -90,6 +91,13 @@ NS_ASSUME_NONNULL_BEGIN
         [self sdl_setNoIconsLayout];
     }
 
+    // HAX: The autolayout doesn't scale for 4s, so hide a view so it doesn't look like garbage.
+    if (CGRectGetHeight([UIScreen mainScreen].bounds) == 480) {
+        self.sdlIconImageView.hidden = YES;
+    } else {
+        self.sdlIconImageView.hidden = NO;
+    }
+
     [self.view layoutIfNeeded];
 }
 
@@ -146,26 +154,28 @@ NS_ASSUME_NONNULL_BEGIN
 
 // TODO: (Joel F.)[2016-08-22] When moved to iOS 7+, use `imageWithRenderingMode:`
 + (UIImage *)sdl_logoImageWithColor:(BOOL)white {
-    if (white) {
-        return [UIImage imageNamed:@"sdl_logo_white" inBundle:[NSBundle sdlBundle] compatibleWithTraitCollection:nil];
-    } else {
-        return [UIImage imageNamed:@"sdl_logo_black" inBundle:[NSBundle sdlBundle] compatibleWithTraitCollection:nil];
-    }
+    return [self sdl_imageWithName:[NSString stringWithFormat:@"sdl_logo_%@", white ? @"white" : @"black"]];
 }
 
 + (UIImage *)sdl_arrowUpImageWithColor:(BOOL)white {
-    if (white) {
-        return [UIImage imageNamed:@"lock_arrow_up_white" inBundle:[NSBundle sdlBundle] compatibleWithTraitCollection:nil];
-    } else {
-        return [UIImage imageNamed:@"lock_arrow_up_black" inBundle:[NSBundle sdlBundle] compatibleWithTraitCollection:nil];
-    }
+    return [self sdl_imageWithName:[NSString stringWithFormat:@"lock_arrow_up_%@", white ? @"white" : @"black"]];
 }
 
 + (UIImage *)sdl_arrowDownImageWithColor:(BOOL)white {
-    if (white) {
-        return [UIImage imageNamed:@"lock_arrow_down_white" inBundle:[NSBundle sdlBundle] compatibleWithTraitCollection:nil];
+    return [self sdl_imageWithName:[NSString stringWithFormat:@"lock_arrow_down_%@", white ? @"white" : @"black"]];
+}
+
++ (UIImage*)sdl_imageWithName:(NSString*)name {
+    if (SDL_SYSTEM_VERSION_LESS_THAN(@"8.0")) {
+        NSString* bundlePath = [[NSBundle sdlBundle] bundlePath];
+        NSInteger deviceScale = [[UIScreen mainScreen] scale];
+        // We assume we are only dealing with PNGs.
+        NSString* fileName = [NSString stringWithFormat:@"%@%i.png", name, deviceScale];
+        NSString* fullPath = [NSString stringWithFormat:@"%@/%@", bundlePath, fileName];
+        NSData* imageData = [NSData dataWithContentsOfFile:fullPath];
+        return [UIImage imageWithData:imageData];
     } else {
-        return [UIImage imageNamed:@"lock_arrow_down_black" inBundle:[NSBundle sdlBundle] compatibleWithTraitCollection:nil];
+        return [UIImage imageNamed:name inBundle:[NSBundle sdlBundle] compatibleWithTraitCollection:nil];
     }
 }
 
@@ -185,4 +195,4 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
-NS_ASSUME_NONNULL_END
\ No newline at end of file
+NS_ASSUME_NONNULL_END
diff --git a/SmartDeviceLink/SDLNotificationConstants.h b/SmartDeviceLink/SDLNotificationConstants.h
index fa367124c..29aaf5528 100644
--- a/SmartDeviceLink/SDLNotificationConstants.h
+++ b/SmartDeviceLink/SDLNotificationConstants.h
@@ -14,7 +14,15 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-typedef NSNotificationName SDLNotificationName;
+// Resolves issue of using Swift 3 and pre-iOS 10 versions due to NSNotificationName unavailability.
+#if __IPHONE_OS_VERSION_MAX_ALLOWED <= __IPHONE_9_3
+    #define NOTIFICATION_TYPEDEF NSString*
+#else
+    #define NOTIFICATION_TYPEDEF NSNotificationName
+#endif
+
+typedef NOTIFICATION_TYPEDEF SDLNotificationName;
+
 typedef NSString *SDLNotificationUserInfoKey;
 
 #pragma mark - Blocks
diff --git a/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/black/lock_arrow_down_black.png b/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/black/lock_arrow_down_black.png
new file mode 100644
index 000000000..68f1c3ca7
--- /dev/null
+++ b/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/black/lock_arrow_down_black.png
diff --git a/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/black/lock_arrow_down_black@2x.png b/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/black/lock_arrow_down_black@2x.png
new file mode 100644
index 000000000..85fbc3446
--- /dev/null
+++ b/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/black/lock_arrow_down_black@2x.png
diff --git a/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/black/lock_arrow_down_black@3x.png b/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/black/lock_arrow_down_black@3x.png
new file mode 100644
index 000000000..af14aa8bb
--- /dev/null
+++ b/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/black/lock_arrow_down_black@3x.png
diff --git a/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/white/lock_arrow_down_white.png b/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/white/lock_arrow_down_white.png
new file mode 100644
index 000000000..07e620d05
--- /dev/null
+++ b/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/white/lock_arrow_down_white.png
diff --git a/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/white/lock_arrow_down_white@2x.png b/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/white/lock_arrow_down_white@2x.png
new file mode 100644
index 000000000..57fa8120f
--- /dev/null
+++ b/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/white/lock_arrow_down_white@2x.png
diff --git a/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/white/lock_arrow_down_white@3x.png b/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/white/lock_arrow_down_white@3x.png
new file mode 100644
index 000000000..b354c1a13
--- /dev/null
+++ b/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/white/lock_arrow_down_white@3x.png
diff --git a/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/black/lock_arrow_up_black.png b/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/black/lock_arrow_up_black.png
new file mode 100644
index 000000000..ecc048331
--- /dev/null
+++ b/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/black/lock_arrow_up_black.png
diff --git a/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/black/lock_arrow_up_black@2x.png b/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/black/lock_arrow_up_black@2x.png
new file mode 100644
index 000000000..fa38a0772
--- /dev/null
+++ b/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/black/lock_arrow_up_black@2x.png
diff --git a/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/black/lock_arrow_up_black@3x.png b/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/black/lock_arrow_up_black@3x.png
new file mode 100644
index 000000000..b59bda372
--- /dev/null
+++ b/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/black/lock_arrow_up_black@3x.png
diff --git a/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/white/lock_arrow_up_white.png b/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/white/lock_arrow_up_white.png
new file mode 100644
index 000000000..bb0662fe5
--- /dev/null
+++ b/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/white/lock_arrow_up_white.png
diff --git a/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/white/lock_arrow_up_white@2x.png b/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/white/lock_arrow_up_white@2x.png
new file mode 100644
index 000000000..f45e6b299
--- /dev/null
+++ b/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/white/lock_arrow_up_white@2x.png
diff --git a/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/white/lock_arrow_up_white@3x.png b/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/white/lock_arrow_up_white@3x.png
new file mode 100644
index 000000000..d30fc404c
--- /dev/null
+++ b/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/white/lock_arrow_up_white@3x.png
diff --git a/SmartDeviceLink/iOS 7 Assets/sdl_logo/black/sdl_logo_black.png b/SmartDeviceLink/iOS 7 Assets/sdl_logo/black/sdl_logo_black.png
new file mode 100644
index 000000000..68cf3a52d
--- /dev/null
+++ b/SmartDeviceLink/iOS 7 Assets/sdl_logo/black/sdl_logo_black.png
diff --git a/SmartDeviceLink/iOS 7 Assets/sdl_logo/black/sdl_logo_black@2x.png b/SmartDeviceLink/iOS 7 Assets/sdl_logo/black/sdl_logo_black@2x.png
new file mode 100644
index 000000000..1427721a7
--- /dev/null
+++ b/SmartDeviceLink/iOS 7 Assets/sdl_logo/black/sdl_logo_black@2x.png
diff --git a/SmartDeviceLink/iOS 7 Assets/sdl_logo/black/sdl_logo_black@3x.png b/SmartDeviceLink/iOS 7 Assets/sdl_logo/black/sdl_logo_black@3x.png
new file mode 100644
index 000000000..dfe0ab3f8
--- /dev/null
+++ b/SmartDeviceLink/iOS 7 Assets/sdl_logo/black/sdl_logo_black@3x.png
diff --git a/SmartDeviceLink/iOS 7 Assets/sdl_logo/white/sdl_logo_white.png b/SmartDeviceLink/iOS 7 Assets/sdl_logo/white/sdl_logo_white.png
new file mode 100644
index 000000000..1c35ef9b3
--- /dev/null
+++ b/SmartDeviceLink/iOS 7 Assets/sdl_logo/white/sdl_logo_white.png
diff --git a/SmartDeviceLink/iOS 7 Assets/sdl_logo/white/sdl_logo_white@2x.png b/SmartDeviceLink/iOS 7 Assets/sdl_logo/white/sdl_logo_white@2x.png
new file mode 100644
index 000000000..b7d0bd92a
--- /dev/null
+++ b/SmartDeviceLink/iOS 7 Assets/sdl_logo/white/sdl_logo_white@2x.png
diff --git a/SmartDeviceLink/iOS 7 Assets/sdl_logo/white/sdl_logo_white@3x.png b/SmartDeviceLink/iOS 7 Assets/sdl_logo/white/sdl_logo_white@3x.png
new file mode 100644
index 000000000..b8b9ef757
--- /dev/null
+++ b/SmartDeviceLink/iOS 7 Assets/sdl_logo/white/sdl_logo_white@3x.png