From a175e2944292bb21fe5fce5ac2d1b66b8b013461 Mon Sep 17 00:00:00 2001
From: Max Hunt <mh2817@ic.ac.uk>
Date: Wed, 3 Jul 2019 23:37:40 +0100
Subject: [PATCH] this is bullshit

---
 Guibe.xcodeproj/project.pbxproj               |   6 +-
 .../xcshareddata/xcschemes/Guibe.xcscheme     |  13 +-
 Guibe/3_StartViewController.swift             |   1 +
 Guibe/5_HandChoiceViewController.swift        |   2 +
 Guibe/6_SideChoiceViewController.swift        |   2 +
 Guibe/7_ReadyViewController.swift             |   1 +
 Guibe/AudioInstrViewController.swift          |   1 +
 Guibe/Base.lproj/Main.storyboard              | 121 +++++++++---------
 Guibe/GameLearnViewController.swift           |   1 +
 Guibe/MainViewController.swift                |   9 ++
 Guibe/ViewController.swift                    |   4 +
 11 files changed, 87 insertions(+), 74 deletions(-)

diff --git a/Guibe.xcodeproj/project.pbxproj b/Guibe.xcodeproj/project.pbxproj
index c338da1..4843203 100644
--- a/Guibe.xcodeproj/project.pbxproj
+++ b/Guibe.xcodeproj/project.pbxproj
@@ -437,11 +437,12 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = T87U8Q4BB3;
 				INFOPLIST_FILE = Guibe/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = icl.8.Guibes;
+				PRODUCT_BUNDLE_IDENTIFIER = icl.8.Guibe2;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
@@ -455,11 +456,12 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = T87U8Q4BB3;
 				INFOPLIST_FILE = Guibe/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = icl.8.Guibes;
+				PRODUCT_BUNDLE_IDENTIFIER = icl.8.Guibe2;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
diff --git a/Guibe.xcodeproj/xcshareddata/xcschemes/Guibe.xcscheme b/Guibe.xcodeproj/xcshareddata/xcschemes/Guibe.xcscheme
index d1865a9..d088ac9 100644
--- a/Guibe.xcodeproj/xcshareddata/xcschemes/Guibe.xcscheme
+++ b/Guibe.xcodeproj/xcshareddata/xcschemes/Guibe.xcscheme
@@ -27,8 +27,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
             ReferencedContainer = "container:Guibe.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -61,13 +59,6 @@
             ReferencedContainer = "container:Guibe.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-         <AdditionalOption
-            key = "NSZombieEnabled"
-            value = "YES"
-            isEnabled = "YES">
-         </AdditionalOption>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Guibe/3_StartViewController.swift b/Guibe/3_StartViewController.swift
index 9bd7ec6..3c0e26b 100644
--- a/Guibe/3_StartViewController.swift
+++ b/Guibe/3_StartViewController.swift
@@ -33,6 +33,7 @@ class S3artViewController: UIViewController, CLLocationManagerDelegate {
         let nextViewController = self.storyboard?.instantiateViewController(withIdentifier: "audioSet") as! AudioInstrViewController
 //        let nextViewController = self.storyboard?.instantiateViewController(withIdentifier: "screen5") as! H5ndChoiceViewController
         nextViewController.modalTransitionStyle = .crossDissolve
+        nextViewController.modalPresentationStyle = .fullScreen
         self.present(nextViewController, animated: true, completion: nil)
     }
     
diff --git a/Guibe/5_HandChoiceViewController.swift b/Guibe/5_HandChoiceViewController.swift
index ef60313..1bf45d3 100644
--- a/Guibe/5_HandChoiceViewController.swift
+++ b/Guibe/5_HandChoiceViewController.swift
@@ -21,12 +21,14 @@ class H5ndChoiceViewController: UIViewController {
         defaults.set(1, forKey: "handSide")
         let nextViewController = self.storyboard?.instantiateViewController(withIdentifier: "screen6") as! S6deChoiceViewController
         nextViewController.modalTransitionStyle = .crossDissolve
+        nextViewController.modalPresentationStyle = .fullScreen
         self.present(nextViewController, animated: true, completion: nil)
     }
     @IBAction func ritHandPressed(_ sender: Any) {
         defaults.set(2, forKey: "handSide")
         let nextViewController = self.storyboard?.instantiateViewController(withIdentifier: "screen6") as! S6deChoiceViewController
         nextViewController.modalTransitionStyle = .crossDissolve
+        nextViewController.modalPresentationStyle = .fullScreen
         self.present(nextViewController, animated: true, completion: nil)
     }
     
