diff --git a/Ring/Ring/Constants/Generated/Images.swift b/Ring/Ring/Constants/Generated/Images.swift
index 4c523ea637922e63c966c060b5af4ad2a4df6754..d1bbf342c9b43c93dc9c3200f4aeba4406efddbd 100644
--- a/Ring/Ring/Constants/Generated/Images.swift
+++ b/Ring/Ring/Constants/Generated/Images.swift
@@ -65,6 +65,7 @@ internal enum Asset {
internal static let infoArrow = ImageAsset(name: "info_arrow")
internal static let jamiIcon = ImageAsset(name: "jamiIcon")
internal static let jamiLogo = ImageAsset(name: "jamiLogo")
+ internal static let jamiGnupackage = ImageAsset(name: "jami_gnupackage")
internal static let leftArrow = ImageAsset(name: "left_arrow")
internal static let messageBackgroundColor = ColorAsset(name: "message_background_color")
internal static let moreSettings = ImageAsset(name: "more_settings")
@@ -75,7 +76,6 @@ internal enum Asset {
internal static let qrCodeScan = ImageAsset(name: "qr_code_scan")
internal static let raiseHand = ImageAsset(name: "raise_hand")
internal static let revokeDevice = ImageAsset(name: "revoke_device")
- internal static let ringLogo = ImageAsset(name: "ring_logo")
internal static let rowSelected = ColorAsset(name: "row_selected")
internal static let scan = ImageAsset(name: "scan")
internal static let sendButton = ImageAsset(name: "send_button")
diff --git a/Ring/Ring/Features/InitialLoading/InitialLoadingViewController.storyboard b/Ring/Ring/Features/InitialLoading/InitialLoadingViewController.storyboard
index c6a75451a23edafe7a2555eb0af49fd7c311fbe7..1e8b9f4a15c6935e5d4368c178c247c20b139031 100644
--- a/Ring/Ring/Features/InitialLoading/InitialLoadingViewController.storyboard
+++ b/Ring/Ring/Features/InitialLoading/InitialLoadingViewController.storyboard
@@ -1,11 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="COY-AX-993">
- <device id="retina5_9" orientation="portrait">
- <adaptation id="fullscreen"/>
- </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="COY-AX-993">
+ <device id="retina5_9" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
@@ -17,32 +15,38 @@
<viewControllerLayoutGuide type="top" id="dJI-hR-sdc"/>
<viewControllerLayoutGuide type="bottom" id="yiq-Ru-NtI"/>
</layoutGuides>
- <view key="view" contentMode="scaleToFill" id="aRx-1z-bhh">
+ <view key="view" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="aRx-1z-bhh">
<rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
- <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" verticalHuggingPriority="251" image="jamiIcon" translatesAutoresizingMaskIntoConstraints="NO" id="noP-kw-7tM">
- <rect key="frame" x="137.66666666666666" y="358.66666666666669" width="100" height="95"/>
+ <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="background_login" translatesAutoresizingMaskIntoConstraints="NO" id="2rh-pr-8T7">
+ <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+ </imageView>
+ <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" verticalHuggingPriority="251" image="jami_gnupackage" translatesAutoresizingMaskIntoConstraints="NO" id="noP-kw-7tM">
+ <rect key="frame" x="-641.66666666666663" y="281" width="1658.3333333333333" height="100"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<constraints>
- <constraint firstAttribute="width" secondItem="noP-kw-7tM" secondAttribute="height" multiplier="20:19" id="90r-Az-47a"/>
- <constraint firstAttribute="width" constant="100" id="u8R-gO-yAc"/>
+ <constraint firstAttribute="height" constant="100" id="6GA-FX-rKn"/>
</constraints>
</imageView>
</subviews>
- <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
- <constraint firstItem="noP-kw-7tM" firstAttribute="centerY" secondItem="aRx-1z-bhh" secondAttribute="centerY" id="YcT-vx-Xtv"/>
+ <constraint firstItem="2rh-pr-8T7" firstAttribute="top" secondItem="aRx-1z-bhh" secondAttribute="topMargin" id="EqJ-bF-qc0"/>
+ <constraint firstItem="2rh-pr-8T7" firstAttribute="leading" secondItem="aRx-1z-bhh" secondAttribute="leading" id="FKU-E2-NGb"/>
+ <constraint firstAttribute="bottomMargin" secondItem="2rh-pr-8T7" secondAttribute="bottom" id="JRX-wn-tcH"/>
+ <constraint firstItem="noP-kw-7tM" firstAttribute="centerY" secondItem="aRx-1z-bhh" secondAttribute="centerY" constant="-75" id="YcT-vx-Xtv"/>
+ <constraint firstAttribute="trailing" secondItem="2rh-pr-8T7" secondAttribute="trailing" id="dcy-Va-7yC"/>
<constraint firstItem="noP-kw-7tM" firstAttribute="centerX" secondItem="aRx-1z-bhh" secondAttribute="centerX" id="gPC-Oy-B1H"/>
</constraints>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="u5I-td-CmB" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
- <point key="canvasLocation" x="52.5" y="375"/>
+ <point key="canvasLocation" x="52" y="374.6305418719212"/>
</scene>
</scenes>
<resources>
- <image name="jamiIcon" width="200" height="190"/>
+ <image name="background_login" width="786" height="1704"/>
+ <image name="jami_gnupackage" width="1658.4000244140625" height="552.79998779296875"/>
</resources>
</document>
diff --git a/Ring/Ring/Features/Walkthrough/WelcomeViewController.storyboard b/Ring/Ring/Features/Walkthrough/WelcomeViewController.storyboard
index f29d1957a42a5001fd7a85f97227dcb05bcbcc09..4f54bf7e62fd7edf0ef89f046c7cbc2891a3a597 100644
--- a/Ring/Ring/Features/Walkthrough/WelcomeViewController.storyboard
+++ b/Ring/Ring/Features/Walkthrough/WelcomeViewController.storyboard
@@ -5,6 +5,7 @@
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
+ <capability name="Stack View standard spacing" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
@@ -25,7 +26,7 @@
<rect key="frame" x="0.0" y="50" width="375" height="658"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ka9-wr-QQv">
- <rect key="frame" x="0.0" y="0.0" width="375" height="471"/>
+ <rect key="frame" x="0.0" y="0.0" width="375" height="415"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" verticalHuggingPriority="251" image="jamiIcon" translatesAutoresizingMaskIntoConstraints="NO" id="2Pc-uJ-SAI">
<rect key="frame" x="137.66666666666666" y="20" width="100" height="95"/>
@@ -35,17 +36,21 @@
<constraint firstAttribute="height" constant="95" id="Mlo-yj-dOM"/>
</constraints>
</imageView>
- <label opaque="NO" userInteractionEnabled="NO" alpha="0.0" contentMode="left" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="Welcome to jami !" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="E4b-Zv-unB">
- <rect key="frame" x="110.33333333333333" y="165" width="154.66666666666669" height="76"/>
- <constraints>
- <constraint firstAttribute="height" constant="76" id="TB2-Qc-8kW"/>
- </constraints>
- <fontDescription key="fontDescription" type="system" pointSize="20"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.5" colorSpace="custom" customColorSpace="sRGB"/>
+ <label opaque="NO" userInteractionEnabled="NO" alpha="0.0" contentMode="left" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" usesAttributedText="YES" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="E4b-Zv-unB">
+ <rect key="frame" x="110.33333333333333" y="165" width="154.66666666666669" height="24"/>
+ <attributedString key="attributedText">
+ <fragment content="Welcome to jami !">
+ <attributes>
+ <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <font key="NSFont" metaFont="system" size="20"/>
+ <paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" lineSpacing="5" tighteningFactorForTruncation="0.0"/>
+ </attributes>
+ </fragment>
+ </attributedString>
<nil key="highlightedColor"/>
</label>
- <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="CTB-bR-Knj">
- <rect key="frame" x="37.666666666666657" y="271" width="300" height="190"/>
+ <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacingType="standard" translatesAutoresizingMaskIntoConstraints="NO" id="CTB-bR-Knj">
+ <rect key="frame" x="37.666666666666657" y="239" width="300" height="166"/>
<subviews>
<button opaque="NO" alpha="0.0" contentMode="scaleToFill" verticalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bu0-90-MB5" customClass="DesignableButton" customModule="Ring" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="300" height="50"/>
@@ -65,7 +70,7 @@
</userDefinedRuntimeAttributes>
</button>
<button opaque="NO" alpha="0.0" contentMode="scaleToFill" verticalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QLK-gs-fOJ" customClass="DesignableButton" customModule="Ring" customModuleProvider="target">
- <rect key="frame" x="0.0" y="70" width="300" height="50"/>
+ <rect key="frame" x="0.0" y="58" width="300" height="50"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="YW4-Sc-61P"/>
</constraints>
@@ -82,7 +87,7 @@
</userDefinedRuntimeAttributes>
</button>
<button hidden="YES" opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Wd6-vQ-gaH" customClass="DesignableButton" customModule="Ring" customModuleProvider="target">
- <rect key="frame" x="0.0" y="130" width="300" height="50"/>
+ <rect key="frame" x="0.0" y="112" width="300" height="50"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="xto-yX-yFM"/>
</constraints>
@@ -99,7 +104,7 @@
</userDefinedRuntimeAttributes>
</button>
<button hidden="YES" opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="py3-Pp-IIC" customClass="DesignableButton" customModule="Ring" customModuleProvider="target">
- <rect key="frame" x="0.0" y="130" width="300" height="50"/>
+ <rect key="frame" x="0.0" y="112" width="300" height="50"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="GuU-S6-A6D"/>
</constraints>
@@ -116,7 +121,7 @@
</userDefinedRuntimeAttributes>
</button>
<button opaque="NO" alpha="0.0" contentMode="scaleToFill" verticalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kHN-iS-Mdb" customClass="DesignableButton" customModule="Ring" customModuleProvider="target">
- <rect key="frame" x="0.0" y="140" width="300" height="50"/>
+ <rect key="frame" x="0.0" y="116" width="300" height="50"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="o1x-x5-0z2"/>
</constraints>
@@ -132,7 +137,7 @@
</userDefinedRuntimeAttributes>
</button>
<button hidden="YES" opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="S02-sh-I3j" customClass="DesignableButton" customModule="Ring" customModuleProvider="target">
- <rect key="frame" x="0.0" y="190" width="300" height="50"/>
+ <rect key="frame" x="0.0" y="170" width="300" height="50"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="sAy-MH-owv"/>
</constraints>
@@ -148,7 +153,7 @@
</userDefinedRuntimeAttributes>
</button>
<button hidden="YES" opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ki3-CT-J1m" customClass="DesignableButton" customModule="Ring" customModuleProvider="target">
- <rect key="frame" x="0.0" y="190" width="300" height="50"/>
+ <rect key="frame" x="0.0" y="170" width="300" height="50"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="xdN-0S-pdc"/>
</constraints>
@@ -178,9 +183,9 @@
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="CTB-bR-Knj" secondAttribute="trailing" constant="30" id="HMv-8n-gxi"/>
<constraint firstAttribute="bottom" secondItem="CTB-bR-Knj" secondAttribute="bottom" constant="10" id="Lju-1b-sgn"/>
<constraint firstItem="E4b-Zv-unB" firstAttribute="top" secondItem="2Pc-uJ-SAI" secondAttribute="bottom" constant="50" id="jYr-kA-NLP"/>
- <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="E4b-Zv-unB" secondAttribute="trailing" constant="15" id="lwR-AZ-cXx"/>
- <constraint firstItem="CTB-bR-Knj" firstAttribute="top" secondItem="E4b-Zv-unB" secondAttribute="bottom" constant="30" id="mPU-JJ-xSF"/>
- <constraint firstItem="E4b-Zv-unB" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="ka9-wr-QQv" secondAttribute="leading" constant="15" id="xBc-Kv-P49"/>
+ <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="E4b-Zv-unB" secondAttribute="trailing" constant="35" id="lwR-AZ-cXx"/>
+ <constraint firstItem="CTB-bR-Knj" firstAttribute="top" secondItem="E4b-Zv-unB" secondAttribute="bottom" constant="50" id="mPU-JJ-xSF"/>
+ <constraint firstItem="E4b-Zv-unB" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="ka9-wr-QQv" secondAttribute="leading" constant="35" id="xBc-Kv-P49"/>
</constraints>
</view>
</subviews>
@@ -214,16 +219,16 @@
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="WKh-ia-14i" firstAttribute="top" secondItem="Ev1-K9-ko3" secondAttribute="top" id="5vk-rm-tgp"/>
- <constraint firstItem="Vbh-6j-wmS" firstAttribute="trailing" secondItem="Ev1-K9-ko3" secondAttribute="trailing" id="7Oc-Ym-9Hs"/>
<constraint firstItem="1aJ-6z-De7" firstAttribute="bottom" secondItem="IWW-3h-vlx" secondAttribute="bottom" constant="10" id="CPo-7T-PUo"/>
<constraint firstItem="IWW-3h-vlx" firstAttribute="centerX" secondItem="1aJ-6z-De7" secondAttribute="centerX" id="DSc-Tr-BZc"/>
<constraint firstAttribute="bottom" secondItem="WKh-ia-14i" secondAttribute="bottom" id="FIY-ya-kOW"/>
<constraint firstItem="IWW-3h-vlx" firstAttribute="top" secondItem="Vbh-6j-wmS" secondAttribute="bottom" constant="10" id="MNp-Gc-3RR"/>
<constraint firstItem="Vbh-6j-wmS" firstAttribute="top" secondItem="1aJ-6z-De7" secondAttribute="top" id="OVd-qb-k4N"/>
<constraint firstItem="CTB-bR-Knj" firstAttribute="centerY" secondItem="1aJ-6z-De7" secondAttribute="centerY" priority="100" id="Vey-an-e0p"/>
+ <constraint firstItem="Vbh-6j-wmS" firstAttribute="trailing" secondItem="1aJ-6z-De7" secondAttribute="trailing" id="Y9l-22-OaU"/>
<constraint firstItem="WKh-ia-14i" firstAttribute="leading" secondItem="Ev1-K9-ko3" secondAttribute="leading" id="fJs-yL-UfK"/>
<constraint firstAttribute="trailing" secondItem="WKh-ia-14i" secondAttribute="trailing" id="fV4-nX-zRz"/>
- <constraint firstItem="Vbh-6j-wmS" firstAttribute="leading" secondItem="1aJ-6z-De7" secondAttribute="leading" id="kAl-nu-6CQ"/>
+ <constraint firstItem="Vbh-6j-wmS" firstAttribute="leading" secondItem="1aJ-6z-De7" secondAttribute="leading" id="xxq-fG-Gzj"/>
</constraints>
</view>
<connections>
@@ -270,7 +275,7 @@
</designable>
</designables>
<resources>
- <image name="background_login" width="2940" height="2189"/>
+ <image name="background_login" width="786" height="1704"/>
<image name="jamiIcon" width="66.666664123535156" height="63.333332061767578"/>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
diff --git a/Ring/Ring/Resources/Images.xcassets/background_login.imageset/BG-DarkMode-ID_Jami.png b/Ring/Ring/Resources/Images.xcassets/background_login.imageset/BG-DarkMode-ID_Jami.png
deleted file mode 100644
index 55c13d725f6a57854b89e8e0580e21c1c11c4175..0000000000000000000000000000000000000000
Binary files a/Ring/Ring/Resources/Images.xcassets/background_login.imageset/BG-DarkMode-ID_Jami.png and /dev/null differ
diff --git a/Ring/Ring/Resources/Images.xcassets/background_login.imageset/BG-LightMode-ID_Jami.png b/Ring/Ring/Resources/Images.xcassets/background_login.imageset/BG-LightMode-ID_Jami.png
deleted file mode 100644
index f6bb1d3956f986a065894a47593b5937416e752f..0000000000000000000000000000000000000000
Binary files a/Ring/Ring/Resources/Images.xcassets/background_login.imageset/BG-LightMode-ID_Jami.png and /dev/null differ
diff --git a/Ring/Ring/Resources/Images.xcassets/background_login.imageset/Background _Dark.heic b/Ring/Ring/Resources/Images.xcassets/background_login.imageset/Background _Dark.heic
new file mode 100644
index 0000000000000000000000000000000000000000..b863e49d689a0f364f9a537771f7d794e4c2c7e2
Binary files /dev/null and b/Ring/Ring/Resources/Images.xcassets/background_login.imageset/Background _Dark.heic differ
diff --git a/Ring/Ring/Resources/Images.xcassets/background_login.imageset/Background _Light.heic b/Ring/Ring/Resources/Images.xcassets/background_login.imageset/Background _Light.heic
new file mode 100644
index 0000000000000000000000000000000000000000..75ecd546a13ede3e4852547c615c0caaf8bf1b97
Binary files /dev/null and b/Ring/Ring/Resources/Images.xcassets/background_login.imageset/Background _Light.heic differ
diff --git a/Ring/Ring/Resources/Images.xcassets/background_login.imageset/Contents.json b/Ring/Ring/Resources/Images.xcassets/background_login.imageset/Contents.json
index 39cae70032cd97eae2003657551275cfd08650c5..8dcd331593e77c27f13703440287cb87fc87df5d 100644
--- a/Ring/Ring/Resources/Images.xcassets/background_login.imageset/Contents.json
+++ b/Ring/Ring/Resources/Images.xcassets/background_login.imageset/Contents.json
@@ -1,7 +1,7 @@
{
"images" : [
{
- "filename" : "BG-LightMode-ID_Jami.png",
+ "filename" : "Background _Light.heic",
"idiom" : "universal"
},
{
@@ -11,7 +11,7 @@
"value" : "dark"
}
],
- "filename" : "BG-DarkMode-ID_Jami.png",
+ "filename" : "Background _Dark.heic",
"idiom" : "universal"
}
],
diff --git a/Ring/Ring/Resources/Images.xcassets/jami_gnupackage.imageset/Contents.json b/Ring/Ring/Resources/Images.xcassets/jami_gnupackage.imageset/Contents.json
new file mode 100644
index 0000000000000000000000000000000000000000..4e4e02d632404be1026fc8ece3ecea9854e45e47
--- /dev/null
+++ b/Ring/Ring/Resources/Images.xcassets/jami_gnupackage.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+ "images" : [
+ {
+ "filename" : "logo-jami.svg",
+ "idiom" : "universal"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/Ring/Ring/Resources/Images.xcassets/jami_gnupackage.imageset/logo-jami.svg b/Ring/Ring/Resources/Images.xcassets/jami_gnupackage.imageset/logo-jami.svg
new file mode 100644
index 0000000000000000000000000000000000000000..f6da53ccc111f415a6a93d612ac89a921042f446
--- /dev/null
+++ b/Ring/Ring/Resources/Images.xcassets/jami_gnupackage.imageset/logo-jami.svg
@@ -0,0 +1,417 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ viewBox="0 0 1658.4 552.8" style="enable-background:new 0 0 1658.4 552.8;" xml:space="preserve">
+<style type="text/css">
+ .st0{fill:#000930;}
+ .st1{fill:url(#SVGID_1_);}
+ .st2{fill:url(#SVGID_2_);}
+ .st3{fill:url(#SVGID_3_);}
+ .st4{fill:url(#SVGID_4_);}
+ .st5{fill:url(#SVGID_5_);}
+ .st6{fill:url(#SVGID_6_);}
+ .st7{opacity:0.4;fill:url(#SVGID_7_);enable-background:new ;}
+ .st8{fill:url(#SVGID_8_);}
+ .st9{fill:url(#SVGID_9_);}
+ .st10{fill:url(#SVGID_10_);}
+ .st11{fill:url(#SVGID_11_);}
+ .st12{fill:url(#SVGID_12_);}
+ .st13{fill:url(#SVGID_13_);}
+ .st14{fill:url(#SVGID_14_);}
+ .st15{fill:url(#SVGID_15_);}
+ .st16{fill:url(#SVGID_16_);}
+ .st17{opacity:0.2;fill:url(#SVGID_17_);enable-background:new ;}
+ .st18{fill:url(#SVGID_18_);}
+ .st19{fill:url(#SVGID_19_);}
+ .st20{opacity:0.25;fill:url(#SVGID_20_);enable-background:new ;}
+ .st21{fill:url(#SVGID_21_);}
+ .st22{fill:url(#SVGID_22_);}
+ .st23{opacity:0.2;fill:url(#SVGID_23_);enable-background:new ;}
+ .st24{fill:url(#SVGID_24_);}
+</style>
+<g id="Layer_1_1_">
+ <g>
+ <g>
+ <path class="st0" d="M786.3,107.5v150.2c0,86.2-69.7,156.5-155.9,156.5v-42.3c62.8-0.6,113.6-51.4,113.6-114.2V107.5H786.3z
+ M793.7,31.6c0-16-13.1-28.6-28.6-28.6c-16,0-28.6,12.6-28.6,28.6c0,15.4,12.6,28.6,28.6,28.6C780.6,60.1,793.7,47,793.7,31.6z"
+ />
+ <path class="st0" d="M1523,411.3V212.6c0-38.8-31.4-69.7-70.2-69.7c-38.8,0-70.2,31.4-70.2,70.2v198.1h-42.3V212.6
+ c0-38.8-31.4-69.7-70.2-69.7c-38.3,0-69.7,31.4-69.7,70.2v198.1h-42.3V212.6c0-62.2,50.3-111.9,111.9-111.9
+ c37.7,0,70.8,18.3,91.4,46.8c20.6-28.6,53.7-46.8,91.4-46.8c62.2,0,112.5,50.3,112.5,112.5v198.1H1523z"/>
+ <path class="st0" d="M1616.1,60.1c-16,0-28.6-12.6-28.6-28.6c0-15.4,12.6-28.6,28.6-28.6s28.6,13.1,28.6,28.6
+ C1644.6,47.5,1632.1,60.1,1616.1,60.1z M1637.2,107.5v303.8h-42.3V107.5H1637.2z"/>
+ <path class="st0" d="M974.6,143.3c63.5,0,115.2,51.7,115.2,115.2v115.2H974.6c-63.5,0-115.2-51.7-115.2-115.2
+ S911.1,143.3,974.6,143.3 M974.6,102.1c-86.4,0-156.4,70-156.4,156.4s70,156.4,156.4,156.4H1131V258.5
+ C1131.1,172.1,1061,102.1,974.6,102.1L974.6,102.1z"/>
+ </g>
+ <g>
+ <g>
+ <path class="st0" d="M883.5,535.1h-8.8v-9.7c-6,6.3-14.4,10.3-23.7,10.3c-18,0-32.7-14.7-32.7-32.7s14.7-32.6,32.7-32.6
+ s32.6,14.6,32.6,32.6L883.5,535.1L883.5,535.1z M874.6,503c0-13.1-10.6-23.7-23.7-23.7c-13.1,0-23.9,10.6-23.9,23.7
+ c0,13.1,10.7,23.8,23.9,23.8C864,526.9,874.6,516.1,874.6,503z"/>
+ <path class="st0" d="M945.9,498.6h32.2c0.1,1.4,0.2,3,0.2,4.4c0,18-14.5,32.7-32.6,32.7c-18,0-32.7-14.7-32.7-32.7
+ s14.7-32.6,32.7-32.6c13.2,0,24.7,7.9,29.8,19.3h-10c-4.3-6.3-11.6-10.5-19.8-10.5c-13.1,0-23.9,10.6-23.9,23.7
+ s10.7,23.8,23.9,23.8c11.6,0,21.2-8.3,23.4-19.4h-23.3L945.9,498.6L945.9,498.6z"/>
+ <path class="st0" d="M1049.7,535.1h-8.8v-31.8c0-13.1-10.6-23.8-23.7-23.8s-23.7,10.7-23.7,23.8v31.8h-8.8V503
+ c0-18,14.5-32.4,32.6-32.4c18.1,0,32.6,14.7,32.6,32.7v31.8H1049.7z"/>
+ <path class="st0" d="M1055.8,471.2h8.8V503c0,13.1,10.6,23.8,23.7,23.8s23.7-10.7,23.7-23.8v-31.8h8.8v32.1
+ c0,18-14.5,32.4-32.6,32.4c-18,0-32.6-14.7-32.6-32.7v-31.8H1055.8z"/>
+ <path class="st0" d="M1150.5,544.6V503c0-18,14.5-32.6,32.6-32.6s32.7,14.6,32.7,32.6s-14.5,32.7-32.7,32.7
+ c-9.3,0-17.8-3.9-23.7-10.3v19.2L1150.5,544.6L1150.5,544.6z M1183,526.9c13.2,0,23.8-10.7,23.8-23.8s-10.6-23.7-23.8-23.7
+ c-13.1,0-23.7,10.6-23.7,23.7C1159.3,516.2,1169.9,526.9,1183,526.9z"/>
+ <path class="st0" d="M1287.1,535.1h-8.8v-9.7c-6,6.3-14.4,10.3-23.7,10.3c-18,0-32.7-14.7-32.7-32.7s14.7-32.6,32.7-32.6
+ s32.6,14.6,32.6,32.6L1287.1,535.1L1287.1,535.1z M1278.3,503c0-13.1-10.6-23.7-23.7-23.7s-23.9,10.6-23.9,23.7
+ c0,13.1,10.7,23.8,23.9,23.8C1267.7,526.9,1278.3,516.1,1278.3,503z"/>
+ <path class="st0" d="M1349.4,507.4h8.9c-2.1,16-15.9,28.3-32.3,28.3c-18,0-32.7-14.7-32.7-32.7s14.7-32.6,32.7-32.6
+ c16.5,0,30.2,12.3,32.3,28.1h-8.9c-2.1-11-11.8-19.3-23.4-19.3c-13.1,0-23.9,10.6-23.9,23.7c0,13.1,10.7,23.8,23.9,23.8
+ C1337.5,526.9,1347.2,518.5,1349.4,507.4z"/>
+ <path class="st0" d="M1424.4,524v11.1h-8.8V524c0-13.1-10.7-24-23.8-24h-18.4v35.1h-8.8v-73.3h8.8v29.7h12.9
+ c10.6,0,19.9-11,22.2-21.1h9.1c-1.4,8.6-6.7,18.6-13.4,23.5C1415.9,498.7,1424.4,510.4,1424.4,524z"/>
+ <path class="st0" d="M1495.8,535.1h-8.8v-9.7c-6,6.3-14.4,10.3-23.7,10.3c-18,0-32.7-14.7-32.7-32.7s14.7-32.6,32.7-32.6
+ s32.6,14.6,32.6,32.6L1495.8,535.1L1495.8,535.1z M1487,503c0-13.1-10.6-23.7-23.7-23.7s-23.9,10.6-23.9,23.7
+ c0,13.1,10.7,23.8,23.9,23.8C1476.4,526.9,1487,516.1,1487,503z"/>
+ <path class="st0" d="M1534.8,498.6h32.2c0.1,1.4,0.2,3,0.2,4.4c0,18-14.5,32.7-32.6,32.7c-18,0-32.7-14.7-32.7-32.7
+ s14.7-32.6,32.7-32.6c13.2,0,24.7,7.9,29.8,19.3h-10c-4.3-6.3-11.6-10.5-19.8-10.5c-13.1,0-23.9,10.6-23.9,23.7
+ s10.7,23.8,23.9,23.8c11.6,0,21.2-8.3,23.4-19.4h-23.3v-8.7H1534.8z"/>
+ </g>
+ <path class="st0" d="M1635.3,490.5c-1.8-5-4.7-9.2-8.6-12.6c-4-3.4-8.8-5.7-14.3-6.7c-5.9-1.1-11.5-0.8-16.7,1s-9.6,4.9-13.2,9.2
+ c-3.6,4.3-6,9.5-7.1,15.6s-0.8,11.8,1,17.2c1.8,5.3,5,9.9,9.4,13.6c4.4,3.7,9.9,6.2,16.3,7.4c2.5,0.5,4.9,0.7,7.3,0.7
+ c2.3,0,4.6-0.2,6.8-0.7c4.4-0.9,8.4-2.8,11.8-5.6l0.3-0.3l-4.1-7.2l-0.5,0.4c-2.7,2.1-5.8,3.6-9.2,4.3c-3.4,0.7-7,0.7-10.8,0
+ c-5.5-1.1-10.1-3.4-13.6-7c-3.3-3.4-5.3-7.6-6-12.5h52.2l0.1-0.4C1637.5,500.9,1637.1,495.5,1635.3,490.5z M1584.5,498.6
+ c0-0.2,0.1-0.5,0.1-0.7c0.9-4.5,2.6-8.3,5.1-11.4s5.7-5.3,9.3-6.6c2.2-0.8,4.6-1.2,7.1-1.2c1.5,0,3.1,0.2,4.7,0.5
+ c5.4,1,9.7,3.6,12.7,7.5c2.7,3.4,4.2,7.5,4.5,11.9"/>
+ </g>
+ </g>
+</g>
+<g id="Layer_3">
+ <g>
+
+ <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="310.5713" y1="723.5924" x2="288.0715" y2="697.3427" gradientTransform="matrix(1 0 0 1 -8.0854 -446.4089)">
+ <stop offset="0" style="stop-color:#2B3B6A"/>
+ <stop offset="1" style="stop-color:#2B3B6A"/>
+ </linearGradient>
+ <polygon class="st1" points="272.7,257.6 307.5,256.6 290.3,289.4 "/>
+
+ <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="504.3354" y1="734.9431" x2="504.3354" y2="915.3576" gradientTransform="matrix(1 0 0 1 -8.0854 -446.4089)">
+ <stop offset="0" style="stop-color:#2B3B6A"/>
+ <stop offset="7.040000e-02" style="stop-color:#2D4576"/>
+ <stop offset="0.2165" style="stop-color:#2E5589"/>
+ <stop offset="0.3608" style="stop-color:#2B5E97"/>
+ <stop offset="0.5" style="stop-color:#29629C"/>
+ <stop offset="0.6392" style="stop-color:#2B5E97"/>
+ <stop offset="0.7835" style="stop-color:#2E5589"/>
+ <stop offset="0.9296" style="stop-color:#2D4576"/>
+ <stop offset="1" style="stop-color:#2B3B6A"/>
+ </linearGradient>
+ <path class="st2" d="M423.2,265.9c128,20.6,146.1,52.5,146.1,52.5c0,2,0,3.9,0,5.9c0,1-0.5,2-1,3.4c-0.5,1.5-13.2,27.9-96.1,45.6
+ L423.2,265.9z"/>
+
+ <linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="103.1957" y1="928.9868" x2="161.7357" y2="824.7559" gradientTransform="matrix(1 0 0 1 -8.0854 -446.4089)">
+ <stop offset="0" style="stop-color:#252B59"/>
+ <stop offset="8.590000e-02" style="stop-color:#2B3A69"/>
+ <stop offset="0.2267" style="stop-color:#2E4A7C"/>
+ <stop offset="0.3658" style="stop-color:#2E5487"/>
+ <stop offset="0.5" style="stop-color:#2D578C"/>
+ <stop offset="0.6342" style="stop-color:#2E5487"/>
+ <stop offset="0.7733" style="stop-color:#2E4A7C"/>
+ <stop offset="0.9141" style="stop-color:#2B3A69"/>
+ <stop offset="1" style="stop-color:#252B59"/>
+ </linearGradient>
+ <path class="st3" d="M100.6,368.9c-28.9,77-14.2,101-13.2,103c0.5,1,1,2,2,2.5c2,0,3.9-0.5,5.9-1c0,0,52.5-2.5,113.7-89.7
+ L100.6,368.9z"/>
+
+ <linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="270.5742" y1="575.0625" x2="173.6782" y2="462.0163" gradientTransform="matrix(1 0 0 1 -8.0854 -446.4089)">
+ <stop offset="0" style="stop-color:#181844"/>
+ <stop offset="2.840000e-02" style="stop-color:#1E1E4C"/>
+ <stop offset="0.1353" style="stop-color:#283261"/>
+ <stop offset="0.2468" style="stop-color:#2D4172"/>
+ <stop offset="0.3647" style="stop-color:#2E4A7C"/>
+ <stop offset="0.5" style="stop-color:#2E4D7F"/>
+ <stop offset="0.6177" style="stop-color:#2D4576"/>
+ <stop offset="0.8125" style="stop-color:#273160"/>
+ <stop offset="1" style="stop-color:#181844"/>
+ </linearGradient>
+ <path class="st4" d="M291.8,75.2c-70.1-77-104-72.6-105.9-72.1c-1,0-2.5,0.5-3.4,1c-2.5,1-4.9,8.8-4.9,8.8s-14.7,42.7,44.6,156.4
+ L291.8,75.2z"/>
+
+ <linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="462.4529" y1="941.3665" x2="387.5968" y2="700.224" gradientTransform="matrix(1 0 0 1 -8.0854 -446.4089)">
+ <stop offset="0" style="stop-color:#181844"/>
+ <stop offset="2.840000e-02" style="stop-color:#1E1E4C"/>
+ <stop offset="0.1353" style="stop-color:#283261"/>
+ <stop offset="0.2468" style="stop-color:#2D4172"/>
+ <stop offset="0.3647" style="stop-color:#2E4A7C"/>
+ <stop offset="0.5" style="stop-color:#2E4D7F"/>
+ <stop offset="0.6177" style="stop-color:#2D4576"/>
+ <stop offset="0.8125" style="stop-color:#273160"/>
+ <stop offset="1" style="stop-color:#181844"/>
+ </linearGradient>
+ <path class="st5" d="M353.1,370.3c95.1,108.8,128.4,102.5,128.4,102.5c2,0.5,4.4,1,6.4,1c1-0.5,1.5-1.5,2-2.5
+ c1.5-2,28.4-46.1-62.8-204.9L353.1,370.3z"/>
+
+ <linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="127.2854" y1="734.9417" x2="127.2854" y2="915.3527" gradientTransform="matrix(1 0 0 1 -8.0854 -446.4089)">
+ <stop offset="0" style="stop-color:#2B3B6A"/>
+ <stop offset="7.040000e-02" style="stop-color:#2D4576"/>
+ <stop offset="0.2165" style="stop-color:#2E5589"/>
+ <stop offset="0.3608" style="stop-color:#2B5E97"/>
+ <stop offset="0.5" style="stop-color:#29629C"/>
+ <stop offset="0.6392" style="stop-color:#2B5E97"/>
+ <stop offset="0.7835" style="stop-color:#2E5589"/>
+ <stop offset="0.9296" style="stop-color:#2D4576"/>
+ <stop offset="1" style="stop-color:#2B3B6A"/>
+ </linearGradient>
+ <path class="st6" d="M230,387C33.9,378.7,10.4,330.1,9.4,327.7c-0.5-1-1-2-1-3.4c0.5-3.4,7.4-9.8,7.4-9.8s52-31.9,138.7-49
+ L230,387z"/>
+
+ <linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="226.4924" y1="557.8589" x2="297.318" y2="557.8589" gradientTransform="matrix(1 0 0 1 -8.0854 -446.4089)">
+ <stop offset="0" style="stop-color:#2B3B6A"/>
+ <stop offset="1" style="stop-color:#2B3B6A"/>
+ </linearGradient>
+ <path class="st7" d="M286.4,69.3c-24.5,26.5-47.1,54.9-67.7,84.3h4.9c15.2-19.1,52.9-67.2,65.7-80.9L286.4,69.3z"/>
+
+ <linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="319.9168" y1="632.8058" x2="319.9168" y2="462.6378" gradientTransform="matrix(1 0 0 1 -8.0854 -446.4089)">
+ <stop offset="0" style="stop-color:#252B59"/>
+ <stop offset="0.5" style="stop-color:#2D578C"/>
+ <stop offset="0.6934" style="stop-color:#2D5588"/>
+ <stop offset="0.8038" style="stop-color:#2E4F80"/>
+ <stop offset="0.8932" style="stop-color:#2D4474"/>
+ <stop offset="0.971" style="stop-color:#283463"/>
+ <stop offset="1" style="stop-color:#252B59"/>
+ </linearGradient>
+ <path class="st8" d="M365.3,157.6c51.5-121.1,31.4-149,31.4-149c-0.5-1.5-1-3.4-1.5-4.9c-1-0.5-2-0.5-3.4-1
+ c-2.5-0.5-55.9-7.4-168.7,150.5L365.3,157.6z"/>
+
+ <linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="164.8027" y1="963.2054" x2="475.6771" y2="493.296" gradientTransform="matrix(1 0 0 1 -8.0854 -446.4089)">
+ <stop offset="0" style="stop-color:#2867A2"/>
+ <stop offset="8.239999e-02" style="stop-color:#177EBC"/>
+ <stop offset="0.1675" style="stop-color:#0E91D1"/>
+ <stop offset="0.2527" style="stop-color:#10A2E1"/>
+ <stop offset="0.337" style="stop-color:#18ACEA"/>
+ <stop offset="0.42" style="stop-color:#24B1ED"/>
+ <stop offset="0.5" style="stop-color:#28B1ED"/>
+ <stop offset="0.58" style="stop-color:#24B1ED"/>
+ <stop offset="0.663" style="stop-color:#18ACEA"/>
+ <stop offset="0.7473" style="stop-color:#10A2E1"/>
+ <stop offset="0.8325" style="stop-color:#0E91D1"/>
+ <stop offset="0.9176" style="stop-color:#177EBC"/>
+ <stop offset="1" style="stop-color:#2867A2"/>
+ </linearGradient>
+ <path class="st9" d="M287.9,461.5c-69.6,75.5-103,71.1-104.9,71.1c-2.9-1-5.9-2.5-8.3-3.9l-84.8-53.9c35.8-7.8,79.9-50,126-104.4
+ L287.9,461.5z"/>
+
+ <linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="136.7031" y1="972.5407" x2="259.8331" y2="862.2963" gradientTransform="matrix(1 0 0 1 -8.0854 -446.4089)">
+ <stop offset="0" style="stop-color:#2C5D95"/>
+ <stop offset="8.220001e-02" style="stop-color:#246EAB"/>
+ <stop offset="0.1808" style="stop-color:#1B79B9"/>
+ <stop offset="0.3007" style="stop-color:#1080C2"/>
+ <stop offset="0.5" style="stop-color:#0E81C5"/>
+ <stop offset="0.6993" style="stop-color:#1080C2"/>
+ <stop offset="0.8192" style="stop-color:#1B79B9"/>
+ <stop offset="0.9178" style="stop-color:#246EAB"/>
+ <stop offset="1" style="stop-color:#2C5D95"/>
+ </linearGradient>
+ <path class="st10" d="M290.8,464.5c-69.6,75.5-103,71.1-104.9,71.1c-2.9-1-5.9-2.5-8.3-3.9l-87.8-57.4
+ c35.8-7.8,82.9-47.1,128.9-101.5L290.8,464.5z"/>
+
+ <linearGradient id="SVGID_11_" gradientUnits="userSpaceOnUse" x1="125.3424" y1="490.1207" x2="411.2583" y2="966.6461" gradientTransform="matrix(1 0 0 1 -8.0854 -446.4089)">
+ <stop offset="0" style="stop-color:#2C5D95"/>
+ <stop offset="1.760000e-02" style="stop-color:#2A6199"/>
+ <stop offset="0.1407" style="stop-color:#1C79B7"/>
+ <stop offset="0.2631" style="stop-color:#0A8CCA"/>
+ <stop offset="0.3837" style="stop-color:#0B97D4"/>
+ <stop offset="0.5" style="stop-color:#0E9AD8"/>
+ <stop offset="0.6163" style="stop-color:#0B97D4"/>
+ <stop offset="0.7369" style="stop-color:#0A8CCA"/>
+ <stop offset="0.8593" style="stop-color:#1C79B7"/>
+ <stop offset="0.9824" style="stop-color:#2A6199"/>
+ <stop offset="1" style="stop-color:#2C5D95"/>
+ </linearGradient>
+ <path class="st11" d="M105,170.3C74.1,90.9,89.3,65.9,90.3,64.4c2-2.5,4.4-4.4,6.9-5.9L182,4.6c-7.4,34.8,11.3,88.2,40.2,150.5
+ L105,170.3z"/>
+
+ <linearGradient id="SVGID_12_" gradientUnits="userSpaceOnUse" x1="434.9247" y1="963.5564" x2="251.0804" y2="731.9966" gradientTransform="matrix(1 0 0 1 -8.0854 -446.4089)">
+ <stop offset="0" style="stop-color:#2C5D95"/>
+ <stop offset="2.570000e-02" style="stop-color:#2A6199"/>
+ <stop offset="0.2053" style="stop-color:#1C79B7"/>
+ <stop offset="0.384" style="stop-color:#0A8CCA"/>
+ <stop offset="0.5599" style="stop-color:#0B97D4"/>
+ <stop offset="0.7296" style="stop-color:#0E9AD8"/>
+ <stop offset="0.7925" style="stop-color:#0B97D4"/>
+ <stop offset="0.8577" style="stop-color:#0A8CCA"/>
+ <stop offset="0.9239" style="stop-color:#1C79B7"/>
+ <stop offset="0.9905" style="stop-color:#2A6199"/>
+ <stop offset="1" style="stop-color:#2C5D95"/>
+ </linearGradient>
+ <path class="st12" d="M283.9,264.4c-42.7,0-85.3,3.4-127.5,9.3c1.5,2.5,21.1,35.3,35.3,57.4c136.3,209.8,200,201.5,203,201
+ c2.9-1,5.9-2.5,8.3-3.9l84.8-53.9C430,462,349.6,367.9,283.9,264.4z"/>
+
+ <linearGradient id="SVGID_13_" gradientUnits="userSpaceOnUse" x1="169.2539" y1="606.6875" x2="133.4592" y2="477.8279" gradientTransform="matrix(1 0 0 1 -8.0854 -446.4089)">
+ <stop offset="0" style="stop-color:#2C5D95"/>
+ <stop offset="8.220001e-02" style="stop-color:#246EAB"/>
+ <stop offset="0.1808" style="stop-color:#1B79B9"/>
+ <stop offset="0.3007" style="stop-color:#1080C2"/>
+ <stop offset="0.5" style="stop-color:#0E81C5"/>
+ <stop offset="0.6993" style="stop-color:#1080C2"/>
+ <stop offset="0.8192" style="stop-color:#1B79B9"/>
+ <stop offset="0.9178" style="stop-color:#246EAB"/>
+ <stop offset="1" style="stop-color:#2C5D95"/>
+ </linearGradient>
+ <path class="st13" d="M102.1,172.8C71.2,93.3,86.4,68.3,87.3,66.9c2-2.5,4.4-4.4,6.9-5.9l88.2-56.9c-7.4,34.8,8.3,91.2,37.3,153
+ L102.1,172.8z"/>
+
+ <linearGradient id="SVGID_14_" gradientUnits="userSpaceOnUse" x1="574.6386" y1="693.4589" x2="16.9401" y2="693.4589" gradientTransform="matrix(1 0 0 1 -8.0854 -446.4089)">
+ <stop offset="0" style="stop-color:#2867A2"/>
+ <stop offset="1.280000e-02" style="stop-color:#256BA7"/>
+ <stop offset="0.1121" style="stop-color:#0B83C3"/>
+ <stop offset="0.2115" style="stop-color:#1797D8"/>
+ <stop offset="0.3099" style="stop-color:#25A3E2"/>
+ <stop offset="0.4066" style="stop-color:#27ABE7"/>
+ <stop offset="0.5" style="stop-color:#2AAEEA"/>
+ <stop offset="0.5934" style="stop-color:#27ABE7"/>
+ <stop offset="0.6901" style="stop-color:#25A3E2"/>
+ <stop offset="0.7885" style="stop-color:#1797D8"/>
+ <stop offset="0.8879" style="stop-color:#0B83C3"/>
+ <stop offset="0.9872" style="stop-color:#256BA7"/>
+ <stop offset="1" style="stop-color:#2867A2"/>
+ </linearGradient>
+ <path class="st14" d="M422.7,276.2c66.2,9.3,121.1,23,146.1,48V223.8c0-2.9-0.5-6.4-1-9.3c-0.5-1.5-13.2-27.5-93.2-44.6
+ L422.7,276.2z"/>
+
+ <linearGradient id="SVGID_15_" gradientUnits="userSpaceOnUse" x1="414.7642" y1="685.5602" x2="574.166" y2="694.1506" gradientTransform="matrix(1 0 0 1 -8.0854 -446.4089)">
+ <stop offset="0" style="stop-color:#2E5284"/>
+ <stop offset="6.100000e-03" style="stop-color:#2E5486"/>
+ <stop offset="9.120000e-02" style="stop-color:#29649D"/>
+ <stop offset="0.1876" style="stop-color:#236FAD"/>
+ <stop offset="0.3049" style="stop-color:#1D77B6"/>
+ <stop offset="0.5" style="stop-color:#1C78B9"/>
+ <stop offset="0.6951" style="stop-color:#1D77B6"/>
+ <stop offset="0.8124" style="stop-color:#236FAD"/>
+ <stop offset="0.9088" style="stop-color:#29649D"/>
+ <stop offset="0.9939" style="stop-color:#2E5486"/>
+ <stop offset="1" style="stop-color:#2E5284"/>
+ </linearGradient>
+ <path class="st15" d="M422.7,272.8c66.2,9.3,121.1,27,146.1,52v-105c0-2.9-0.5-6.4-1-9.3c-0.5-1.5-13.2-27.5-93.2-44.6
+ L422.7,272.8z"/>
+
+ <linearGradient id="SVGID_16_" gradientUnits="userSpaceOnUse" x1="16.4854" y1="686.0589" x2="304.0796" y2="686.0589" gradientTransform="matrix(1 0 0 1 -8.0854 -446.4089)">
+ <stop offset="0" style="stop-color:#2867A2"/>
+ <stop offset="2.250000e-02" style="stop-color:#256BA7"/>
+ <stop offset="0.1971" style="stop-color:#0B83C3"/>
+ <stop offset="0.3718" style="stop-color:#1797D8"/>
+ <stop offset="0.5447" style="stop-color:#25A3E2"/>
+ <stop offset="0.7147" style="stop-color:#27ABE7"/>
+ <stop offset="0.8788" style="stop-color:#2AAEEA"/>
+ <stop offset="0.9015" style="stop-color:#27ABE7"/>
+ <stop offset="0.9249" style="stop-color:#25A3E2"/>
+ <stop offset="0.9487" style="stop-color:#1797D8"/>
+ <stop offset="0.9728" style="stop-color:#0B83C3"/>
+ <stop offset="0.9969" style="stop-color:#256BA7"/>
+ <stop offset="1" style="stop-color:#2867A2"/>
+ </linearGradient>
+ <path class="st16" d="M362.9,156.1c-14.7-0.5-46.6-2-74-2c-250.5,0-278,57.9-279.5,60.8c-1,2.9-1,5.9-1,9.3v101
+ c24.5-24.5,78-37.8,143.2-47.6c42.2-5.9,84.3-9.3,127-9.8c7.8,0,15.7,0,23.5,0C302.1,267.4,377.6,156.6,362.9,156.1z"/>
+
+ <linearGradient id="SVGID_17_" gradientUnits="userSpaceOnUse" x1="218.7356" y1="611.4308" x2="110.6509" y2="596.2313" gradientTransform="matrix(1 0 0 1 -8.0854 -446.4089)">
+ <stop offset="0" style="stop-color:#2B3B6A"/>
+ <stop offset="1" style="stop-color:#2B3B6A"/>
+ </linearGradient>
+ <path class="st17" d="M219.7,148.3c-52.5,2.5-90.2,6.4-121.6,15.2l1.5,3.9c2.9-0.5,6.4-1.5,9.3-2c37.8-5.9,75.5-9.8,113.3-11.3
+ L219.7,148.3z"/>
+
+ <linearGradient id="SVGID_18_" gradientUnits="userSpaceOnUse" x1="328.6856" y1="704.0787" x2="23.2429" y2="661.1258" gradientTransform="matrix(1 0 0 1 -8.0854 -446.4089)">
+ <stop offset="0" style="stop-color:#2867A2"/>
+ <stop offset="3.820000e-02" style="stop-color:#2174B1"/>
+ <stop offset="0.1177" style="stop-color:#0B86C4"/>
+ <stop offset="0.2081" style="stop-color:#0A94D2"/>
+ <stop offset="0.3177" style="stop-color:#0C9BDB"/>
+ <stop offset="0.5" style="stop-color:#109EDE"/>
+ <stop offset="0.6823" style="stop-color:#0C9BDB"/>
+ <stop offset="0.7919" style="stop-color:#0A94D2"/>
+ <stop offset="0.8823" style="stop-color:#0B86C4"/>
+ <stop offset="0.9618" style="stop-color:#2174B1"/>
+ <stop offset="1" style="stop-color:#2867A2"/>
+ </linearGradient>
+ <path class="st18" d="M362.9,152.2c-14.7-0.5-46.6-2-74-2c-250.5,0-278,57.9-279.5,60.8c-1,2.9-1,5.9-1,9.3v104.9
+ c24.5-24.5,78-41.7,143.2-51.5c42.2-5.9,84.3-9.3,127-9.8c7.8,0,15.7,0,23.5,0C313.4,264,377.6,152.7,362.9,152.2z"/>
+
+ <linearGradient id="SVGID_19_" gradientUnits="userSpaceOnUse" x1="470.1697" y1="492.1855" x2="324.9195" y2="742.3387" gradientTransform="matrix(1 0 0 1 -8.0854 -446.4089)">
+ <stop offset="0" style="stop-color:#2867A2"/>
+ <stop offset="0.1238" style="stop-color:#177EBC"/>
+ <stop offset="0.2516" style="stop-color:#0E91D1"/>
+ <stop offset="0.3797" style="stop-color:#10A2E1"/>
+ <stop offset="0.5064" style="stop-color:#18ACEA"/>
+ <stop offset="0.631" style="stop-color:#24B1ED"/>
+ <stop offset="0.7513" style="stop-color:#28B1ED"/>
+ <stop offset="0.7911" style="stop-color:#24B1ED"/>
+ <stop offset="0.8324" style="stop-color:#18ACEA"/>
+ <stop offset="0.8743" style="stop-color:#10A2E1"/>
+ <stop offset="0.9167" style="stop-color:#0E91D1"/>
+ <stop offset="0.959" style="stop-color:#177EBC"/>
+ <stop offset="1" style="stop-color:#2867A2"/>
+ </linearGradient>
+ <path class="st19" d="M288.8,272.3C357,169.8,407.5,62.5,395.2,4.1L480,58c2.5,1.5,4.9,3.4,6.9,5.9c1.5,2.5,34.8,57.4-101.5,267.2
+ c-9.8,15.7-19.1,33.8-22.6,35.3c-20.1-19.6-61.8-76.5-72.1-90.7C289.3,273.8,288.8,272.3,288.8,272.3z"/>
+
+ <linearGradient id="SVGID_20_" gradientUnits="userSpaceOnUse" x1="488.7314" y1="618.1837" x2="435.847" y2="717.4269" gradientTransform="matrix(1 0 0 1 -8.0854 -446.4089)">
+ <stop offset="0" style="stop-color:#2B3B6A"/>
+ <stop offset="1" style="stop-color:#2B3B6A"/>
+ </linearGradient>
+ <path class="st20" d="M477.6,166.4c-15.2,38.2-33.3,75-54.4,109.8l6.4,1c27-46.6,42.7-80.9,53.4-109.8L477.6,166.4z"/>
+
+ <linearGradient id="SVGID_21_" gradientUnits="userSpaceOnUse" x1="465.6816" y1="497.8327" x2="319.9706" y2="771.2739" gradientTransform="matrix(1 0 0 1 -8.0854 -446.4089)">
+ <stop offset="0" style="stop-color:#2867A2"/>
+ <stop offset="3.820000e-02" style="stop-color:#2174B1"/>
+ <stop offset="0.1177" style="stop-color:#0B86C4"/>
+ <stop offset="0.2081" style="stop-color:#0A94D2"/>
+ <stop offset="0.3177" style="stop-color:#0C9BDB"/>
+ <stop offset="0.5" style="stop-color:#109EDE"/>
+ <stop offset="0.6823" style="stop-color:#0C9BDB"/>
+ <stop offset="0.7919" style="stop-color:#0A94D2"/>
+ <stop offset="0.8823" style="stop-color:#0B86C4"/>
+ <stop offset="0.9618" style="stop-color:#2174B1"/>
+ <stop offset="1" style="stop-color:#2867A2"/>
+ </linearGradient>
+ <path class="st21" d="M388.9,334.1c136.3-209.8,103-264.7,101.5-267.2c-2-2.5-4.4-4.4-6.9-5.9L395.2,4.1
+ C407.5,62,359,173.7,291.3,276.2c22.6,34.8,46.1,68.6,71.1,97.6C367.3,367.9,379.5,348.3,388.9,334.1z"/>
+
+ <linearGradient id="SVGID_22_" gradientUnits="userSpaceOnUse" x1="476.9116" y1="503.9521" x2="329.9179" y2="779.801" gradientTransform="matrix(1 0 0 1 -8.0854 -446.4089)">
+ <stop offset="0" style="stop-color:#2867A2"/>
+ <stop offset="3.820000e-02" style="stop-color:#2174B1"/>
+ <stop offset="0.1177" style="stop-color:#0B86C4"/>
+ <stop offset="0.2081" style="stop-color:#0A94D2"/>
+ <stop offset="0.3177" style="stop-color:#0C9BDB"/>
+ <stop offset="0.5" style="stop-color:#109EDE"/>
+ <stop offset="0.6823" style="stop-color:#0C9BDB"/>
+ <stop offset="0.7919" style="stop-color:#0A94D2"/>
+ <stop offset="0.8823" style="stop-color:#0B86C4"/>
+ <stop offset="0.9618" style="stop-color:#2174B1"/>
+ <stop offset="1" style="stop-color:#2867A2"/>
+ </linearGradient>
+ <path class="st22" d="M359.9,377.2c0.5-0.5,1-0.5,1-1c-26-30.9-50-63.2-72.1-96.6c-0.5,0.5-1,1-1,2
+ C287.4,281.1,334.9,356.1,359.9,377.2z"/>
+
+ <linearGradient id="SVGID_23_" gradientUnits="userSpaceOnUse" x1="239.5275" y1="817.5889" x2="277.2304" y2="919.7321" gradientTransform="matrix(1 0 0 1 -8.0854 -446.4089)">
+ <stop offset="0" style="stop-color:#2B3B6A"/>
+ <stop offset="1" style="stop-color:#2B3B6A"/>
+ </linearGradient>
+ <path class="st23" d="M288.8,466.4c-1-1.5-51-60.3-74-95.1l-3.9,4.4c22.6,32.8,47.6,64.2,75,94.1L288.8,466.4z"/>
+
+ <linearGradient id="SVGID_24_" gradientUnits="userSpaceOnUse" x1="311.1502" y1="712.5167" x2="355.5364" y2="988.8544" gradientTransform="matrix(1 0 0 1 -8.0854 -446.4089)">
+ <stop offset="0" style="stop-color:#2E5284"/>
+ <stop offset="2.440000e-02" style="stop-color:#2C5C92"/>
+ <stop offset="8.880000e-02" style="stop-color:#2075B1"/>
+ <stop offset="0.1599" style="stop-color:#0B86C4"/>
+ <stop offset="0.2403" style="stop-color:#0A94D2"/>
+ <stop offset="0.3378" style="stop-color:#0E9CDA"/>
+ <stop offset="0.5" style="stop-color:#109EDE"/>
+ <stop offset="0.6718" style="stop-color:#0C9BDB"/>
+ <stop offset="0.7751" style="stop-color:#0A94D2"/>
+ <stop offset="0.8603" style="stop-color:#0B86C4"/>
+ <stop offset="0.9351" style="stop-color:#2174B1"/>
+ <stop offset="1" style="stop-color:#2C5D95"/>
+ </linearGradient>
+ <path class="st24" d="M360.9,376.2c-26-30.9-50-63.2-72.1-96.6c-2.5-3.9-5.4-7.8-7.8-11.8c-42.7,0-85.3,3.4-127.5,9.3
+ c1.5,2.5,21.1,35.3,35.3,57.4c136.3,209.8,200,201.5,203,201c2.9-1,5.9-2.5,8.3-3.9l87.8-56.9C452.1,466.4,406,428.7,360.9,376.2z
+ "/>
+ </g>
+</g>
+</svg>
diff --git a/Ring/Ring/Resources/Images.xcassets/ring_logo.imageset/Contents.json b/Ring/Ring/Resources/Images.xcassets/ring_logo.imageset/Contents.json
deleted file mode 100644
index cbe81525527c6c0040d3ff7b1fde6fa1ff84a296..0000000000000000000000000000000000000000
--- a/Ring/Ring/Resources/Images.xcassets/ring_logo.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "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
deleted file mode 100644
index f29ded8762abe949d47ab319e87a6073acecc193..0000000000000000000000000000000000000000
Binary files a/Ring/Ring/Resources/Images.xcassets/ring_logo.imageset/logo-ring-tagline-EN-couleur-texteblanc.png and /dev/null 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
deleted file mode 100644
index 456a06a94deac259179a483308202e95767207e9..0000000000000000000000000000000000000000
Binary files a/Ring/Ring/Resources/Images.xcassets/ring_logo.imageset/logo-ring-tagline-EN-couleur-texteblanc@2.png and /dev/null 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
deleted file mode 100644
index c8d155ce7950e129cdf0b35fdab2c3186184cc0c..0000000000000000000000000000000000000000
Binary files a/Ring/Ring/Resources/Images.xcassets/ring_logo.imageset/logo-ring-tagline-EN-couleur-texteblanc@3.png and /dev/null differ
diff --git a/Ring/Ring/Resources/LaunchScreen.storyboard b/Ring/Ring/Resources/LaunchScreen.storyboard
index d9c602f98b4aa26c665aacf7b3380c9d25e94ade..d447febcbed48c52659d96f37c87c1104fd487d0 100644
--- a/Ring/Ring/Resources/LaunchScreen.storyboard
+++ b/Ring/Ring/Resources/LaunchScreen.storyboard
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15505" 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="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<device id="retina5_9" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
@@ -15,32 +15,38 @@
<viewControllerLayoutGuide type="top" id="Llm-lL-Icb"/>
<viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
</layoutGuides>
- <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
+ <view key="view" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="Ze5-6b-2t3">
<rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
- <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" verticalHuggingPriority="251" image="jamiIcon" translatesAutoresizingMaskIntoConstraints="NO" id="kP1-oe-ZEx">
- <rect key="frame" x="137.66666666666666" y="358.66666666666669" width="100" height="95"/>
+ <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="background_login" translatesAutoresizingMaskIntoConstraints="NO" id="5w4-lf-PEm">
+ <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+ </imageView>
+ <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" verticalHuggingPriority="251" image="jami_gnupackage" translatesAutoresizingMaskIntoConstraints="NO" id="kP1-oe-ZEx">
+ <rect key="frame" x="-641.66666666666663" y="281" width="1658.3333333333333" height="100"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<constraints>
- <constraint firstAttribute="width" secondItem="kP1-oe-ZEx" secondAttribute="height" multiplier="20:19" id="5Bg-Lw-vZJ"/>
- <constraint firstAttribute="width" constant="100" id="Vc4-VQ-EsM"/>
+ <constraint firstAttribute="height" constant="100" id="bZq-5y-hTA"/>
</constraints>
</imageView>
</subviews>
- <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
- <constraint firstItem="kP1-oe-ZEx" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="ksh-ub-gUe"/>
+ <constraint firstItem="kP1-oe-ZEx" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" constant="-75" id="ksh-ub-gUe"/>
+ <constraint firstItem="5w4-lf-PEm" firstAttribute="bottom" secondItem="Ze5-6b-2t3" secondAttribute="bottomMargin" id="ofT-oK-fqA"/>
+ <constraint firstItem="5w4-lf-PEm" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="qpt-Qa-DZT"/>
+ <constraint firstAttribute="trailing" secondItem="5w4-lf-PEm" secondAttribute="trailing" id="rvJ-Is-9e7"/>
<constraint firstItem="kP1-oe-ZEx" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="soi-Xo-HWk"/>
+ <constraint firstItem="5w4-lf-PEm" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="topMargin" id="w3l-vN-1aN"/>
</constraints>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
- <point key="canvasLocation" x="52.5" y="375"/>
+ <point key="canvasLocation" x="52" y="374.6305418719212"/>
</scene>
</scenes>
<resources>
- <image name="jamiIcon" width="66.666664123535156" height="63.333332061767578"/>
+ <image name="background_login" width="786" height="1704"/>
+ <image name="jami_gnupackage" width="1658.4000244140625" height="552.79998779296875"/>
</resources>
</document>