Skip to content
Snippets Groups Projects
Commit e36578b2 authored by Romain Bertozzi's avatar Romain Bertozzi
Browse files

project: clean storyboards

This patch reorganizes and cleans the existing storyboards.

This change is introduced by the choice of the device for the scenes
simulation. It used to recompute all the layouts.

Tuleap: #1327
Change-Id: I0ca6802e995208a7f6db5373590cf8e9120409ee
parent 4384369b
No related branches found
No related tags found
No related merge requests found
...@@ -274,6 +274,15 @@ ...@@ -274,6 +274,15 @@
name = Frameworks; name = Frameworks;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
02DE64671DDD15FC007D20EC /* Storyboards */ = {
isa = PBXGroup;
children = (
043999FF1D1C2D9D00E99CD9 /* Main.storyboard */,
04399A041D1C2D9D00E99CD9 /* LaunchScreen.storyboard */,
);
name = Storyboards;
sourceTree = "<group>";
};
043866221D22C38400E06CE2 /* Models */ = { 043866221D22C38400E06CE2 /* Models */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
...@@ -334,14 +343,13 @@ ...@@ -334,14 +343,13 @@
043999F51D1C2D9D00E99CD9 /* Ring */ = { 043999F51D1C2D9D00E99CD9 /* Ring */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
02DE64671DDD15FC007D20EC /* Storyboards */,
043866341D22D04E00E06CE2 /* UI */, 043866341D22D04E00E06CE2 /* UI */,
0438662D1D22C87500E06CE2 /* ViewController */, 0438662D1D22C87500E06CE2 /* ViewController */,
043866221D22C38400E06CE2 /* Models */, 043866221D22C38400E06CE2 /* Models */,
04399AAF1D1C305600E99CD9 /* DRingAdaptator */, 04399AAF1D1C305600E99CD9 /* DRingAdaptator */,
043999F61D1C2D9D00E99CD9 /* AppDelegate.swift */, 043999F61D1C2D9D00E99CD9 /* AppDelegate.swift */,
043999FF1D1C2D9D00E99CD9 /* Main.storyboard */,
04399A021D1C2D9D00E99CD9 /* Assets.xcassets */, 04399A021D1C2D9D00E99CD9 /* Assets.xcassets */,
04399A041D1C2D9D00E99CD9 /* LaunchScreen.storyboard */,
04399A071D1C2D9D00E99CD9 /* Info.plist */, 04399A071D1C2D9D00E99CD9 /* Info.plist */,
043999F81D1C2D9D00E99CD9 /* Ring.xcdatamodeld */, 043999F81D1C2D9D00E99CD9 /* Ring.xcdatamodeld */,
043866391D2307C000E06CE2 /* Extensions */, 043866391D2307C000E06CE2 /* Extensions */,
......
{ {
"images" : [ "images" : [
{
"idiom" : "iphone",
"size" : "20x20",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "20x20",
"scale" : "3x"
},
{ {
"idiom" : "iphone", "idiom" : "iphone",
"size" : "29x29", "size" : "29x29",
...@@ -30,6 +40,16 @@ ...@@ -30,6 +40,16 @@
"size" : "60x60", "size" : "60x60",
"scale" : "3x" "scale" : "3x"
}, },
{
"idiom" : "ipad",
"size" : "20x20",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "20x20",
"scale" : "2x"
},
{ {
"idiom" : "ipad", "idiom" : "ipad",
"size" : "29x29", "size" : "29x29",
...@@ -59,6 +79,11 @@ ...@@ -59,6 +79,11 @@
"idiom" : "ipad", "idiom" : "ipad",
"size" : "76x76", "size" : "76x76",
"scale" : "2x" "scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "83.5x83.5",
"scale" : "2x"
} }
], ],
"info" : { "info" : {
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?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> <dependencies>
<deployment identifier="iOS"/> <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> </dependencies>
<scenes> <scenes>
<!--View Controller--> <!--View Controller-->
...@@ -14,17 +18,17 @@ ...@@ -14,17 +18,17 @@
<viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/> <viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
</layoutGuides> </layoutGuides>
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3"> <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"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <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"> <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"/> <fontDescription key="fontDescription" type="system" pointSize="22"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
</subviews> </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> <constraints>
<constraint firstItem="vy5-r8-oQ3" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="PE3-VY-U9r"/> <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="vy5-r8-oQ3" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="U34-24-7hY"/>
......
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment