Skip to content
Snippets Groups Projects
Commit 6dd843a2 authored by yanis's avatar yanis
Browse files

Merge remote-tracking branch 'refs/remotes/origin/feature/lien_interface'

parents b852e4a6 83e8ab92
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Pendu/Base.lproj/Main.storyboard
+ 48
− 3
View file @ 6dd843a2
......@@ -49,7 +49,7 @@
<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"/>
<segue destination="NpT-5q-8iC" kind="show" id="0UP-m3-NzU"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Rxj-5T-1Nw">
......@@ -86,7 +86,7 @@
<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"/>
<segue destination="aQz-4m-G2v" kind="show" id="UXc-h0-Uzj"/>
</connections>
</button>
</subviews>
......@@ -97,7 +97,6 @@
<connections>
<outlet property="choixNiv" destination="NvB-ZN-BTJ" id="fAA-St-woR"/>
<outlet property="choixTheme" destination="LNU-nY-Uyk" id="Fff-Y6-Z8A"/>
<outlet property="classement" destination="lae-hh-psQ" id="YEG-ma-abh"/>
<outlet property="pseudoinput" destination="iRK-mL-RC3" id="v77-OK-9QK"/>
</connections>
</viewController>
......@@ -105,6 +104,29 @@
</objects>
<point key="canvasLocation" x="275.38461538461536" y="72.511848341232223"/>
</scene>
<!--View Controller-->
<scene sceneID="l4M-7k-UUe">
<objects>
<viewController id="aQz-4m-G2v" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="jFk-yG-B96">
<rect key="frame" x="0.0" y="0.0" width="390" height="844"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="reH-wE-BOx">
<rect key="frame" x="37" y="138" width="312" height="561"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
</tableView>
</subviews>
<viewLayoutGuide key="safeArea" id="N0d-E2-OLY"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
</view>
<navigationItem key="navigationItem" id="MWc-6A-tgg"/>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="zoG-p9-fvl" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="1112" y="-680"/>
</scene>
<!--Partie-->
<scene sceneID="LqT-Za-AMF">
<objects>
......@@ -551,6 +573,29 @@
</objects>
<point key="canvasLocation" x="1113.0434782608697" y="72.991071428571431"/>
</scene>
<!--View Controller-->
<scene sceneID="DOp-cS-lmI">
<objects>
<viewController id="NpT-5q-8iC" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="lxZ-hk-aBd">
<rect key="frame" x="0.0" y="0.0" width="390" height="844"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="6qe-0q-g54">
<rect key="frame" x="43" y="197" width="308" height="491"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
</tableView>
</subviews>
<viewLayoutGuide key="safeArea" id="5W1-ma-4ti"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
</view>
<navigationItem key="navigationItem" id="oJn-Ow-Ppk"/>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="lSg-hU-biK" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-369.23076923076923" y="-673.2227488151658"/>
</scene>
<!--Accueil-->
<scene sceneID="v2s-Cx-8QZ">
<objects>
......
Pendu/ViewController.swift
+ 8
− 1
View file @ 6dd843a2
......@@ -24,13 +24,20 @@ extension UIView {
class ViewController: UIViewController, UIPickerViewDataSource, UIPickerViewDelegate {
@IBAction func ranking(_ sender: Any) {
}
@IBAction func myScore(_ sender: Any) {
}
@IBOutlet weak var classement: UIButton!
@IBOutlet weak var pseudoinput: UITextField!
@IBOutlet weak var choixTheme: UIPickerView!
@IBOutlet weak var choixNiv: UISegmentedControl!
@IBAction func ank(_ sender: Any) {
}
var wordToGuess : String = ""
let pickerData = ["Animals", "Sports", "Food", "Cities", "Colors"]
let gameEngine : GameEngine = GameEngine()
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment