From d3168d0bd3aa3f0459457a20d3096656d1edd2fe Mon Sep 17 00:00:00 2001
From: Jesse Portnoy <jesse@packman.io>
Date: Wed, 5 Jul 2023 00:20:35 +0100
Subject: [PATCH 1/3] - Updated deps - Added Android and web support

---
 app.json     | 10 ++++++++++
 package.json | 22 +++++++++++++---------
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/app.json b/app.json
index b450c0cf..11b31c17 100644
--- a/app.json
+++ b/app.json
@@ -4,6 +4,7 @@
     "slug": "Quiz",
     "privacy": "public",
     "platforms": [
+      "web",
       "ios",
       "android"
     ],
@@ -23,6 +24,15 @@
     ],
     "ios": {
       "supportsTablet": true
+    },
+    "android": {
+      "adaptiveIcon": {
+        "foregroundImage": "./assets/icon.png",
+        "backgroundColor": "#ffffff"
+      }
+    },
+    "web": {
+      "favicon": "./assets/icon.png"
     }
   }
 }
diff --git a/package.json b/package.json
index 0d0b2afd..aa2611de 100644
--- a/package.json
+++ b/package.json
@@ -4,23 +4,27 @@
     "start": "expo start",
     "android": "expo start --android",
     "ios": "expo start --ios",
+    "web": "expo start --web",
     "eject": "expo eject",
     "lint": "eslint ."
   },
   "dependencies": {
+    "@expo/webpack-config": "^18.0.1",
     "@react-native-community/masked-view": "0.1.10",
-    "expo": "^38.0.0",
-    "react": "16.11.0",
-    "react-native": "https://github.com/expo/react-native/archive/sdk-38.0.2.tar.gz",
-    "react-native-gesture-handler": "~1.6.0",
-    "react-native-reanimated": "~1.9.0",
-    "react-native-safe-area-context": "~3.0.7",
-    "react-native-screens": "~2.9.0",
     "react-navigation": "^4.4.0",
-    "react-navigation-stack": "^2.8.2"
+    "react-navigation-stack": "^2.10.4",
+    "expo": "~48.0.18",
+    "react": "18.2.0",
+    "react-dom": "18.2.0",
+    "react-native": "0.71.8",
+    "react-native-gesture-handler": "~2.9.0",
+    "react-native-reanimated": "~2.14.4",
+    "react-native-safe-area-context": "4.5.0",
+    "react-native-screens": "~3.20.0",
+    "react-native-web": "~0.18.10"
   },
   "devDependencies": {
-    "babel-preset-expo": "^8.2.3",
+    "babel-preset-expo": "^9.3.0",
     "eslint": "^7.4.0",
     "eslint-config-handlebarlabs": "^0.0.6"
   },

From af301c264efff4a4d1133ce86b4fa110cb85b89d Mon Sep 17 00:00:00 2001
From: Jesse Portnoy <jesse@packman.io>
Date: Thu, 6 Jul 2023 00:47:37 +0100
Subject: [PATCH 2/3] Since the value for `correct` is obtained from the JSON
 file, `"correct": "false"` will also be interpreted as true..

---
 App/screens/Quiz.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/App/screens/Quiz.js b/App/screens/Quiz.js
index c8c023eb..d1b0111b 100644
--- a/App/screens/Quiz.js
+++ b/App/screens/Quiz.js
@@ -33,12 +33,12 @@ class Quiz extends React.Component {
     answerCorrect: false
   };
 
-  answer = correct => {
+  answer = (correct) => {
     this.setState(
       state => {
         const nextState = { answered: true };
 
-        if (correct) {
+	if (JSON.parse(correct)) {
           nextState.correctCount = state.correctCount + 1;
           nextState.answerCorrect = true;
         } else {

From 5e9526f4639d0423e481e1aee01e12461413b589 Mon Sep 17 00:00:00 2001
From: Jesse Portnoy <jesse@packman.io>
Date: Thu, 6 Jul 2023 01:31:24 +0100
Subject: [PATCH 3/3] .

---
 App/screens/Quiz.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/App/screens/Quiz.js b/App/screens/Quiz.js
index d1b0111b..744b6258 100644
--- a/App/screens/Quiz.js
+++ b/App/screens/Quiz.js
@@ -38,7 +38,7 @@ class Quiz extends React.Component {
       state => {
         const nextState = { answered: true };
 
-	if (JSON.parse(correct)) {
+        if (correct && JSON.parse(correct)) {
           nextState.correctCount = state.correctCount + 1;
           nextState.answerCorrect = true;
         } else {