diff --git a/node_modules/.yarn-integrity b/node_modules/.yarn-integrity
new file mode 100644
index 0000000..fe703d0
--- /dev/null
+++ b/node_modules/.yarn-integrity
@@ -0,0 +1,10 @@
+{
+ "systemParams": "linux-x64-137",
+ "modulesFolders": [],
+ "flags": [],
+ "linkedModules": [],
+ "topLevelPatterns": [],
+ "lockfileEntries": {},
+ "files": [],
+ "artifacts": {}
+}
\ No newline at end of file
diff --git a/vds-app/App/components/Banner.js b/vds-app/App/components/Banner.js
index 4afb78a..993b636 100644
--- a/vds-app/App/components/Banner.js
+++ b/vds-app/App/components/Banner.js
@@ -2,8 +2,8 @@ import React from "react"
import { View, StyleSheet, StatusBar, Text, Dimensions } from "react-native"
import { colors, texts, credentials } from "./Variables"
-import { BannerAd, BannerAdSize, TestIds } from 'react-native-google-mobile-ads'
-const adUnitId = __DEV__ ? TestIds.INTERSTITIAL : 'ca-app-pub-4145771316565790/1848957462'
+// import { BannerAd, BannerAdSize, TestIds } from 'react-native-google-mobile-ads'
+// const adUnitId = __DEV__ ? TestIds.INTERSTITIAL : 'ca-app-pub-4145771316565790/1848957462'
const screen = Dimensions.get("window")
@@ -26,7 +26,7 @@ export const Banner = () => {
if(__DEV__) {
banner = DEV BANNER
} else {
- banner =
+ banner = BANNER //
}
return (
diff --git a/vds-app/App/index.js b/vds-app/App/index.js
index 617da30..9774627 100644
--- a/vds-app/App/index.js
+++ b/vds-app/App/index.js
@@ -1,94 +1,43 @@
-import 'react-native-gesture-handler'
-import { createAppContainer } from "react-navigation"
-import { createStackNavigator } from "react-navigation-stack"
+import 'react-native-gesture-handler';
+import * as React from 'react';
+import { NavigationContainer } from '@react-navigation/native';
+import { createNativeStackNavigator } from '@react-navigation/native-stack';
-import Splash from "./screens/Splash"
-import QuizIndex from "./screens/QuizIndex"
-import Quiz from "./screens/Quiz"
-import TrueFalse from "./screens/TrueFalse"
-import Exam from "./screens/Exam"
-import Results from "./screens/Results"
-import ResultsTrueFalse from "./screens/ResultsTrueFalse"
-import Recap from "./screens/Recap"
-import RecapTrueFalse from "./screens/RecapTrueFalse"
-import Info from "./screens/Info"
-import Setup from "./screens/Setup"
-import Dictionary from "./screens/Dictionary"
-import { colors, texts} from "./components/Variables"
+import Splash from "./screens/Splash";
+import QuizIndex from "./screens/QuizIndex";
+import Quiz from "./screens/Quiz";
+import TrueFalse from "./screens/TrueFalse";
+import Exam from "./screens/Exam";
+import Results from "./screens/Results";
+import ResultsTrueFalse from "./screens/ResultsTrueFalse";
+import Recap from "./screens/Recap";
+import RecapTrueFalse from "./screens/RecapTrueFalse";
+import Info from "./screens/Info";
+import Setup from "./screens/Setup";
+import Dictionary from "./screens/Dictionary";
-const MainStack = createStackNavigator({
- Splash: {
- screen: Splash,
- navigationOptions: ({ navigation }) => ({
- headerShown: false
- })
- },
- RecapTrueFalse: {
- screen: RecapTrueFalse,
- navigationOptions: ({ navigation }) => ({
- headerShown: false
- })
- },
- Recap: {
- screen: Recap,
- navigationOptions: ({ navigation }) => ({
- headerShown: false
- })
- },
- Results: {
- screen: Results,
- navigationOptions: ({ navigation }) => ({
- headerShown: false
- })
- },
- ResultsTrueFalse: {
- screen: ResultsTrueFalse,
- navigationOptions: ({ navigation }) => ({
- headerShown: false
- })
- },
- Info: {
- screen: Info,
- navigationOptions: ({ navigation }) => ({
- headerShown: false
- })
- },
- Dictionary: {
- screen: Dictionary,
- navigationOptions: ({ navigation }) => ({
- headerShown: false
- })
- },
- QuizIndex: {
- screen: QuizIndex,
- navigationOptions: ({ navigation }) => ({
- headerShown: false
- })
- },
- Quiz: {
- screen: Quiz,
- navigationOptions: ({ navigation }) => ({
- headerShown: false
- })
- },
- TrueFalse: {
- screen: TrueFalse,
- navigationOptions: ({ navigation }) => ({
- headerShown: false
- })
- },
- Exam: {
- screen: Exam,
- navigationOptions: ({ navigation }) => ({
- headerShown: false
- })
- },
- Setup: {
- screen: Setup,
- navigationOptions: ({ navigation }) => ({
- headerShown: false
- })
- }
-})
+const Stack = createNativeStackNavigator();
-export default createAppContainer(MainStack)
+export default function App() {
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ );
+}
diff --git a/vds-app/App/screens/Exam.js b/vds-app/App/screens/Exam.js
index 27e5a01..ee4ce36 100644
--- a/vds-app/App/screens/Exam.js
+++ b/vds-app/App/screens/Exam.js
@@ -1,20 +1,20 @@
-import React from "react"
-import { View, ScrollView, StyleSheet, StatusBar, Text, ImageBackground, BackHandler } from "react-native"
-import SafeAreaView from 'react-native-safe-area-view'
-import AsyncStorage from '@react-native-async-storage/async-storage'
-
-import { Button, ButtonContainer } from "../components/Button"
-import { colors, texts, examScheme } from "../components/Variables"
-
-import aerodynamicsQuestions from "../data/aerodynamics"
-import firstAidQuestions from "../data/firstAid"
-import flightSafetyQuestions from "../data/flightSafety"
-import instrumentsQuestions from "../data/instruments"
-import legislationQuestions from "../data/legislation"
-import materialsQuestions from "../data/materials"
-import meteorologyQuestions from "../data/meteorology"
-import physiopathologyQuestions from "../data/physiopathology"
-import pilotingTechniquesQuestions from "../data/pilotingTechniques"
+import React from "react";
+import { View, ScrollView, StyleSheet, StatusBar, Text, ImageBackground, BackHandler } from "react-native";
+import SafeAreaView from 'react-native-safe-area-view';
+import AsyncStorage from '@react-native-async-storage/async-storage';
+
+import { Button, ButtonContainer } from "../components/Button";
+import { colors, texts, examScheme } from "../components/Variables";
+
+import aerodynamicsQuestions from "../data/aerodynamics";
+import firstAidQuestions from "../data/firstAid";
+import flightSafetyQuestions from "../data/flightSafety";
+import instrumentsQuestions from "../data/instruments";
+import legislationQuestions from "../data/legislation";
+import materialsQuestions from "../data/materials";
+import meteorologyQuestions from "../data/meteorology";
+import physiopathologyQuestions from "../data/physiopathology";
+import pilotingTechniquesQuestions from "../data/pilotingTechniques";
const allQuestions = {
aerodynamics: aerodynamicsQuestions,
@@ -26,107 +26,93 @@ const allQuestions = {
meteorology: meteorologyQuestions,
physiopathology: physiopathologyQuestions,
pilotingTechniques: pilotingTechniquesQuestions
-}
+};
-const bgImage = require("../assets/bg.jpg")
+const bgImage = require("../assets/bg.jpg");
const styles = StyleSheet.create({
- container: {
- flex: 1
- },
- text: {
- color: colors.white,
- fontSize: 20,
- textAlign: "center",
- fontWeight: "600",
- paddingTop: 5,
- paddingBottom: 20
- },
- textCode: {
- color: colors.white,
- fontSize: 12,
- textAlign: "center",
- fontWeight: "500",
- paddingTop: 20,
- paddingBottom: 0
- },
- timer: {
- color: colors.white,
- fontSize: 30,
- textAlign: "center",
- fontWeight: "600",
- paddingVertical: 10,
- marginTop: 30,
- backgroundColor: colors.white_alpha,
- borderRadius: 10,
- textShadowColor: 'rgba(0, 0, 0, 0.45)',
- textShadowOffset: {width: -1, height: 1},
- textShadowRadius: 2
- },
- safearea: {
- flex: 1,
- marginTop: 20,
- paddingHorizontal: 20,
- justifyContent: "space-between"
- },
- bg: {
- width: "100%",
- height: "100%"
- },
-})
-
-let interval = null
-const maxTime = 1800
+ container: { flex: 1 },
+ text: { color: colors.white, fontSize: 20, textAlign: "center", fontWeight: "600", paddingTop: 5, paddingBottom: 20 },
+ textCode: { color: colors.white, fontSize: 12, textAlign: "center", fontWeight: "500", paddingTop: 20, paddingBottom: 0 },
+ timer: { color: colors.white, fontSize: 30, textAlign: "center", fontWeight: "600", paddingVertical: 10, marginTop: 30, backgroundColor: colors.white_alpha, borderRadius: 10, textShadowColor: 'rgba(0, 0, 0, 0.45)', textShadowOffset: { width: -1, height: 1 }, textShadowRadius: 2 },
+ safearea: { flex: 1, marginTop: 20, paddingHorizontal: 20, justifyContent: "space-between" },
+ bg: { width: "100%", height: "100%" }
+});
-class Exam extends React.Component {
+const MAX_TIME = 1800; // 30 minutes
- state = {
- correctCount: 0,
- pointsCount: 0,
- totalPoints: 0,
- wrongCount: 0,
- wrongAnswers: [],
- totalCount: this.props.navigation.getParam("questions", []).length,
- availableIds: this.props.navigation.getParam("questions", []).map(a => a.id),
- activeQuestionId: this.props.navigation.getParam("questions", [])[
- Math.floor(Math.random() * this.props.navigation.getParam("questions", []).length)
- ].id,
- answered: false,
- answerCorrect: false,
- results: false,
- timer: maxTime
+class Exam extends React.Component {
+ constructor(props) {
+ super(props);
+ const { questions = [] } = props.route.params || {};
+
+ this.state = {
+ correctCount: 0,
+ wrongCount: 0,
+ pointsCount: 0,
+ totalPoints: 0,
+ wrongAnswers: [],
+ totalCount: questions.length,
+ availableIds: questions.map(q => q.id),
+ activeQuestionId: questions.length ? questions[Math.floor(Math.random() * questions.length)].id : null,
+ answered: false,
+ answerCorrect: false,
+ results: false,
+ timer: MAX_TIME,
+ clickedId: null
+ };
+
+ this.interval = null;
}
componentDidMount() {
- BackHandler.addEventListener('hardwareBackPress', this.handleBackButton)
+ // BackHandler subscription
+ this.backHandler = BackHandler.addEventListener('hardwareBackPress', this.handleBackButton);
+
+ // Start timer
+ this.startTimer();
}
componentWillUnmount() {
- BackHandler.removeEventListener('hardwareBackPress', this.handleBackButton)
+ this.backHandler?.remove();
+ if (this.interval) clearInterval(this.interval);
}
- handleBackButton = () => {
+ startTimer = () => {
+ this.interval = setInterval(() => {
+ this.setState(prev => {
+ if (prev.timer <= 1) {
+ clearInterval(this.interval);
+ this.showResults();
+ return { timer: 0, results: true };
+ }
+ return { timer: prev.timer - 1 };
+ });
+ }, 1000);
+ }
- let tmpQuestions = []
+ handleBackButton = () => {
+ let tmpQuestions = [];
AsyncStorage.getItem('setupData').then((value) => {
- let setupData = JSON.parse(value)
- examScheme.forEach( (elem) => {
- let currentSection = setupData.excludeDelta ? allQuestions[elem.section].filter(item => !item.delta) : allQuestions[elem.section]
- for(let i=0; i index != currentIndex)
- }
- })
+ const setupData = JSON.parse(value) || {};
- this.props.navigation.navigate("Splash", {
- examQuestions: tmpQuestions
- })
+ examScheme.forEach(elem => {
+ let currentSection = setupData.excludeDelta
+ ? allQuestions[elem.section].filter(item => !item.delta)
+ : allQuestions[elem.section];
+
+ for (let i = 0; i < elem.questions; i++) {
+ const currentIndex = Math.floor(Math.random() * currentSection.length);
+ tmpQuestions.push(currentSection[currentIndex]);
+ currentSection = currentSection.filter((_, index) => index !== currentIndex);
+ }
+ });
- return true
+ this.props.navigation.navigate("Splash", { examQuestions: tmpQuestions });
+ });
- })
+ return true;
}
showResults = () => {
@@ -140,125 +126,87 @@ class Exam extends React.Component {
totalPoints: this.state.totalPoints,
wrongAnswers: this.state.wrongAnswers
}
- })
+ });
}
answer = (correct, id, question) => {
- this.setState(
- state => {
- const nextState = { answered: true, clickedId: id, totalPoints: state.totalPoints + parseInt(question.points)}
-
- if (correct) {
- nextState.correctCount = state.correctCount + 1
- nextState.pointsCount = state.pointsCount + parseInt(question.points)
- nextState.answerCorrect = true
- } else {
- nextState.wrongCount = state.wrongCount + 1
- nextState.answerCorrect = false
- nextState.wrongAnswers = state.wrongAnswers
- nextState.wrongAnswers.push(
- { question: question.question,
- id: question.id,
- clicked: id,
- answers: question.answers
- }
- )
- }
- return nextState
- },
- () => {
- if(this.state.timer > 1 || (this.state.correctCount+this.state.wrongCount) < this.state.totalCount) {
- setTimeout(() => this.nextQuestion(), correct ? 750 : 3500)
- }
+ this.setState(prev => {
+ const nextState = {
+ answered: true,
+ clickedId: id,
+ totalPoints: prev.totalPoints + parseInt(question.points)
+ };
+
+ if (correct) {
+ nextState.correctCount = prev.correctCount + 1;
+ nextState.pointsCount = prev.pointsCount + parseInt(question.points);
+ nextState.answerCorrect = true;
+ } else {
+ nextState.wrongCount = prev.wrongCount + 1;
+ nextState.answerCorrect = false;
+ nextState.wrongAnswers = [...prev.wrongAnswers, {
+ question: question.question,
+ id: question.id,
+ clicked: id,
+ answers: question.answers
+ }];
}
- )
+ return nextState;
+ }, () => setTimeout(() => this.nextQuestion(), correct ? 750 : 3500));
}
nextQuestion = () => {
+ const { availableIds, activeQuestionId, correctCount, wrongCount, totalCount } = this.state;
+ const updatedIndexes = availableIds.filter(id => id !== activeQuestionId);
- const updatedIndexes = this.state.availableIds.filter( item => item != this.state.activeQuestionId)
- const nextId = updatedIndexes[Math.floor(Math.random() * updatedIndexes.length)]
- let resultsShow = (this.state.timer <= 1 || (this.state.correctCount+this.state.wrongCount) == this.state.totalCount) ? true : false
-
- if (!updatedIndexes.length) {
-
- clearInterval(interval)
- this.showResults()
-
- } else {
- this.setState( (state) => {
- return {
- availableIds: updatedIndexes,
- activeQuestionId: nextId,
- answered: false,
- results: resultsShow
- }
- })
+ if (!updatedIndexes.length || (correctCount + wrongCount) === totalCount) {
+ clearInterval(this.interval);
+ this.showResults();
+ return;
}
- }
- componentWillUnmount(){
- clearInterval(interval)
+ const nextId = updatedIndexes[Math.floor(Math.random() * updatedIndexes.length)];
+ this.setState({ availableIds: updatedIndexes, activeQuestionId: nextId, answered: false, results: false, clickedId: null });
}
render() {
- const questions = this.props.navigation.getParam("questions", [])
- const question = questions.filter(item => item.id == this.state.activeQuestionId)[0] || questions[0]
-
- if(this.state.timer==maxTime) {
- interval = setInterval( () => {
- this.setState( (state) => {
- return {
- timer: this.state.timer-1,
- results: this.state.timer <= 1 || false
- }
- })
- }, 1000)
- }
-
- if(this.state.timer < 1 || (this.state.correctCount+this.state.wrongCount) == this.state.totalCount) {
- clearInterval(interval)
- setTimeout ( () => {
- this.showResults()
- }, 1000)
- }
+ const { availableIds, activeQuestionId, results, correctCount, wrongCount, totalCount, clickedId } = this.state;
+ const questions = this.props.route.params?.questions || [];
+ const question = questions.find(q => q.id === activeQuestionId) || questions[0];
return (
-
-
-
- {!this.state.results ?
-
- {new Date(this.state.timer * 1000).toISOString().substr(11, 8)}
-
- {question.id}
- {question.question}
-
-
- {question.answers.map(answer => (
-
-
-
-
- {`${this.state.correctCount+this.state.wrongCount}/${this.state.totalCount}`}
-
-
- : }
-
-
+
+
+
+ {!results && question ? (
+
+ {new Date(this.state.timer * 1000).toISOString().substr(11, 8)}
+ {question.id}
+ {question.question}
+
+
+ {question.answers.map(answer => (
+
+
+ {`${correctCount + wrongCount}/${totalCount}`}
+
+ ) : (
+
+ )}
+
- )
+ );
}
}
-export default Exam
+export default Exam;
diff --git a/vds-app/App/screens/Quiz.js b/vds-app/App/screens/Quiz.js
index adeb928..c032cf6 100644
--- a/vds-app/App/screens/Quiz.js
+++ b/vds-app/App/screens/Quiz.js
@@ -1,105 +1,58 @@
-import React from "react"
-import { View, ScrollView, StyleSheet, StatusBar, Text, Dimensions, ImageBackground, BackHandler } from "react-native"
-import { Picker } from '@react-native-picker/picker'
-import SafeAreaView from 'react-native-safe-area-view'
-import AsyncStorage from '@react-native-async-storage/async-storage'
+import React from "react";
+import { View, ScrollView, StyleSheet, Text, Dimensions, ImageBackground, BackHandler } from "react-native";
+import { Picker } from '@react-native-picker/picker';
+import SafeAreaView from 'react-native-safe-area-view';
+import AsyncStorage from '@react-native-async-storage/async-storage';
-import { Button, ButtonContainer } from "../components/Button"
-import { Banner } from "../components/Banner"
-import { texts, colors, credentials } from "../components/Variables"
+import { Button, ButtonContainer } from "../components/Button";
+import { Banner } from "../components/Banner";
+import { texts, colors } from "../components/Variables";
-const bgImage = require("../assets/bg.jpg")
-const screen = Dimensions.get("window")
+const bgImage = require("../assets/bg.jpg");
+const screen = Dimensions.get("window");
const styles = StyleSheet.create({
- container: {
- flex: 1
- },
- text: {
- color: colors.white,
- fontSize: 20,
- textAlign: "center",
- fontWeight: "600",
- paddingTop: 5,
- paddingBottom: 20
- },
- textCode: {
- color: colors.white,
- fontSize: 12,
- textAlign: "center",
- fontWeight: "500",
- paddingTop: 20,
- paddingBottom: 0
- },
- safearea: {
- flex: 1,
- paddingHorizontal: 20,
- paddingTop: 20,
- justifyContent: "space-between"
- },
- box: {
- width: screen.width,
- paddingVertical: 10,
- overflow: "hidden"
- },
- scrollView: {
- //margin: 10,
- height: screen.height-20
- },
- bg: {
- width: "100%",
- height: "100%"
- },
- dropdownContainer: {
- marginTop: 20,
- borderRadius: 5,
- width: "100%",
- textAlign: "center",
- backgroundColor: colors.white_alpha2
- },
- dropdown: {
- color: colors.black,
- fontSize: 16,
- width: "100%",
- textAlign: "center",
- fontWeight: "600",
- backgroundColor: "transparent"
- },
- dropdownItem: {
- color: colors.white,
- backgroundColor: "red",
- fontSize: 16,
- borderRadius: 10,
- textAlign: "center",
- fontWeight: "600"
- },
- bannerContainer: {
- flex: 1,
- alignItems: "center",
- justifyContent: "center"
- }
-})
+ container: { flex: 1 },
+ text: { color: colors.white, fontSize: 20, textAlign: "center", fontWeight: "600", paddingTop: 5, paddingBottom: 20 },
+ textCode: { color: colors.white, fontSize: 12, textAlign: "center", fontWeight: "500", paddingTop: 20, paddingBottom: 0 },
+ safearea: { flex: 1, paddingHorizontal: 20, paddingTop: 20, justifyContent: "space-between" },
+ box: { width: screen.width, paddingVertical: 10, overflow: "hidden" },
+ scrollView: { height: screen.height - 20 },
+ bg: { width: "100%", height: "100%" },
+ dropdownContainer: { marginTop: 20, borderRadius: 5, width: "100%", textAlign: "center", backgroundColor: colors.white_alpha2 },
+ dropdown: { color: colors.black, fontSize: 16, width: "100%", textAlign: "center", fontWeight: "600", backgroundColor: "transparent" },
+ dropdownItem: { color: colors.white, backgroundColor: "red", fontSize: 16, borderRadius: 10, textAlign: "center", fontWeight: "600" },
+ bannerContainer: { flex: 1, alignItems: "center", justifyContent: "center" }
+});
class Quiz extends React.Component {
-
- state = {
- correctCount: 0,
- wrongCount: 0,
- wrongAnswers: [],
- pointsCount: 0,
- totalPoints: 0,
- totalCount: this.props.navigation.getParam("questions", []).length,
- availableIds: this.props.navigation.getParam("questions", []).map(a => a.id),
- availableQuestions: this.props.navigation.getParam("questions", []),
- activeQuestionId: this.props.navigation.getParam("questions", [])[
- this.props.navigation.getParam("randomQuestions") ?
- Math.floor(Math.random() * this.props.navigation.getParam("questions", []).length) : 0
- ].id,
- minIndex: 0,
- answered: false,
- answerCorrect: false,
- results: false,
- setupData: {}
+ constructor(props) {
+ super(props);
+
+ // Access route params safely
+ const { questions = [], randomQuestions = false, isWrong = false } = props.route.params || {};
+
+ this.state = {
+ correctCount: 0,
+ wrongCount: 0,
+ wrongAnswers: [],
+ pointsCount: 0,
+ totalPoints: 0,
+ totalCount: questions.length,
+ availableIds: questions.map(q => q.id),
+ availableQuestions: questions,
+ activeQuestionId: randomQuestions
+ ? questions[Math.floor(Math.random() * questions.length)]?.id
+ : questions[0]?.id,
+ minIndex: 0,
+ answered: false,
+ answerCorrect: false,
+ results: false,
+ setupData: {},
+ isWrongParam: isWrong,
+ randomQuestionsParam: randomQuestions,
+ clickedId: null
+ };
}
bannerError = (e) => {
@@ -107,66 +60,69 @@ class Quiz extends React.Component {
}
componentDidMount() {
- BackHandler.addEventListener('hardwareBackPress', this.handleBackButton)
+ // BackHandler subscription
+ this.backHandler = BackHandler.addEventListener(
+ 'hardwareBackPress',
+ this.handleBackButton
+ );
AsyncStorage.getItem('setupData').then((value) => {
- this.setState( (state) => {
- return {
- setupData: JSON.parse(value)
- }
- })
- })
+ this.setState({ setupData: JSON.parse(value) || {} });
+ });
+ }
+
+ componentWillUnmount() {
+ this.backHandler?.remove();
}
handleBackButton = () => {
- this.props.navigation.navigate("Splash")
- return true
+ this.props.navigation.navigate("Splash");
+ return true;
}
answer = (correct, id, question) => {
this.setState(
state => {
- const nextState = { answered: true, clickedId: id, totalPoints: state.totalPoints + parseInt(question.points)}
+ const nextState = { answered: true, clickedId: id, totalPoints: state.totalPoints + parseInt(question.points) };
if (correct) {
- nextState.correctCount = state.correctCount + 1
- nextState.pointsCount = state.pointsCount + parseInt(question.points)
- nextState.answerCorrect = true
+ nextState.correctCount = state.correctCount + 1;
+ nextState.pointsCount = state.pointsCount + parseInt(question.points);
+ nextState.answerCorrect = true;
} else {
- nextState.wrongCount = state.wrongCount + 1
- nextState.answerCorrect = false,
- nextState.wrongAnswers = state.wrongAnswers
- nextState.wrongAnswers.push(
- { question: question.question,
- id: question.id,
- clicked: id,
- answers: question.answers
- }
- )
+ nextState.wrongCount = state.wrongCount + 1;
+ nextState.answerCorrect = false;
+ nextState.wrongAnswers = [...state.wrongAnswers, {
+ question: question.question,
+ id: question.id,
+ clicked: id,
+ answers: question.answers
+ }];
}
- return nextState
+ return nextState;
},
- () => {
- setTimeout(() => this.nextQuestion(), correct ? 750 : 3000)
- }
- )
+ () => setTimeout(() => this.nextQuestion(), correct ? 750 : 3000)
+ );
}
nextQuestion = () => {
+ const { availableIds, availableQuestions, activeQuestionId, minIndex } = this.state;
- const updatedIndexes = this.state.availableIds.filter( item => item != this.state.activeQuestionId)
- const updatedQuestions = this.state.availableQuestions.filter( item => updatedIndexes.indexOf(item.id) > -1)
- const nextId = this.props.navigation.getParam("randomQuestions") ?
- updatedIndexes[Math.floor(Math.random() * updatedIndexes.length)] :
- updatedIndexes[this.state.minIndex]
- let resultsShow = (this.state.timer <= 1 || (this.state.correctCount+this.state.wrongCount) == this.state.totalCount) ? true : false
+ const updatedIndexes = availableIds.filter(item => item !== activeQuestionId);
+ const updatedQuestions = availableQuestions.filter(item => updatedIndexes.includes(item.id));
+
+ const nextId = this.state.randomQuestionsParam
+ ? updatedIndexes[Math.floor(Math.random() * updatedIndexes.length)]
+ : updatedIndexes[minIndex];
+
+ const resultsShow = !updatedIndexes.length || (this.state.correctCount + this.state.wrongCount) === this.state.totalCount;
if (!updatedIndexes.length) {
this.props.navigation.navigate("Results", {
results: {
isExam: false,
- isWrong: this.props.navigation.getParam("isWrong"),
+ isWrong: this.state.isWrongParam,
total: this.state.totalCount,
correct: this.state.correctCount,
wrong: this.state.wrongCount,
@@ -174,95 +130,84 @@ class Quiz extends React.Component {
totalPoints: this.state.totalPoints,
wrongAnswers: this.state.wrongAnswers
}
- })
-
+ });
} else {
-
- this.setState( (state) => {
- return {
- availableIds: updatedIndexes,
- availableQuestions: updatedQuestions,
- minIndex: this.state.minIndex >= updatedIndexes.length - 1 ? 0 : this.state.minIndex,
- activeQuestionId: nextId,
- answered: false,
- results: resultsShow
- }
- })
+ this.setState({
+ availableIds: updatedIndexes,
+ availableQuestions: updatedQuestions,
+ minIndex: minIndex >= updatedIndexes.length - 1 ? 0 : minIndex,
+ activeQuestionId: nextId,
+ answered: false,
+ results: resultsShow,
+ clickedId: null
+ });
}
}
jumpTo = (questionId, itemIndex) => {
- if(itemIndex) {
- this.setState( (state) => {
- return {
- activeQuestionId: questionId,
- minIndex: itemIndex-1
- }
- })
+ if (itemIndex) {
+ this.setState({
+ activeQuestionId: questionId,
+ minIndex: itemIndex - 1
+ });
}
}
render() {
- const questions = this.props.navigation.getParam("questions", [])
- const question = questions.filter(item => item.id == this.state.activeQuestionId)[0] || questions[0]
+ const { availableQuestions, activeQuestionId, results, correctCount, wrongCount, totalCount, clickedId } = this.state;
+
+ const question = availableQuestions.find(item => item.id === activeQuestionId) || availableQuestions[0];
return (
-
- {!this.state.results ?
-
-
- {question.id}
- {question.question}
+
+ {!results ? (
+
+ {question?.id}
+ {question?.question}
- {question.answers.map( (answer, index) => (
+ {question?.answers.map(answer => (
-
-
-
- {`${this.state.correctCount+this.state.wrongCount}/${this.state.totalCount}`}
-
-
-
- this.jumpTo(itemValue, itemIndex)}
- >
-
- {this.state.availableQuestions.map( (item, index) => (
-
- ))}
-
-
-
-
-
- : }
+ {`${correctCount + wrongCount}/${totalCount}`}
+
+
+ this.jumpTo(itemValue, itemIndex)}
+ >
+
+ {availableQuestions.map((item, index) => (
+
+ ))}
+
+
+
+ ) : (
+
+ )}
-
-
- )
+ );
}
}
-export default Quiz
+export default Quiz;
diff --git a/vds-app/App/screens/Recap.js b/vds-app/App/screens/Recap.js
index 3e12047..d89e194 100644
--- a/vds-app/App/screens/Recap.js
+++ b/vds-app/App/screens/Recap.js
@@ -1,25 +1,21 @@
-import React from "react"
-import { View, ScrollView, StyleSheet, StatusBar, Text, Dimensions, Image, ImageBackground, BackHandler} from "react-native"
-import SafeAreaView from 'react-native-safe-area-view'
-import AsyncStorage from '@react-native-async-storage/async-storage'
-
-import { Button, ButtonContainer } from "../components/Button"
-import { Banner } from "../components/Banner"
-import { colors, texts, examScheme, credentials } from "../components/Variables"
-
-import aerodynamicsQuestions from "../data/aerodynamics"
-import firstAidQuestions from "../data/firstAid"
-import flightSafetyQuestions from "../data/flightSafety"
-import instrumentsQuestions from "../data/instruments"
-import legislationQuestions from "../data/legislation"
-import materialsQuestions from "../data/materials"
-import meteorologyQuestions from "../data/meteorology"
-import physiopathologyQuestions from "../data/physiopathology"
-import pilotingTechniquesQuestions from "../data/pilotingTechniques"
-
-const screen = Dimensions.get("window")
-const header = require("../assets/header.png")
-const bgImage = require("../assets/bg.jpg")
+import React from "react";
+import { View, ScrollView, StyleSheet, Text, Image, BackHandler } from "react-native";
+import SafeAreaView from 'react-native-safe-area-view';
+import AsyncStorage from '@react-native-async-storage/async-storage';
+
+import { Button, ButtonContainer } from "../components/Button";
+import { Banner } from "../components/Banner";
+import { colors, texts, examScheme } from "../components/Variables";
+
+import aerodynamicsQuestions from "../data/aerodynamics";
+import firstAidQuestions from "../data/firstAid";
+import flightSafetyQuestions from "../data/flightSafety";
+import instrumentsQuestions from "../data/instruments";
+import legislationQuestions from "../data/legislation";
+import materialsQuestions from "../data/materials";
+import meteorologyQuestions from "../data/meteorology";
+import physiopathologyQuestions from "../data/physiopathology";
+import pilotingTechniquesQuestions from "../data/pilotingTechniques";
const allQuestions = {
aerodynamics: aerodynamicsQuestions,
@@ -31,130 +27,77 @@ const allQuestions = {
meteorology: meteorologyQuestions,
physiopathology: physiopathologyQuestions,
pilotingTechniques: pilotingTechniquesQuestions
-}
+};
+
+const header = require("../assets/header.png");
const styles = StyleSheet.create({
- container: {
- backgroundColor: colors.dark_blue,
- flex: 1
- },
- safearea: {
- flex: 1,
- marginTop: 0,
- justifyContent: "space-between",
- paddingHorizontal: 20,
- paddingBottom: 40
- },
- headerContainer: {
- marginTop: -40,
- alignItems: "center",
- justifyContent: "center",
- width: "100%",
- height: screen.width/1.5
- },
- header: {
- width: "100%"
- },
- box: {
- marginTop: 30,
- borderColor: colors.black_alpha,
- borderWidth: 1,
- padding: 15,
- borderRadius: 5,
- backgroundColor: colors.white_alpha
- },
- text: {
- color: colors.white,
- fontSize: 20,
- textAlign: "center",
- fontWeight: "600",
- paddingTop: 0
- },
- textCode: {
- color: colors.white,
- fontSize: 12,
- textAlign: "center",
- fontWeight: "500",
- paddingTop: 10,
- paddingBottom: 0
- },
- textBig: {
- color: colors.white,
- fontSize: 22,
- textAlign: "center",
- fontWeight: "400",
- paddingBottom: 15,
- textTransform: "uppercase",
- textShadowColor: 'rgba(0, 0, 0, 0.75)',
- textShadowOffset: {width: -1, height: 1},
- textShadowRadius: 10
- },
- bg: {
- width: "100%",
- height: "100%"
- },
- bannerContainer: {
- flex: 1,
- alignItems: "center",
- justifyContent: "center"
- }
-})
+ container: { backgroundColor: colors.dark_blue, flex: 1 },
+ safearea: { flex: 1, marginTop: 0, justifyContent: "space-between", paddingHorizontal: 20, paddingBottom: 40 },
+ headerContainer: { marginTop: -40, alignItems: "center", justifyContent: "center", width: "100%", height: 200 },
+ header: { width: "100%" },
+ box: { marginTop: 30, borderColor: colors.black_alpha, borderWidth: 1, padding: 15, borderRadius: 5, backgroundColor: colors.white_alpha },
+ text: { color: colors.white, fontSize: 20, textAlign: "center", fontWeight: "600", paddingTop: 0 },
+ textCode: { color: colors.white, fontSize: 12, textAlign: "center", fontWeight: "500", paddingTop: 10, paddingBottom: 0 },
+ textBig: { color: colors.white, fontSize: 22, textAlign: "center", fontWeight: "400", paddingBottom: 15, textTransform: "uppercase", textShadowColor: 'rgba(0, 0, 0, 0.75)', textShadowOffset: { width: -1, height: 1 }, textShadowRadius: 10 },
+ bannerContainer: { flex: 1, alignItems: "center", justifyContent: "center" }
+});
class Recap extends React.Component {
-
- state = {
- storeWrongAnswers: []
+ constructor(props) {
+ super(props);
+ this.state = {
+ storeWrongAnswers: []
+ };
}
componentDidMount() {
- BackHandler.addEventListener('hardwareBackPress', this.handleBackButton)
- AsyncStorage.getItem('storeWrongAnswers').then((value) => {
- //console.log('storeWrongAnswers: ', JSON.parse(value))
- this.setState( (state) => {
- return {
- storeWrongAnswers: JSON.parse(value)
- }
- })
- })
+ this.backHandler = BackHandler.addEventListener('hardwareBackPress', this.handleBackButton);
+
+ AsyncStorage.getItem('storeWrongAnswers').then(value => {
+ if (value) {
+ this.setState({ storeWrongAnswers: JSON.parse(value) });
+ }
+ });
}
componentWillUnmount() {
- BackHandler.removeEventListener('hardwareBackPress', this.handleBackButton)
+ this.backHandler?.remove();
}
handleBackButton = () => {
+ const tmpQuestions = [];
+ AsyncStorage.getItem('setupData').then(value => {
+ const setupData = JSON.parse(value) || {};
- let tmpQuestions = []
- AsyncStorage.getItem('setupData').then((value) => {
- let setupData = JSON.parse(value)
+ examScheme.forEach(elem => {
+ let currentSection = setupData.excludeDelta
+ ? allQuestions[elem.section].filter(item => !item.delta)
+ : allQuestions[elem.section];
- examScheme.forEach( (elem) => {
- let currentSection = setupData.excludeDelta ? allQuestions[elem.section].filter(item => !item.delta) : allQuestions[elem.section]
- for(let i=0; i index != currentIndex)
+ for (let i = 0; i < elem.questions; i++) {
+ const currentIndex = Math.floor(Math.random() * currentSection.length);
+ tmpQuestions.push(currentSection[currentIndex]);
+ currentSection = currentSection.filter((_, index) => index !== currentIndex);
}
- })
+ });
this.props.navigation.navigate("Splash", {
examQuestions: tmpQuestions,
storeWrongAnswers: this.state.storeWrongAnswers
- })
-
- return true
+ });
+ });
- })
+ return true;
}
render() {
-
- const questions = this.props.navigation.getParam("wrongAnswers", [])
+ const questions = this.props.route.params?.wrongAnswers || [];
return (
-
-
+
+
@@ -162,31 +105,30 @@ class Recap extends React.Component {
- {questions.map( (question, index) => (
+ {questions.map(question => (
{question.id}
{question.question}
- {question.answers.map( (answer, index) => (
+ {question.answers.map(answer => (
))}
))}
-
+
@@ -195,11 +137,9 @@ class Recap extends React.Component {
-
-
- )
+ );
}
}
-export default Recap
+export default Recap;
diff --git a/vds-app/App/screens/Results.js b/vds-app/App/screens/Results.js
index a57d9d4..42d6646 100644
--- a/vds-app/App/screens/Results.js
+++ b/vds-app/App/screens/Results.js
@@ -1,10 +1,10 @@
-import React from "react"
-import { View, ScrollView, StyleSheet, StatusBar, Text, Dimensions, Image, BackHandler} from "react-native"
-import SafeAreaView from 'react-native-safe-area-view'
-import AsyncStorage from '@react-native-async-storage/async-storage'
+import React from "react";
+import { View, ScrollView, StyleSheet, Text, Image, BackHandler } from "react-native";
+import SafeAreaView from 'react-native-safe-area-view';
-import { Button, ButtonContainer } from "../components/Button"
-import { colors, texts, examScheme } from "../components/Variables"
+import { Button, ButtonContainer } from "../components/Button";
+import { Banner } from "../components/Banner";
+import { colors, texts, examScheme } from "../components/Variables";
import aerodynamicsQuestions from "../data/aerodynamics"
import firstAidQuestions from "../data/firstAid"
@@ -16,11 +16,6 @@ import meteorologyQuestions from "../data/meteorology"
import physiopathologyQuestions from "../data/physiopathology"
import pilotingTechniquesQuestions from "../data/pilotingTechniques"
-const screen = Dimensions.get("window")
-const header = require("../assets/header.png")
-const maxTime = 0 // 10
-let interval = null
-
const allQuestions = {
aerodynamics: aerodynamicsQuestions,
firstAid: firstAidQuestions,
@@ -31,234 +26,93 @@ const allQuestions = {
meteorology: meteorologyQuestions,
physiopathology: physiopathologyQuestions,
pilotingTechniques: pilotingTechniquesQuestions
-}
+};
-const styles = StyleSheet.create({
- container: {
- backgroundColor: colors.dark_blue,
- flex: 1
- },
- safearea: {
- flex: 1,
- marginTop: 0,
- justifyContent: "space-between",
- paddingHorizontal: 20,
- paddingBottom: 40
- },
- headerContainer: {
- marginTop: -40,
- alignItems: "center",
- justifyContent: "center",
- width: "100%",
- height: screen.width/1.5
- },
- header: {
- width: "100%"
- },
- box: {
- marginTop: 20,
- marginBottom: 20,
- marginHorizontal: 20,
- width: screen.width-80,
- borderRadius: 10,
- borderBottomEndRadius: 80,
- borderTopStartRadius: 100,
- backgroundColor: colors.white_alpha,
- borderColor: colors.white,
- borderWidth: 2,
- paddingVertical: 30
- },
- boxCorrect: {
- backgroundColor: colors.green_light,
- },
- boxWrong: {
- backgroundColor: colors.red,
- },
- boxUnsafe: {
- backgroundColor: colors.orange,
- },
- button: {
- width: screen.width-80,
- marginHorizontal: 20
- },
- text: {
- color: colors.white,
- fontSize: 22,
- textAlign: "center",
- fontWeight: "400",
- lineHeight: 40,
- textShadowColor: 'rgba(0, 0, 0, 0.75)',
- textShadowOffset: {width: -1, height: 1},
- textShadowRadius: 10
- },
- textSmall: {
- color: colors.white,
- marginTop: 20,
- fontSize: 26,
- textAlign: "center",
- fontWeight: "500",
- lineHeight: 30,
- textShadowColor: 'rgba(0, 0, 0, 0.75)',
- textShadowOffset: {width: -1, height: 1},
- textShadowRadius: 10
- },
- textLabel: {
- paddingHorizontal: 20,
- paddingVertical: 20
- },
- correct: {
- color: colors.green
- },
- wrong: {
- color: colors.red
- },
- unsafe: {
- color: colors.yellow
- }
-})
-
-class Results extends React.Component {
-
- state = {
- bannerExpanded: true,
- timer: maxTime,
- storeWrongAnswers: []
- }
+const header = require("../assets/header.png");
+const styles = StyleSheet.create({
+ container: { backgroundColor: colors.blue, flex: 1 },
+ safearea: { flex: 1, marginTop: 0, justifyContent: "space-between", paddingHorizontal: 20, paddingBottom: 40 },
+ headerContainer: { marginTop: -40, alignItems: "center", justifyContent: "center", width: "100%", height: 200 },
+ header: { width: "100%" },
+ box: { marginTop: 30, borderColor: colors.black_alpha, borderWidth: 1, padding: 15, borderRadius: 5, backgroundColor: colors.white_alpha },
+ text: { color: colors.white, fontSize: 20, textAlign: "center", fontWeight: "600" },
+ textCode: { color: colors.white, fontSize: 12, textAlign: "center", fontWeight: "500", paddingTop: 10 },
+ textBig: { color: colors.white, fontSize: 22, textAlign: "center", fontWeight: "400", paddingBottom: 15, textTransform: "uppercase", textShadowColor: 'rgba(0,0,0,0.75)', textShadowOffset: {width:-1, height:1}, textShadowRadius:10 },
+ bannerContainer: { flex: 1, alignItems: "center", justifyContent: "center" }
+});
+
+class RecapTrueFalse extends React.Component {
componentDidMount() {
- BackHandler.addEventListener('hardwareBackPress', this.handleBackButton)
-
- AsyncStorage.getItem('storeWrongAnswers').then( (value) => {
- const currentResults = this.props.navigation.getParam("results")
- const wrongAnswers = currentResults.wrongAnswers || []
- const stored = JSON.parse(value) || []
- const result = currentResults.isWrong ? wrongAnswers : Object.assign([], wrongAnswers, stored);
- AsyncStorage.setItem('storeWrongAnswers', JSON.stringify(result))
-
- this.setState( (state) => {
- return {
- storeWrongAnswers: result
- }
- })
-
- })
+ this.backHandler = BackHandler.addEventListener('hardwareBackPress', this.handleBackButton);
}
componentWillUnmount() {
- BackHandler.removeEventListener('hardwareBackPress', this.handleBackButton)
+ this.backHandler?.remove();
}
handleBackButton = () => {
+ const tmpQuestions = [];
+ let fullQuestions = [];
- let tmpQuestions = []
- AsyncStorage.getItem('setupData').then((value) => {
- let setupData = JSON.parse(value)
+ examScheme.forEach(elem => {
+ fullQuestions.push(...allQuestions[elem.section]);
+ });
- examScheme.forEach( (elem) => {
- let currentSection = setupData.excludeDelta ? allQuestions[elem.section].filter(item => !item.delta) : allQuestions[elem.section]
- for(let i=0; i index != currentIndex)
- }
- })
-
- this.props.navigation.navigate("Splash", {
- examQuestions: tmpQuestions,
- storeWrongAnswers: this.state.storeWrongAnswers
- })
-
- return true
+ for (let i = 0; i < 10; i++) {
+ const index = Math.floor(Math.random() * fullQuestions.length);
+ tmpQuestions.push(fullQuestions[index]);
+ fullQuestions.splice(index, 1);
+ }
- })
+ this.props.navigation.navigate("Splash", { trueFalseQuestions: tmpQuestions });
+ return true;
}
-
render() {
-
- const currentResults = this.props.navigation.getParam("results")
- const wrongAnswers = currentResults.wrongAnswers || null
- const percentage = currentResults.total ? (100/currentResults.total) * currentResults.correct : 0
- let resultStyle = ''//currentResults.points >= 80 ? currentResults.points >= 85 ? styles.correct : styles.unsafe : styles.wrong
- let boxStyle = currentResults.points >= 80 ? currentResults.points >= 85 ? styles.boxCorrect : styles.boxUnsafe : styles.boxWrong
-
- if(!currentResults.isExam) {
- resultStyle = ''//percentage >= 80 ? percentage >= 85 ? styles.correct : styles.unsafe : styles.wrong
- boxStyle = percentage >= 80 ? percentage >= 85 ? styles.boxCorrect : styles.boxUnsafe : styles.boxWrong
- }
-
+ const questions = this.props.route.params?.wrongAnswers || [];
return (
-
-
+
+
+ {texts.recapTitle}
+
-
-
- {`${texts.corrects}: ${currentResults.correct}`}
-
-
- {`${texts.wrongs}: ${currentResults.wrong}`}
-
-
- {`${texts.percentage}: ${Math.round(percentage)}%`}
-
- {
- currentResults.points ? (
-
- {`${texts.points}: ${currentResults.points}/${currentResults.totalPoints}`}
-
- ) : null
- }
-
- {currentResults.isExam ?
-
- {currentResults.points >= 80 ? currentResults.points >= 85 ? texts.exam_passed : texts.exam_needs_oral : texts.exam_not_passed}
- :
- }
-
-
- {wrongAnswers.length ?
-
- :
-
-
-
+
+
+
+
- )
+ );
}
}
-export default Results
+export default RecapTrueFalse;
diff --git a/vds-app/App/screens/ResultsTrueFalse.js b/vds-app/App/screens/ResultsTrueFalse.js
index 287635a..42d6646 100644
--- a/vds-app/App/screens/ResultsTrueFalse.js
+++ b/vds-app/App/screens/ResultsTrueFalse.js
@@ -1,9 +1,10 @@
-import React from "react"
-import { View, ScrollView, StyleSheet, StatusBar, Text, Dimensions, Image, BackHandler} from "react-native"
-import SafeAreaView from 'react-native-safe-area-view'
+import React from "react";
+import { View, ScrollView, StyleSheet, Text, Image, BackHandler } from "react-native";
+import SafeAreaView from 'react-native-safe-area-view';
-import { Button, ButtonContainer } from "../components/Button"
-import { colors, texts, examScheme } from "../components/Variables"
+import { Button, ButtonContainer } from "../components/Button";
+import { Banner } from "../components/Banner";
+import { colors, texts, examScheme } from "../components/Variables";
import aerodynamicsQuestions from "../data/aerodynamics"
import firstAidQuestions from "../data/firstAid"
@@ -15,11 +16,6 @@ import meteorologyQuestions from "../data/meteorology"
import physiopathologyQuestions from "../data/physiopathology"
import pilotingTechniquesQuestions from "../data/pilotingTechniques"
-const screen = Dimensions.get("window")
-const header = require("../assets/header.png")
-const maxTime = 0 // 10
-let interval = null
-
const allQuestions = {
aerodynamics: aerodynamicsQuestions,
firstAid: firstAidQuestions,
@@ -30,205 +26,93 @@ const allQuestions = {
meteorology: meteorologyQuestions,
physiopathology: physiopathologyQuestions,
pilotingTechniques: pilotingTechniquesQuestions
-}
-
-const styles = StyleSheet.create({
- container: {
- backgroundColor: colors.dark_blue,
- flex: 1
- },
- safearea: {
- flex: 1,
- marginTop: 0,
- justifyContent: "space-between",
- paddingHorizontal: 20,
- paddingBottom: 40
- },
- headerContainer: {
- marginTop: -40,
- alignItems: "center",
- justifyContent: "center",
- width: "100%",
- height: screen.width/1.5
- },
- header: {
- width: "100%"
- },
- box: {
- marginTop: 20,
- marginBottom: 20,
- marginHorizontal: 20,
- width: screen.width-80,
- borderRadius: 10,
- borderBottomEndRadius: 80,
- borderTopStartRadius: 100,
- backgroundColor: colors.white_alpha,
- borderColor: colors.white,
- borderWidth: 2,
- paddingVertical: 30
- },
- boxCorrect: {
- backgroundColor: colors.green_light,
- },
- boxWrong: {
- backgroundColor: colors.red,
- },
- boxUnsafe: {
- backgroundColor: colors.orange,
- },
- button: {
- width: screen.width-80,
- marginHorizontal: 20
- },
- text: {
- color: colors.white,
- fontSize: 22,
- textAlign: "center",
- fontWeight: "400",
- lineHeight: 40,
- textShadowColor: 'rgba(0, 0, 0, 0.75)',
- textShadowOffset: {width: -1, height: 1},
- textShadowRadius: 10
- },
- textSmall: {
- color: colors.white,
- marginTop: 20,
- fontSize: 26,
- textAlign: "center",
- fontWeight: "500",
- lineHeight: 30,
- textShadowColor: 'rgba(0, 0, 0, 0.75)',
- textShadowOffset: {width: -1, height: 1},
- textShadowRadius: 10
- },
- textLabel: {
- paddingHorizontal: 20,
- paddingVertical: 20
- },
- correct: {
- color: colors.green
- },
- wrong: {
- color: colors.red
- },
- unsafe: {
- color: colors.yellow
- }
-})
+};
-class Results extends React.Component {
-
- state = {
- bannerExpanded: true,
- timer: maxTime
- }
+const header = require("../assets/header.png");
+const styles = StyleSheet.create({
+ container: { backgroundColor: colors.blue, flex: 1 },
+ safearea: { flex: 1, marginTop: 0, justifyContent: "space-between", paddingHorizontal: 20, paddingBottom: 40 },
+ headerContainer: { marginTop: -40, alignItems: "center", justifyContent: "center", width: "100%", height: 200 },
+ header: { width: "100%" },
+ box: { marginTop: 30, borderColor: colors.black_alpha, borderWidth: 1, padding: 15, borderRadius: 5, backgroundColor: colors.white_alpha },
+ text: { color: colors.white, fontSize: 20, textAlign: "center", fontWeight: "600" },
+ textCode: { color: colors.white, fontSize: 12, textAlign: "center", fontWeight: "500", paddingTop: 10 },
+ textBig: { color: colors.white, fontSize: 22, textAlign: "center", fontWeight: "400", paddingBottom: 15, textTransform: "uppercase", textShadowColor: 'rgba(0,0,0,0.75)', textShadowOffset: {width:-1, height:1}, textShadowRadius:10 },
+ bannerContainer: { flex: 1, alignItems: "center", justifyContent: "center" }
+});
+
+class RecapTrueFalse extends React.Component {
componentDidMount() {
- BackHandler.addEventListener('hardwareBackPress', this.handleBackButton)
+ this.backHandler = BackHandler.addEventListener('hardwareBackPress', this.handleBackButton);
}
componentWillUnmount() {
- BackHandler.removeEventListener('hardwareBackPress', this.handleBackButton)
+ this.backHandler?.remove();
}
handleBackButton = () => {
+ const tmpQuestions = [];
+ let fullQuestions = [];
- let tmpQuestions = []
- let fullQuestions = []
+ examScheme.forEach(elem => {
+ fullQuestions.push(...allQuestions[elem.section]);
+ });
- examScheme.forEach( (elem) => {
- let currentSection = allQuestions[elem.section]
- for(let i=0; i index != currentIndex)
+ for (let i = 0; i < 10; i++) {
+ const index = Math.floor(Math.random() * fullQuestions.length);
+ tmpQuestions.push(fullQuestions[index]);
+ fullQuestions.splice(index, 1);
}
- this.props.navigation.navigate("Splash", {
- trueFalseQuestions: tmpQuestions
- })
- return true
+ this.props.navigation.navigate("Splash", { trueFalseQuestions: tmpQuestions });
+ return true;
}
render() {
-
- const currentResults = this.props.navigation.getParam("results")
- const wrongAnswers = currentResults.wrongAnswers || null
- const percentage = currentResults.total ? (100/currentResults.total) * currentResults.correct : 0
- let resultStyle = ''
- let boxStyle = currentResults.points >= 80 ? currentResults.points >= 85 ? styles.boxCorrect : styles.boxUnsafe : styles.boxWrong
-
- if(!currentResults.isExam) {
- resultStyle = ''
- boxStyle = percentage >= 80 ? percentage >= 85 ? styles.boxCorrect : styles.boxUnsafe : styles.boxWrong
- }
-
- //console.log(currentResults)
+ const questions = this.props.route.params?.wrongAnswers || [];
return (
-
-
+
+
+ {texts.recapTitle}
+
-
-
- {`${texts.corrects}: ${currentResults.correct}`}
-
-
- {`${texts.wrongs}: ${currentResults.wrong}`}
-
-
- {`${texts.percentage}: ${Math.round(percentage)}%`}
-
-
-
-
- {wrongAnswers.length ?
-
- :
-
-
-
+
+
+
+
- )
+ );
}
}
-export default Results
+export default RecapTrueFalse;
diff --git a/vds-app/App/screens/Splash.js b/vds-app/App/screens/Splash.js
index 9333e9b..a70742d 100644
--- a/vds-app/App/screens/Splash.js
+++ b/vds-app/App/screens/Splash.js
@@ -1,78 +1,39 @@
-import React from "react"
-import { View, ScrollView, StyleSheet, StatusBar, Text, Dimensions, Image, Alert, BackHandler } from "react-native"
-import AsyncStorage from '@react-native-async-storage/async-storage'
-import SafeAreaView from 'react-native-safe-area-view'
-
-import { Button, ButtonContainer } from "../components/Button"
-import { Banner } from "../components/Banner"
-import { colors, texts, credentials } from "../components/Variables"
-import { examQuestions } from "../components/ExamQuestions"
-import { trueFalseQuestions } from "../components/TrueFalseQuestions"
-
-const screen = Dimensions.get("window")
-const header = require("../assets/header.png")
-const pkg = require('../../app.json')
-const maxTime = 0 // 10
-let interval = null
+import React from "react";
+import { View, ScrollView, StyleSheet, StatusBar, Text, Dimensions, Image, Alert, BackHandler } from "react-native";
+import AsyncStorage from '@react-native-async-storage/async-storage';
+import SafeAreaView from 'react-native-safe-area-view';
+
+import { Button, ButtonContainer } from "../components/Button";
+import { Banner } from "../components/Banner";
+import { colors, texts } from "../components/Variables";
+import { examQuestions } from "../components/ExamQuestions";
+import { trueFalseQuestions } from "../components/TrueFalseQuestions";
+
+const screen = Dimensions.get("window");
+const header = require("../assets/header.png");
+const maxTime = 0; // 10
+let interval = null;
const styles = StyleSheet.create({
- container: {
- backgroundColor: colors.dark_blue,
- flex: 1
- },
- title: {
- color: colors.white,
- fontSize: 25,
- textAlign: "center",
- fontWeight: "600",
- paddingVertical: 20
- },
- text: {
- color: colors.white,
- fontSize: 20,
- textAlign: "center",
- fontWeight: "400",
- paddingVertical: 20,
- marginTop: 20,
- },
- timer: {
- color: colors.white,
- fontSize: 30,
- textAlign: "center",
- fontWeight: "600",
- paddingVertical: 20,
- marginBottom: 20,
- },
- safearea: {
- flex: 1,
- marginTop: 0,
- justifyContent: "space-between",
- paddingHorizontal: 20
- },
- headerContainer: {
- marginTop: 20,
- alignItems: "center",
- justifyContent: "center",
- width: "100%",
- height: 150
- },
- header: {
- width: "100%"
- },
- bannerContainer: {
- flex: 1,
- alignItems: "center",
- justifyContent: "center"
- }
-})
+ container: { backgroundColor: colors.dark_blue, flex: 1 },
+ safearea: { flex: 1, justifyContent: "space-between", paddingHorizontal: 20 },
+ headerContainer: { marginTop: 20, alignItems: "center", justifyContent: "center", width: "100%", height: 150 },
+ header: { width: "100%" },
+ bannerContainer: { flex: 1, alignItems: "center", justifyContent: "center" }
+});
class Splash extends React.Component {
+ constructor(props) {
+ super(props);
+
+ const params = props.route.params || {};
- state = {
- bannerExpanded: true,
- timer: maxTime,
- storeWrongAnswers: this.props.navigation.getParam("storeWrongAnswers", []) || [],
- setupData: {}
+ this.state = {
+ bannerExpanded: true,
+ timer: maxTime,
+ storeWrongAnswers: params.storeWrongAnswers || [],
+ setupData: {}
+ };
}
bannerError = (e) => {
@@ -80,73 +41,68 @@ class Splash extends React.Component {
}
componentDidMount() {
- BackHandler.addEventListener('hardwareBackPress', this.handleBackButton)
- AsyncStorage.getItem('storeWrongAnswers').then( (value) => {
- if(!value) {
- AsyncStorage.setItem('storeWrongAnswers', JSON.stringify([]))
- }
-
- AsyncStorage.getItem('setupData').then((setup) => {
- if(!setup) {
- AsyncStorage.setItem('setupData', JSON.stringify({}))
- }
- this.setState( (state) => {
- return {
- storeWrongAnswers: value ? JSON.parse(value) : [],
- setupData: setup ? JSON.parse(setup) : {}
- }
- })
- })
- })
+ // Save subscription for removal later
+ this.backHandler = BackHandler.addEventListener(
+ 'hardwareBackPress',
+ this.handleBackButton
+ );
+ AsyncStorage.getItem('storeWrongAnswers').then((value) => {
+ if (!value) AsyncStorage.setItem('storeWrongAnswers', JSON.stringify([]));
+ AsyncStorage.getItem('setupData').then((setup) => {
+ if (!setup) AsyncStorage.setItem('setupData', JSON.stringify({}));
+
+ this.setState({
+ storeWrongAnswers: value ? JSON.parse(value) : [],
+ setupData: setup ? JSON.parse(setup) : {}
+ });
+ });
+ });
}
componentWillUnmount() {
- BackHandler.removeEventListener('hardwareBackPress', this.handleBackButton)
+ // Remove subscription correctly
+ this.backHandler?.remove();
+
+ if (interval) clearInterval(interval);
}
+
handleBackButton = () => {
Alert.alert(
texts.exit,
texts.exitQuestion,
[
- {text: 'No', onPress: () => console.log('Cancel Pressed'), style: 'cancel'},
- {text: 'Si', onPress: () => BackHandler.exitApp()},
+ { text: 'No', onPress: () => console.log('Cancel Pressed'), style: 'cancel' },
+ { text: 'Si', onPress: () => BackHandler.exitApp() },
],
{ cancelable: false }
- )
- return true
+ );
+ return true;
}
- render() {
-
- const storeWrongAnswers = this.props.navigation.getParam("storeWrongAnswers") || this.state.storeWrongAnswers
-
- if(this.state.timer==maxTime) {
- interval = setInterval( () => {
- this.setState( (state) => {
- return {
- timer: this.state.timer-1,
- }
- })
- }, 1000)
+ startTimer = () => {
+ if (this.state.timer === maxTime) {
+ interval = setInterval(() => {
+ this.setState((state) => ({ timer: state.timer - 1 }));
+ }, 1000);
}
- if(this.state.timer < 1) {
- clearInterval(interval)
- setTimeout( () => {
- this.setState( (state) => {
- return {
- bannerExpanded: false
- }
- })
- }, 500)
+ if (this.state.timer < 1 && interval) {
+ clearInterval(interval);
+ interval = null;
+ setTimeout(() => this.setState({ bannerExpanded: false }), 500);
}
+ }
+
+ render() {
+ const { storeWrongAnswers } = this.state;
+ this.startTimer();
return (
-
-
+
+
@@ -157,127 +113,123 @@ class Splash extends React.Component {
text={texts.section_quizzes}
subtitle={`(${texts.section_quizzes_subtitle})`}
isBig={false}
- hasBg={true}
+ hasBg
noPadding={false}
- hasShadow={true}
- noBorder={true}
+ hasShadow
+ noBorder
color={colors.white_alpha}
- onPress={() =>
- this.props.navigation.navigate("QuizIndex", {
- title: texts.section_quizzes,
- color: colors.white_alpha
- })}
+ onPress={() => this.props.navigation.navigate("QuizIndex", {
+ title: texts.section_quizzes,
+ color: colors.white_alpha
+ })}
/>
-
+
-
- )
+ );
}
}
-export default Splash
+export default Splash;
diff --git a/vds-app/App/screens/TrueFalse.js b/vds-app/App/screens/TrueFalse.js
index 97ef47f..6aaebed 100644
--- a/vds-app/App/screens/TrueFalse.js
+++ b/vds-app/App/screens/TrueFalse.js
@@ -1,10 +1,10 @@
-import React from "react"
-import { View, ScrollView, StyleSheet, StatusBar, Text, Dimensions, ImageBackground, BackHandler } from "react-native"
-import SafeAreaView from 'react-native-safe-area-view'
+import React from "react";
+import { View, ScrollView, StyleSheet, Text, ImageBackground, Dimensions, BackHandler } from "react-native";
+import SafeAreaView from 'react-native-safe-area-view';
-import { Button, ButtonContainer } from "../components/Button"
-import { Banner } from "../components/Banner"
-import { texts, colors, examScheme, credentials } from "../components/Variables"
+import { Button, ButtonContainer } from "../components/Button";
+import { Banner } from "../components/Banner";
+import { texts, colors, examScheme } from "../components/Variables";
import aerodynamicsQuestions from "../data/aerodynamics"
import firstAidQuestions from "../data/firstAid"
@@ -26,10 +26,11 @@ const allQuestions = {
meteorology: meteorologyQuestions,
physiopathology: physiopathologyQuestions,
pilotingTechniques: pilotingTechniquesQuestions
-}
+};
+
-const bgImage = require("../assets/bg.jpg")
-const screen = Dimensions.get("window")
+const bgImage = require("../assets/bg.jpg");
+const screen = Dimensions.get("window");
const styles = StyleSheet.create({
container: {
@@ -54,7 +55,7 @@ const styles = StyleSheet.create({
textAnswer: {
color: colors.white,
backgroundColor: colors.black_alpha,
- borderColor: colors.white,
+ borderColor: colors.white,
borderWidth: 2,
fontSize: 18,
textAlign: "center",
@@ -91,175 +92,112 @@ const styles = StyleSheet.create({
}
})
-class Quiz extends React.Component {
+class Quiz extends React.Component {
state = {
correctCount: 0,
wrongCount: 0,
wrongAnswers: [],
- totalCount: this.props.navigation.getParam("questions", []).length,
- availableIds: this.props.navigation.getParam("questions", []).map(a => a.id),
- activeQuestionId: this.props.navigation.getParam("questions", [])[
- Math.floor(Math.random() * this.props.navigation.getParam("questions", []).length)
- ].id,
- activeAnswerId: Math.floor(Math.random() * 3),
+ availableIds: [],
+ activeQuestionId: null,
+ activeAnswerId: 0,
clickedAnswer: false,
- answered: false,
- results: false
- }
-
- bannerError = (e) => {
- //console.log("Banner error (footer): ", e)
- }
+ answered: false
+ };
componentDidMount() {
- BackHandler.addEventListener('hardwareBackPress', this.handleBackButton)
+ this.backHandler = BackHandler.addEventListener('hardwareBackPress', this.handleBackButton);
+
+ const questions = this.props.route.params?.questions || [];
+ this.setState({
+ availableIds: questions.map(q => q.id),
+ activeQuestionId: questions.length ? questions[Math.floor(Math.random() * questions.length)].id : null
+ });
}
componentWillUnmount() {
- BackHandler.removeEventListener('hardwareBackPress', this.handleBackButton)
+ this.backHandler?.remove();
}
handleBackButton = () => {
+ const tmpQuestions = [];
+ let fullQuestions = [];
- let tmpQuestions = []
- let fullQuestions = []
-
- examScheme.forEach( (elem) => {
- let currentSection = allQuestions[elem.section]
- for(let i=0; i fullQuestions.push(...allQuestions[elem.section]));
- for(let i=0; i<10; i++) {
- const currentIndex = Math.floor(Math.random() * fullQuestions.length)
- tmpQuestions.push(fullQuestions[currentIndex])
- fullQuestions = fullQuestions.filter( (item, index) => index != currentIndex)
+ for (let i = 0; i < 10; i++) {
+ const idx = Math.floor(Math.random() * fullQuestions.length);
+ tmpQuestions.push(fullQuestions[idx]);
+ fullQuestions.splice(idx, 1);
}
- this.props.navigation.navigate("Splash", {
- trueFalseQuestions: tmpQuestions
- })
- return true
+ this.props.navigation.navigate("Splash", { trueFalseQuestions: tmpQuestions });
+ return true;
}
answer = (answer, correct, id, question) => {
- this.setState(
- state => {
- const nextState = { answered: true, clickedId: id, clickedAnswer: answer }
-
- if ((correct && answer) || (!correct && !answer)) {
- //console.log('ok')
- nextState.correctCount = state.correctCount + 1
- } else {
- //console.log('ko')
- nextState.wrongCount = state.wrongCount + 1
- nextState.wrongAnswers = state.wrongAnswers
- nextState.wrongAnswers.push(
- { question: question.question,
- id: question.id,
- clicked: question.answers[state.activeAnswerId].id,
- answers: question.answers
- }
- )
-
- }
-
- return nextState
- },
- () => {
- setTimeout(() => this.nextQuestion(), 2000)
+ this.setState(state => {
+ const nextState = { answered: true, clickedId: id, clickedAnswer: answer };
+
+ if ((correct && answer) || (!correct && !answer)) {
+ nextState.correctCount = state.correctCount + 1;
+ } else {
+ nextState.wrongCount = state.wrongCount + 1;
+ nextState.wrongAnswers = [...state.wrongAnswers, { question: question.question, id: question.id, clicked: question.answers[state.activeAnswerId].id, answers: question.answers }];
}
- )
+
+ return nextState;
+ }, () => setTimeout(this.nextQuestion, 2000));
}
nextQuestion = () => {
-
- const updatedIndexes = this.state.availableIds.filter( item => item != this.state.activeQuestionId)
- const nextId = updatedIndexes[Math.floor(Math.random() * updatedIndexes.length)]
-
+ const updatedIndexes = this.state.availableIds.filter(id => id !== this.state.activeQuestionId);
if (!updatedIndexes.length) {
- //console.log(this.state.wrongAnswers)
this.props.navigation.navigate("ResultsTrueFalse", {
results: {
isExam: false,
- total: this.state.totalCount,
+ total: this.state.availableIds.length,
correct: this.state.correctCount,
wrong: this.state.wrongCount,
wrongAnswers: this.state.wrongAnswers
}
- })
-
- } else {
- this.setState( (state) => {
- return {
- availableIds: updatedIndexes,
- activeQuestionId: nextId,
- activeAnswerId: Math.floor(Math.random() * 3),
- answered: false
- }
- })
+ });
+ return;
}
+
+ const nextId = updatedIndexes[Math.floor(Math.random() * updatedIndexes.length)];
+ this.setState({ availableIds: updatedIndexes, activeQuestionId: nextId, activeAnswerId: Math.floor(Math.random() * 3), answered: false });
}
render() {
- const questions = this.props.navigation.getParam("questions", [])
- const question = questions.filter(item => item.id == this.state.activeQuestionId)[0] || questions[0]
- const randomAnswer = question.answers[this.state.activeAnswerId]
-
- //console.log({id: randomAnswer.id, clicked: this.state.clickedId, answered: this.state.answered, isCorrect: randomAnswer.correct || false})
+ const questions = this.props.route.params?.questions || [];
+ const question = questions.find(q => q.id === this.state.activeQuestionId) || questions[0];
+ const randomAnswer = question?.answers[this.state.activeAnswerId];
return (
-
-
-
-
-
-
-
- {!this.state.results ?
-
-
- {question.id}
- {question.question}
- {randomAnswer.text}
-
-
-
-
-
-
-
- {`${this.state.correctCount+this.state.wrongCount}/${this.state.totalCount}`}
-
-
- : }
-
-
-
-
-
-
-
+
+
+
+ {question?.id}
+ {question?.question}
+ {randomAnswer?.text}
+
+
+
+
+ {`${this.state.correctCount + this.state.wrongCount}/${this.state.availableIds.length}`}
+
+
+
- )
+ );
}
}
-export default Quiz
+export default Quiz;
diff --git a/vds-app/android/.gitignore b/vds-app/android/.gitignore
new file mode 100644
index 0000000..8a6be07
--- /dev/null
+++ b/vds-app/android/.gitignore
@@ -0,0 +1,16 @@
+# OSX
+#
+.DS_Store
+
+# Android/IntelliJ
+#
+build/
+.idea
+.gradle
+local.properties
+*.iml
+*.hprof
+.cxx/
+
+# Bundle artifacts
+*.jsbundle
diff --git a/vds-app/android/app/build.gradle b/vds-app/android/app/build.gradle
new file mode 100644
index 0000000..391d3ba
--- /dev/null
+++ b/vds-app/android/app/build.gradle
@@ -0,0 +1,182 @@
+apply plugin: "com.android.application"
+apply plugin: "org.jetbrains.kotlin.android"
+apply plugin: "com.facebook.react"
+
+def projectRoot = rootDir.getAbsoluteFile().getParentFile().getAbsolutePath()
+
+/**
+ * This is the configuration block to customize your React Native Android app.
+ * By default you don't need to apply any configuration, just uncomment the lines you need.
+ */
+react {
+ entryFile = file(["node", "-e", "require('expo/scripts/resolveAppEntry')", projectRoot, "android", "absolute"].execute(null, rootDir).text.trim())
+ reactNativeDir = new File(["node", "--print", "require.resolve('react-native/package.json')"].execute(null, rootDir).text.trim()).getParentFile().getAbsoluteFile()
+ hermesCommand = new File(["node", "--print", "require.resolve('react-native/package.json')"].execute(null, rootDir).text.trim()).getParentFile().getAbsolutePath() + "/sdks/hermesc/%OS-BIN%/hermesc"
+ codegenDir = new File(["node", "--print", "require.resolve('@react-native/codegen/package.json', { paths: [require.resolve('react-native/package.json')] })"].execute(null, rootDir).text.trim()).getParentFile().getAbsoluteFile()
+
+ enableBundleCompression = (findProperty('android.enableBundleCompression') ?: false).toBoolean()
+ // Use Expo CLI to bundle the app, this ensures the Metro config
+ // works correctly with Expo projects.
+ cliFile = new File(["node", "--print", "require.resolve('@expo/cli', { paths: [require.resolve('expo/package.json')] })"].execute(null, rootDir).text.trim())
+ bundleCommand = "export:embed"
+
+ /* Folders */
+ // The root of your project, i.e. where "package.json" lives. Default is '../..'
+ // root = file("../../")
+ // The folder where the react-native NPM package is. Default is ../../node_modules/react-native
+ // reactNativeDir = file("../../node_modules/react-native")
+ // The folder where the react-native Codegen package is. Default is ../../node_modules/@react-native/codegen
+ // codegenDir = file("../../node_modules/@react-native/codegen")
+
+ /* Variants */
+ // The list of variants to that are debuggable. For those we're going to
+ // skip the bundling of the JS bundle and the assets. By default is just 'debug'.
+ // If you add flavors like lite, prod, etc. you'll have to list your debuggableVariants.
+ // debuggableVariants = ["liteDebug", "prodDebug"]
+
+ /* Bundling */
+ // A list containing the node command and its flags. Default is just 'node'.
+ // nodeExecutableAndArgs = ["node"]
+
+ //
+ // The path to the CLI configuration file. Default is empty.
+ // bundleConfig = file(../rn-cli.config.js)
+ //
+ // The name of the generated asset file containing your JS bundle
+ // bundleAssetName = "MyApplication.android.bundle"
+ //
+ // The entry file for bundle generation. Default is 'index.android.js' or 'index.js'
+ // entryFile = file("../js/MyApplication.android.js")
+ //
+ // A list of extra flags to pass to the 'bundle' commands.
+ // See https://github.com/react-native-community/cli/blob/main/docs/commands.md#bundle
+ // extraPackagerArgs = []
+
+ /* Hermes Commands */
+ // The hermes compiler command to run. By default it is 'hermesc'
+ // hermesCommand = "$rootDir/my-custom-hermesc/bin/hermesc"
+ //
+ // The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
+ // hermesFlags = ["-O", "-output-source-map"]
+
+ /* Autolinking */
+ autolinkLibrariesWithApp()
+}
+
+/**
+ * Set this to true in release builds to optimize the app using [R8](https://developer.android.com/topic/performance/app-optimization/enable-app-optimization).
+ */
+def enableMinifyInReleaseBuilds = (findProperty('android.enableMinifyInReleaseBuilds') ?: false).toBoolean()
+
+/**
+ * The preferred build flavor of JavaScriptCore (JSC)
+ *
+ * For example, to use the international variant, you can use:
+ * `def jscFlavor = 'org.webkit:android-jsc-intl:+'`
+ *
+ * The international variant includes ICU i18n library and necessary data
+ * allowing to use e.g. `Date.toLocaleString` and `String.localeCompare` that
+ * give correct results when using with locales other than en-US. Note that
+ * this variant is about 6MiB larger per architecture than default.
+ */
+def jscFlavor = 'io.github.react-native-community:jsc-android:2026004.+'
+
+android {
+ ndkVersion rootProject.ext.ndkVersion
+
+ buildToolsVersion rootProject.ext.buildToolsVersion
+ compileSdk rootProject.ext.compileSdkVersion
+
+ namespace 'com.dslak.vdsquiz'
+ defaultConfig {
+ applicationId 'com.dslak.vdsquiz'
+ minSdkVersion rootProject.ext.minSdkVersion
+ targetSdkVersion rootProject.ext.targetSdkVersion
+ versionCode 31
+ versionName "3.8.3"
+
+ buildConfigField "String", "REACT_NATIVE_RELEASE_LEVEL", "\"${findProperty('reactNativeReleaseLevel') ?: 'stable'}\""
+ }
+ signingConfigs {
+ debug {
+ storeFile file('debug.keystore')
+ storePassword 'android'
+ keyAlias 'androiddebugkey'
+ keyPassword 'android'
+ }
+ }
+ buildTypes {
+ debug {
+ signingConfig signingConfigs.debug
+ }
+ release {
+ // Caution! In production, you need to generate your own keystore file.
+ // see https://reactnative.dev/docs/signed-apk-android.
+ signingConfig signingConfigs.debug
+ def enableShrinkResources = findProperty('android.enableShrinkResourcesInReleaseBuilds') ?: 'false'
+ shrinkResources enableShrinkResources.toBoolean()
+ minifyEnabled enableMinifyInReleaseBuilds
+ proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
+ def enablePngCrunchInRelease = findProperty('android.enablePngCrunchInReleaseBuilds') ?: 'true'
+ crunchPngs enablePngCrunchInRelease.toBoolean()
+ }
+ }
+ packagingOptions {
+ jniLibs {
+ def enableLegacyPackaging = findProperty('expo.useLegacyPackaging') ?: 'false'
+ useLegacyPackaging enableLegacyPackaging.toBoolean()
+ }
+ }
+ androidResources {
+ ignoreAssetsPattern '!.svn:!.git:!.ds_store:!*.scc:!CVS:!thumbs.db:!picasa.ini:!*~'
+ }
+}
+
+// Apply static values from `gradle.properties` to the `android.packagingOptions`
+// Accepts values in comma delimited lists, example:
+// android.packagingOptions.pickFirsts=/LICENSE,**/picasa.ini
+["pickFirsts", "excludes", "merges", "doNotStrip"].each { prop ->
+ // Split option: 'foo,bar' -> ['foo', 'bar']
+ def options = (findProperty("android.packagingOptions.$prop") ?: "").split(",");
+ // Trim all elements in place.
+ for (i in 0.. 0) {
+ println "android.packagingOptions.$prop += $options ($options.length)"
+ // Ex: android.packagingOptions.pickFirsts += '**/SCCS/**'
+ options.each {
+ android.packagingOptions[prop] += it
+ }
+ }
+}
+
+dependencies {
+ // The version of react-native is set by the React Native Gradle Plugin
+ implementation("com.facebook.react:react-android")
+
+ def isGifEnabled = (findProperty('expo.gif.enabled') ?: "") == "true";
+ def isWebpEnabled = (findProperty('expo.webp.enabled') ?: "") == "true";
+ def isWebpAnimatedEnabled = (findProperty('expo.webp.animated') ?: "") == "true";
+
+ if (isGifEnabled) {
+ // For animated gif support
+ implementation("com.facebook.fresco:animated-gif:${expoLibs.versions.fresco.get()}")
+ }
+
+ if (isWebpEnabled) {
+ // For webp support
+ implementation("com.facebook.fresco:webpsupport:${expoLibs.versions.fresco.get()}")
+ if (isWebpAnimatedEnabled) {
+ // Animated webp support
+ implementation("com.facebook.fresco:animated-webp:${expoLibs.versions.fresco.get()}")
+ }
+ }
+
+ if (hermesEnabled.toBoolean()) {
+ implementation("com.facebook.react:hermes-android")
+ } else {
+ implementation jscFlavor
+ }
+}
diff --git a/vds-app/android/app/debug.keystore b/vds-app/android/app/debug.keystore
new file mode 100644
index 0000000..364e105
Binary files /dev/null and b/vds-app/android/app/debug.keystore differ
diff --git a/vds-app/android/app/proguard-rules.pro b/vds-app/android/app/proguard-rules.pro
new file mode 100644
index 0000000..551eb41
--- /dev/null
+++ b/vds-app/android/app/proguard-rules.pro
@@ -0,0 +1,14 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /usr/local/Cellar/android-sdk/24.3.3/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+# http://developer.android.com/guide/developing/tools/proguard.html
+
+# react-native-reanimated
+-keep class com.swmansion.reanimated.** { *; }
+-keep class com.facebook.react.turbomodule.** { *; }
+
+# Add any project specific keep options here:
diff --git a/vds-app/android/app/src/debug/AndroidManifest.xml b/vds-app/android/app/src/debug/AndroidManifest.xml
new file mode 100644
index 0000000..3ec2507
--- /dev/null
+++ b/vds-app/android/app/src/debug/AndroidManifest.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
diff --git a/vds-app/android/app/src/main/AndroidManifest.xml b/vds-app/android/app/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..6d8591d
--- /dev/null
+++ b/vds-app/android/app/src/main/AndroidManifest.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/vds-app/android/app/src/main/java/com/dslak/vdsquiz/MainActivity.kt b/vds-app/android/app/src/main/java/com/dslak/vdsquiz/MainActivity.kt
new file mode 100644
index 0000000..975f0d2
--- /dev/null
+++ b/vds-app/android/app/src/main/java/com/dslak/vdsquiz/MainActivity.kt
@@ -0,0 +1,61 @@
+package com.dslak.vdsquiz
+
+import android.os.Build
+import android.os.Bundle
+
+import com.facebook.react.ReactActivity
+import com.facebook.react.ReactActivityDelegate
+import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.fabricEnabled
+import com.facebook.react.defaults.DefaultReactActivityDelegate
+
+import expo.modules.ReactActivityDelegateWrapper
+
+class MainActivity : ReactActivity() {
+ override fun onCreate(savedInstanceState: Bundle?) {
+ // Set the theme to AppTheme BEFORE onCreate to support
+ // coloring the background, status bar, and navigation bar.
+ // This is required for expo-splash-screen.
+ setTheme(R.style.AppTheme);
+ super.onCreate(null)
+ }
+
+ /**
+ * Returns the name of the main component registered from JavaScript. This is used to schedule
+ * rendering of the component.
+ */
+ override fun getMainComponentName(): String = "main"
+
+ /**
+ * Returns the instance of the [ReactActivityDelegate]. We use [DefaultReactActivityDelegate]
+ * which allows you to enable New Architecture with a single boolean flags [fabricEnabled]
+ */
+ override fun createReactActivityDelegate(): ReactActivityDelegate {
+ return ReactActivityDelegateWrapper(
+ this,
+ BuildConfig.IS_NEW_ARCHITECTURE_ENABLED,
+ object : DefaultReactActivityDelegate(
+ this,
+ mainComponentName,
+ fabricEnabled
+ ){})
+ }
+
+ /**
+ * Align the back button behavior with Android S
+ * where moving root activities to background instead of finishing activities.
+ * @see onBackPressed
+ */
+ override fun invokeDefaultOnBackPressed() {
+ if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.R) {
+ if (!moveTaskToBack(false)) {
+ // For non-root activities, use the default implementation to finish them.
+ super.invokeDefaultOnBackPressed()
+ }
+ return
+ }
+
+ // Use the default back button implementation on Android S
+ // because it's doing more than [Activity.moveTaskToBack] in fact.
+ super.invokeDefaultOnBackPressed()
+ }
+}
diff --git a/vds-app/android/app/src/main/java/com/dslak/vdsquiz/MainApplication.kt b/vds-app/android/app/src/main/java/com/dslak/vdsquiz/MainApplication.kt
new file mode 100644
index 0000000..348185d
--- /dev/null
+++ b/vds-app/android/app/src/main/java/com/dslak/vdsquiz/MainApplication.kt
@@ -0,0 +1,56 @@
+package com.dslak.vdsquiz
+
+import android.app.Application
+import android.content.res.Configuration
+
+import com.facebook.react.PackageList
+import com.facebook.react.ReactApplication
+import com.facebook.react.ReactNativeApplicationEntryPoint.loadReactNative
+import com.facebook.react.ReactNativeHost
+import com.facebook.react.ReactPackage
+import com.facebook.react.ReactHost
+import com.facebook.react.common.ReleaseLevel
+import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint
+import com.facebook.react.defaults.DefaultReactNativeHost
+
+import expo.modules.ApplicationLifecycleDispatcher
+import expo.modules.ReactNativeHostWrapper
+
+class MainApplication : Application(), ReactApplication {
+
+ override val reactNativeHost: ReactNativeHost = ReactNativeHostWrapper(
+ this,
+ object : DefaultReactNativeHost(this) {
+ override fun getPackages(): List =
+ PackageList(this).packages.apply {
+ // Packages that cannot be autolinked yet can be added manually here, for example:
+ // add(MyReactNativePackage())
+ }
+
+ override fun getJSMainModuleName(): String = ".expo/.virtual-metro-entry"
+
+ override fun getUseDeveloperSupport(): Boolean = BuildConfig.DEBUG
+
+ override val isNewArchEnabled: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
+ }
+ )
+
+ override val reactHost: ReactHost
+ get() = ReactNativeHostWrapper.createReactHost(applicationContext, reactNativeHost)
+
+ override fun onCreate() {
+ super.onCreate()
+ DefaultNewArchitectureEntryPoint.releaseLevel = try {
+ ReleaseLevel.valueOf(BuildConfig.REACT_NATIVE_RELEASE_LEVEL.uppercase())
+ } catch (e: IllegalArgumentException) {
+ ReleaseLevel.STABLE
+ }
+ loadReactNative(this)
+ ApplicationLifecycleDispatcher.onApplicationCreate(this)
+ }
+
+ override fun onConfigurationChanged(newConfig: Configuration) {
+ super.onConfigurationChanged(newConfig)
+ ApplicationLifecycleDispatcher.onConfigurationChanged(this, newConfig)
+ }
+}
diff --git a/vds-app/android/app/src/main/res/drawable-hdpi/splashscreen_logo.png b/vds-app/android/app/src/main/res/drawable-hdpi/splashscreen_logo.png
new file mode 100644
index 0000000..33c047f
Binary files /dev/null and b/vds-app/android/app/src/main/res/drawable-hdpi/splashscreen_logo.png differ
diff --git a/vds-app/android/app/src/main/res/drawable-mdpi/splashscreen_logo.png b/vds-app/android/app/src/main/res/drawable-mdpi/splashscreen_logo.png
new file mode 100644
index 0000000..e523f97
Binary files /dev/null and b/vds-app/android/app/src/main/res/drawable-mdpi/splashscreen_logo.png differ
diff --git a/vds-app/android/app/src/main/res/drawable-xhdpi/splashscreen_logo.png b/vds-app/android/app/src/main/res/drawable-xhdpi/splashscreen_logo.png
new file mode 100644
index 0000000..4758e33
Binary files /dev/null and b/vds-app/android/app/src/main/res/drawable-xhdpi/splashscreen_logo.png differ
diff --git a/vds-app/android/app/src/main/res/drawable-xxhdpi/splashscreen_logo.png b/vds-app/android/app/src/main/res/drawable-xxhdpi/splashscreen_logo.png
new file mode 100644
index 0000000..f60f726
Binary files /dev/null and b/vds-app/android/app/src/main/res/drawable-xxhdpi/splashscreen_logo.png differ
diff --git a/vds-app/android/app/src/main/res/drawable-xxxhdpi/splashscreen_logo.png b/vds-app/android/app/src/main/res/drawable-xxxhdpi/splashscreen_logo.png
new file mode 100644
index 0000000..5a07903
Binary files /dev/null and b/vds-app/android/app/src/main/res/drawable-xxxhdpi/splashscreen_logo.png differ
diff --git a/vds-app/android/app/src/main/res/drawable/ic_launcher_background.xml b/vds-app/android/app/src/main/res/drawable/ic_launcher_background.xml
new file mode 100644
index 0000000..883b2a0
--- /dev/null
+++ b/vds-app/android/app/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,6 @@
+
+ -
+
+
+
\ No newline at end of file
diff --git a/vds-app/android/app/src/main/res/drawable/rn_edit_text_material.xml b/vds-app/android/app/src/main/res/drawable/rn_edit_text_material.xml
new file mode 100644
index 0000000..5c25e72
--- /dev/null
+++ b/vds-app/android/app/src/main/res/drawable/rn_edit_text_material.xml
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+