From 15fe561f19a06aadb1fa09f64da1a95382c2c1b0 Mon Sep 17 00:00:00 2001 From: neohaojun Date: Sat, 19 Dec 2020 21:48:08 +0800 Subject: [PATCH 1/2] commented out accessibility settings, will implement at a later date --- .../SettingsTableViewController.swift | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/CATmistry/Settings Pages/SettingsTableViewController.swift b/CATmistry/Settings Pages/SettingsTableViewController.swift index ceae88a..3e7a6c2 100644 --- a/CATmistry/Settings Pages/SettingsTableViewController.swift +++ b/CATmistry/Settings Pages/SettingsTableViewController.swift @@ -19,7 +19,7 @@ var gameFourAttempts = ud.integer(forKey: "gameFourAttempts") class SettingsTableViewController: UITableViewController { var settingsHeaderArray = [ - "Accessibility Settings", +// "Accessibility Settings", "Quiz Attempts", "Game Attempts", // "General Statistics", @@ -32,23 +32,23 @@ class SettingsTableViewController: UITableViewController { ] var settingsContentArray = [ - [ - SettingsContent( - labelText: "Dyslexic Text", - type: "switchCell", - emojiImage: "🅰️" - ), - SettingsContent( - labelText: "Haptics", - type: "switchCell", - emojiImage: "📳" - ), - SettingsContent( - labelText: "Dark Mode", - type: "switchCell", - emojiImage: "🌙" - ), - ], +// [ +// SettingsContent( +// labelText: "Dyslexic Text", +// type: "switchCell", +// emojiImage: "🅰️" +// ), +// SettingsContent( +// labelText: "Haptics", +// type: "switchCell", +// emojiImage: "📳" +// ), +// SettingsContent( +// labelText: "Dark Mode", +// type: "switchCell", +// emojiImage: "🌙" +// ), +// ], [ SettingsContent( From 558c749582761e9d408dfbb44cc3fc6e14aaac91 Mon Sep 17 00:00:00 2001 From: neohaojun Date: Sat, 19 Dec 2020 22:02:43 +0800 Subject: [PATCH 2/2] fixed some faulty gas tests game questions --- CATmistry/structsFunctions.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CATmistry/structsFunctions.swift b/CATmistry/structsFunctions.swift index 3a32b9a..ac95b2e 100644 --- a/CATmistry/structsFunctions.swift +++ b/CATmistry/structsFunctions.swift @@ -886,13 +886,13 @@ var gasesArray = [ GasTestGame(firstGasTank: "Ammonia", secondGasTank: "Oxygen", thirdGasTank: "Carbon Dioxide", fourthGasTank: "Hydrogen", firstGasIsPositive: [false, false, false, true], secondGasIsPositive: [false, false, true, false], thirdGasIsPositive: [true, false, false, false], forthGasIsPositive: [false, true, false, false], correctGasTank: "Oxygen"), GasTestGame(firstGasTank: "Ammonia", secondGasTank: "Oxygen", thirdGasTank: "Hydrogen", fourthGasTank: "Carbon Dioxide", firstGasIsPositive: [false, false, false, true], secondGasIsPositive: [false, false, true, false], thirdGasIsPositive: [false, true, false, false], forthGasIsPositive: [true, false, false, false], correctGasTank: "Oxygen"), GasTestGame(firstGasTank: "Ammonia", secondGasTank: "Hydrogen", thirdGasTank: "Oxygen", fourthGasTank: "Carbon Dioxide", firstGasIsPositive: [false, false, false, true], secondGasIsPositive: [false, true, false, false], thirdGasIsPositive: [false, false, true, false], forthGasIsPositive: [true, false, false, false], correctGasTank: "Ammonia"), - GasTestGame(firstGasTank: "Ammonia", secondGasTank: "Hydrogen", thirdGasTank: "Carbon Dioxide", fourthGasTank: "Oxygen", firstGasIsPositive: [false, false, true, false], secondGasIsPositive: [false, true, false, false], thirdGasIsPositive: [false, false, false, true], forthGasIsPositive: [true, false, false, false], correctGasTank: "Carbon Dioxide"), + GasTestGame(firstGasTank: "Ammonia", secondGasTank: "Hydrogen", thirdGasTank: "Carbon Dioxide", fourthGasTank: "Oxygen", firstGasIsPositive: [false, false, false, true], secondGasIsPositive: [false, true, false, false], thirdGasIsPositive: [false, false, false, true], forthGasIsPositive: [true, false, false, false], correctGasTank: "Carbon Dioxide"), - GasTestGame(firstGasTank: "Carbon Dioxide", secondGasTank: "Ammonia", thirdGasTank: "Hydrogen", fourthGasTank: "Oxygen", firstGasIsPositive: [true, false, false, false], secondGasIsPositive: [false, false, true, false], thirdGasIsPositive: [false, false, false, true], forthGasIsPositive: [false, true, false, false], correctGasTank: "Ammonia"), + GasTestGame(firstGasTank: "Carbon Dioxide", secondGasTank: "Ammonia", thirdGasTank: "Hydrogen", fourthGasTank: "Oxygen", firstGasIsPositive: [true, false, false, false], secondGasIsPositive: [false, false, false, true], thirdGasIsPositive: [false, false, false, true], forthGasIsPositive: [false, true, false, false], correctGasTank: "Ammonia"), GasTestGame(firstGasTank: "Carbon Dioxide", secondGasTank: "Ammonia", thirdGasTank: "Oxygen", fourthGasTank: "Hydrogen", firstGasIsPositive: [true, false, false, false], secondGasIsPositive: [false, false, false, true], thirdGasIsPositive: [false, false, true, false], forthGasIsPositive: [false, true, false, false], correctGasTank: "Oxygen"), GasTestGame(firstGasTank: "Carbon Dioxide", secondGasTank: "Hydrogen", thirdGasTank: "Oxygen", fourthGasTank: "Ammonia", firstGasIsPositive: [true, false, false, false], secondGasIsPositive: [false, true, false, false], thirdGasIsPositive: [false, false, true, false], forthGasIsPositive: [false, false, false, true], correctGasTank: "Hydrogen"), GasTestGame(firstGasTank: "Carbon Dioxide", secondGasTank: "Hydrogen", thirdGasTank: "Ammonia", fourthGasTank: "Oxygen", firstGasIsPositive: [true, false, false, false], secondGasIsPositive: [false, true, false, false], thirdGasIsPositive: [false, false, false, true], forthGasIsPositive: [false, false, true, false], correctGasTank: "Carbon Dioxide"), - GasTestGame(firstGasTank: "Carbon Dioxide", secondGasTank: "Oxygen", thirdGasTank: "Ammonia", fourthGasTank: "Hydrogen", firstGasIsPositive: [true, false, false, false], secondGasIsPositive: [false, false, false, true], thirdGasIsPositive: [false, true, false, false], forthGasIsPositive: [false, false, true, false], correctGasTank: "Ammonia"), + GasTestGame(firstGasTank: "Carbon Dioxide", secondGasTank: "Oxygen", thirdGasTank: "Ammonia", fourthGasTank: "Hydrogen", firstGasIsPositive: [true, false, false, false], secondGasIsPositive: [false, false, false, true], thirdGasIsPositive: [false, false, false, true], forthGasIsPositive: [false, false, true, false], correctGasTank: "Ammonia"), GasTestGame(firstGasTank: "Carbon Dioxide", secondGasTank: "Oxygen", thirdGasTank: "Hydrogen", fourthGasTank: "Ammonia", firstGasIsPositive: [true, false, false, false], secondGasIsPositive: [false, false, true, false], thirdGasIsPositive: [false, true, false, false], forthGasIsPositive: [false, false, false, true], correctGasTank: "Oxygen"), GasTestGame(firstGasTank: "Oxygen", secondGasTank: "Hydrogen", thirdGasTank: "Carbon Dioxide", fourthGasTank: "Ammonia", firstGasIsPositive: [false, false, true, false], secondGasIsPositive: [false, true, false, false], thirdGasIsPositive: [true, false, false, false], forthGasIsPositive: [false, false, false, true], correctGasTank: "Carbon Dioxide"),