oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix devices icon intermittently showing 

Because it was not rendering correctly in all cases, we're foregoing the
templated image, and using a colored asset.

// FREEBIE
This commit is contained in:
Michael Kirk 2016-09-09 09:48:18 -04:00
parent a595cb9326
commit 33f63e76d1
9 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Signal/Images.xcassets/devices-icon.imageset/ic_devices_ios.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
Signal/Images.xcassets/devices-icon.imageset/ic_devices_ios@2x.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.5 KiB

BIN
Signal/Images.xcassets/devices-icon.imageset/ic_devices_ios@3x.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.9 KiB

3
Signal/Images.xcassets/devices-icon.imageset/Contents.json → Signal/Images.xcassets/ic_devices_ios.imageset/Contents.json vendored
View File

@ -19,8 +19,5 @@
"info" : {
"version" : 1,
"author" : "xcode"
},
"properties" : {
"template-rendering-intent" : "template"
}
}

BIN
Signal/Images.xcassets/ic_devices_ios.imageset/ic_devices_ios.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
Signal/Images.xcassets/ic_devices_ios.imageset/ic_devices_ios@2x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
Signal/Images.xcassets/ic_devices_ios.imageset/ic_devices_ios@3x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.8 KiB

2
Signal/Signal-Info.plist
View File

@ -38,7 +38,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>2.5.0.5</string>
<string>2.5.0.6</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LOGS_EMAIL</key>

14
Signal/src/Storyboard/Storyboard.storyboard
View File

@ -1708,25 +1708,25 @@ A0 09 9A FF A8 8A 09 99</string>
<rect key="frame" x="16" y="294" width="288" height="230"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqf-fj-8Va" userLabel="Spacer">
<rect key="frame" x="0.0" y="0.0" width="288" height="40"/>
<rect key="frame" x="0.0" y="0.0" width="288" height="49"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="16" id="Xq5-fV-fUr"/>
</constraints>
</view>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="devices-icon" translatesAutoresizingMaskIntoConstraints="NO" id="zl7-KG-ma4">
<rect key="frame" x="72" y="40" width="144" height="115"/>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_devices_ios" translatesAutoresizingMaskIntoConstraints="NO" id="zl7-KG-ma4">
<rect key="frame" x="72" y="49" width="144" height="96"/>
<color key="tintColor" red="0.67450980392156867" green="0.67450980392156867" blue="0.67450980392156867" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="width" secondItem="zl7-KG-ma4" secondAttribute="height" multiplier="5:4" id="RKt-hc-iWB"/>
<constraint firstAttribute="width" secondItem="zl7-KG-ma4" secondAttribute="height" multiplier="3:2" id="RKt-hc-iWB"/>
</constraints>
</imageView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GMf-cM-kQN" userLabel="Spacer">
<rect key="frame" x="0.0" y="190.5" width="288" height="39.5"/>
<rect key="frame" x="0.0" y="181" width="288" height="49"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Scan the QR code displayed on the device to link." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="3D8-yn-TJ8">
<rect key="frame" x="0.0" y="171" width="288" height="19.5"/>
<rect key="frame" x="0.0" y="161" width="288" height="20"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
@ -2036,9 +2036,9 @@ A0 09 9A FF A8 8A 09 99</string>
<image name="btnQRShow--white-1" width="66" height="66"/>
<image name="call.png" width="100" height="100"/>
<image name="contact-options-action" width="44" height="44"/>
<image name="devices-icon" width="180" height="144"/>
<image name="empty-group-avatar" width="53" height="53"/>
<image name="endcall.png" width="100" height="100"/>
<image name="ic_devices_ios" width="180" height="119"/>
<image name="logoSignal" width="138" height="139"/>
<image name="mute-active" width="80" height="80"/>
<image name="mute-inactive" width="80" height="80"/>