Merge pull request #534 from smartdevicelink/feature/ios8_minimum

Minimum iOS version support set to 8.0+

20 files changed, 22 insertions, 40 deletions

diff --git a/SmartDeviceLink-iOS.podspec b/SmartDeviceLink-iOS.podspec
index 3dca39206..d8a5fa14f 100644
--- a/SmartDeviceLink-iOS.podspec
+++ b/SmartDeviceLink-iOS.podspec
@@ -6,11 +6,11 @@ s.summary      = "Connect your app with cars!"
 s.homepage     = "https://github.com/smartdevicelink/SmartDeviceLink-iOS"
 s.license      = { :type => "New BSD", :file => "LICENSE" }
 s.author       = { "SmartDeviceLink Team" => "developer@smartdevicelink.com" }
-s.platform     = :ios, "7.0"
+s.platform     = :ios, "8.0"
 s.source       = { :git => "https://github.com/smartdevicelink/sdl_ios.git", :tag => s.version.to_s }
 s.source_files = "SmartDeviceLink/*.{h,m}"
 s.requires_arc = true
-s.resource_bundles = { 'SmartDeviceLink' => ['SmartDeviceLink/Assets/**/*', 'SmartDeviceLink/iOS 7 Assets/*'] }
+s.resource_bundles = { 'SmartDeviceLink' => ['SmartDeviceLink/Assets/**/*'] }
 s.public_header_files = [
 'SmartDeviceLink/SmartDeviceLink.h',
 'SmartDeviceLink/SDLJingle.h',
diff --git a/SmartDeviceLink/Assets/Base.lproj/SDLLockScreen.storyboard b/SmartDeviceLink/Assets/Base.lproj/SDLLockScreen.storyboard
index 975a9d34c..9eb887c73 100644
--- a/SmartDeviceLink/Assets/Base.lproj/SDLLockScreen.storyboard
+++ b/SmartDeviceLink/Assets/Base.lproj/SDLLockScreen.storyboard
@@ -1,10 +1,13 @@
 <?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="NO" initialViewController="sao-xX-Ugl">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="sao-xX-Ugl">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
-        <deployment version="1536" identifier="iOS"/>
-        <development version="7000" identifier="xcode"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
+        <deployment version="1808" identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
         <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-->
@@ -16,67 +19,67 @@
                         <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="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fyC-E0-YKF">
+                            <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="fyC-E0-YKF">
                                 <rect key="frame" x="127.5" y="594" width="120" height="36"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="120" id="Pm5-yr-PT3"/>
                                     <constraint firstAttribute="height" constant="36" id="yVy-ww-yMp"/>
                                 </constraints>
                             </imageView>
-                            <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="qlE-SZ-K9i">
+                            <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="qlE-SZ-K9i">
                                 <rect key="frame" x="67.5" y="155.5" 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" misplaced="YES" text="Locked for your safety" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2GC-iG-Bjq">
+                            <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="16" y="642" width="343" 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"/>
                             </label>
-                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="lock_arrow_up_black" translatesAutoresizingMaskIntoConstraints="NO" id="bgC-hp-jto">
+                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="lock_arrow_up_black" translatesAutoresizingMaskIntoConstraints="NO" id="bgC-hp-jto">
                                 <rect key="frame" x="148.5" y="299.5" 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" misplaced="YES" image="lock_arrow_down_black" translatesAutoresizingMaskIntoConstraints="NO" id="QwS-i6-nIR">
+                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="lock_arrow_down_black" translatesAutoresizingMaskIntoConstraints="NO" id="QwS-i6-nIR">
                                 <rect key="frame" x="196.5" y="299.5" 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" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="M7Q-8D-weT">
+                            <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="M7Q-8D-weT">
                                 <rect key="frame" x="67.5" y="383.5" width="240" height="128"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="128" id="1Px-le-yzw"/>
                                     <constraint firstAttribute="width" constant="240" id="eVl-bJ-3TM"/>
                                 </constraints>
                             </imageView>
-                            <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="b2o-8D-i9T">
+                            <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="b2o-8D-i9T">
                                 <rect key="frame" x="95" y="295.5" 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" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="yyo-mJ-82g" userLabel="Center Spacer View">
+                            <view opaque="NO" alpha="0.0" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yyo-mJ-82g" userLabel="Center Spacer View">
                                 <rect key="frame" x="186.5" y="332.5" width="2" height="2"/>
-                                <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                <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" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                        <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"/>
diff --git a/SmartDeviceLink/SDLLockScreenViewController.m b/SmartDeviceLink/SDLLockScreenViewController.m
index 73659eaf6..c69b059bb 100644
--- a/SmartDeviceLink/SDLLockScreenViewController.m
+++ b/SmartDeviceLink/SDLLockScreenViewController.m
@@ -164,19 +164,7 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 + (UIImage *)sdl_imageWithName:(NSString *)name {
-    UIImage* image = nil;
-    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:@"%@%li.png", name, (long)deviceScale];
-        NSString *fullPath = [NSString stringWithFormat:@"%@/%@", bundlePath, fileName];
-        NSData *imageData = [NSData dataWithContentsOfFile:fullPath];
-        image = [UIImage imageWithData:imageData];
-    } else {
-        image = [UIImage imageNamed:name inBundle:[NSBundle sdlBundle] compatibleWithTraitCollection:nil];
-    }
-    
+    UIImage* image = [UIImage imageNamed:name inBundle:[NSBundle sdlBundle] compatibleWithTraitCollection:nil];
     return [image imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
 }
 
