From b852e4a62091ffe672589b7a7f06c0b639fd582e Mon Sep 17 00:00:00 2001 From: yanis <flkefefe@gmail.com> Date: Tue, 6 Jun 2023 11:36:57 +0200 Subject: [PATCH] ajustement couleur bon accueil --- Pendu/Base.lproj/Main.storyboard | 14 ++++---------- Pendu/ViewController.swift | 1 + 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/Pendu/Base.lproj/Main.storyboard b/Pendu/Base.lproj/Main.storyboard index b84685f..7401e9d 100644 --- a/Pendu/Base.lproj/Main.storyboard +++ b/Pendu/Base.lproj/Main.storyboard @@ -46,19 +46,19 @@ </attributes> </fragment> </attributedString> - <color key="baseBackgroundColor" systemColor="systemYellowColor"/> + <color key="baseBackgroundColor" red="0.91485461992086825" green="0.72546671504217852" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </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="89" y="621" width="212" height="39"/> + <rect key="frame" x="28" y="621" width="335" height="39"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <state key="normal" title="Button"/> <buttonConfiguration key="configuration" style="filled" title="Start game"> <fontDescription key="titleFontDescription" style="UICTFontTextStyleTitle3"/> - <color key="baseBackgroundColor" systemColor="systemTealColor"/> + <color key="baseBackgroundColor" red="0.16242280080033861" green="0.61513349139014162" blue="0.69163225280749385" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </buttonConfiguration> <connections> <action selector="LancerPartie:" destination="BYZ-38-t0r" eventType="touchUpInside" id="ccG-OM-Emx"/> @@ -83,7 +83,7 @@ </attributes> </fragment> </attributedString> - <color key="baseBackgroundColor" systemColor="systemYellowColor"/> + <color key="baseBackgroundColor" red="0.91485461990000005" green="0.72546671500000004" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </buttonConfiguration> <connections> <action selector="AfficherClassement:" destination="BYZ-38-t0r" eventType="touchUpInside" id="7El-p9-KHs"/> @@ -583,11 +583,5 @@ <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 81202d6..aab2577 100644 --- a/Pendu/ViewController.swift +++ b/Pendu/ViewController.swift @@ -29,6 +29,7 @@ class ViewController: UIViewController, UIPickerViewDataSource, UIPickerViewDele @IBOutlet weak var pseudoinput: UITextField! @IBOutlet weak var choixTheme: UIPickerView! @IBOutlet weak var choixNiv: UISegmentedControl! + var wordToGuess : String = "" let pickerData = ["Animals", "Sports", "Food", "Cities", "Colors"] -- GitLab