Przeglądaj źródła

Added a loading screen

Inigo Valentin 10 lat temu
rodzic
commit
77e9fd8fcd

BIN
app.xcodeproj/project.xcworkspace/xcuserdata/seavenois.xcuserdatad/UserInterfaceState.xcuserstate


+ 6 - 0
app/Assets.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

+ 23 - 0
app/Assets.xcassets/Logo.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "Icon-App-83.5x83.5@2x-2.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Icon-App-83.5x83.5@2x-1.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Icon-App-83.5x83.5@2x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
app/Assets.xcassets/Logo.imageset/Icon-App-83.5x83.5@2x-1.png


BIN
app/Assets.xcassets/Logo.imageset/Icon-App-83.5x83.5@2x-2.png


BIN
app/Assets.xcassets/Logo.imageset/Icon-App-83.5x83.5@2x.png


+ 31 - 4
app/Base.lproj/LaunchScreen.storyboard

@@ -1,7 +1,9 @@
 <?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="11134" systemVersion="15F34" 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="11201" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
     <dependencies>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11106"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
+        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     </dependencies>
     <scenes>
     <scenes>
@@ -14,9 +16,31 @@
                         <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="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="480"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <subviews>
+                            <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="Logo" translatesAutoresizingMaskIntoConstraints="NO" id="xeT-G1-Q3q">
+                                <frame key="frameInset" minX="40" minY="150" width="240" height="128"/>
+                            </imageView>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Gasteizko Margolariak" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="F3X-x3-mX4">
+                                <frame key="frameInset" minY="350" width="320" height="21"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="21" id="t8M-JA-MQh"/>
+                                </constraints>
+                                <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                        </subviews>
+                        <color key="backgroundColor" red="0.85979589509999998" green="0.95012098089999997" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                        <constraints>
+                            <constraint firstItem="xb3-aO-Qok" firstAttribute="top" secondItem="F3X-x3-mX4" secondAttribute="bottom" constant="100" id="3ra-9G-FVO"/>
+                            <constraint firstItem="F3X-x3-mX4" firstAttribute="centerX" secondItem="xeT-G1-Q3q" secondAttribute="centerX" id="FXe-TV-HzQ"/>
+                            <constraint firstItem="xeT-G1-Q3q" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="Gu6-y1-cm4"/>
+                            <constraint firstItem="xeT-G1-Q3q" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="L2Q-Jt-DEp"/>
+                            <constraint firstItem="F3X-x3-mX4" firstAttribute="width" secondItem="Ze5-6b-2t3" secondAttribute="width" id="a1k-6G-Bic"/>
+                            <constraint firstAttribute="trailingMargin" secondItem="F3X-x3-mX4" secondAttribute="trailing" constant="-16" id="hjh-i8-v6t"/>
+                        </constraints>
                     </view>
                     </view>
                 </viewController>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -24,4 +48,7 @@
             <point key="canvasLocation" x="53" y="375"/>
             <point key="canvasLocation" x="53" y="375"/>
         </scene>
         </scene>
     </scenes>
     </scenes>
+    <resources>
+        <image name="Logo" width="83" height="83"/>
+    </resources>
 </document>
 </document>

+ 16 - 2
app/Base.lproj/Main.storyboard

@@ -3,6 +3,7 @@
     <dependencies>
     <dependencies>
         <deployment identifier="iOS"/>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
+        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     </dependencies>
     <scenes>
     <scenes>
@@ -38,10 +39,10 @@
                                 </constraints>
                                 </constraints>
                                 <color key="barTintColor" red="0.85979589512451782" green="0.95012098090369101" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                 <color key="barTintColor" red="0.85979589512451782" green="0.95012098090369101" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                 <items>
                                 <items>
-                                    <navigationItem title="Gasteizko Margolariak" id="Bum-YC-FZU"/>
+                                    <navigationItem title="Title" id="isw-jq-8xu"/>
                                 </items>
                                 </items>
                             </navigationBar>
                             </navigationBar>
-                            <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" pagingEnabled="YES" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="Ikv-46-g2m">
+                            <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" pagingEnabled="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="Ikv-46-g2m">
                                 <color key="backgroundColor" red="0.85979589509999998" green="0.95012098089999997" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                 <color key="backgroundColor" red="0.85979589509999998" green="0.95012098089999997" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                 <constraints>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="40" id="D8o-cR-8qU"/>
                                     <constraint firstAttribute="height" constant="40" id="D8o-cR-8qU"/>
@@ -71,11 +72,24 @@
                                                     <nil key="textColor"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 </label>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0zD-5h-K1i">
+                                                    <frame key="frameInset" minX="29" minY="14" width="42" height="21"/>
+                                                    <color key="backgroundColor" red="0.39387386904777305" green="0.62796053144439012" blue="0.99835759401321411" alpha="1" colorSpace="calibratedRGB"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="height" constant="2" id="V9n-Wq-pBe"/>
+                                                    </constraints>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                    <nil key="textColor"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
                                             </subviews>
                                             </subviews>
                                         </view>
                                         </view>
                                         <color key="backgroundColor" red="0.58073881927014726" green="0.82106793130139011" blue="0.99835759401321411" alpha="1" colorSpace="calibratedRGB"/>
                                         <color key="backgroundColor" red="0.58073881927014726" green="0.82106793130139011" blue="0.99835759401321411" alpha="1" colorSpace="calibratedRGB"/>
                                         <constraints>
                                         <constraints>
+                                            <constraint firstItem="0zD-5h-K1i" firstAttribute="centerX" secondItem="a4j-DF-epb" secondAttribute="centerX" id="2n7-QU-CYC"/>
                                             <constraint firstItem="PbJ-gz-Ivz" firstAttribute="centerX" secondItem="a4j-DF-epb" secondAttribute="centerX" id="BgU-YL-9w0"/>
                                             <constraint firstItem="PbJ-gz-Ivz" firstAttribute="centerX" secondItem="a4j-DF-epb" secondAttribute="centerX" id="BgU-YL-9w0"/>
+                                            <constraint firstItem="0zD-5h-K1i" firstAttribute="width" secondItem="a4j-DF-epb" secondAttribute="width" constant="-8" id="SKa-0j-eNV"/>
+                                            <constraint firstAttribute="bottomMargin" secondItem="0zD-5h-K1i" secondAttribute="bottom" id="WfL-GN-Mgd"/>
                                             <constraint firstItem="PbJ-gz-Ivz" firstAttribute="centerY" secondItem="a4j-DF-epb" secondAttribute="centerY" id="YZg-8N-4hG"/>
                                             <constraint firstItem="PbJ-gz-Ivz" firstAttribute="centerY" secondItem="a4j-DF-epb" secondAttribute="centerY" id="YZg-8N-4hG"/>
                                         </constraints>
                                         </constraints>
                                         <connections>
                                         <connections>