diff --git a/Pendu.xcodeproj/project.pbxproj b/Pendu.xcodeproj/project.pbxproj index f90f64d76555e8cb826a48c720d036bf4ed78470..ea68e0e4daa1bde953e74aa50c2008a5a1116724 100644 --- a/Pendu.xcodeproj/project.pbxproj +++ b/Pendu.xcodeproj/project.pbxproj @@ -9,16 +9,15 @@ /* Begin PBXBuildFile section */ BF3C480E2A0A1FCA00CE128F /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF3C480D2A0A1FCA00CE128F /* AppDelegate.swift */; }; BF3C48102A0A1FCA00CE128F /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF3C480F2A0A1FCA00CE128F /* SceneDelegate.swift */; }; - BF3C48122A0A1FCA00CE128F /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF3C48112A0A1FCA00CE128F /* ViewController.swift */; }; - BF3C48152A0A1FCA00CE128F /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = BF3C48132A0A1FCA00CE128F /* Main.storyboard */; }; + BF3C48122A0A1FCA00CE128F /* GameViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF3C48112A0A1FCA00CE128F /* GameViewController.swift */; }; BF3C48182A0A1FCA00CE128F /* Pendu.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = BF3C48162A0A1FCA00CE128F /* Pendu.xcdatamodeld */; }; BF3C481A2A0A1FCD00CE128F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BF3C48192A0A1FCD00CE128F /* Assets.xcassets */; }; BF3C481D2A0A1FCD00CE128F /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = BF3C481B2A0A1FCD00CE128F /* LaunchScreen.storyboard */; }; BF3C48282A0A1FCD00CE128F /* PenduTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF3C48272A0A1FCD00CE128F /* PenduTests.swift */; }; BF3C48322A0A1FCD00CE128F /* PenduUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF3C48312A0A1FCD00CE128F /* PenduUITests.swift */; }; BF3C48342A0A1FCD00CE128F /* PenduUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF3C48332A0A1FCD00CE128F /* PenduUITestsLaunchTests.swift */; }; - F817CE902A13AD0C0078F0A5 /* ButtonTemplate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F817CE8F2A13AD0C0078F0A5 /* ButtonTemplate.swift */; }; F817CE932A13B9DD0078F0A5 /* whatever it takes.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F817CE922A13B9DC0078F0A5 /* whatever it takes.ttf */; }; + F8B49FB42A25E67600750A52 /* Game.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = BF3C48132A0A1FCA00CE128F /* Game.storyboard */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -42,8 +41,8 @@ BF3C480A2A0A1FCA00CE128F /* Pendu.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Pendu.app; sourceTree = BUILT_PRODUCTS_DIR; }; BF3C480D2A0A1FCA00CE128F /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; }; BF3C480F2A0A1FCA00CE128F /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; }; - BF3C48112A0A1FCA00CE128F /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; }; - BF3C48142A0A1FCA00CE128F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; }; + BF3C48112A0A1FCA00CE128F /* GameViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameViewController.swift; sourceTree = "<group>"; }; + BF3C48142A0A1FCA00CE128F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Game.storyboard; sourceTree = "<group>"; }; BF3C48172A0A1FCA00CE128F /* Pendu.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Pendu.xcdatamodel; sourceTree = "<group>"; }; BF3C48192A0A1FCD00CE128F /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; }; BF3C481C2A0A1FCD00CE128F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; }; @@ -53,7 +52,6 @@ BF3C482D2A0A1FCD00CE128F /* PenduUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PenduUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; BF3C48312A0A1FCD00CE128F /* PenduUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PenduUITests.swift; sourceTree = "<group>"; }; BF3C48332A0A1FCD00CE128F /* PenduUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PenduUITestsLaunchTests.swift; sourceTree = "<group>"; }; - F817CE8F2A13AD0C0078F0A5 /* ButtonTemplate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ButtonTemplate.swift; sourceTree = "<group>"; }; F817CE922A13B9DC0078F0A5 /* whatever it takes.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "whatever it takes.ttf"; sourceTree = "<group>"; }; /* End PBXFileReference section */ @@ -108,9 +106,8 @@ F817CE912A13B99F0078F0A5 /* Font */, BF3C480D2A0A1FCA00CE128F /* AppDelegate.swift */, BF3C480F2A0A1FCA00CE128F /* SceneDelegate.swift */, - BF3C48112A0A1FCA00CE128F /* ViewController.swift */, - F817CE8F2A13AD0C0078F0A5 /* ButtonTemplate.swift */, - BF3C48132A0A1FCA00CE128F /* Main.storyboard */, + BF3C48112A0A1FCA00CE128F /* GameViewController.swift */, + BF3C48132A0A1FCA00CE128F /* Game.storyboard */, BF3C48192A0A1FCD00CE128F /* Assets.xcassets */, BF3C481B2A0A1FCD00CE128F /* LaunchScreen.storyboard */, BF3C481E2A0A1FCD00CE128F /* Info.plist */, @@ -248,10 +245,10 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + F8B49FB42A25E67600750A52 /* Game.storyboard in Resources */, F817CE932A13B9DD0078F0A5 /* whatever it takes.ttf in Resources */, BF3C481D2A0A1FCD00CE128F /* LaunchScreen.storyboard in Resources */, BF3C481A2A0A1FCD00CE128F /* Assets.xcassets in Resources */, - BF3C48152A0A1FCA00CE128F /* Main.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -276,8 +273,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - BF3C48122A0A1FCA00CE128F /* ViewController.swift in Sources */, - F817CE902A13AD0C0078F0A5 /* ButtonTemplate.swift in Sources */, + BF3C48122A0A1FCA00CE128F /* GameViewController.swift in Sources */, BF3C480E2A0A1FCA00CE128F /* AppDelegate.swift in Sources */, BF3C48182A0A1FCA00CE128F /* Pendu.xcdatamodeld in Sources */, BF3C48102A0A1FCA00CE128F /* SceneDelegate.swift in Sources */, @@ -317,12 +313,12 @@ /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ - BF3C48132A0A1FCA00CE128F /* Main.storyboard */ = { + BF3C48132A0A1FCA00CE128F /* Game.storyboard */ = { isa = PBXVariantGroup; children = ( BF3C48142A0A1FCA00CE128F /* Base */, ); - name = Main.storyboard; + name = Game.storyboard; sourceTree = "<group>"; }; BF3C481B2A0A1FCD00CE128F /* LaunchScreen.storyboard */ = { diff --git a/Pendu/Base.lproj/Main.storyboard b/Pendu/Base.lproj/Game.storyboard similarity index 100% rename from Pendu/Base.lproj/Main.storyboard rename to Pendu/Base.lproj/Game.storyboard diff --git a/Pendu/ViewController.swift b/Pendu/GameViewController.swift similarity index 98% rename from Pendu/ViewController.swift rename to Pendu/GameViewController.swift index 42033e537edc3b0f7cfa24e148c8e31616190b62..17e9d49b1f914982de2a884341ddbc172480772a 100644 --- a/Pendu/ViewController.swift +++ b/Pendu/GameViewController.swift @@ -30,6 +30,8 @@ extension UIView { class ViewController: UIViewController { + let mainstoryboard = UIStoryboard(name: "Game", bundle: nil) + @IBOutlet weak var wordLabel: UILabel! @IBOutlet weak var A_Button: UIButton! @@ -153,7 +155,7 @@ class ViewController: UIViewController { view.addSubview(imageView) } - let wordToGess = "VOITURE BLEU" + let wordToGess = "PENDU" var currentWordState = "" override func viewDidLoad() {