diff --git a/Pendu/Base.lproj/Main.storyboard b/Pendu/Base.lproj/Main.storyboard index a5c7b58ab0f39e98059fcae669d907a5cbbd0420..b84685f9ad2a4e34e7e107dfbafa4f35b09a6903 100644 --- a/Pendu/Base.lproj/Main.storyboard +++ b/Pendu/Base.lproj/Main.storyboard @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="vyD-kt-VPW"> - <device id="retina6_1" orientation="portrait" appearance="light"/> + <device id="retina6_0" orientation="portrait" appearance="light"/> <dependencies> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> @@ -13,68 +13,82 @@ <objects> <viewController id="BYZ-38-t0r" customClass="ViewController" customModule="Pendu" customModuleProvider="target" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC"> - <rect key="frame" x="0.0" y="0.0" width="414" height="896"/> + <rect key="frame" x="0.0" y="0.0" width="390" height="844"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> - <textField opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="iRK-mL-RC3"> - <rect key="frame" x="106" y="400" width="184" height="34"/> + <textField opaque="NO" alpha="0.84999999999999998" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="Player name" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="iRK-mL-RC3"> + <rect key="frame" x="28" y="267" width="335" height="34"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> + <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <fontDescription key="fontDescription" type="system" pointSize="14"/> <textInputTraits key="textInputTraits"/> </textField> - <pickerView contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="LNU-nY-Uyk"> - <rect key="frame" x="0.0" y="565" width="414" height="162"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> - </pickerView> - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Choisissez un theme" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dAa-qb-1JB"> - <rect key="frame" x="119" y="484" width="158" height="21"/> + <segmentedControl opaque="NO" alpha="0.84999999999999998" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="NvB-ZN-BTJ"> + <rect key="frame" x="28" y="350" width="335" height="32"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" type="system" pointSize="17"/> - <nil key="textColor"/> - <nil key="highlightedColor"/> - </label> - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="choissisez votre pseudo" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="doS-CU-ueI"> - <rect key="frame" x="106" y="351" width="184" height="21"/> + <color key="backgroundColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> + <segments> + <segment title="Easy"/> + <segment title="Hard"/> + </segments> + </segmentedControl> + <button contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="lae-hh-psQ"> + <rect key="frame" x="28" y="102" width="130" height="39"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" type="system" pointSize="17"/> - <nil key="textColor"/> - <nil key="highlightedColor"/> - </label> + <color key="tintColor" systemColor="labelColor"/> + <state key="normal" title="Button"/> + <buttonConfiguration key="configuration" style="gray"> + <attributedString key="attributedTitle"> + <fragment content="My score"> + <attributes> + <font key="NSFont" size="18" name="Helvetica"/> + <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/> + </attributes> + </fragment> + </attributedString> + <color key="baseBackgroundColor" systemColor="systemYellowColor"/> + </buttonConfiguration> + <connections> + <action selector="AfficherClassement:" destination="BYZ-38-t0r" eventType="touchUpInside" id="up5-UE-mBH"/> + </connections> + </button> <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Rxj-5T-1Nw"> - <rect key="frame" x="117" y="720" width="181" height="54"/> + <rect key="frame" x="89" y="621" width="212" height="39"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <state key="normal" title="Button"/> - <buttonConfiguration key="configuration" style="filled" title="Lancer Partie"/> + <buttonConfiguration key="configuration" style="filled" title="Start game"> + <fontDescription key="titleFontDescription" style="UICTFontTextStyleTitle3"/> + <color key="baseBackgroundColor" systemColor="systemTealColor"/> + </buttonConfiguration> <connections> <action selector="LancerPartie:" destination="BYZ-38-t0r" eventType="touchUpInside" id="ccG-OM-Emx"/> <segue destination="SII-Cn-Tul" kind="show" identifier="DeAccueilAJeu" id="GRR-mn-viL"/> </connections> </button> - <segmentedControl opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="NvB-ZN-BTJ"> - <rect key="frame" x="144" y="526" width="109" height="32"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <segments> - <segment title="Facile"/> - <segment title="Hard"/> - </segments> - </segmentedControl> - <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="lae-hh-psQ"> - <rect key="frame" x="119" y="284" width="160" height="31"/> + <pickerView alpha="0.84999999999999998" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="LNU-nY-Uyk"> + <rect key="frame" x="0.0" y="424" width="390" height="162"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> + </pickerView> + <button contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4Oq-OS-e2C"> + <rect key="frame" x="233" y="102" width="130" height="39"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> + <color key="tintColor" systemColor="labelColor"/> <state key="normal" title="Button"/> <buttonConfiguration key="configuration" style="gray"> <attributedString key="attributedTitle"> - <fragment content="Classement"/> + <fragment content="Ranking"> + <attributes> + <font key="NSFont" size="18" name="Helvetica"/> + <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/> + </attributes> + </fragment> </attributedString> + <color key="baseBackgroundColor" systemColor="systemYellowColor"/> </buttonConfiguration> <connections> - <action selector="AfficherClassement:" destination="BYZ-38-t0r" eventType="touchUpInside" id="up5-UE-mBH"/> + <action selector="AfficherClassement:" destination="BYZ-38-t0r" eventType="touchUpInside" id="7El-p9-KHs"/> </connections> </button> - <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="hqdefault.jpeg" translatesAutoresizingMaskIntoConstraints="NO" id="pv2-ee-Khp"> - <rect key="frame" x="0.0" y="-43" width="414" height="319"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - </imageView> </subviews> <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/> <color key="backgroundColor" systemColor="systemBackgroundColor"/> @@ -89,21 +103,21 @@ </viewController> <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/> </objects> - <point key="canvasLocation" x="276.81159420289856" y="72.991071428571431"/> + <point key="canvasLocation" x="275.38461538461536" y="72.511848341232223"/> </scene> - <!--Game View Controller--> + <!--Partie--> <scene sceneID="LqT-Za-AMF"> <objects> - <viewController id="SII-Cn-Tul" customClass="GameViewController" customModule="Pendu" customModuleProvider="target" sceneMemberID="viewController"> + <viewController title="Partie" id="SII-Cn-Tul" customClass="GameViewController" customModule="Pendu" customModuleProvider="target" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="lA6-ta-b6b"> - <rect key="frame" x="0.0" y="0.0" width="414" height="896"/> + <rect key="frame" x="0.0" y="0.0" width="390" height="844"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <stackView autoresizesSubviews="NO" opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillProportionally" spacing="12" translatesAutoresizingMaskIntoConstraints="NO" id="nPm-hO-jSU"> - <rect key="frame" x="18" y="674" width="378" height="117"/> + <rect key="frame" x="18" y="674" width="354" height="117"/> <subviews> <stackView opaque="NO" contentMode="scaleToFill" spacing="6" translatesAutoresizingMaskIntoConstraints="NO" id="Lxn-jn-iUp"> - <rect key="frame" x="0.0" y="0.0" width="378" height="31"/> + <rect key="frame" x="0.0" y="0.0" width="354" height="31"/> <subviews> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="K1J-8m-J9K"> <rect key="frame" x="0.0" y="0.0" width="37" height="31"/> @@ -119,7 +133,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3y4-VD-M0Z"> - <rect key="frame" x="43" y="0.0" width="36.5" height="31"/> + <rect key="frame" x="43" y="0.0" width="36.666666666666657" height="31"/> <constraints> <constraint firstAttribute="width" constant="36.5" id="gwE-ee-OW4"/> </constraints> @@ -133,7 +147,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="A5I-Mg-2Ou"> - <rect key="frame" x="85.5" y="0.0" width="37" height="31"/> + <rect key="frame" x="85.666666666666671" y="0.0" width="37" height="31"/> <constraints> <constraint firstAttribute="width" constant="37" id="08g-4b-Pf0"/> </constraints> @@ -147,7 +161,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zO4-1x-xRr"> - <rect key="frame" x="128.5" y="0.0" width="36.5" height="31"/> + <rect key="frame" x="128.66666666666666" y="0.0" width="36.333333333333343" height="31"/> <constraints> <constraint firstAttribute="width" constant="36.5" id="Au1-0z-JiC"/> </constraints> @@ -161,7 +175,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="VI7-Hb-gxf"> - <rect key="frame" x="171" y="0.0" width="36" height="31"/> + <rect key="frame" x="171" y="0.0" width="12" height="31"/> <color key="tintColor" systemColor="opaqueSeparatorColor"/> <state key="normal" title="Button"/> <buttonConfiguration key="configuration" style="filled" title="T"> @@ -172,7 +186,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dUl-j1-UPC"> - <rect key="frame" x="213" y="0.0" width="36.5" height="31"/> + <rect key="frame" x="189" y="0.0" width="36.666666666666657" height="31"/> <constraints> <constraint firstAttribute="width" constant="36.5" id="wNM-kd-Ozm"/> </constraints> @@ -186,7 +200,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="eT3-eI-h6F"> - <rect key="frame" x="255.5" y="0.0" width="37" height="31"/> + <rect key="frame" x="231.66666666666666" y="0.0" width="36.999999999999972" height="31"/> <constraints> <constraint firstAttribute="width" constant="37" id="rQg-Xn-Ap9"/> </constraints> @@ -200,7 +214,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3Vi-3e-hIm"> - <rect key="frame" x="298.5" y="0.0" width="36.5" height="31"/> + <rect key="frame" x="274.66666666666669" y="0.0" width="36.333333333333314" height="31"/> <constraints> <constraint firstAttribute="width" constant="36.5" id="T3K-oO-Awp"/> </constraints> @@ -214,7 +228,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dwK-xf-gfo"> - <rect key="frame" x="341" y="0.0" width="37" height="31"/> + <rect key="frame" x="317" y="0.0" width="37" height="31"/> <color key="tintColor" systemColor="opaqueSeparatorColor"/> <state key="normal" title="Button"/> <buttonConfiguration key="configuration" style="filled" title="O"> @@ -231,7 +245,7 @@ </constraints> </stackView> <stackView opaque="NO" contentMode="scaleToFill" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="iGY-z0-cnq"> - <rect key="frame" x="0.0" y="43" width="378" height="31"/> + <rect key="frame" x="0.0" y="43" width="354" height="31"/> <subviews> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="VcP-Ew-YEz"> <rect key="frame" x="0.0" y="0.0" width="35" height="31"/> @@ -287,7 +301,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xVA-v4-SeY"> - <rect key="frame" x="171" y="0.0" width="36" height="31"/> + <rect key="frame" x="171" y="0.0" width="12" height="31"/> <color key="tintColor" systemColor="opaqueSeparatorColor"/> <state key="normal" title="Button"/> <buttonConfiguration key="configuration" style="filled" title="F"> @@ -298,7 +312,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="lFV-Ph-7oH"> - <rect key="frame" x="215" y="0.0" width="35" height="31"/> + <rect key="frame" x="191" y="0.0" width="35" height="31"/> <constraints> <constraint firstAttribute="width" constant="35" id="PAi-d0-m1T"/> </constraints> @@ -312,7 +326,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gfF-8E-ztz"> - <rect key="frame" x="258" y="0.0" width="35" height="31"/> + <rect key="frame" x="234" y="0.0" width="35" height="31"/> <constraints> <constraint firstAttribute="width" constant="35" id="wzM-tZ-pzw"/> </constraints> @@ -326,7 +340,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9Hg-a5-lyX"> - <rect key="frame" x="301" y="0.0" width="35" height="31"/> + <rect key="frame" x="277" y="0.0" width="35" height="31"/> <constraints> <constraint firstAttribute="width" constant="35" id="3eq-2n-Zh7"/> </constraints> @@ -340,7 +354,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="SRC-kg-I9t"> - <rect key="frame" x="344" y="0.0" width="34" height="31"/> + <rect key="frame" x="320" y="0.0" width="34" height="31"/> <constraints> <constraint firstAttribute="width" constant="34" id="Fzp-gB-C60"/> </constraints> @@ -361,10 +375,10 @@ </constraints> </stackView> <stackView opaque="NO" contentMode="scaleToFill" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="2hT-k9-3se"> - <rect key="frame" x="0.0" y="86" width="378" height="31"/> + <rect key="frame" x="0.0" y="86" width="354" height="31"/> <subviews> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="CiT-Ul-IXe"> - <rect key="frame" x="0.0" y="0.0" width="40.5" height="31"/> + <rect key="frame" x="0.0" y="0.0" width="40.666666666666664" height="31"/> <constraints> <constraint firstAttribute="width" constant="40.5" id="hAd-XB-8jO"/> </constraints> @@ -378,7 +392,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="him-pb-hSO"> - <rect key="frame" x="48.5" y="0.0" width="40" height="31"/> + <rect key="frame" x="48.666666666666671" y="0.0" width="40" height="31"/> <constraints> <constraint firstAttribute="width" constant="40" id="Sv9-mP-1Lk"/> </constraints> @@ -392,7 +406,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="f86-Pv-8XU"> - <rect key="frame" x="96.5" y="0.0" width="40.5" height="31"/> + <rect key="frame" x="96.666666666666671" y="0.0" width="40.333333333333329" height="31"/> <constraints> <constraint firstAttribute="width" constant="40.5" id="y8F-zR-SoZ"/> </constraints> @@ -420,7 +434,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="f5g-Vp-Dkm"> - <rect key="frame" x="193" y="0.0" width="40.5" height="31"/> + <rect key="frame" x="193" y="0.0" width="16.666666666666657" height="31"/> <color key="tintColor" systemColor="opaqueSeparatorColor"/> <state key="normal" title="Button"/> <buttonConfiguration key="configuration" style="filled" title="C"> @@ -431,7 +445,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="wg8-a4-KPy"> - <rect key="frame" x="241.5" y="0.0" width="40" height="31"/> + <rect key="frame" x="217.66666666666666" y="0.0" width="39.999999999999972" height="31"/> <constraints> <constraint firstAttribute="width" constant="40" id="1G0-6C-igj"/> </constraints> @@ -445,7 +459,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ErA-af-qSV"> - <rect key="frame" x="289.5" y="0.0" width="40" height="31"/> + <rect key="frame" x="265.66666666666669" y="0.0" width="40" height="31"/> <constraints> <constraint firstAttribute="width" constant="40" id="eeV-Eq-QWY"/> </constraints> @@ -459,7 +473,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="JoJ-to-kUH"> - <rect key="frame" x="337.5" y="0.0" width="40.5" height="31"/> + <rect key="frame" x="313.66666666666669" y="0.0" width="40.333333333333314" height="31"/> <constraints> <constraint firstAttribute="width" constant="40.5" id="kz1-9t-uCY"/> </constraints> @@ -481,7 +495,7 @@ <rect key="contentStretch" x="1" y="1" width="1" height="1"/> </stackView> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YK4-Bp-YJg"> - <rect key="frame" x="20" y="606" width="376" height="60"/> + <rect key="frame" x="16" y="606" width="356" height="60"/> <fontDescription key="fontDescription" type="system" pointSize="30"/> <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <nil key="highlightedColor"/> @@ -537,13 +551,13 @@ </objects> <point key="canvasLocation" x="1113.0434782608697" y="72.991071428571431"/> </scene> - <!--Navigation Controller--> + <!--Accueil--> <scene sceneID="v2s-Cx-8QZ"> <objects> - <navigationController automaticallyAdjustsScrollViewInsets="NO" id="vyD-kt-VPW" sceneMemberID="viewController"> + <navigationController title="Accueil" automaticallyAdjustsScrollViewInsets="NO" id="vyD-kt-VPW" sceneMemberID="viewController"> <toolbarItems/> <navigationBar key="navigationBar" contentMode="scaleToFill" id="HKI-s4-KxF"> - <rect key="frame" x="0.0" y="44" width="414" height="44"/> + <rect key="frame" x="0.0" y="44" width="390" height="44"/> <autoresizingMask key="autoresizingMask"/> </navigationBar> <nil name="viewControllers"/> @@ -557,7 +571,9 @@ </scene> </scenes> <resources> - <image name="hqdefault.jpeg" width="480" height="360"/> + <systemColor name="labelColor"> + <color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> + </systemColor> <systemColor name="opaqueSeparatorColor"> <color red="0.77647058823529413" green="0.77647058823529413" blue="0.78431372549019607" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </systemColor> @@ -567,5 +583,11 @@ <systemColor name="systemBrownColor"> <color red="0.63529411764705879" green="0.51764705882352946" blue="0.36862745098039218" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </systemColor> + <systemColor name="systemTealColor"> + <color red="0.18823529411764706" green="0.69019607843137254" blue="0.7803921568627451" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + </systemColor> + <systemColor name="systemYellowColor"> + <color red="1" green="0.80000000000000004" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + </systemColor> </resources> </document> diff --git a/Pendu/ViewController.swift b/Pendu/ViewController.swift index 1a822c61b772055ff1c59c15f889dea3e0ec3c79..81202d680c51554088e55fdae687a8c10b88bbb4 100644 --- a/Pendu/ViewController.swift +++ b/Pendu/ViewController.swift @@ -1,7 +1,30 @@ import UIKit +extension UIView { + func addBackgroundAcceuil(imageName: String = "fond_acceuil.png", contentMode: UIView.ContentMode = .scaleToFill) { + // setup the UIImageView + let backgroundImageView = UIImageView(frame: UIScreen.main.bounds) + backgroundImageView.image = UIImage(named: imageName) + backgroundImageView.contentMode = contentMode + backgroundImageView.translatesAutoresizingMaskIntoConstraints = false + + addSubview(backgroundImageView) + sendSubviewToBack(backgroundImageView) + + // adding NSLayoutConstraints + let leadingConstraint = NSLayoutConstraint(item: backgroundImageView, attribute: .leading, relatedBy: .equal, toItem: self, attribute: .leading, multiplier: 1.0, constant: 0.0) + let trailingConstraint = NSLayoutConstraint(item: backgroundImageView, attribute: .trailing, relatedBy: .equal, toItem: self, attribute: .trailing, multiplier: 1.0, constant: 0.0) + let topConstraint = NSLayoutConstraint(item: backgroundImageView, attribute: .top, relatedBy: .equal, toItem: self, attribute: .top, multiplier: 1.0, constant: 0.0) + let bottomConstraint = NSLayoutConstraint(item: backgroundImageView, attribute: .bottom, relatedBy: .equal, toItem: self, attribute: .bottom, multiplier: 1.0, constant: 0.0) + + NSLayoutConstraint.activate([leadingConstraint, trailingConstraint, topConstraint, bottomConstraint]) + } +} + class ViewController: UIViewController, UIPickerViewDataSource, UIPickerViewDelegate { + + @IBOutlet weak var classement: UIButton! @IBOutlet weak var pseudoinput: UITextField! @IBOutlet weak var choixTheme: UIPickerView! @@ -13,6 +36,7 @@ class ViewController: UIViewController, UIPickerViewDataSource, UIPickerViewDele override func viewDidLoad() { super.viewDidLoad() + view.addBackgroundAcceuil() choixTheme.dataSource = self choixTheme.delegate = self }