UI: change ring logo
Change-Id: Ic4399f90385bedc179d70021145c0e25bbfad274
Reviewed-by: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com>
diff --git a/Ring/Ring/Constants/Generated/Images.swift b/Ring/Ring/Constants/Generated/Images.swift
index 2647401..88c24e5 100644
--- a/Ring/Ring/Constants/Generated/Images.swift
+++ b/Ring/Ring/Constants/Generated/Images.swift
@@ -54,7 +54,7 @@
static let device = ImageAsset(name: "device")
static let fallbackAvatar = ImageAsset(name: "fallback_avatar")
static let icContactPicture = ImageAsset(name: "ic_contact_picture")
- static let logoRingBeta2Blanc = ImageAsset(name: "logo-ring-beta2-blanc")
+ static let ringLogo = ImageAsset(name: "ring_logo")
static let settingsIcon = ImageAsset(name: "settings_icon")
// swiftlint:disable trailing_comma
@@ -69,7 +69,7 @@
device,
fallbackAvatar,
icContactPicture,
- logoRingBeta2Blanc,
+ ringLogo,
settingsIcon,
]
// swiftlint:enable trailing_comma
diff --git a/Ring/Ring/Features/Walkthrough/Welcome/WelcomeViewController.storyboard b/Ring/Ring/Features/Walkthrough/Welcome/WelcomeViewController.storyboard
index 0597427..50dec0f 100644
--- a/Ring/Ring/Features/Walkthrough/Welcome/WelcomeViewController.storyboard
+++ b/Ring/Ring/Features/Walkthrough/Welcome/WelcomeViewController.storyboard
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="ILs-xb-iKr">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="ILs-xb-iKr">
<device id="retina5_9" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -34,8 +34,8 @@
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</view>
- <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" verticalHuggingPriority="251" image="logo-ring-beta2-blanc" translatesAutoresizingMaskIntoConstraints="NO" id="2Pc-uJ-SAI">
- <rect key="frame" x="97.666666666666686" y="305.66666666666669" width="180" height="66"/>
+ <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" verticalHuggingPriority="251" image="ring_logo" translatesAutoresizingMaskIntoConstraints="NO" id="2Pc-uJ-SAI">
+ <rect key="frame" x="92.333333333333314" y="301.66666666666669" width="191" height="70"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="width" secondItem="2Pc-uJ-SAI" secondAttribute="height" multiplier="30:11" id="Qre-jC-ga0"/>
@@ -48,7 +48,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="750" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="Welcome to Ring" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Lbn-cd-UXk">
- <rect key="frame" x="100.66666666666667" y="391.66666666666669" width="174.33333333333331" height="29"/>
+ <rect key="frame" x="100.66666666666669" y="391.66666666666669" width="174" height="29"/>
<fontDescription key="fontDescription" type="system" pointSize="24"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
@@ -124,6 +124,6 @@
</scenes>
<resources>
<image name="background_ring" width="750" height="1334"/>
- <image name="logo-ring-beta2-blanc" width="180" height="65"/>
+ <image name="ring_logo" width="191" height="63"/>
</resources>
</document>
diff --git a/Ring/Ring/Resources/Images.xcassets/logo-ring-beta2-blanc.imageset/Contents.json b/Ring/Ring/Resources/Images.xcassets/logo-ring-beta2-blanc.imageset/Contents.json
deleted file mode 100644
index becb456..0000000
--- a/Ring/Ring/Resources/Images.xcassets/logo-ring-beta2-blanc.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "images" : [
- {
- "idiom" : "universal",
- "filename" : "logo-ring-beta2-blanc.png",
- "scale" : "1x"
- },
- {
- "idiom" : "universal",
- "filename" : "logo-ring-beta2-blanc@2x.png",
- "scale" : "2x"
- },
- {
- "idiom" : "universal",
- "filename" : "logo-ring-beta2-blanc@3x.png",
- "scale" : "3x"
- }
- ],
- "info" : {
- "version" : 1,
- "author" : "xcode"
- }
-}
\ No newline at end of file
diff --git a/Ring/Ring/Resources/Images.xcassets/logo-ring-beta2-blanc.imageset/logo-ring-beta2-blanc.png b/Ring/Ring/Resources/Images.xcassets/logo-ring-beta2-blanc.imageset/logo-ring-beta2-blanc.png
deleted file mode 100644
index 6c85c05..0000000
--- a/Ring/Ring/Resources/Images.xcassets/logo-ring-beta2-blanc.imageset/logo-ring-beta2-blanc.png
+++ /dev/null
Binary files differ
diff --git a/Ring/Ring/Resources/Images.xcassets/logo-ring-beta2-blanc.imageset/logo-ring-beta2-blanc@2x.png b/Ring/Ring/Resources/Images.xcassets/logo-ring-beta2-blanc.imageset/logo-ring-beta2-blanc@2x.png
deleted file mode 100644
index a39394a..0000000
--- a/Ring/Ring/Resources/Images.xcassets/logo-ring-beta2-blanc.imageset/logo-ring-beta2-blanc@2x.png
+++ /dev/null
Binary files differ
diff --git a/Ring/Ring/Resources/Images.xcassets/logo-ring-beta2-blanc.imageset/logo-ring-beta2-blanc@3x.png b/Ring/Ring/Resources/Images.xcassets/logo-ring-beta2-blanc.imageset/logo-ring-beta2-blanc@3x.png
deleted file mode 100644
index 5ea334c..0000000
--- a/Ring/Ring/Resources/Images.xcassets/logo-ring-beta2-blanc.imageset/logo-ring-beta2-blanc@3x.png
+++ /dev/null
Binary files differ
diff --git a/Ring/Ring/Resources/Images.xcassets/ring_logo.imageset/Contents.json b/Ring/Ring/Resources/Images.xcassets/ring_logo.imageset/Contents.json
new file mode 100644
index 0000000..cbe8152
--- /dev/null
+++ b/Ring/Ring/Resources/Images.xcassets/ring_logo.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "filename" : "logo-ring-tagline-EN-couleur-texteblanc.png",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "universal",
+ "filename" : "logo-ring-tagline-EN-couleur-texteblanc@2.png",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "universal",
+ "filename" : "logo-ring-tagline-EN-couleur-texteblanc@3.png",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/Ring/Ring/Resources/Images.xcassets/ring_logo.imageset/logo-ring-tagline-EN-couleur-texteblanc.png b/Ring/Ring/Resources/Images.xcassets/ring_logo.imageset/logo-ring-tagline-EN-couleur-texteblanc.png
new file mode 100644
index 0000000..f29ded8
--- /dev/null
+++ b/Ring/Ring/Resources/Images.xcassets/ring_logo.imageset/logo-ring-tagline-EN-couleur-texteblanc.png
Binary files differ
diff --git a/Ring/Ring/Resources/Images.xcassets/ring_logo.imageset/logo-ring-tagline-EN-couleur-texteblanc@2.png b/Ring/Ring/Resources/Images.xcassets/ring_logo.imageset/logo-ring-tagline-EN-couleur-texteblanc@2.png
new file mode 100644
index 0000000..456a06a
--- /dev/null
+++ b/Ring/Ring/Resources/Images.xcassets/ring_logo.imageset/logo-ring-tagline-EN-couleur-texteblanc@2.png
Binary files differ
diff --git a/Ring/Ring/Resources/Images.xcassets/ring_logo.imageset/logo-ring-tagline-EN-couleur-texteblanc@3.png b/Ring/Ring/Resources/Images.xcassets/ring_logo.imageset/logo-ring-tagline-EN-couleur-texteblanc@3.png
new file mode 100644
index 0000000..c8d155c
--- /dev/null
+++ b/Ring/Ring/Resources/Images.xcassets/ring_logo.imageset/logo-ring-tagline-EN-couleur-texteblanc@3.png
Binary files differ
diff --git a/Ring/Ring/Resources/LaunchScreen.storyboard b/Ring/Ring/Resources/LaunchScreen.storyboard
index 75f567a..c7cc39e 100644
--- a/Ring/Ring/Resources/LaunchScreen.storyboard
+++ b/Ring/Ring/Resources/LaunchScreen.storyboard
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<device id="retina4_0" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13174"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
@@ -21,24 +21,18 @@
<rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
- <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="RING" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vy5-r8-oQ3">
- <rect key="frame" x="134.5" y="271" width="51" height="26.5"/>
- <fontDescription key="fontDescription" type="system" pointSize="22"/>
- <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
- <nil key="highlightedColor"/>
- </label>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="background_ring" translatesAutoresizingMaskIntoConstraints="NO" id="QbZ-1j-Ebd">
<rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
</imageView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0tt-6B-dHo" userLabel="Gradient View">
<rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
<subviews>
- <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" verticalHuggingPriority="251" image="logo-ring-beta2-blanc" translatesAutoresizingMaskIntoConstraints="NO" id="kP1-oe-ZEx">
- <rect key="frame" x="70" y="251" width="180" height="66"/>
+ <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" verticalHuggingPriority="251" image="ring_logo" translatesAutoresizingMaskIntoConstraints="NO" id="kP1-oe-ZEx">
+ <rect key="frame" x="64.5" y="252.5" width="191" height="63"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</imageView>
</subviews>
- <color key="backgroundColor" red="0.2274509804" green="0.75294117650000003" blue="0.82352941180000006" alpha="0.20000000000000001" colorSpace="custom" customColorSpace="displayP3"/>
+ <color key="backgroundColor" red="0.2274509804" green="0.75294117650000003" blue="0.82352941180000006" alpha="0.34999999999999998" colorSpace="custom" customColorSpace="displayP3"/>
<constraints>
<constraint firstItem="kP1-oe-ZEx" firstAttribute="centerX" secondItem="0tt-6B-dHo" secondAttribute="centerX" id="54e-9c-yxP"/>
<constraint firstItem="kP1-oe-ZEx" firstAttribute="centerY" secondItem="0tt-6B-dHo" secondAttribute="centerY" id="fXn-9R-frB"/>
@@ -50,8 +44,6 @@
<constraint firstAttribute="bottom" secondItem="0tt-6B-dHo" secondAttribute="bottom" id="Bwv-uE-mOw"/>
<constraint firstItem="QbZ-1j-Ebd" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="GdO-YK-ig4"/>
<constraint firstItem="xb3-aO-Qok" firstAttribute="top" secondItem="QbZ-1j-Ebd" secondAttribute="bottom" id="OrU-s1-c96"/>
- <constraint firstItem="vy5-r8-oQ3" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="PE3-VY-U9r"/>
- <constraint firstItem="vy5-r8-oQ3" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="U34-24-7hY"/>
<constraint firstItem="0tt-6B-dHo" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="WEG-5j-2f3"/>
<constraint firstItem="0tt-6B-dHo" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="h0e-hO-zEy"/>
<constraint firstAttribute="trailing" secondItem="0tt-6B-dHo" secondAttribute="trailing" id="hq4-6q-gx1"/>
@@ -67,6 +59,6 @@
</scenes>
<resources>
<image name="background_ring" width="750" height="1334"/>
- <image name="logo-ring-beta2-blanc" width="180" height="66"/>
+ <image name="ring_logo" width="191" height="63"/>
</resources>
</document>
