diff --git a/Ring/Ring.xcodeproj/project.pbxproj b/Ring/Ring.xcodeproj/project.pbxproj
index b6820130b274d1acceff9af2cb1d51452473095a..2db63a59b1639d029f9a6ddcd24c8ba27accb106 100644
--- a/Ring/Ring.xcodeproj/project.pbxproj
+++ b/Ring/Ring.xcodeproj/project.pbxproj
@@ -274,6 +274,15 @@
name = Frameworks;
sourceTree = "<group>";
};
+ 02DE64671DDD15FC007D20EC /* Storyboards */ = {
+ isa = PBXGroup;
+ children = (
+ 043999FF1D1C2D9D00E99CD9 /* Main.storyboard */,
+ 04399A041D1C2D9D00E99CD9 /* LaunchScreen.storyboard */,
+ );
+ name = Storyboards;
+ sourceTree = "<group>";
+ };
043866221D22C38400E06CE2 /* Models */ = {
isa = PBXGroup;
children = (
@@ -334,14 +343,13 @@
043999F51D1C2D9D00E99CD9 /* Ring */ = {
isa = PBXGroup;
children = (
+ 02DE64671DDD15FC007D20EC /* Storyboards */,
043866341D22D04E00E06CE2 /* UI */,
0438662D1D22C87500E06CE2 /* ViewController */,
043866221D22C38400E06CE2 /* Models */,
04399AAF1D1C305600E99CD9 /* DRingAdaptator */,
043999F61D1C2D9D00E99CD9 /* AppDelegate.swift */,
- 043999FF1D1C2D9D00E99CD9 /* Main.storyboard */,
04399A021D1C2D9D00E99CD9 /* Assets.xcassets */,
- 04399A041D1C2D9D00E99CD9 /* LaunchScreen.storyboard */,
04399A071D1C2D9D00E99CD9 /* Info.plist */,
043999F81D1C2D9D00E99CD9 /* Ring.xcdatamodeld */,
043866391D2307C000E06CE2 /* Extensions */,
diff --git a/Ring/Ring/Assets.xcassets/AppIcon.appiconset/Contents.json b/Ring/Ring/Assets.xcassets/AppIcon.appiconset/Contents.json
index 36d2c80d8893178d7e1f2964085b273959bfdc28..1d060ed28827ed6aca9565d946e6b5595c8978df 100644
--- a/Ring/Ring/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/Ring/Ring/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,5 +1,15 @@
{
"images" : [
+ {
+ "idiom" : "iphone",
+ "size" : "20x20",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "iphone",
+ "size" : "20x20",
+ "scale" : "3x"
+ },
{
"idiom" : "iphone",
"size" : "29x29",
@@ -30,6 +40,16 @@
"size" : "60x60",
"scale" : "3x"
},
+ {
+ "idiom" : "ipad",
+ "size" : "20x20",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "20x20",
+ "scale" : "2x"
+ },
{
"idiom" : "ipad",
"size" : "29x29",
@@ -59,6 +79,11 @@
"idiom" : "ipad",
"size" : "76x76",
"scale" : "2x"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "83.5x83.5",
+ "scale" : "2x"
}
],
"info" : {
diff --git a/Ring/Ring/Base.lproj/LaunchScreen.storyboard b/Ring/Ring/Base.lproj/LaunchScreen.storyboard
index 5df8e70727cdbaefbc9f993e2c34b511c8c3013d..96768f7265dab1853ec55ab066ccefad4fb5326f 100644
--- a/Ring/Ring/Base.lproj/LaunchScreen.storyboard
+++ b/Ring/Ring/Base.lproj/LaunchScreen.storyboard
@@ -1,8 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11542" systemVersion="15G1108" 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="10085"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11524"/>
+ <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
@@ -14,17 +18,17 @@
<viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
- <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+ <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="274.5" y="286.5" width="51" height="26.5"/>
+ <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>
</subviews>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<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"/>
diff --git a/Ring/Ring/Base.lproj/Main.storyboard b/Ring/Ring/Base.lproj/Main.storyboard
index 8ec5d483c4b3d3e67cf33c422fd10a1fa9acbfae..b1befa3d2b5a931295dbe33762bec82b3be2b753 100644
--- a/Ring/Ring/Base.lproj/Main.storyboard
+++ b/Ring/Ring/Base.lproj/Main.storyboard
@@ -1,9 +1,13 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="qdG-Sd-QaE">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11542" systemVersion="15G1108" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="qdG-Sd-QaE">
+ <device id="retina4_0" orientation="portrait">
+ <adaptation id="fullscreen"/>
+ </device>
<dependencies>
<deployment identifier="iOS"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11524"/>
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
+ <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--Me-->
@@ -15,38 +19,38 @@
<viewControllerLayoutGuide type="bottom" id="37a-rZ-qQK"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="5d9-Wo-lnI">
- <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+ <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="PERSON 
PLACEHOLDER" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vcL-Nj-NcH">
- <rect key="frame" x="20" y="102" width="180" height="64"/>
+ <rect key="frame" x="16" y="102" width="180" height="64"/>
<constraints>
<constraint firstAttribute="width" constant="180" id="CUM-z9-ubY"/>
<constraint firstAttribute="height" constant="64" id="qTZ-Qf-EMe"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="22"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="PYw-q1-MgO">
- <rect key="frame" x="245" y="181" width="110" height="110"/>
+ <rect key="frame" x="105" y="149" width="110" height="110"/>
<constraints>
<constraint firstAttribute="width" constant="110" id="JL8-2N-trX"/>
<constraint firstAttribute="height" constant="110" id="sfn-3N-dGV"/>
</constraints>
</imageView>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="w6i-WA-dDu">
- <rect key="frame" x="0.0" y="333" width="600" height="218"/>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <rect key="frame" x="0.0" y="301" width="320" height="218"/>
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="218" id="1Nb-4o-17J"/>
</constraints>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="accountTableCell" id="i1O-Yc-WGd" customClass="AccountTableViewCell" customModule="Ring" customModuleProvider="target">
- <rect key="frame" x="0.0" y="28" width="600" height="44"/>
+ <rect key="frame" x="0.0" y="28" width="320" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="i1O-Yc-WGd" id="Bz1-A3-Z3f">
- <rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
+ <rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="bm0-lC-K2F">
@@ -56,18 +60,18 @@
</connections>
</switch>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="TYPE" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aWK-hB-xaJ">
- <rect key="frame" x="510" y="11" width="42" height="21"/>
+ <rect key="frame" x="230" y="11" width="42" height="21"/>
<constraints>
<constraint firstAttribute="width" constant="42" id="ow1-lO-Jjx"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="di5-bP-pFg" userLabel="Account Name Label">
- <rect key="frame" x="71" y="11" width="380" height="21"/>
+ <rect key="frame" x="71" y="11" width="100" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
@@ -89,16 +93,16 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="addAccountTableCell" id="Ok2-8L-eMm">
- <rect key="frame" x="0.0" y="72" width="600" height="44"/>
+ <rect key="frame" x="0.0" y="72" width="320" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Ok2-8L-eMm" id="m64-AI-t2h">
- <rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
+ <rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Add Account" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kZv-uf-BsD" userLabel="Account Name Label">
<rect key="frame" x="72" y="11" width="99" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="contactAdd" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="aNy-Wu-wDj">
@@ -123,7 +127,7 @@
</connections>
</tableView>
</subviews>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="w6i-WA-dDu" firstAttribute="top" secondItem="PYw-q1-MgO" secondAttribute="bottom" constant="42" id="01d-Gb-x0d"/>
<constraint firstAttribute="trailing" secondItem="w6i-WA-dDu" secondAttribute="trailing" id="EiT-gL-H1H"/>
@@ -146,7 +150,7 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="e9Q-pi-QIS" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
- <point key="canvasLocation" x="-180" y="-578"/>
+ <point key="canvasLocation" x="-94" y="-438"/>
</scene>
<!--Details-->
<scene sceneID="EYO-6b-v34">
@@ -157,17 +161,17 @@
<viewControllerLayoutGuide type="bottom" id="1SM-kJ-lna"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="uEm-4u-10U">
- <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+ <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="Details" textAlignment="natural" lineBreakMode="clip" numberOfLines="0" baselineAdjustment="alignBaselines" minimumScaleFactor="0.25" translatesAutoresizingMaskIntoConstraints="NO" id="fEM-NK-AEk">
- <rect key="frame" x="20" y="84" width="560" height="16"/>
+ <rect key="frame" x="16" y="84" width="288" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="fEM-NK-AEk" firstAttribute="trailing" secondItem="uEm-4u-10U" secondAttribute="trailingMargin" id="DOV-pz-GeB"/>
<constraint firstItem="fEM-NK-AEk" firstAttribute="leading" secondItem="uEm-4u-10U" secondAttribute="leadingMargin" id="L3x-kW-NoX"/>
@@ -181,7 +185,7 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="HG4-2x-M68" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
- <point key="canvasLocation" x="492" y="-543"/>
+ <point key="canvasLocation" x="784" y="-438"/>
</scene>
<!--Me-->
<scene sceneID="zvS-DX-8kB">
@@ -198,7 +202,24 @@
</navigationController>
<placeholder placeholderIdentifier="IBFirstResponder" id="5pC-Na-ca9" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
- <point key="canvasLocation" x="-1104" y="-161"/>
+ <point key="canvasLocation" x="-954" y="-438"/>
+ </scene>
+ <!--Item-->
+ <scene sceneID="RrV-5t-V1t">
+ <objects>
+ <navigationController id="m3Y-hs-SzS" sceneMemberID="viewController">
+ <tabBarItem key="tabBarItem" title="Item" id="vc8-sv-IF0"/>
+ <navigationBar key="navigationBar" contentMode="scaleToFill" id="G6y-tt-W3p">
+ <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+ <autoresizingMask key="autoresizingMask"/>
+ </navigationBar>
+ <connections>
+ <segue destination="NIj-Cd-aWO" kind="relationship" relationship="rootViewController" id="GUx-m9-dbP"/>
+ </connections>
+ </navigationController>
+ <placeholder placeholderIdentifier="IBFirstResponder" id="GAd-lM-wsI" userLabel="First Responder" sceneMemberID="firstResponder"/>
+ </objects>
+ <point key="canvasLocation" x="-954" y="-1178"/>
</scene>
<!--Home-->
<scene sceneID="UuZ-iE-GB0">
@@ -209,36 +230,23 @@
<viewControllerLayoutGuide type="bottom" id="aoH-Yk-Qrn"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="khr-49-0iv">
- <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+ <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
- <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="B6Y-MZ-L7L">
- <rect key="frame" x="0.0" y="64" width="600" height="536"/>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <tableView clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="B6Y-MZ-L7L">
+ <rect key="frame" x="0.0" y="0.0" width="320" height="519"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</tableView>
- <navigationBar contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="RoS-DU-xAu">
- <rect key="frame" x="0.0" y="20" width="600" height="44"/>
- <items>
- <navigationItem title="Title" id="y9b-TT-Tvh"/>
- </items>
- </navigationBar>
</subviews>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
- <constraints>
- <constraint firstAttribute="bottomMargin" secondItem="B6Y-MZ-L7L" secondAttribute="bottom" id="9LS-Eg-CQJ"/>
- <constraint firstItem="RoS-DU-xAu" firstAttribute="leading" secondItem="khr-49-0iv" secondAttribute="leadingMargin" constant="-20" id="EiR-wF-LnR"/>
- <constraint firstItem="RoS-DU-xAu" firstAttribute="top" secondItem="s1e-Lp-B2j" secondAttribute="bottom" id="MJ2-c9-uFX"/>
- <constraint firstAttribute="trailingMargin" secondItem="RoS-DU-xAu" secondAttribute="trailing" constant="-20" id="YoL-Tg-R7w"/>
- <constraint firstAttribute="trailingMargin" secondItem="B6Y-MZ-L7L" secondAttribute="trailing" constant="-20" id="dRH-q8-FlJ"/>
- <constraint firstItem="B6Y-MZ-L7L" firstAttribute="leading" secondItem="khr-49-0iv" secondAttribute="leadingMargin" constant="-20" id="wKh-S2-UyP"/>
- <constraint firstItem="B6Y-MZ-L7L" firstAttribute="top" secondItem="RoS-DU-xAu" secondAttribute="bottom" id="we3-Ap-eSi"/>
- </constraints>
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view>
<tabBarItem key="tabBarItem" title="Home" id="1QA-0Y-BFL"/>
+ <navigationItem key="navigationItem" id="b8m-eG-Q9D"/>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="rzQ-ll-5bo" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
- <point key="canvasLocation" x="-180" y="-1238"/>
+ <point key="canvasLocation" x="-97.5" y="-1177.8169014084508"/>
</scene>
<!--Ring-->
<scene sceneID="oqo-zJ-m0o">
@@ -247,16 +255,16 @@
<tabBar key="tabBar" contentMode="scaleToFill" id="zN5-xb-CQh">
<rect key="frame" x="0.0" y="0.0" width="320" height="49"/>
<autoresizingMask key="autoresizingMask"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
</tabBar>
<connections>
- <segue destination="NIj-Cd-aWO" kind="relationship" relationship="viewControllers" id="yGh-h9-MeW"/>
+ <segue destination="m3Y-hs-SzS" kind="relationship" relationship="viewControllers" id="tnG-cB-lXh"/>
<segue destination="acv-jH-RCt" kind="relationship" relationship="viewControllers" id="0f1-MJ-FH1"/>
</connections>
</tabBarController>
<placeholder placeholderIdentifier="IBFirstResponder" id="JF8-3k-Wf9" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
- <point key="canvasLocation" x="-1104" y="-914"/>
+ <point key="canvasLocation" x="-1879" y="-815"/>
</scene>
</scenes>
</document>