diff options
author | Joel Fischer <joeljfischer@gmail.com> | 2019-11-13 13:55:48 -0500 |
---|---|---|
committer | Joel Fischer <joeljfischer@gmail.com> | 2019-11-13 13:55:48 -0500 |
commit | 8362a18039be7b9cbbd396af1fa63567ad1941ae (patch) | |
tree | 517212e38c15868ab6d6c72c6f42e23bfa75ff60 | |
parent | b8712a19f567c763a0ec63f6950fb1dc206e6430 (diff) | |
download | sdl_ios-8362a18039be7b9cbbd396af1fa63567ad1941ae.tar.gz |
Add left / right arrow images
10 files changed, 103 insertions, 6 deletions
diff --git a/SmartDeviceLink/Assets/Base.lproj/SDLLockScreen.storyboard b/SmartDeviceLink/Assets/Base.lproj/SDLLockScreen.storyboard index b98ebfd30..fe7b3e564 100644 --- a/SmartDeviceLink/Assets/Base.lproj/SDLLockScreen.storyboard +++ b/SmartDeviceLink/Assets/Base.lproj/SDLLockScreen.storyboard @@ -33,14 +33,14 @@ <nil key="highlightedColor"/> </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="329" y="173" width="30" height="68"/> + <rect key="frame" x="168" y="334" 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="377" y="173" width="30" height="68"/> + <rect key="frame" x="216" y="334" width="30" height="68"/> <constraints> <constraint firstAttribute="width" constant="30" id="dH7-wX-ij9"/> <constraint firstAttribute="height" constant="68" id="hm6-eY-q7P"/> @@ -95,27 +95,45 @@ </mask> </variation> </imageView> + <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="lock_arrow_left_black" translatesAutoresizingMaskIntoConstraints="NO" id="xIz-6c-NNY"> + <rect key="frame" x="334" y="174" width="68" height="30"/> + <constraints> + <constraint firstAttribute="width" constant="68" id="Gfi-ib-u0N"/> + <constraint firstAttribute="height" constant="30" id="U3l-GC-Xrg"/> + </constraints> + </imageView> + <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="lock_arrow_right_black" translatesAutoresizingMaskIntoConstraints="NO" id="MKF-hz-tMZ"> + <rect key="frame" x="334" y="210" width="68" height="30"/> + <constraints> + <constraint firstAttribute="width" constant="68" id="5al-TQ-IsD"/> + <constraint firstAttribute="height" constant="30" id="pZ2-7Y-9J8"/> + </constraints> + </imageView> </subviews> <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstItem="M7Q-8D-weT" firstAttribute="width" secondItem="daa-1b-9se" secondAttribute="width" multiplier="0.25" id="0xM-dx-xZ0"/> <constraint firstItem="bgC-hp-jto" firstAttribute="centerY" secondItem="daa-1b-9se" secondAttribute="centerY" id="3M5-ke-rxH"/> + <constraint firstItem="MKF-hz-tMZ" firstAttribute="centerX" secondItem="daa-1b-9se" secondAttribute="centerX" id="5Z9-0c-ZVz"/> <constraint firstItem="M7Q-8D-weT" firstAttribute="centerY" secondItem="daa-1b-9se" secondAttribute="centerY" id="5xZ-by-Fu8"/> <constraint firstAttribute="trailingMargin" secondItem="2GC-iG-Bjq" secondAttribute="trailing" id="8ye-Ub-7tt"/> <constraint firstItem="wh4-r5-yql" firstAttribute="top" secondItem="2GC-iG-Bjq" secondAttribute="bottom" constant="8" id="BNz-vd-t0G"/> <constraint firstItem="QwS-i6-nIR" firstAttribute="centerY" secondItem="daa-1b-9se" secondAttribute="centerY" id="Bda-7E-hB1"/> <constraint firstAttribute="trailing" secondItem="M7Q-8D-weT" secondAttribute="trailing" constant="20" id="E1f-a6-rih"/> <constraint firstItem="M7Q-8D-weT" firstAttribute="centerX" secondItem="daa-1b-9se" secondAttribute="centerX" id="FpJ-PV-OTU"/> + <constraint firstItem="MKF-hz-tMZ" firstAttribute="top" secondItem="yyo-mJ-82g" secondAttribute="bottom" constant="2" id="I5J-Pi-u6W"/> <constraint firstItem="b2o-8D-i9T" firstAttribute="centerY" secondItem="daa-1b-9se" secondAttribute="centerY" id="Irb-tb-I3c"/> <constraint firstItem="yyo-mJ-82g" firstAttribute="centerY" secondItem="daa-1b-9se" secondAttribute="centerY" id="KJS-9f-Xk1"/> <constraint firstItem="qlE-SZ-K9i" firstAttribute="width" secondItem="daa-1b-9se" secondAttribute="width" multiplier="0.25" id="PAm-2N-EDL"/> <constraint firstItem="qlE-SZ-K9i" firstAttribute="leading" secondItem="daa-1b-9se" secondAttribute="leading" constant="20" id="Qrg-WO-zs6"/> + <constraint firstItem="xIz-6c-NNY" firstAttribute="centerX" secondItem="daa-1b-9se" secondAttribute="centerX" id="SM4-aR-RUB"/> <constraint firstItem="b2o-8D-i9T" firstAttribute="centerX" secondItem="daa-1b-9se" secondAttribute="centerX" id="TOb-Qt-FwN"/> <constraint firstItem="fyC-E0-YKF" firstAttribute="centerX" secondItem="daa-1b-9se" secondAttribute="centerX" id="VU4-AJ-Uzf"/> <constraint firstItem="qlE-SZ-K9i" firstAttribute="leading" secondItem="daa-1b-9se" secondAttribute="leading" constant="20" id="WXE-1r-KaS"/> <constraint firstItem="yyo-mJ-82g" firstAttribute="centerX" secondItem="daa-1b-9se" secondAttribute="centerX" id="YcC-cU-iOu"/> <constraint firstItem="qlE-SZ-K9i" firstAttribute="centerX" secondItem="daa-1b-9se" secondAttribute="centerX" id="a80-NE-fUz"/> <constraint firstItem="2GC-iG-Bjq" firstAttribute="top" secondItem="fyC-E0-YKF" secondAttribute="bottom" constant="12" id="aY6-Wi-6Ss"/> + <constraint firstItem="yyo-mJ-82g" firstAttribute="top" secondItem="xIz-6c-NNY" secondAttribute="bottom" constant="2" id="bP2-G8-FR4"/> <constraint firstItem="yyo-mJ-82g" firstAttribute="leading" secondItem="bgC-hp-jto" secondAttribute="trailing" constant="8" id="cFE-fa-NpO"/> <constraint firstItem="QwS-i6-nIR" firstAttribute="leading" secondItem="yyo-mJ-82g" secondAttribute="trailing" constant="8" id="d7Z-Gl-Q0P"/> <constraint firstItem="M7Q-8D-weT" firstAttribute="top" secondItem="bgC-hp-jto" secondAttribute="bottom" constant="16" id="eba-BW-tt4"/> @@ -124,6 +142,10 @@ <constraint firstAttribute="leadingMargin" secondItem="2GC-iG-Bjq" secondAttribute="leading" id="vFo-Ag-WyF"/> </constraints> <variation key="default"> + <mask key="subviews"> + <exclude reference="xIz-6c-NNY"/> + <exclude reference="MKF-hz-tMZ"/> + </mask> <mask key="constraints"> <exclude reference="PAm-2N-EDL"/> <exclude reference="Qrg-WO-zs6"/> @@ -135,13 +157,19 @@ </mask> </variation> <variation key="heightClass=compact-widthClass=compact"> + <mask key="subviews"> + <exclude reference="bgC-hp-jto"/> + <exclude reference="QwS-i6-nIR"/> + <include reference="xIz-6c-NNY"/> + <include reference="MKF-hz-tMZ"/> + </mask> <mask key="constraints"> + <exclude reference="gwo-mS-ib9"/> <include reference="PAm-2N-EDL"/> <include reference="Qrg-WO-zs6"/> <include reference="WXE-1r-KaS"/> <exclude reference="a80-NE-fUz"/> <include reference="euB-xP-ET0"/> - <exclude reference="gwo-mS-ib9"/> <include reference="0xM-dx-xZ0"/> <include reference="5xZ-by-Fu8"/> <include reference="E1f-a6-rih"/> @@ -150,12 +178,18 @@ </mask> </variation> <variation key="heightClass=compact-widthClass=regular"> + <mask key="subviews"> + <exclude reference="bgC-hp-jto"/> + <exclude reference="QwS-i6-nIR"/> + <include reference="xIz-6c-NNY"/> + <include reference="MKF-hz-tMZ"/> + </mask> <mask key="constraints"> + <exclude reference="gwo-mS-ib9"/> <include reference="PAm-2N-EDL"/> <include reference="WXE-1r-KaS"/> <exclude reference="a80-NE-fUz"/> <include reference="euB-xP-ET0"/> - <exclude reference="gwo-mS-ib9"/> <include reference="0xM-dx-xZ0"/> <include reference="5xZ-by-Fu8"/> <include reference="E1f-a6-rih"/> @@ -171,6 +205,8 @@ </view> <connections> <outlet property="arrowDownImageView" destination="QwS-i6-nIR" id="saq-rY-Rze"/> + <outlet property="arrowLeftImageView" destination="xIz-6c-NNY" id="XiY-fc-Ppu"/> + <outlet property="arrowRightImageView" destination="MKF-hz-tMZ" id="0N7-49-CIM"/> <outlet property="arrowUpImageView" destination="bgC-hp-jto" id="Eej-gQ-YBF"/> <outlet property="backupImageView" destination="b2o-8D-i9T" id="uRA-dC-93k"/> <outlet property="lockedLabel" destination="2GC-iG-Bjq" id="Eth-07-rcX"/> @@ -181,11 +217,13 @@ </viewController> <placeholder placeholderIdentifier="IBFirstResponder" id="Wfa-ZV-GKT" userLabel="First Responder" sceneMemberID="firstResponder"/> </objects> - <point key="canvasLocation" x="879" y="888"/> + <point key="canvasLocation" x="878.804347826087" y="886.95652173913049"/> </scene> </scenes> <resources> <image name="lock_arrow_down_black" width="30" height="68"/> + <image name="lock_arrow_left_black" width="68" height="30"/> + <image name="lock_arrow_right_black" width="68" height="30"/> <image name="lock_arrow_up_black" width="30" height="68"/> </resources> </document> diff --git a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_left_black.imageset/Contents.json b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_left_black.imageset/Contents.json new file mode 100644 index 000000000..b93cb64e9 --- /dev/null +++ b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_left_black.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "lock_arrow_left_black.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "lock_arrow_left_black@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "lock_arrow_left_black@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +}
\ No newline at end of file diff --git a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_left_black.imageset/lock_arrow_left_black.png b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_left_black.imageset/lock_arrow_left_black.png Binary files differnew file mode 100644 index 000000000..3b98a89cd --- /dev/null +++ b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_left_black.imageset/lock_arrow_left_black.png diff --git a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_left_black.imageset/lock_arrow_left_black@2x.png b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_left_black.imageset/lock_arrow_left_black@2x.png Binary files differnew file mode 100644 index 000000000..be0ed0560 --- /dev/null +++ b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_left_black.imageset/lock_arrow_left_black@2x.png diff --git a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_left_black.imageset/lock_arrow_left_black@3x.png b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_left_black.imageset/lock_arrow_left_black@3x.png Binary files differnew file mode 100644 index 000000000..ce65add74 --- /dev/null +++ b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_left_black.imageset/lock_arrow_left_black@3x.png diff --git a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_right_black.imageset/Contents.json b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_right_black.imageset/Contents.json new file mode 100644 index 000000000..b3c3a4a16 --- /dev/null +++ b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_right_black.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "lock_arrow_right_black.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "lock_arrow_right_black@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "lock_arrow_right_black@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +}
\ No newline at end of file diff --git a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_right_black.imageset/lock_arrow_right_black.png b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_right_black.imageset/lock_arrow_right_black.png Binary files differnew file mode 100644 index 000000000..fdd933091 --- /dev/null +++ b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_right_black.imageset/lock_arrow_right_black.png diff --git a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_right_black.imageset/lock_arrow_right_black@2x.png b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_right_black.imageset/lock_arrow_right_black@2x.png Binary files differnew file mode 100644 index 000000000..d90331bba --- /dev/null +++ b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_right_black.imageset/lock_arrow_right_black@2x.png diff --git a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_right_black.imageset/lock_arrow_right_black@3x.png b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_right_black.imageset/lock_arrow_right_black@3x.png Binary files differnew file mode 100644 index 000000000..b7bd42eb5 --- /dev/null +++ b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_right_black.imageset/lock_arrow_right_black@3x.png diff --git a/SmartDeviceLink/SDLLockScreenViewController.m b/SmartDeviceLink/SDLLockScreenViewController.m index 215ef061c..6fc91e9ea 100644 --- a/SmartDeviceLink/SDLLockScreenViewController.m +++ b/SmartDeviceLink/SDLLockScreenViewController.m @@ -23,6 +23,8 @@ NS_ASSUME_NONNULL_BEGIN @property (weak, nonatomic) IBOutlet UILabel *lockedLabel; @property (weak, nonatomic) IBOutlet UIImageView *arrowUpImageView; @property (weak, nonatomic) IBOutlet UIImageView *arrowDownImageView; +@property (weak, nonatomic) IBOutlet UIImageView *arrowLeftImageView; +@property (weak, nonatomic) IBOutlet UIImageView *arrowRightImageView; @property (strong, nonatomic) SwipeGestureCallbackBlock dismissGestureCallback; @property (strong, nonatomic, nullable) UISwipeGestureRecognizer *swipeGesture; @@ -116,9 +118,12 @@ NS_ASSUME_NONNULL_BEGIN self.arrowUpImageView.image = [self.class sdl_imageWithName:@"lock_arrow_up_black"]; self.arrowUpImageView.tintColor = iconColor; - self.arrowDownImageView.image = [self.class sdl_imageWithName:@"lock_arrow_down_black"]; self.arrowDownImageView.tintColor = iconColor; + self.arrowLeftImageView.image = [self.class sdl_imageWithName:@"lock_arrow_left_black"]; + self.arrowLeftImageView.tintColor = iconColor; + self.arrowRightImageView.image = [self.class sdl_imageWithName:@"lock_arrow_right_black"]; + self.arrowRightImageView.tintColor = iconColor; self.lockedLabel.textColor = iconColor; self.lockedLabel.numberOfLines = 0; @@ -161,6 +166,8 @@ NS_ASSUME_NONNULL_BEGIN self.arrowUpImageView.alpha = 1.0; self.arrowDownImageView.alpha = 1.0; + self.arrowLeftImageView.alpha = 1.0; + self.arrowRightImageView.alpha = 1.0; self.sdlIconImageView.alpha = 1.0; } @@ -174,6 +181,8 @@ NS_ASSUME_NONNULL_BEGIN self.arrowUpImageView.alpha = 0.0; self.arrowDownImageView.alpha = 0.0; + self.arrowLeftImageView.alpha = 0.0; + self.arrowRightImageView.alpha = 0.0; self.sdlIconImageView.alpha = 1.0; } @@ -187,6 +196,8 @@ NS_ASSUME_NONNULL_BEGIN self.arrowUpImageView.alpha = 0.0; self.arrowDownImageView.alpha = 0.0; + self.arrowLeftImageView.alpha = 0.0; + self.arrowRightImageView.alpha = 0.0; self.sdlIconImageView.alpha = 1.0; } @@ -200,6 +211,8 @@ NS_ASSUME_NONNULL_BEGIN self.arrowUpImageView.alpha = 0.0; self.arrowDownImageView.alpha = 0.0; + self.arrowLeftImageView.alpha = 0.0; + self.arrowRightImageView.alpha = 0.0; self.sdlIconImageView.alpha = 0.0; } |