Button changes, text introduction, color adjustments, dark mode ground work

EncuestaMarle/Assets.xcassets/Icon-rounded.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "Icon-rounded.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

EncuestaMarle/Base.lproj/Main.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15400" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="VBd-I7-AF1">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="VBd-I7-AF1">
     <device id="retina5_5" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15404"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -18,21 +18,32 @@
                         <subviews>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="X5i-Gf-gnI">
                                 <rect key="frame" x="35" y="285" width="344" height="59"/>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <color key="backgroundColor" red="0.32369405029999998" green="0.51431828739999996" blue="0.92553383109999998" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="59" identifier="ANS1" id="jwc-vC-t0x"/>
                                 </constraints>
                                 <fontDescription key="fontDescription" type="system" weight="black" pointSize="26"/>
                                 <color key="tintColor" red="0.35331264140000002" green="0.40740802879999999" blue="0.96476000549999996" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                                 <state key="normal" title="Answer Survey">
-                                    <color key="titleColor" red="0.35331264140000002" green="0.40740802879999999" blue="0.96476000549999996" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
+                                    <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 </state>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                        <real key="value" value="5"/>
+                                    </userDefinedRuntimeAttribute>
+                                    <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
+                                        <real key="value" value="1"/>
+                                    </userDefinedRuntimeAttribute>
+                                    <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
+                                        <color key="value" red="0.32369405029999998" green="0.51431828739999996" blue="0.92553383109999998" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
+                                    </userDefinedRuntimeAttribute>
+                                </userDefinedRuntimeAttributes>
                                 <connections>
                                     <action selector="tomar_encuesta:" destination="BYZ-38-t0r" eventType="touchUpInside" id="f1H-vM-X8H"/>
                                 </connections>
                             </button>
                         </subviews>
-                        <color key="backgroundColor" red="0.35331264140000002" green="0.40740802879999999" blue="0.96476000549999996" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
                             <constraint firstItem="X5i-Gf-gnI" firstAttribute="leading" secondItem="6Tk-OE-BBY" secondAttribute="leading" constant="35" identifier="Ans2" id="FUW-5x-JJm"/>
                             <constraint firstItem="X5i-Gf-gnI" firstAttribute="top" secondItem="6Tk-OE-BBY" secondAttribute="top" constant="241" identifier="Ans3" id="Isl-Wl-ceq"/>
@@ -91,59 +102,89 @@
                         <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <containerView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="h4U-fy-FIW">
-                                <rect key="frame" x="20" y="49.666666666666686" width="374" height="629.33333333333326"/>
-                                <connections>
-                                    <segue destination="OQz-xT-dhH" kind="embed" id="TPl-T3-NpQ"/>
-                                </connections>
-                            </containerView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="MARLE" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="oMK-W6-xSz">
-                                <rect key="frame" x="165" y="8" width="84" height="33.666666666666664"/>
-                                <fontDescription key="fontDescription" style="UICTFontTextStyleTitle1"/>
-                                <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                <nil key="highlightedColor"/>
-                            </label>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gGJ-33-J27">
                                 <rect key="frame" x="20" y="8" width="100" height="22"/>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <color key="backgroundColor" red="0.32369405029999998" green="0.51431828739999996" blue="0.92553383109999998" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="100" identifier="Rec1" id="Txs-tV-5RB"/>
                                 </constraints>
                                 <fontDescription key="fontDescription" type="system" weight="black" pointSize="8"/>
                                 <state key="normal" title="Recover Account">
-                                    <color key="titleColor" red="0.35331264140000002" green="0.40740802879999999" blue="0.96476000549999996" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
+                                    <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 </state>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
+                                        <real key="value" value="1"/>
+                                    </userDefinedRuntimeAttribute>
+                                    <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                        <real key="value" value="5"/>
+                                    </userDefinedRuntimeAttribute>
+                                    <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
+                                        <color key="value" red="0.32369405029999998" green="0.51431828739999996" blue="0.92553383109999998" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
+                                    </userDefinedRuntimeAttribute>
+                                </userDefinedRuntimeAttributes>
                                 <connections>
                                     <action selector="recover_account:" destination="w49-Mx-cg8" eventType="touchUpInside" id="aMh-PE-CkL"/>
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="nNl-6H-60E">
                                 <rect key="frame" x="150.66666666666666" y="693" width="112.99999999999997" height="30"/>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <color key="backgroundColor" red="0.32369405029999998" green="0.51431828739999996" blue="0.92553383109999998" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="113" identifier="Join1" id="ofM-bD-SdS"/>
                                 </constraints>
                                 <fontDescription key="fontDescription" type="system" weight="black" pointSize="15"/>
                                 <state key="normal" title="Join Study">
