diff --git a/App/screens/Quiz.js b/App/screens/Quiz.js index c8c023eb4..744b62582 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 (correct && JSON.parse(correct)) { nextState.correctCount = state.correctCount + 1; nextState.answerCorrect = true; } else { diff --git a/app.json b/app.json index b450c0cf5..11b31c17f 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 0d0b2afd5..aa2611de3 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" },