Merge pull request #59 from swiftaccelerator2020/v1.2.0

V1.2.0

CATmistry.xcodeproj/project.pbxproj

@@ -253,6 +253,18 @@
 			path = open_dyslexic;
 			sourceTree = "<group>";
 		};
+		54C511CE259033760057F12A /* Quiz View Controllers */ = {
+			isa = PBXGroup;
+			children = (
+				267F9EDA2588357D0066BFAB /* QuizCorrectAnswerViewController.swift */,
+				267F9EFF258887F30066BFAB /* QuizStartViewController.swift */,
+				267F9EE8258837B30066BFAB /* QuizWrongAnswerViewController.swift */,
+				54788FCC25863A2F00A16CD2 /* QuizEndedViewController.swift */,
+				54B5D28525738FB5006A55F2 /* QuizViewController.swift */,
+			);
+			path = "Quiz View Controllers";
+			sourceTree = "<group>";
+		};
 		54FEFB122578603A0054CFF9 /* Play Pages */ = {
 			isa = PBXGroup;
 			children = (
@@ -270,14 +282,10 @@
 		54FEFB172578609C0054CFF9 /* Learn Pages */ = {
 			isa = PBXGroup;
 			children = (
-				267F9EFF258887F30066BFAB /* QuizStartViewController.swift */,
-				267F9EE8258837B30066BFAB /* QuizWrongAnswerViewController.swift */,
-				267F9EDA2588357D0066BFAB /* QuizCorrectAnswerViewController.swift */,
+				54C511CE259033760057F12A /* Quiz View Controllers */,
 				54FEFB1D257861690054CFF9 /* Specific Learn Pages */,
 				547F0ADD2570F66E00A224D9 /* LearnHomePageTableViewCell.swift */,
 				547F0AD82570F5F900A224D9 /* LearnHomePageTableViewController.swift */,
-				54788FCC25863A2F00A16CD2 /* QuizEndedViewController.swift */,
-				54B5D28525738FB5006A55F2 /* QuizViewController.swift */,
 			);
 			path = "Learn Pages";
 			sourceTree = "<group>";

CATmistry/Base.lproj/Main.storyboard

@@ -349,7 +349,7 @@ As your cat can only live in a certain type of gas, your task is to use your kno
                                         <color key="tintColor" red="0.43771609659999999" green="0.60172057150000002" blue="0.74904519319999996" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                                     </imageView>
                                 </subviews>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="200" id="0JT-JU-Rhw"/>
                                     <constraint firstAttribute="trailing" secondItem="BgO-ca-5ez" secondAttribute="trailing" constant="15" id="PVc-By-ifM"/>
@@ -1492,7 +1492,7 @@ Given the properties of each Group of the periodic table, select the correct gro
                                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="B2H-1r-aQ3">
                                                                 <rect key="frame" x="0.0" y="45" width="140" height="35"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                                                <state key="normal" title="Group 3">
+                                                                <state key="normal" title="Group 2">
                                                                     <color key="titleColor" systemColor="labelColor"/>
                                                                 </state>
                                                                 <connections>
@@ -1510,7 +1510,7 @@ Given the properties of each Group of the periodic table, select the correct gro
                                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="O7J-Hd-b7c">
                                                                 <rect key="frame" x="0.0" y="0.0" width="140" height="35"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                                                <state key="normal" title="Group 2">
+                                                                <state key="normal" title="Group 7">
                                                                     <color key="titleColor" systemColor="labelColor"/>
                                                                 </state>
                                                                 <connections>
@@ -1520,7 +1520,7 @@ Given the properties of each Group of the periodic table, select the correct gro
                                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="60r-ze-aOG">
                                                                 <rect key="frame" x="0.0" y="45" width="140" height="35"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                                                <state key="normal" title="Group 4">
+                                                                <state key="normal" title="Group 8">
                                                                     <color key="titleColor" systemColor="labelColor"/>
                                                                 </state>
                                                                 <connections>
@@ -2074,7 +2074,7 @@ Don't worry though, a cat has 9 lives, and you still have \(String(10 - currentG
                 <navigationController id="8Us-es-0oa" sceneMemberID="viewController">
                     <tabBarItem key="tabBarItem" title="Learn" image="books.vertical.fill" catalog="system" selectedImage="books.vertical.fill" id="ZOw-bY-pdm"/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" largeTitles="YES" id="OvI-u8-jpf">
-                        <rect key="frame" x="0.0" y="44" width="390" height="96"/>
+                        <rect key="frame" x="0.0" y="44" width="390" height="104.33333333333334"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <color key="backgroundColor" red="0.95419245959999999" green="0.83945876360000005" blue="0.47016263009999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <color key="tintColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -2413,7 +2413,7 @@ Don't worry though, a cat has 9 lives, and you still have \(String(10 - currentG
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" contentInsetAdjustmentBehavior="never" translatesAutoresizingMaskIntoConstraints="NO" id="XVC-Ig-NQi">
-                                <rect key="frame" x="0.0" y="148.33333333333331" width="390" height="612.66666666666674"/>
+                                <rect key="frame" x="0.0" y="140" width="390" height="621"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mVw-ph-Zlg">
                                         <rect key="frame" x="0.0" y="0.0" width="390" height="850"/>
@@ -2425,7 +2425,7 @@ Don't worry though, a cat has 9 lives, and you still have \(String(10 - currentG
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="SYZ-WC-ALx">
-                                                <rect key="frame" x="25" y="312.33333333333337" width="340" height="280"/>
+                                                <rect key="frame" x="25" y="312.33333333333331" width="340" height="279.99999999999994"/>
                                                 <subviews>
                                                     <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ruL-5t-Hew">
                                                         <rect key="frame" x="0.0" y="0.0" width="340" height="20"/>
@@ -2469,15 +2469,15 @@ Don't worry though, a cat has 9 lives, and you still have \(String(10 - currentG
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="7aQ-Kb-rIM">
-                                                        <rect key="frame" x="0.0" y="109.99999999999994" width="340" height="170"/>
+                                                        <rect key="frame" x="0.0" y="110.00000000000006" width="340" height="170"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="170" id="FtG-tu-kGa"/>
                                                         </constraints>
                                                     </imageView>
                                                 </subviews>
                                             </stackView>
                                             <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="a9P-V4-qKv">
-                                                <rect key="frame" x="0.0" y="622.33333333333326" width="390" height="227.66666666666663"/>
+                                                <rect key="frame" x="0.0" y="622.33333333333337" width="390" height="227.66666666666663"/>
                                                 <subviews>
                                                     <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" scrollEnabled="NO" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="Jm5-uT-0GT">
                                                         <rect key="frame" x="0.0" y="0.0" width="390" height="227.66666666666666"/>
@@ -2600,7 +2600,7 @@ Don't worry though, a cat has 9 lives, and you still have \(String(10 - currentG
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" translatesAutoresizingMaskIntoConstraints="NO" id="QUe-cY-thK">
-                                <rect key="frame" x="0.0" y="140" width="390" height="621"/>
+                                <rect key="frame" x="0.0" y="140" width="390" height="670"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="zMu-Qc-3rs">
                                         <rect key="frame" x="0.0" y="0.0" width="390" height="590"/>
@@ -2988,7 +2988,7 @@ Don't worry though, a cat has 9 lives, and you still have \(String(10 - currentG
                 <navigationController automaticallyAdjustsScrollViewInsets="NO" id="q0c-Zz-aob" sceneMemberID="viewController">
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" largeTitles="YES" id="jRP-bA-vTs">
-                        <rect key="frame" x="0.0" y="44" width="390" height="96"/>
+                        <rect key="frame" x="0.0" y="44" width="390" height="104.33333333333334"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <nil name="viewControllers"/>
@@ -3230,11 +3230,11 @@ Your answer was wrong, but don't worry! You have \(String(10 - currentQuestion))
         </scene>
     </scenes>
     <inferredMetricsTieBreakers>
-        <segue reference="YEM-b9-J01"/>
-        <segue reference="s4T-H5-cTx"/>
-        <segue reference="l86-7T-ukz"/>
-        <segue reference="8zc-2j-Gbh"/>
-        <segue reference="xa7-EN-bjL"/>
+        <segue reference="GnF-zJ-RVj"/>
+        <segue reference="gvO-ns-Fai"/>
+        <segue reference="omW-sG-g2z"/>
+        <segue reference="orq-5T-Gly"/>
+        <segue reference="SnY-zI-Ehk"/>
     </inferredMetricsTieBreakers>
     <resources>
         <image name="books.vertical.fill" catalog="system" width="128" height="100"/>

CATmistry/Learn Pages/LearnHomePageTableViewController.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import FirebaseDatabase
 
 let ud = UserDefaults.standard
 var chOneDone = ud.bool(forKey: "chOneDone")
@@ -70,11 +71,29 @@ class LearnHomePageTableViewController: UITableViewController {
         if let savedPerson = defaults.object(forKey: "retrieveSolidsArray") as? Data {
             let decoder = JSONDecoder()
             if let loadedPerson = try? decoder.decode(specificSeperationMethod.self, from: savedPerson) {
+                print(loadedPerson)
                 retrieveSolidsArray = [loadedPerson]
+                print("Hello does this work")
             }
         }
 
-        loadData()
+        tableView.reloadData()
+
+        var versionNumber: Int!
+        // var currentVersionNumber: Int?
+
+        // currentVersionNumber = defaults.integer(forKey: "versionNumber")
+        let ref = Database.database().reference(withPath: "versionNumber")
+        ref.keepSynced(true)
+        ref.observe(.value, with: { (snapshot) in
+
+            let data = snapshot.value
+            versionNumber = data as? Int
+            if true {
+                loadData(versionNumber: versionNumber, tableView: self.tableView)
+            }
+        })
+
 
         tableView.tableFooterView = UIView()
 

CATmistry/Learn Pages/QuizCorrectAnswerViewController.swift → CATmistry/Learn Pages/Quiz View Controllers/QuizCorrectAnswerViewController.swift

@@ -14,6 +14,7 @@ class QuizCorrectAnswerViewController: UIViewController {
     var correctAnswers: Int!
     var wrongAnswers: Int!
     var currentTopicId: Int!
+
     var chapterCompletedUserDefaultsArray = [
         chOneDone,
         chTwoDone,
@@ -48,14 +49,15 @@ class QuizCorrectAnswerViewController: UIViewController {
 
         // Do any additional setup after loading the view.
         nextQuestionButton.layer.cornerRadius = 25
-
         if 9 - currentQuestion == 0 {
-            if correctAnswers >= 0 {
+            if correctAnswers >= 7 {
                 congratsLabel.text = "Well done! You got the answer right. \n\nThe quiz has to an end, and you got \(String(correctAnswers)) of 10 questions right. Excellent!"
                 ud.set(true, forKey: chapterCompletedStringsUserDefaultsArray[currentTopicId])
                 chapterCompletedUserDefaultsArray[currentTopicId] = true
                 UserDefaults.incrementIntegerForKey(key: quizAttemptsStringsUserDefaultArray[currentTopicId])
                 quizAttemptsUserDefaultArray[currentTopicId] += 1
+                UserDefaults.standard.synchronize()
+
             } else {
                 congratsLabel.text = "Well done! You got the answer right. \n\nHowever, you only scored \(String(correctAnswers)) out of 10 in this quiz. You need at least 7 out of 10 to pass. Try harder next time!"
             }

CATmistry/Learn Pages/QuizViewController.swift → CATmistry/Learn Pages/Quiz View Controllers/QuizViewController.swift

@@ -135,6 +135,8 @@ class QuizViewController: UIViewController {
             destVC.correctAnswers = correctAnswers
             destVC.wrongAnswers = wrongAnswers
             destVC.currentTopicId = currentTopicId
+            destVC.question = question[index].question
+            destVC.correctAnswer = question[index].options[question[index].correctAnswer-1]
         }
      }
 

CATmistry/Learn Pages/QuizWrongAnswerViewController.swift → CATmistry/Learn Pages/Quiz View Controllers/QuizWrongAnswerViewController.swift

@@ -13,6 +13,8 @@ class QuizWrongAnswerViewController: UIViewController {
     var correctAnswers: Int!
     var wrongAnswers: Int!
     var currentTopicId: Int!
+    var question: String!
+    var correctAnswer: String!
     var chapterCompletedUserDefaultsArray = [
         chOneDone,
         chTwoDone,
@@ -49,17 +51,19 @@ class QuizWrongAnswerViewController: UIViewController {
         nextQuestionButton.layer.cornerRadius = 25
 
         if 9 - currentQuestion == 0 {
-            if correctAnswers >= 0 {
-                sadLabel.text = "Oh no! \n\nYour answer was wrong, but not to worry! You got \(String(correctAnswers)) of 10 questions in this quiz right. Excellent!"
+            if correctAnswers >= 7 {
+                sadLabel.text = "Oh no! \n\nYour answer was wrong, but not to worry! You got \(String(correctAnswers)) of 10 questions in this quiz right. Excellent!\n\nQuestion: \(question!)\nCorrect Answer: \(correctAnswer!)"
                 ud.set(true, forKey: chapterCompletedStringsUserDefaultsArray[currentTopicId])
                 chapterCompletedUserDefaultsArray[currentTopicId] = true
                 UserDefaults.incrementIntegerForKey(key: quizAttemptsStringsUserDefaultArray[currentTopicId])
                 quizAttemptsUserDefaultArray[currentTopicId] += 1
+                UserDefaults.standard.synchronize()
+
             } else {
-                sadLabel.text = "Oh no! \n\nYour answer was wrong, and you only scored \(String(correctAnswers)) out of 10 in this quiz. You need at least 7 out of 10 to pass. Try harder next time!"
+                sadLabel.text = "Oh no! \n\nYour answer was wrong, and you only scored \(String(correctAnswers)) out of 10 in this quiz. You need at least 7 out of 10 to pass. Try harder next time!\n\nQuestion: \(question!)\nCorrect Answer: \(correctAnswer!)"
             }
         } else {
-            sadLabel.text = "Oh no! \n\nYour answer was wrong, but don't worry! You have \(String(9 - currentQuestion)) questions left in this quiz. Try harder next time!"
+            sadLabel.text = "Oh no! \n\nYour answer was wrong, but don't worry! You have \(String(9 - currentQuestion)) questions left in this quiz. Try harder next time!\n\nQuestion: \(question!)\nCorrect Answer: \(correctAnswer!)"
         }
 
         if 9 - currentQuestion == 0 {

CATmistry/Play Pages/PH game/PlayAdjustPhDetailsViewController.swift

@@ -94,6 +94,7 @@ class PlayAdjustPhDetailsViewController: UIViewController {
         timeLeft = 20
         timer = Timer.scheduledTimer(timeInterval: 1, target: self, selector: #selector(PlayAdjustPhDetailsViewController.updateTimer), userInfo: nil, repeats: true)
     }
+
     @IBAction func clickAddUniversalIndicator(_ sender: Any) {
         if addFirstIndicatorButton.titleLabel!.text == "Add Universal Indicator" {
             indicatorPresent = true
@@ -259,11 +260,15 @@ class PlayAdjustPhDetailsViewController: UIViewController {
 
     func optionCorrect() {
         correctGames += 1
+        timer.invalidate()
+        timer = nil
         performSegue(withIdentifier: "adjustPhCorrect", sender: nil)
     }
 
     func optionWrong() {
         wrongGames += 1
+        timer.invalidate()
+        timer = nil
         performSegue(withIdentifier: "adjustPhWrong", sender: nil)
     }