diff --git a/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/Contents.json b/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/Contents.json
index d8db8d65fd79fd541b2b7eba75c7378af3448f9c..12b639d810a8aac592e5119e5f859fc202ac04c1 100644
--- a/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -1,93 +1,111 @@
{
"images" : [
{
- "idiom" : "iphone",
"size" : "20x20",
+ "idiom" : "iphone",
+ "filename" : "ring-ios-icon-20@2x.png",
"scale" : "2x"
},
{
- "idiom" : "iphone",
"size" : "20x20",
+ "idiom" : "iphone",
+ "filename" : "ring-ios-icon-20@3x.png",
"scale" : "3x"
},
{
- "idiom" : "iphone",
"size" : "29x29",
+ "idiom" : "iphone",
+ "filename" : "ring-ios-icon-29@2x.png",
"scale" : "2x"
},
{
- "idiom" : "iphone",
"size" : "29x29",
+ "idiom" : "iphone",
+ "filename" : "ring-ios-icon-29@3x.png",
"scale" : "3x"
},
{
- "idiom" : "iphone",
"size" : "40x40",
+ "idiom" : "iphone",
+ "filename" : "ring-ios-icon-40@2x.png",
"scale" : "2x"
},
{
- "idiom" : "iphone",
"size" : "40x40",
+ "idiom" : "iphone",
+ "filename" : "ring-ios-icon-40@3x.png",
"scale" : "3x"
},
{
- "idiom" : "iphone",
"size" : "60x60",
+ "idiom" : "iphone",
+ "filename" : "ring-ios-icon-60@2x.png",
"scale" : "2x"
},
{
- "idiom" : "iphone",
"size" : "60x60",
+ "idiom" : "iphone",
+ "filename" : "ring-ios-icon-60@3x.png",
"scale" : "3x"
},
{
- "idiom" : "ipad",
"size" : "20x20",
+ "idiom" : "ipad",
+ "filename" : "ring-ios-icon-20.png",
"scale" : "1x"
},
{
- "idiom" : "ipad",
"size" : "20x20",
+ "idiom" : "ipad",
+ "filename" : "ring-ios-icon-20@2x.png",
"scale" : "2x"
},
{
- "idiom" : "ipad",
"size" : "29x29",
+ "idiom" : "ipad",
+ "filename" : "ring-ios-icon-29.png",
"scale" : "1x"
},
{
- "idiom" : "ipad",
"size" : "29x29",
+ "idiom" : "ipad",
+ "filename" : "ring-ios-icon-29@2x.png",
"scale" : "2x"
},
{
- "idiom" : "ipad",
"size" : "40x40",
+ "idiom" : "ipad",
+ "filename" : "ring-ios-icon-40.png",
"scale" : "1x"
},
{
- "idiom" : "ipad",
"size" : "40x40",
+ "idiom" : "ipad",
+ "filename" : "ring-ios-icon-40@2x.png",
"scale" : "2x"
},
{
- "idiom" : "ipad",
"size" : "76x76",
+ "idiom" : "ipad",
+ "filename" : "ring-ios-icon-76.png",
"scale" : "1x"
},
{
- "idiom" : "ipad",
"size" : "76x76",
+ "idiom" : "ipad",
+ "filename" : "ring-ios-icon-76@2x.png",
"scale" : "2x"
},
{
- "idiom" : "ipad",
"size" : "83.5x83.5",
+ "idiom" : "ipad",
+ "filename" : "ring-ios-icon-83.5@2x.png",
"scale" : "2x"
},
{
- "idiom" : "ios-marketing",
"size" : "1024x1024",
+ "idiom" : "ios-marketing",
+ "filename" : "ring-ios-icon-1024.png",
"scale" : "1x"
}
],
diff --git a/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/ring-ios-icon-1024.png b/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/ring-ios-icon-1024.png
new file mode 100644
index 0000000000000000000000000000000000000000..d92a369204dd62f73650400cdff9764a6881b8a8
Binary files /dev/null and b/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/ring-ios-icon-1024.png differ
diff --git a/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/ring-ios-icon-20.png b/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/ring-ios-icon-20.png
new file mode 100644
index 0000000000000000000000000000000000000000..b14b3c60de54bedd6f484387a66afcba47e1219b
Binary files /dev/null and b/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/ring-ios-icon-20.png differ
diff --git a/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/ring-ios-icon-20@2x.png b/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/ring-ios-icon-20@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..af76162b157e0b36851468691c63897a8a0bdbf0
Binary files /dev/null and b/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/ring-ios-icon-20@2x.png differ
diff --git a/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/ring-ios-icon-20@3x.png b/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/ring-ios-icon-20@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d0a96034d60139fe8d3e30766d9f61d92d114e1
Binary files /dev/null and b/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/ring-ios-icon-20@3x.png differ
diff --git a/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/ring-ios-icon-29.png b/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/ring-ios-icon-29.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f03e1804562ec2793fb429f222c8ed83e359bda
Binary files /dev/null and b/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/ring-ios-icon-29.png differ
diff --git a/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/ring-ios-icon-29@2x.png b/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/ring-ios-icon-29@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d1009f7b5090ec826502800c4046d71032c1fe3
Binary files /dev/null and b/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/ring-ios-icon-29@2x.png differ
diff --git a/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/ring-ios-icon-29@3x.png b/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/ring-ios-icon-29@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..84aeb156663a81564166962f7533448b8f10024e
Binary files /dev/null and b/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/ring-ios-icon-29@3x.png differ
diff --git a/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/ring-ios-icon-40.png b/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/ring-ios-icon-40.png
new file mode 100644
index 0000000000000000000000000000000000000000..af76162b157e0b36851468691c63897a8a0bdbf0
Binary files /dev/null and b/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/ring-ios-icon-40.png differ
diff --git a/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/ring-ios-icon-40@2x.png b/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/ring-ios-icon-40@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..e95dbb41b83a017433907268771719b61833a033
Binary files /dev/null and b/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/ring-ios-icon-40@2x.png differ
diff --git a/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/ring-ios-icon-40@3x.png b/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/ring-ios-icon-40@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..b291ac061c6f3fa058ef5e9a1794b491b7fab341
Binary files /dev/null and b/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/ring-ios-icon-40@3x.png differ
diff --git a/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/ring-ios-icon-60@2x.png b/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/ring-ios-icon-60@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..b291ac061c6f3fa058ef5e9a1794b491b7fab341
Binary files /dev/null and b/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/ring-ios-icon-60@2x.png differ
diff --git a/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/ring-ios-icon-60@3x.png b/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/ring-ios-icon-60@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..b844d15d0c812bd23dda5a6c25e6df62aec86223
Binary files /dev/null and b/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/ring-ios-icon-60@3x.png differ
diff --git a/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/ring-ios-icon-76.png b/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/ring-ios-icon-76.png
new file mode 100644
index 0000000000000000000000000000000000000000..bdde8700bd7d72e6ef94026a2eeadaece73da9ba
Binary files /dev/null and b/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/ring-ios-icon-76.png differ
diff --git a/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/ring-ios-icon-76@2x.png b/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/ring-ios-icon-76@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..d904f3f7e0609bcb0cb52923aedc40a7bdf6bd3d
Binary files /dev/null and b/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/ring-ios-icon-76@2x.png differ
diff --git a/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/ring-ios-icon-83.5@2x.png b/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/ring-ios-icon-83.5@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..e08199276a36a3ec828cc1689c73c1619e3370e1
Binary files /dev/null and b/Ring/Ring/Resources/Images.xcassets/AppIcon.appiconset/ring-ios-icon-83.5@2x.png differ
diff --git a/Ring/Ring/Resources/LaunchScreen.storyboard b/Ring/Ring/Resources/LaunchScreen.storyboard
index 2d6fdb2146c241be30443374c3ef98bb26ddfa03..75f567a642ac14614a395c890454147f109a0b6f 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="12121" systemVersion="16F73" 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="13196" 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="12089"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13174"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
@@ -27,17 +27,46 @@
<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"/>
+ <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"/>
+ <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"/>
+ </constraints>
+ </view>
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
+ <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"/>
+ <constraint firstItem="QbZ-1j-Ebd" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="mB5-R8-Vf7"/>
+ <constraint firstAttribute="trailing" secondItem="QbZ-1j-Ebd" secondAttribute="trailing" id="n4Y-q4-dRf"/>
</constraints>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
- <point key="canvasLocation" x="53" y="375"/>
+ <point key="canvasLocation" x="52.5" y="375"/>
</scene>
</scenes>
+ <resources>
+ <image name="background_ring" width="750" height="1334"/>
+ <image name="logo-ring-beta2-blanc" width="180" height="66"/>
+ </resources>
</document>