diff --git a/Guibe/6_SideChoiceViewController.swift b/Guibe/6_SideChoiceViewController.swift
index 8730c1b..90a2c33 100644
--- a/Guibe/6_SideChoiceViewController.swift
+++ b/Guibe/6_SideChoiceViewController.swift
@@ -21,12 +21,14 @@ class S6deChoiceViewController: UIViewController {
         defaults.set(1, forKey: "bigSide")
         let nextViewController = self.storyboard?.instantiateViewController(withIdentifier: "screen6_5") as! GameLearnViewController
         nextViewController.modalTransitionStyle = .crossDissolve
+        nextViewController.modalPresentationStyle = .fullScreen
         self.present(nextViewController, animated: true, completion: nil)
     }
     @IBAction func bottomBigPressed(_ sender: Any) {
         defaults.set(2, forKey: "bigSide")
         let nextViewController = self.storyboard?.instantiateViewController(withIdentifier: "screen6_5") as! GameLearnViewController
         nextViewController.modalTransitionStyle = .crossDissolve
+        nextViewController.modalPresentationStyle = .fullScreen
         self.present(nextViewController, animated: true, completion: nil)
     }
     
diff --git a/Guibe/7_ReadyViewController.swift b/Guibe/7_ReadyViewController.swift
index 9f20f7d..0dc439e 100644
--- a/Guibe/7_ReadyViewController.swift
+++ b/Guibe/7_ReadyViewController.swift
@@ -22,6 +22,7 @@ class R7adyViewController: UIViewController {
         DispatchQueue.main.asyncAfter(deadline: .now() + 2) {
             let nextViewController = self.storyboard?.instantiateViewController(withIdentifier: "mainScreen") as! MainViewController
             nextViewController.modalTransitionStyle = .crossDissolve
+            nextViewController.modalPresentationStyle = .fullScreen
             self.present(nextViewController, animated: true, completion: nil)
         }
         
diff --git a/Guibe/AudioInstrViewController.swift b/Guibe/AudioInstrViewController.swift
index 1cab5bf..3515572 100644
--- a/Guibe/AudioInstrViewController.swift
+++ b/Guibe/AudioInstrViewController.swift
@@ -56,6 +56,7 @@
         @IBAction func nextBtnPressed(_ sender: Any) {
             let nextViewController = self.storyboard?.instantiateViewController(withIdentifier: "screen5") as! H5ndChoiceViewController
             nextViewController.modalTransitionStyle = .crossDissolve
+            nextViewController.modalPresentationStyle = .fullScreen
             self.present(nextViewController, animated: true, completion: nil)
         }
         
diff --git a/Guibe/Base.lproj/Main.storyboard b/Guibe/Base.lproj/Main.storyboard
index 8de151a..f378f00 100644
--- a/Guibe/Base.lproj/Main.storyboard
+++ b/Guibe/Base.lproj/Main.storyboard
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14810.12" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+    <device id="retina6_5" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14766.15"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -14,7 +13,7 @@
             <objects>
                 <viewController id="BYZ-38-t0r" customClass="ViewController" customModule="Guibe" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="LoadScreen" translatesAutoresizingMaskIntoConstraints="NO" id="oNd-dx-rFl">
@@ -38,7 +37,7 @@
             <objects>
                 <viewController storyboardIdentifier="screen3" useStoryboardIdentifierAsRestorationIdentifier="YES" id="S0e-nc-j2W" customClass="S3artViewController" customModule="Guibe" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="e0K-tK-Xb4">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="startScreen" highlightedImage="startScreen" translatesAutoresizingMaskIntoConstraints="NO" id="MAO-Q8-WFo">
@@ -46,7 +45,7 @@
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             </imageView>
                             <button opaque="NO" contentMode="scaleAspectFit" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Vc2-EO-nFa">
-                                <rect key="frame" x="91.411398265853677" y="669" width="228.99999999999977" height="59.999999999999915"/>
+                                <rect key="frame" x="91.411398265853677" y="669" width="228.99999999999977" height="59.999999999999886"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <state key="normal" backgroundImage="startBtn"/>
                                 <connections>
@@ -88,16 +87,9 @@
             <objects>
                 <viewController storyboardIdentifier="audioSet" useStoryboardIdentifierAsRestorationIdentifier="YES" id="Lyg-Zw-BYT" customClass="AudioInstrViewController" customModule="Guibe" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="lGA-WW-NXa">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Audio Instructions" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Uis-Id-5Oa">
-                                <rect key="frame" x="79" y="54" width="256" height="36"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <fontDescription key="fontDescription" type="boldSystem" pointSize="30"/>
-                                <nil key="textColor"/>
-                                <nil key="highlightedColor"/>
-                            </label>
                             <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="leading" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mRg-bz-h0I">
                                 <rect key="frame" x="27" y="144" width="360" height="51"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
@@ -173,10 +165,18 @@
                                     <action selector="nextBtnPressed:" destination="Lyg-Zw-BYT" eventType="touchUpInside" id="3rH-U8-xf4"/>
                                 </connections>
                             </button>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Audio Instructions" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Uis-Id-5Oa">
+                                <rect key="frame" x="79" y="54" width="256" height="36"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="boldSystem" pointSize="30"/>
+                                <color key="textColor" red="1" green="0.14913141730000001" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <viewLayoutGuide key="safeArea" id="LBL-gp-rVB"/>
                     </view>
+                    <navigationItem key="navigationItem" id="V1q-vh-VvI"/>
                     <connections>
                         <outlet property="b1" destination="mRg-bz-h0I" id="GKf-aO-Kys"/>
                         <outlet property="b2" destination="vxx-Z6-SOS" id="Jcv-ej-w3E"/>
@@ -196,7 +196,7 @@
             <objects>
                 <viewController storyboardIdentifier="screen5" useStoryboardIdentifierAsRestorationIdentifier="YES" id="1fA-dZ-9ei" customClass="H5ndChoiceViewController" customModule="Guibe" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="yFE-3g-5Bb">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <button opaque="NO" contentMode="scaleAspectFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gt2-6x-6Ha">
@@ -269,7 +269,7 @@ to wear Guibe?</string>
             <objects>
                 <viewController storyboardIdentifier="screen6" useStoryboardIdentifierAsRestorationIdentifier="YES" id="Y31-kj-JwL" customClass="S6deChoiceViewController" customModule="Guibe" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="mMu-dE-sY9">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <button opaque="NO" contentMode="scaleAspectFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="knf-O9-7aw">
@@ -342,11 +342,11 @@ wear Guibe?</string>
             <objects>
                 <viewController storyboardIdentifier="screen6_5" useStoryboardIdentifierAsRestorationIdentifier="YES" id="5T0-tQ-Zc3" customClass="GameLearnViewController" customModule="Guibe" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="2XH-El-mte">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <progressView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" fixedFrame="YES" progressViewStyle="bar" translatesAutoresizingMaskIntoConstraints="NO" id="oRi-Kv-h1c">
-                                <rect key="frame" x="20" y="836.33333333333337" width="374" height="1.6666666666666665"/>
+                                <rect key="frame" x="20" y="836.33333333333337" width="374" height="2.6666666666666288"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <color key="tintColor" red="1" green="0.14913141730000001" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -405,7 +405,7 @@ wear Guibe?</string>
             <objects>
                 <viewController storyboardIdentifier="screen7" useStoryboardIdentifierAsRestorationIdentifier="YES" id="lTn-Ln-RFg" customClass="R7adyViewController" customModule="Guibe" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="6A0-Zn-hBC">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="welcome2Screen" highlightedImage="startScreen" translatesAutoresizingMaskIntoConstraints="NO" id="ZIq-iO-Wdz">
@@ -433,7 +433,7 @@ wear Guibe?</string>
             <objects>
                 <viewController storyboardIdentifier="mainScreen" useStoryboardIdentifierAsRestorationIdentifier="YES" id="Ovf-sw-BKp" customClass="MainViewController" customModule="Guibe" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="x4u-9U-kMO">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <mapView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" fixedFrame="YES" mapType="standard" translatesAutoresizingMaskIntoConstraints="NO" id="Bex-Mk-DDO">
@@ -447,9 +447,9 @@ wear Guibe?</string>
                                     <button opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3Xt-Rr-hs1" userLabel="searchBarBg">
                                         <rect key="frame" x="0.0" y="8" width="374" height="59"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                        <color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                        <state key="normal" backgroundImage="searchBar">
+                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <color key="tintColor" cocoaTouchSystemColor="viewFlipsideBackgroundColor"/>
+                                        <state key="normal">
                                             <color key="titleColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         </state>
                                     </button>
@@ -505,7 +505,7 @@ wear Guibe?</string>
                                     <action selector="headingBtnPressed:" destination="Ovf-sw-BKp" eventType="touchUpInside" id="ZlX-6a-RgF"/>
                                 </connections>
                             </button>
-                            <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="J48-J9-3Mc">
+                            <view alpha="0.0" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="J48-J9-3Mc">
                                 <rect key="frame" x="-34" y="-24" width="347" height="489"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <subviews>
@@ -716,7 +716,7 @@ wear Guibe?</string>
             <objects>
                 <viewController storyboardIdentifier="resultsScreen" useStoryboardIdentifierAsRestorationIdentifier="YES" id="jBr-V0-GbL" customClass="TableViewController" customModule="Guibe" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="Rps-Dk-rvQ">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="100" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="402-5S-nhO">
@@ -728,7 +728,7 @@ wear Guibe?</string>
                                         <rect key="frame" x="0.0" y="28" width="414" height="90"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="87K-Xo-0a5" id="2HV-Qz-1Wd" customClass="NewTableViewCell" customModule="Guibe" customModuleProvider="target">
-                                            <rect key="frame" x="0.0" y="0.0" width="414" height="89.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="414" height="90"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9iK-CB-Rc6">
@@ -803,7 +803,7 @@ wear Guibe?</string>
             <objects>
                 <viewController storyboardIdentifier="settingsScn" useStoryboardIdentifierAsRestorationIdentifier="YES" id="C7R-cA-IIg" customClass="settingsViewController" customModule="Guibe" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="LsY-LB-als">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="842"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="serparator" translatesAutoresizingMaskIntoConstraints="NO" id="5OC-U4-KxU">
@@ -946,7 +946,7 @@ wear Guibe?</string>
             <objects>
                 <viewController storyboardIdentifier="ivc" useStoryboardIdentifierAsRestorationIdentifier="YES" id="Obs-kC-EBO" customClass="InstructionsViewController" customModule="Guibe" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="C7n-A7-fCY">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="842"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="uJJ-lQ-GmO">
@@ -1014,7 +1014,7 @@ wear Guibe?</string>
             <objects>
                 <viewController id="EcN-9C-GZO" customClass="WrittenInstructionsViewController" customModule="Guibe" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="ytx-yX-XHi">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="842"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="70" estimatedRowHeight="70" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="YPD-fc-WvS">
@@ -1026,7 +1026,7 @@ wear Guibe?</string>
                                         <rect key="frame" x="0.0" y="28" width="414" height="70"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="bUS-jX-rKe" id="Uzf-uP-EpB">
-                                            <rect key="frame" x="0.0" y="0.0" width="414" height="69.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="414" height="70"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                         </tableViewCellContentView>
                                     </tableViewCell>
@@ -1076,7 +1076,7 @@ wear Guibe?</string>
             <objects>
                 <viewController id="JpF-eY-5Vc" customClass="setupTextInstructionsViewController" customModule="Guibe" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="nwg-o1-bZ9">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="842"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="serparator" translatesAutoresizingMaskIntoConstraints="NO" id="VWq-dC-HGJ">
@@ -1138,7 +1138,7 @@ And that’s all you need to know to follow the vibe!</string>
             <objects>
                 <viewController id="Z1d-IC-mUl" customClass="VideoInstrictionsViewController" customModule="Guibe" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="5kX-Rk-2ip">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="842"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="serparator" translatesAutoresizingMaskIntoConstraints="NO" id="Jsy-ZZ-va0">
@@ -1249,7 +1249,7 @@ And that’s all you need to know to follow the vibe!</string>
             <objects>
                 <viewController id="fQI-eI-vgI" customClass="TechSpecsViewController" customModule="Guibe" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="qTR-ky-aoo">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="serparator" translatesAutoresizingMaskIntoConstraints="NO" id="jLf-nt-C32">
@@ -1307,11 +1307,11 @@ And that’s all you need to know to follow the vibe!</string>
             <objects>
                 <viewController id="ppL-gd-4JI" customClass="SecondGameLearnViewController" customModule="Guibe" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="w1b-M5-Yp6">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="842"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <progressView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" fixedFrame="YES" progressViewStyle="bar" translatesAutoresizingMaskIntoConstraints="NO" id="OwN-Ov-RpE">
-                                <rect key="frame" x="20" y="861" width="374" height="1.6666666666666665"/>
+                                <rect key="frame" x="20" y="861" width="374" height="2.6666666666666288"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <color key="backgroundColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <color key="tintColor" red="1" green="0.27450980390000002" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -1382,7 +1382,7 @@ And that’s all you need to know to follow the vibe!</string>
             <objects>
                 <viewController id="FXb-No-u4u" customClass="SecretsViewController" customModule="Guibe" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="D5y-fs-KxB">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="842"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Secret Menu" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qR2-Bn-PxO">
@@ -1424,7 +1424,7 @@ And that’s all you need to know to follow the vibe!</string>
                                 </connections>
                             </button>
                             <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="rfz-lB-HGC">
-                                <rect key="frame" x="307" y="153" width="49" height="31"/>
+                                <rect key="frame" x="307" y="153" width="51" height="31"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <connections>
                                     <action selector="valueToggled:" destination="FXb-No-u4u" eventType="valueChanged" id="A3J-qr-Zmg"/>
@@ -1459,27 +1459,26 @@ And that’s all you need to know to follow the vibe!</string>
         </scene>
     </scenes>
     <resources>
-        <image name="LoadScreen" width="442" height="957"/>
-        <image name="appLogo" width="512" height="512"/>
-        <image name="blank" width="472" height="114"/>
-        <image name="buttonMedSize" width="310.5" height="125"/>
-        <image name="circle" width="863" height="852.5"/>
-        <image name="guibeWord" width="376" height="150"/>
-        <image name="headingButton" width="512.5" height="512.5"/>
-        <image name="menuBtnImg" width="512" height="512"/>
-        <image name="naviStartedImg" width="579" height="1258"/>
-        <image name="nextBtn" width="743" height="272"/>
-        <image name="playAgainBtn" width="895" height="344"/>
-        <image name="s1l" width="452" height="522"/>
-        <image name="s1r" width="653" height="715"/>
-        <image name="s2b" width="771.5" height="760.5"/>
-        <image name="s2t" width="742" height="735"/>
-        <image name="searchBar" width="858.5" height="143"/>
-        <image name="serparator" width="1106" height="21"/>
-        <image name="settingsScreen" width="420" height="912"/>
-        <image name="startBtn" width="260" height="71.5"/>
-        <image name="startScreen" width="446" height="968"/>
-        <image name="stop" width="256" height="256"/>
-        <image name="welcome2Screen" width="424" height="925"/>
+        <image name="LoadScreen" width="294.66665649414062" height="638"/>
+        <image name="appLogo" width="341.33334350585938" height="341.33334350585938"/>
+        <image name="blank" width="314.66665649414062" height="76"/>
+        <image name="buttonMedSize" width="207" height="83.333335876464844"/>
+        <image name="circle" width="575.33331298828125" height="568.33331298828125"/>
+        <image name="guibeWord" width="250.66667175292969" height="100"/>
+        <image name="headingButton" width="341.66665649414062" height="341.66665649414062"/>
+        <image name="menuBtnImg" width="341.33334350585938" height="341.33334350585938"/>
+        <image name="naviStartedImg" width="386" height="838.66668701171875"/>
+        <image name="nextBtn" width="495.33334350585938" height="181.33332824707031"/>
+        <image name="playAgainBtn" width="596.66668701171875" height="229.33332824707031"/>
+        <image name="s1l" width="301.33334350585938" height="348"/>
+        <image name="s1r" width="435.33334350585938" height="476.66665649414062"/>
+        <image name="s2b" width="514.33331298828125" height="507"/>
+        <image name="s2t" width="494.66665649414062" height="490"/>
+        <image name="serparator" width="737.33331298828125" height="14"/>
+        <image name="settingsScreen" width="280" height="608"/>
+        <image name="startBtn" width="173.33332824707031" height="47.666667938232422"/>
+        <image name="startScreen" width="297.33334350585938" height="645.33331298828125"/>
+        <image name="stop" width="170.66667175292969" height="170.66667175292969"/>
+        <image name="welcome2Screen" width="282.66665649414062" height="616.66668701171875"/>
     </resources>
 </document>
diff --git a/Guibe/GameLearnViewController.swift b/Guibe/GameLearnViewController.swift
index 29ce14c..d0229d8 100644
--- a/Guibe/GameLearnViewController.swift
+++ b/Guibe/GameLearnViewController.swift
@@ -161,6 +161,7 @@ class GameLearnViewController: UIViewController, AVAudioPlayerDelegate {
     func nextPage() {
         let nextViewController = self.storyboard?.instantiateViewController(withIdentifier: "screen7") as! R7adyViewController
         nextViewController.modalTransitionStyle = .crossDissolve
+        nextViewController.modalPresentationStyle = .fullScreen
         self.present(nextViewController, animated: true, completion: nil)
     }
     
diff --git a/Guibe/MainViewController.swift b/Guibe/MainViewController.swift
index 9d35db9..b653356 100644
--- a/Guibe/MainViewController.swift
+++ b/Guibe/MainViewController.swift
@@ -149,6 +149,8 @@ class MainViewController: UIViewController, AVAudioPlayerDelegate, myProtocol {
     override func viewDidLoad() {
         super.viewDidLoad()
         
+        overrideUserInterfaceStyle = .light
+        
         let debugVar = defaults.integer(forKey: "debug")
         
         if debugVar == 2 {
@@ -165,6 +167,9 @@ class MainViewController: UIViewController, AVAudioPlayerDelegate, myProtocol {
         searchBarBg.layer.shadowRadius = 10
         searchBarBg.layer.shadowOpacity = 0.2
         
+        
+        
+        
         keybDismissBtn.isHidden = true
         
         menuWindowView.alpha = 0.0
@@ -225,6 +230,8 @@ class MainViewController: UIViewController, AVAudioPlayerDelegate, myProtocol {
         arrivedAtDestinationBtn.layer.shadowOffset = CGSize(width: 5, height: 7)
         arrivedAtDestinationBtn.layer.shadowRadius = 50
         arrivedAtDestinationBtn.layer.shadowOpacity = 0.6
+        
+        
 
         menuBtn.accessibilityLabel = "Menu"
         headingButton.accessibilityLabel = "Heading"
@@ -522,6 +529,8 @@ extension MainViewController: CLLocationManagerDelegate {
             }}))
         self.present(alert, animated: true, completion: nil)
     }
+    
+    
 }
 
 
diff --git a/Guibe/ViewController.swift b/Guibe/ViewController.swift
index c5e0724..993d5eb 100644
--- a/Guibe/ViewController.swift
+++ b/Guibe/ViewController.swift
@@ -24,7 +24,9 @@ class ViewController: UIViewController {
             DispatchQueue.main.asyncAfter(deadline: .now() + 2) {
                 let nextViewController = self.storyboard?.instantiateViewController(withIdentifier: "screen3") as! S3artViewController
                 nextViewController.modalTransitionStyle = .crossDissolve
+                nextViewController.modalPresentationStyle = .fullScreen
                 self.present(nextViewController, animated: true, completion: nil)
+//                self.show(nextViewController, sender: self)
             }
         }
         
@@ -32,6 +34,8 @@ class ViewController: UIViewController {
             DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
                 let nextViewController = self.storyboard?.instantiateViewController(withIdentifier: "mainScreen") as! MainViewController
                 nextViewController.modalTransitionStyle = .crossDissolve
+//                self.show(nextViewController, sender: self)
+                nextViewController.modalPresentationStyle = .fullScreen
                 self.present(nextViewController, animated: true, completion: nil)
             }
         }