Guibe.xcodeproj/project.pbxproj

@@ -437,15 +437,14 @@
 				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.Guibe2;
+				PRODUCT_BUNDLE_IDENTIFIER = icl.8.Guibes;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = 1;
+				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
 		};
@@ -456,15 +455,14 @@
 				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.Guibe2;
+				PRODUCT_BUNDLE_IDENTIFIER = icl.8.Guibes;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = 1;
+				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
 		};

Guibe.xcodeproj/xcshareddata/xcschemes/Guibe.xcscheme

@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1020"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "50A7ADD0229D6A4200D58743"
-               BuildableName = "Guibe.app"
-               BlueprintName = "Guibe"
-               ReferencedContainer = "container:Guibe.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "50A7ADD0229D6A4200D58743"
-            BuildableName = "Guibe.app"
-            BlueprintName = "Guibe"
-            ReferencedContainer = "container:Guibe.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "50A7ADD0229D6A4200D58743"
-            BuildableName = "Guibe.app"
-            BlueprintName = "Guibe"
-            ReferencedContainer = "container:Guibe.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "50A7ADD0229D6A4200D58743"
-            BuildableName = "Guibe.app"
-            BlueprintName = "Guibe"
-            ReferencedContainer = "container:Guibe.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

Guibe/3_StartViewController.swift

@@ -33,7 +33,6 @@ 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)
     }
     

Guibe/5_HandChoiceViewController.swift

@@ -14,9 +14,6 @@ class H5ndChoiceViewController: UIViewController {
     @IBOutlet weak var rBtn: UIButton!
     @IBOutlet weak var textLbl: UITextView!
     @IBOutlet weak var altLbl: UILabel!
-    @IBOutlet var vCtrl: UIView!
-    @IBOutlet weak var lHand: UIButton!
-    @IBOutlet weak var rHand: UIButton!
     
     let defaults = UserDefaults.standard
     
@@ -24,22 +21,17 @@ 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)
     }
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        altLbl.textColor = UIColor.secondaryLabel
-        vCtrl.backgroundColor = UIColor.secondarySystemBackground
-        
         lBtn.accessibilityLabel = "Left Hand"
         rBtn.accessibilityLabel = "Right Hand"
         textLbl.accessibilityLabel = "where would you like to wear ghibe"

Guibe/6_SideChoiceViewController.swift

@@ -14,8 +14,6 @@ class S6deChoiceViewController: UIViewController {
     @IBOutlet weak var sBtn: UIButton!
     @IBOutlet weak var textLbl: UITextView!
     @IBOutlet weak var altLbl: UILabel!
-    @IBOutlet var vCtrl: UIView!
-    
     
     let defaults = UserDefaults.standard
     
@@ -23,23 +21,18 @@ 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)
     }
     
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        vCtrl.backgroundColor = UIColor.secondarySystemBackground
-        textLbl.textColor = UIColor.secondaryLabel
-        
         bTtn.accessibilityLabel = "Big on top"
         sBtn.accessibilityLabel = "Small on top"
         textLbl.accessibilityLabel = "How would you like to wear ghibe"

Guibe/7_ReadyViewController.swift

@@ -22,7 +22,6 @@ 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)
         }
         

Guibe/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,16 +1,28 @@
 {
   "images" : [
-    {
+	{
       "size" : "20x20",
-      "idiom" : "iphone",
+      "idiom": "iphone",
-      "filename" : "appLogo-20@2x.png",
+	  "filename" : "appLogo-20@2x.png",
-      "scale" : "2x"
+      "scale": "2x"
+    },
+	{
+      "size" : "20x20",
+      "idiom": "iphone",
+	  "filename" : "appLogo-20@3x.png",
+      "scale": "3x"
+    },
+	{
+      "size" : "20x20",
+      "idiom": "ipad",
+	  "filename" : "appLogo-20.png",
+      "scale": "1x"
     },
     {
       "size" : "20x20",
-      "idiom" : "iphone",
+      "idiom": "ipad",
-      "filename" : "appLogo-20@3x.png",
+	  "filename" : "appLogo-20@2x.png",
-      "scale" : "3x"
+      "scale": "2x"
     },
     {
       "size" : "29x29",
@@ -48,18 +60,6 @@
       "filename" : "appLogo-60@3x.png",
       "scale" : "3x"
     },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "appLogo-20.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "appLogo-20@2x.png",
-      "scale" : "2x"
-    },
     {
       "size" : "29x29",
       "idiom" : "ipad",
@@ -113,4 +113,4 @@
     "version" : 1,
     "author" : "xcode"
   }
-}
+}

Guibe/Assets.xcassets/LoadScreen.imageset/Contents.json

@@ -2,50 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "g.png",
+      "filename" : "Screenshot 2019-05-28 at 14.09.29.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "g-dark.png",
+      "filename" : "Screenshot 2019-05-28 at 14.09.29-1.png",
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "g-1.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "g-dark-1.png",
+      "filename" : "Screenshot 2019-05-28 at 14.09.29-2.png",
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "g-2.png",
-      "scale" : "3x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "g-dark-2.png",
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
       "scale" : "3x"
     }
   ],

Guibe/Assets.xcassets/SetLblColour.colorset/Contents.json

@@ -1,38 +0,0 @@
-{
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  },
-  "colors" : [
-    {
-      "idiom" : "universal",
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "red" : "1.000",
-          "alpha" : "1.000",
-          "blue" : "0.000",
-          "green" : "0.179"
-        }
-      }
-    },
-    {
-      "idiom" : "universal",
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "red" : "0.673",
-          "alpha" : "1.000",
-          "blue" : "0.180",
-          "green" : "0.144"
-        }
-      }
-    }
-  ]
-}

