Skip to content

Commit 283337b

Browse files
mauroolivolvaccaro
mauroolivo
authored and
lvaccaro
committed
jade: update UI resources
1 parent eab9f2b commit 283337b

File tree

5 files changed

+21
-17
lines changed

5 files changed

+21
-17
lines changed

‎gaios/HWFlow/Controllers/PinCreateViewController.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class PinCreateViewController: HWFlowBaseViewController {
4646
}
4747

4848
func setContent() {
49-
imgDevice.image = JadeAsset.img(.select, nil)
49+
imgDevice.image = JadeAsset.img(.selectDual, nil)
5050
lblStepNumber.text = "SETUP YOUR JADE"
5151
lblStepTitle.text = "Create a PIN"
5252
lblStepHint.text = "Enter and confirm a unique PIN that will be entered to unlock Jade."

‎gaios/Shared/Shared.storyboard‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
33
<device id="retina6_1" orientation="portrait" appearance="light"/>
44
<dependencies>
55
<deployment identifier="iOS"/>
6-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
77
<capability name="Named colors" minToolsVersion="9.0"/>
88
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
99
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -616,7 +616,7 @@
616616
<action selector="btnDismiss:" destination="XlG-lb-9GS" eventType="touchUpInside" id="q9a-kJ-eBh"/>
617617
</connections>
618618
</button>
619-
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="il_jade_frame_v1" translatesAutoresizingMaskIntoConstraints="NO" id="uWg-8K-XTs">
619+
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="il_jade_load_v1" translatesAutoresizingMaskIntoConstraints="NO" id="uWg-8K-XTs">
620620
<rect key="frame" x="90" y="80" width="234" height="60"/>
621621
<constraints>
622622
<constraint firstAttribute="height" constant="60" id="6tm-ef-5Z4"/>
@@ -1696,7 +1696,7 @@
16961696
<constraint firstAttribute="width" constant="50" id="uVw-yr-Hzz"/>
16971697
</constraints>
16981698
</imageView>
1699-
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="il_jade_frame_v1" translatesAutoresizingMaskIntoConstraints="NO" id="RHT-PF-mC9">
1699+
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="il_jade_load_v1" translatesAutoresizingMaskIntoConstraints="NO" id="RHT-PF-mC9">
17001700
<rect key="frame" x="90" y="139" width="234" height="60"/>
17011701
<constraints>
17021702
<constraint firstAttribute="height" constant="60" id="DgN-NK-RlN"/>
@@ -2461,7 +2461,7 @@
24612461
<action selector="btnDismiss:" destination="vDF-Mw-QF0" eventType="touchUpInside" id="fye-S8-P6h"/>
24622462
</connections>
24632463
</button>
2464-
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="il_jade_frame_v1" translatesAutoresizingMaskIntoConstraints="NO" id="Fef-Tr-nf0">
2464+
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="il_jade_load_v1" translatesAutoresizingMaskIntoConstraints="NO" id="Fef-Tr-nf0">
24652465
<rect key="frame" x="90" y="80" width="234" height="60"/>
24662466
<constraints>
24672467
<constraint firstAttribute="height" constant="60" id="5AD-rh-e0y"/>
@@ -2757,7 +2757,7 @@
27572757
<image name="ic_hww_arrow" width="60" height="60"/>
27582758
<image name="ic_qr" width="60" height="60"/>
27592759
<image name="ic_text" width="24" height="24"/>
2760-
<image name="il_jade_frame_v1" width="183" height="82"/>
2760+
<image name="il_jade_load_v1" width="197" height="111"/>
27612761
<namedColor name="customGrayLight">
27622762
<color red="0.42352941176470588" green="0.47058823529411764" blue="0.50196078431372548" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
27632763
</namedColor>

‎gaios/Utility/MasterKey/MasterKeyViewController.swift‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ class MasterKeyViewController: UIViewController {
1212
@IBOutlet weak var lblTitle: UILabel!
1313
@IBOutlet weak var lblHint: UILabel!
1414
@IBOutlet weak var btnLearnMore: UIButton!
15+
@IBOutlet weak var icon: UIImageView!
1516

1617
var indexPath: IndexPath?
1718

@@ -47,6 +48,8 @@ class MasterKeyViewController: UIViewController {
4748
let tapToClose = UITapGestureRecognizer(target: self, action: #selector(didTapToClose))
4849
tappableBg.addGestureRecognizer(tapToClose)
4950

51+
let isV2 = BleViewModel.shared.jade?.version?.boardType == .v2
52+
icon.image = JadeAsset.img(.load, isV2 ? .v2 : .v1)
5053
}
5154

5255
deinit {

‎gaios/Utility/Utility.storyboard‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
33
<device id="retina6_12" orientation="portrait" appearance="light"/>
44
<dependencies>
55
<deployment identifier="iOS"/>
6-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
77
<capability name="Named colors" minToolsVersion="9.0"/>
88
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
99
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -619,7 +619,7 @@
619619
</constraints>
620620
</view>
621621
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="F1G-l1-9Ag">
622-
<rect key="frame" x="0.0" y="52" width="393" height="523.33333333333337"/>
622+
<rect key="frame" x="0.0" y="52.000000000000057" width="393" height="523.33333333333348"/>
623623
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
624624
<connections>
625625
<outlet property="dataSource" destination="pnX-Bd-wI6" id="WXX-qy-nuM"/>
@@ -847,7 +847,7 @@
847847
<constraint firstAttribute="height" constant="50" id="Xv7-9B-zoF"/>
848848
</constraints>
849849
</imageView>
850-
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="il_jade_frame_v1" translatesAutoresizingMaskIntoConstraints="NO" id="7L8-0z-SMA">
850+
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="il_jade_load_v1" translatesAutoresizingMaskIntoConstraints="NO" id="7L8-0z-SMA">
851851
<rect key="frame" x="90" y="80" width="213" height="60"/>
852852
<constraints>
853853
<constraint firstAttribute="height" constant="60" id="gNh-ak-zqf"/>
@@ -984,6 +984,7 @@
984984
<outlet property="btnLearnMore" destination="qg3-D3-RUk" id="ShJ-vQ-Zjv"/>
985985
<outlet property="cardView" destination="Njf-1r-QVr" id="oHX-Gp-49y"/>
986986
<outlet property="handle" destination="rzu-iG-g2l" id="Vk7-0D-3JZ"/>
987+
<outlet property="icon" destination="7L8-0z-SMA" id="pt6-sI-Rlu"/>
987988
<outlet property="lblHint" destination="JlP-dt-L4H" id="Qzo-tz-kE8"/>
988989
<outlet property="lblTitle" destination="6s0-f6-R8A" id="dr7-vq-Ouy"/>
989990
<outlet property="scrollView" destination="9gn-Lc-2cl" id="qcu-Rf-ufh"/>
@@ -1002,7 +1003,7 @@
10021003
<image name="ic_info_home" width="24" height="24"/>
10031004
<image name="ic_qr" width="60" height="60"/>
10041005
<image name="ic_search" width="16.666666030883789" height="16.666666030883789"/>
1005-
<image name="il_jade_frame_v1" width="183" height="82"/>
1006+
<image name="il_jade_load_v1" width="197" height="111"/>
10061007
<namedColor name="customMatrixGreen">
10071008
<color red="0.0" green="0.70588235294117652" blue="0.35294117647058826" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
10081009
</namedColor>

‎gaios/Wallet/WalletViewController/Cells/PromoCell/PromoLayout2Cell.xib‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
33
<device id="retina6_1" orientation="portrait" appearance="light"/>
44
<dependencies>
55
<deployment identifier="iOS"/>
6-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
77
<capability name="Named colors" minToolsVersion="9.0"/>
88
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
99
</dependencies>
@@ -20,8 +20,8 @@
2020
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2Et-Dy-SC5">
2121
<rect key="frame" x="25" y="10" width="556" height="359"/>
2222
<subviews>
23-
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="il_jade_frame_v1" translatesAutoresizingMaskIntoConstraints="NO" id="HbQ-iP-gOH">
24-
<rect key="frame" x="186.5" y="276" width="183" height="82"/>
23+
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="il_jade_load_v1" translatesAutoresizingMaskIntoConstraints="NO" id="HbQ-iP-gOH">
24+
<rect key="frame" x="179.5" y="247" width="197" height="111"/>
2525
</imageView>
2626
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="cAZ-PS-TyT">
2727
<rect key="frame" x="0.0" y="0.0" width="556" height="359"/>
@@ -127,7 +127,7 @@
127127
</objects>
128128
<resources>
129129
<image name="cancel" width="14" height="14"/>
130-
<image name="il_jade_frame_v1" width="183" height="82"/>
130+
<image name="il_jade_load_v1" width="197" height="111"/>
131131
<namedColor name="customMatrixGreen">
132132
<color red="0.0" green="0.70588235294117652" blue="0.35294117647058826" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
133133
</namedColor>

0 commit comments

Comments
 (0)