diff --git a/SmartDeviceLink/SDLStreamingMediaManager.h b/SmartDeviceLink/SDLStreamingMediaManager.h
index a88f735e2..d34a6a9fc 100644
--- a/SmartDeviceLink/SDLStreamingMediaManager.h
+++ b/SmartDeviceLink/SDLStreamingMediaManager.h
@@ -101,8 +101,6 @@ typedef void (^SDLStreamingEncryptionStartBlock)(BOOL success, BOOL encryption,
 /**
  *  This method will attempt to start a streaming video session. It will set up iOS's video encoder,  and call out to the head unit asking if it will start a video session. This will not use encryption.
  *
- *  @warning If this method is called on an 8.0 device, it will assert (in debug), or return a failure immediately to your block (in release).
- *
  *  @param startBlock A block that will be called with the result of attempting to start a video session
  */
 - (void)startVideoSessionWithStartBlock:(SDLStreamingStartBlock)startBlock;
diff --git a/SmartDeviceLink/SDLStreamingMediaManager.m b/SmartDeviceLink/SDLStreamingMediaManager.m
index bdd88af17..e39f24a4c 100644
--- a/SmartDeviceLink/SDLStreamingMediaManager.m
+++ b/SmartDeviceLink/SDLStreamingMediaManager.m
@@ -128,13 +128,6 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)startVideoSessionWithTLS:(SDLEncryptionFlag)encryptionFlag startBlock:(SDLStreamingEncryptionStartBlock)startBlock {
-    if (SDL_SYSTEM_VERSION_LESS_THAN(@"8.0")) {
-        NSAssert(NO, @"SDL Video Sessions can only be run on iOS 8+ devices");
-        startBlock(NO, NO, [NSError errorWithDomain:SDLErrorDomainStreamingMediaVideo code:SDLStreamingVideoErrorInvalidOperatingSystemVersion userInfo:nil]);
-
-        return;
-    }
-
     self.videoStartBlock = [startBlock copy];
     self.videoSessionEncrypted = (encryptionFlag == SDLEncryptionFlagAuthenticateAndEncrypt ? YES : NO);
 
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
deleted file mode 100644
index 68f1c3ca7..000000000
--- a/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/black/lock_arrow_down_black.png
+++ /dev/null
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
deleted file mode 100644
index 85fbc3446..000000000
--- a/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/black/lock_arrow_down_black@2x.png
+++ /dev/null
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
deleted file mode 100644
index af14aa8bb..000000000
--- a/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/black/lock_arrow_down_black@3x.png
+++ /dev/null
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
deleted file mode 100644
index ecc048331..000000000
--- a/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/black/lock_arrow_up_black.png
+++ /dev/null
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
deleted file mode 100644
index fa38a0772..000000000
--- a/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/black/lock_arrow_up_black@2x.png
+++ /dev/null
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
deleted file mode 100644
index b59bda372..000000000
--- a/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/black/lock_arrow_up_black@3x.png
+++ /dev/null
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
deleted file mode 100644
index bb0662fe5..000000000
--- a/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/white/lock_arrow_up_white.png
+++ /dev/null
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
deleted file mode 100644
index f45e6b299..000000000
--- a/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/white/lock_arrow_up_white@2x.png
+++ /dev/null
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
deleted file mode 100644
index d30fc404c..000000000
--- a/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/white/lock_arrow_up_white@3x.png
+++ /dev/null
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
deleted file mode 100644
index 68cf3a52d..000000000
--- a/SmartDeviceLink/iOS 7 Assets/sdl_logo/black/sdl_logo_black.png
+++ /dev/null
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
deleted file mode 100644
index 1427721a7..000000000
--- a/SmartDeviceLink/iOS 7 Assets/sdl_logo/black/sdl_logo_black@2x.png
+++ /dev/null
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
deleted file mode 100644
index dfe0ab3f8..000000000
--- a/SmartDeviceLink/iOS 7 Assets/sdl_logo/black/sdl_logo_black@3x.png
+++ /dev/null
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
deleted file mode 100644
index 1c35ef9b3..000000000
--- a/SmartDeviceLink/iOS 7 Assets/sdl_logo/white/sdl_logo_white.png
+++ /dev/null
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
deleted file mode 100644
index b7d0bd92a..000000000
--- a/SmartDeviceLink/iOS 7 Assets/sdl_logo/white/sdl_logo_white@2x.png
+++ /dev/null
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
deleted file mode 100644
index b8b9ef757..000000000
--- a/SmartDeviceLink/iOS 7 Assets/sdl_logo/white/sdl_logo_white@3x.png
+++ /dev/null