Guibe/Assets.xcassets/appLogo.imageset/Contents.json

@@ -5,48 +5,15 @@
       "filename" : "appLogo.png",
       "scale" : "1x"
     },
-    {
-      "idiom" : "universal",
-      "filename" : "ad.png",
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "scale" : "1x"
-    },
     {
       "idiom" : "universal",
       "filename" : "appLogo-1.png",
       "scale" : "2x"
     },
-    {
-      "idiom" : "universal",
-      "filename" : "ad-1.png",
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "scale" : "2x"
-    },
     {
       "idiom" : "universal",
       "filename" : "appLogo-2.png",
       "scale" : "3x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "ad-2.png",
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "scale" : "3x"
     }
   ],
   "info" : {

Guibe/Assets.xcassets/bg.imageset/Contents.json

@@ -1,56 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "bg.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "bgd.png",
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "bg-1.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "bgd-1.png",
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "bg-2.png",
-      "scale" : "3x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "bgd-2.png",
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

Guibe/Assets.xcassets/buttonMedSize.imageset/Contents.json

@@ -5,48 +5,15 @@
       "filename" : "buttonMedSize.png",
       "scale" : "1x"
     },
-    {
-      "idiom" : "universal",
-      "filename" : "med-d.png",
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "scale" : "1x"
-    },
     {
       "idiom" : "universal",
       "filename" : "buttonMedSize-1.png",
       "scale" : "2x"
     },
-    {
-      "idiom" : "universal",
-      "filename" : "med-d-1.png",
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "scale" : "2x"
-    },
     {
       "idiom" : "universal",
       "filename" : "buttonMedSize-2.png",
       "scale" : "3x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "med-d-2.png",
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "scale" : "3x"
     }
   ],
   "info" : {

Guibe/Assets.xcassets/headingButton.imageset/Contents.json

@@ -5,48 +5,15 @@
       "filename" : "headingButton.png",
       "scale" : "1x"
     },
-    {
-      "idiom" : "universal",
-      "filename" : "headingDark.png",
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "scale" : "1x"
-    },
     {
       "idiom" : "universal",
       "filename" : "headingButton-1.png",
       "scale" : "2x"
     },
-    {
-      "idiom" : "universal",
-      "filename" : "headingDark-1.png",
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "scale" : "2x"
-    },
     {
       "idiom" : "universal",
       "filename" : "headingButton-2.png",
       "scale" : "3x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "headingDark-2.png",
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "scale" : "3x"
     }
   ],
   "info" : {

Guibe/Assets.xcassets/loadScreen-1.imageset/Contents.json

@@ -5,48 +5,15 @@
       "filename" : "startScreen.png",
       "scale" : "1x"
     },
-    {
-      "idiom" : "universal",
-      "filename" : "g-dark.png",
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "scale" : "1x"
-    },
     {
       "idiom" : "universal",
       "filename" : "startScreen-1.png",
       "scale" : "2x"
     },
-    {
-      "idiom" : "universal",
-      "filename" : "g-dark-1.png",
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "scale" : "2x"
-    },
     {
       "idiom" : "universal",
       "filename" : "startScreen-2.png",
       "scale" : "3x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "g-dark-2.png",
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "scale" : "3x"
     }
   ],
   "info" : {

Guibe/Assets.xcassets/menuBtnImg.imageset/Contents.json

@@ -5,48 +5,15 @@
       "filename" : "manuBtnImg.png",
       "scale" : "1x"
     },
-    {
-      "idiom" : "universal",
-      "filename" : "mbd.png",
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "scale" : "1x"
-    },
     {
       "idiom" : "universal",
       "filename" : "manuBtnImg-1.png",
       "scale" : "2x"
     },
-    {
-      "idiom" : "universal",
-      "filename" : "mbd-1.png",
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "scale" : "2x"
-    },
     {
       "idiom" : "universal",
       "filename" : "manuBtnImg-2.png",
       "scale" : "3x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "mbd-2.png",
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "scale" : "3x"
     }
   ],
   "info" : {

Guibe/Assets.xcassets/nextBtn.imageset/Contents.json

@@ -5,48 +5,15 @@
       "filename" : "nextBtn.png",
       "scale" : "1x"
     },
-    {
-      "idiom" : "universal",
-      "filename" : "next-d.png",
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "scale" : "1x"
-    },
     {
       "idiom" : "universal",
       "filename" : "nextBtn-1.png",
       "scale" : "2x"
     },
-    {
-      "idiom" : "universal",
-      "filename" : "next-d-1.png",
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "scale" : "2x"
-    },
     {
       "idiom" : "universal",
       "filename" : "nextBtn-2.png",
       "scale" : "3x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "next-d-2.png",
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "scale" : "3x"
     }
   ],
   "info" : {

Guibe/Assets.xcassets/s1l.imageset/Contents.json

@@ -2,50 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "nl.png",
+      "filename" : "s1l.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "lhd.png",
+      "filename" : "s1l-1.png",
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "nl-1.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "lhd-1.png",
+      "filename" : "s1l-2.png",
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "nl-2.png",
-      "scale" : "3x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "lhd-2.png",
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
       "scale" : "3x"
     }
   ],

Guibe/Assets.xcassets/s1r.imageset/Contents.json

@@ -2,50 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "nr.png",
+      "filename" : "s1r.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "rhd.png",
+      "filename" : "s1r-1.png",
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "nr-1.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "rhd-1.png",
+      "filename" : "s1r-2.png",
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "nr-2.png",
-      "scale" : "3x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "rhd-2.png",
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
       "scale" : "3x"
     }
   ],