-                                    <color key="titleColor" red="0.35331264140000002" green="0.40740802879999999" blue="0.96476000549999996" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
+                                    <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 </state>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                        <real key="value" value="5"/>
+                                    </userDefinedRuntimeAttribute>
+                                    <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
+                                        <real key="value" value="1"/>
+                                    </userDefinedRuntimeAttribute>
+                                    <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
+                                        <color key="value" red="0.32369405029999998" green="0.51431828739999996" blue="0.92553383109999998" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
+                                    </userDefinedRuntimeAttribute>
+                                </userDefinedRuntimeAttributes>
                                 <connections>
                                     <action selector="joinButtonTapped:" destination="w49-Mx-cg8" eventType="touchUpInside" id="rRA-lm-n6W"/>
                                 </connections>
                             </button>
+                            <textView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" fixedFrame="YES" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="Fb5-jH-gVK">
+                                <rect key="frame" x="20" y="217" width="374" height="185"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                <string key="text">To register a new account tap on Join Study bellow.
+
+To log-in to a previously registered account tap Recover Account above.</string>
+                                <color key="textColor" systemColor="labelColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
+                                <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
+                            </textView>
+                            <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" fixedFrame="YES" text="Welcome to Tania" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="gEj-a4-kWk">
+                                <rect key="frame" x="20" y="114" width="374" height="50"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                <color key="textColor" systemColor="labelColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <fontDescription key="fontDescription" style="UICTFontTextStyleTitle0"/>
+                                <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
+                            </textView>
+                            <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" fixedFrame="YES" text="Momentary Assesment Made Simple" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="0BG-sB-Fdn">
+                                <rect key="frame" x="20" y="163" width="374" height="30"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                <color key="textColor" systemColor="labelColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
+                                <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
+                            </textView>
                         </subviews>
-                        <color key="backgroundColor" red="0.35331264140000002" green="0.40740802879999999" blue="0.96476000549999996" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
-                            <constraint firstItem="oMK-W6-xSz" firstAttribute="leading" secondItem="gGJ-33-J27" secondAttribute="trailing" constant="45" identifier="O7" id="0Pg-uk-G5W"/>
                             <constraint firstItem="gGJ-33-J27" firstAttribute="top" secondItem="beN-qE-bp8" secondAttribute="bottom" constant="8" identifier="O3" id="4zi-tr-PYm"/>
-                            <constraint firstItem="BO1-Dh-wF9" firstAttribute="trailing" secondItem="oMK-W6-xSz" secondAttribute="trailing" constant="165" identifier="O1" id="5K9-uu-c0P"/>
-                            <constraint firstItem="oMK-W6-xSz" firstAttribute="top" secondItem="beN-qE-bp8" secondAttribute="bottom" constant="8" identifier="O8" id="8Gc-Yc-YGJ"/>
                             <constraint firstItem="gGJ-33-J27" firstAttribute="leading" secondItem="BO1-Dh-wF9" secondAttribute="leading" constant="20" identifier="O4" id="CVA-X6-d88"/>
-                            <constraint firstItem="h4U-fy-FIW" firstAttribute="top" secondItem="oMK-W6-xSz" secondAttribute="bottom" constant="8" identifier="O5" id="CYO-wr-eSz"/>
-                            <constraint firstItem="BO1-Dh-wF9" firstAttribute="trailing" secondItem="h4U-fy-FIW" secondAttribute="trailing" constant="20" identifier="O2" id="GJa-xN-CbG"/>
-                            <constraint firstItem="h4U-fy-FIW" firstAttribute="leading" secondItem="BO1-Dh-wF9" secondAttribute="leading" constant="20" identifier="O6" id="ZTq-Rz-caW"/>
                             <constraint firstItem="nNl-6H-60E" firstAttribute="centerX" secondItem="k2H-mA-LDM" secondAttribute="centerX" identifier="O9" id="g79-aS-WzZ"/>
-                            <constraint firstItem="nNl-6H-60E" firstAttribute="top" secondItem="h4U-fy-FIW" secondAttribute="bottom" constant="14" identifier="O10" id="hEt-tS-9aq"/>
                             <constraint firstItem="iR7-hv-y5I" firstAttribute="top" secondItem="nNl-6H-60E" secondAttribute="bottom" constant="13" identifier="O11" id="z3j-SS-T9B"/>
                         </constraints>
                         <viewLayoutGuide key="safeArea" id="BO1-Dh-wF9"/>
@@ -176,7 +217,7 @@
                     <view key="view" contentMode="scaleToFill" id="zlh-oI-xFU">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" red="0.35331264140000002" green="0.40740802879999999" blue="0.96476000549999996" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <viewLayoutGuide key="safeArea" id="vRR-YT-vKf"/>
                     </view>
                     <connections>
@@ -288,8 +329,9 @@
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="leading" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="We0-cd-h10">
-                                    <rect key="frame" x="8" y="88.333333333333329" width="398" height="33"/>
+                                    <rect key="frame" x="8" y="88.333333333333329" width="398" height="21"/>
                                     <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="17"/>
+                                    <inset key="contentEdgeInsets" minX="7" minY="0.0" maxX="0.0" maxY="0.0"/>
                                     <state key="normal" title="See your Consent Form">
                                         <color key="titleColor" red="0.35331264140000002" green="0.40740802879999999" blue="0.96476000549999996" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                                     </state>
@@ -298,7 +340,7 @@
                                     </connections>
                                 </button>
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="leading" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="wordWrap" translatesAutoresizingMaskIntoConstraints="NO" id="wkQ-h0-GIO">
-                                    <rect key="frame" x="8" y="129.33333333333334" width="398" height="41"/>
+                                    <rect key="frame" x="8" y="117.33333333333331" width="398" height="41"/>
                                     <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="17"/>
                                     <inset key="contentEdgeInsets" minX="10" minY="10" maxX="10" maxY="10"/>
                                     <state key="normal" title="Leave Study">
@@ -326,8 +368,8 @@
                     </tableView>
                     <navigationItem key="navigationItem" title="Settings" id="uhv-Sm-Z60">
                         <barButtonItem key="leftBarButtonItem" style="plain" id="iJq-QW-VgJ">
-                            <button key="customView" opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="BiD-bE-waD" userLabel="Done">
-                                <rect key="frame" x="20" y="7" width="92" height="30"/>
+                            <button key="customView" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="BiD-bE-waD" userLabel="Done">
+                                <rect key="frame" x="20" y="5" width="92" height="34"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
                                 <state key="normal" title="Done"/>

EncuestaMarle/LaunchScreen.xib

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina5_9" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="iN0-l3-epB">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="Icon-rounded" translatesAutoresizingMaskIntoConstraints="NO" id="gYv-gG-XQu">
+                    <rect key="frame" x="137" y="356" width="100" height="100"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
+                </imageView>
+            </subviews>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
+            <point key="canvasLocation" x="137.68115942028987" y="152.67857142857142"/>
+        </view>
+    </objects>
+    <resources>
+        <image name="Icon-rounded" width="1024" height="1024"/>
+    </resources>
+</document>

EncuestaMarle/OnboardingViewController.swift

@@ -534,6 +534,38 @@ extension OnboardingViewController : ORKTaskViewControllerDelegate {
     }
 }
 
+@IBDesignable extension UIButton {
+
+    @IBInspectable var borderWidth: CGFloat {
+        set {
+            layer.borderWidth = newValue
+        }
+        get {
+            return layer.borderWidth
+        }
+    }
+
+    @IBInspectable var cornerRadius: CGFloat {
+        set {
+            layer.cornerRadius = newValue
+        }
+        get {
+            return layer.cornerRadius
+        }
+    }
+
+    @IBInspectable var borderColor: UIColor? {
+        set {
+            guard let uiColor = newValue else { return }
+            layer.borderColor = uiColor.cgColor
+        }
+        get {
+            guard let color = layer.borderColor else { return nil }
+            return UIColor(cgColor: color)
+        }
+    }
+}
+
 //extension NSLayoutConstraint {
 //
 //    override public var description: String {

Tania.xcodeproj/project.pbxproj

@@ -11,11 +11,11 @@
 		23C570622271EF80000C7E90 /* Podfile in Resources */ = {isa = PBXBuildFile; fileRef = 23C570612271EF80000C7E90 /* Podfile */; };
 		35439533237E182A00E73402 /* ResearchKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 35439530237E181E00E73402 /* ResearchKit.framework */; };
 		35439534237E182A00E73402 /* ResearchKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 35439530237E181E00E73402 /* ResearchKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		35602D5E237E1D2D008C9338 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 35602D5D237E1D2D008C9338 /* LaunchScreen.xib */; };
 		371DA37622621B03006C22EC /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 371DA37522621B03006C22EC /* AppDelegate.swift */; };
 		371DA37822621B03006C22EC /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 371DA37722621B03006C22EC /* ViewController.swift */; };
 		371DA37B22621B03006C22EC /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 371DA37922621B03006C22EC /* Main.storyboard */; };
 		371DA37E22621B03006C22EC /* EncuestaMarle.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 371DA37C22621B03006C22EC /* EncuestaMarle.xcdatamodeld */; };
-		371DA38322621B06006C22EC /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 371DA38122621B06006C22EC /* LaunchScreen.storyboard */; };
 		371DA38E22621B06006C22EC /* EncuestaMarleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 371DA38D22621B06006C22EC /* EncuestaMarleTests.swift */; };
 		371DA39922621B06006C22EC /* EncuestaMarleUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 371DA39822621B06006C22EC /* EncuestaMarleUITests.swift */; };
 		371DA3A822621C2D006C22EC /* EncuestaViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 371DA3A722621C2D006C22EC /* EncuestaViewController.swift */; };
@@ -82,12 +82,12 @@
 		23C456DA2270BAEF008CC76B /* ORKESerialization.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ORKESerialization.h; sourceTree = "<group>"; };
 		23C570612271EF80000C7E90 /* Podfile */ = {isa = PBXFileReference; lastKnownFileType = text; path = Podfile; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
 		35439529237E181600E73402 /* ResearchKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ResearchKit.xcodeproj; path = "../ResearchKit-master/ResearchKit.xcodeproj"; sourceTree = "<group>"; };
+		35602D5D237E1D2D008C9338 /* LaunchScreen.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = LaunchScreen.xib; sourceTree = "<group>"; };
 		371DA37222621B03006C22EC /* Tania.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Tania.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		371DA37522621B03006C22EC /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		371DA37722621B03006C22EC /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
 		371DA37A22621B03006C22EC /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		371DA37D22621B03006C22EC /* EncuestaMarle.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = EncuestaMarle.xcdatamodel; sourceTree = "<group>"; };
-		371DA38222621B06006C22EC /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		371DA38422621B06006C22EC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		371DA38922621B06006C22EC /* TaniaTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = TaniaTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		371DA38D22621B06006C22EC /* EncuestaMarleTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EncuestaMarleTests.swift; sourceTree = "<group>"; };
@@ -200,10 +200,10 @@
 				37E2BC7A2294C3C500432417 /* ProfileViewController.swift */,
 				372F3FFB229408F3003C414A /* ConsentDocument.swift */,
 				37E2BC782294BE5200432417 /* WithdrawViewController.swift */,
-				371DA38122621B06006C22EC /* LaunchScreen.storyboard */,
 				371DA38422621B06006C22EC /* Info.plist */,
 				379967E92292DFDD00DEE05F /* GoogleService-Info.plist */,
 				371DA37C22621B03006C22EC /* EncuestaMarle.xcdatamodeld */,
+				35602D5D237E1D2D008C9338 /* LaunchScreen.xib */,
 				371DA37722621B03006C22EC /* ViewController.swift */,
 			);
 			path = EncuestaMarle;
@@ -375,7 +375,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				371DA38322621B06006C22EC /* LaunchScreen.storyboard in Resources */,
+				35602D5E237E1D2D008C9338 /* LaunchScreen.xib in Resources */,
 				379967EA2292DFDD00DEE05F /* GoogleService-Info.plist in Resources */,
 				23C570622271EF80000C7E90 /* Podfile in Resources */,
 				371DA37B22621B03006C22EC /* Main.storyboard in Resources */,
@@ -502,14 +502,6 @@
 			name = Main.storyboard;
 			sourceTree = "<group>";
 		};
-		371DA38122621B06006C22EC /* LaunchScreen.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				371DA38222621B06006C22EC /* Base */,
-			);
-			name = LaunchScreen.storyboard;
-			sourceTree = "<group>";
-		};
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */