From 5073d3a1c2b767c000b44a70acaec4326fe842c3 Mon Sep 17 00:00:00 2001
From: Dslak <dslaky@gmail.com>
Date: Sun, 20 Oct 2019 19:18:43 +0200
Subject: [PATCH 1/4] add exam questions filter

---
 vds-app/App/components/Results.js   |  19 +++-
 vds-app/App/components/Variables.js |  12 +++
 vds-app/App/index.js                |  12 +++
 vds-app/App/screens/Exam.js         | 133 ++++++++++++++++++++++++++++
 vds-app/App/screens/QuizIndex.js    |  35 +++++++-
 5 files changed, 204 insertions(+), 7 deletions(-)
 create mode 100644 vds-app/App/screens/Exam.js

diff --git a/vds-app/App/components/Results.js b/vds-app/App/components/Results.js
index 6e95233..30c8053 100644
--- a/vds-app/App/components/Results.js
+++ b/vds-app/App/components/Results.js
@@ -25,7 +25,7 @@ const styles = StyleSheet.create({
     alignItems: "center",
     justifyContent: "center"
   },
-  boxLooser: {
+  boxWrong: {
     backgroundColor: colors.red_alpha,
     width: screen.width / 1.1,
     height: screen.height / 2,
@@ -35,6 +35,16 @@ const styles = StyleSheet.create({
     alignItems: "center",
     justifyContent: "center"
   },
+  boxUnsafe: {
+    backgroundColor: colors.orange,
+    width: screen.width / 1.1,
+    height: screen.height / 2,
+    borderRadius: 5,
+    borderColor: colors.orange,
+    borderWidth: 5,
+    alignItems: "center",
+    justifyContent: "center"
+  },
   text: {
     color: colors.white,
     fontSize: 25,
@@ -52,6 +62,9 @@ const styles = StyleSheet.create({
   },
   wrong: {
     color: colors.red
+  },
+  unsafe: {
+    color: colors.yellow
   }
 })
 
@@ -60,8 +73,8 @@ export const Results = ({ correct, wrong, visible }) => {
 
   const total = wrong+correct
   const percentage = (100/total) * correct
-  const boxStyle = percentage > 80 ? styles.box : styles.boxLooser
-  const percentStyle = percentage > 80 ? styles.correct : styles.wrong
+  const boxStyle = percentage >= 80 ? percentage >= 85 ? styles.box : styles.boxUnsafe : styles.boxWrong
+  const percentStyle = percentage >= 80 ? percentage >= 85 ? styles.correct : styles.unsafe : styles.wrong
 
   return (
     <View style={styles.container}>
diff --git a/vds-app/App/components/Variables.js b/vds-app/App/components/Variables.js
index a3200ab..87f951a 100644
--- a/vds-app/App/components/Variables.js
+++ b/vds-app/App/components/Variables.js
@@ -29,3 +29,15 @@ export const texts = {
   physiopathology: "Fisiopatologia del volo",
   piloting_techniques: "Tecniche di pilotaggio"
 }
+
+export const examScheme = [
+  {section: "aerodynamics", questions: 8, points: 3},
+  {section: "firstAid", questions: 1, points: 2},
+  {section: "flightSafety", questions: 3, points: 4},
+  {section: "instruments", questions: 1, points: 2},
+  {section: "legislation", questions: 4, points: 3},
+  {section: "materials", questions: 1, points: 2},
+  {section: "meteorology", questions: 6, points: 4},
+  {section: "physiopathology", questions: 1, points: 2},
+  {section: "pilotingTechniques", questions: 5, points: 4}
+]
diff --git a/vds-app/App/index.js b/vds-app/App/index.js
index eff7a1a..3734f9f 100644
--- a/vds-app/App/index.js
+++ b/vds-app/App/index.js
@@ -2,6 +2,7 @@ import { createStackNavigator, createAppContainer } from "react-navigation"
 
 import QuizIndex from "./screens/QuizIndex"
 import Quiz from "./screens/Quiz"
+import Exam from "./screens/Exam"
 import { colors, texts} from "./components/Variables"
 
 const MainStack = createStackNavigator({
@@ -26,6 +27,17 @@ const MainStack = createStackNavigator({
         borderBottomColor: navigation.getParam("color")
       }
     })
+  },
+  Exam: {
+    screen: Exam,
+    navigationOptions: ({ navigation }) => ({
+      headerTitle: navigation.getParam("title"),
+      headerTintColor: colors.white,
+      headerStyle: {
+        backgroundColor: navigation.getParam("color"),
+        borderBottomColor: navigation.getParam("color")
+      }
+    })
   }
 })
 
diff --git a/vds-app/App/screens/Exam.js b/vds-app/App/screens/Exam.js
new file mode 100644
index 0000000..ada9393
--- /dev/null
+++ b/vds-app/App/screens/Exam.js
@@ -0,0 +1,133 @@
+import React from "react"
+import { View, ScrollView, StyleSheet, StatusBar, Text, SafeAreaView } from "react-native"
+
+import { Button, ButtonContainer } from "../components/Button"
+import { Alert } from "../components/Alert"
+import { Results } from "../components/Results"
+import { colors } from "../components/Variables"
+
+const styles = StyleSheet.create({
+  container: {
+    backgroundColor: colors.blue,
+    flex: 1,
+    paddingHorizontal: 20
+  },
+  text: {
+    color: colors.white,
+    fontSize: 20,
+    textAlign: "center",
+    fontWeight: "600",
+    paddingVertical: 20,
+    marginTop: 20,
+  },
+  safearea: {
+    flex: 1,
+    marginTop: 20,
+    justifyContent: "space-between"
+  }
+})
+
+class Exam extends React.Component {
+
+  state = {
+    correctCount: 0,
+    wrongCount: 0,
+    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
+  }
+
+  answer = correct => {
+    this.setState(
+      state => {
+        const nextState = { answered: true }
+
+        if (correct) {
+          nextState.correctCount = state.correctCount + 1
+          nextState.answerCorrect = true
+        } else {
+          nextState.wrongCount = state.wrongCount + 1
+          nextState.answerCorrect = false
+        }
+
+        return nextState
+      },
+      () => {
+        setTimeout(() => this.nextQuestion(), 750)
+      }
+    )
+  }
+
+  nextQuestion = () => {
+    this.setState( (state) => {
+      const updatedIndexes = state.availableIds.filter( item => item != state.activeQuestionId)
+      const nextId = updatedIndexes[Math.floor(Math.random() * updatedIndexes.length)]
+      let resultsShow = false
+
+      if (!updatedIndexes.length) {
+        resultsShow = true
+        setTimeout( () => {
+          this.props.navigation.popToTop()
+        }, 5000)
+      }
+
+      return {
+        //totalCount: updatedIndexes.length,
+        availableIds: updatedIndexes,
+        activeQuestionId: nextId,
+        answered: false,
+        results: resultsShow
+      }
+    })
+  }
+
+  render() {
+    const questions = this.props.navigation.getParam("questions", [])
+    const question = questions.filter(item => item.id == this.state.activeQuestionId)[0] || questions[0]
+
+    return (
+      <ScrollView style={[
+          styles.container,
+          { backgroundColor: this.props.navigation.getParam("color") }
+        ]}
+      >
+        <StatusBar barStyle="light-content" />
+        <SafeAreaView style={styles.safearea}>
+          <View>
+            <Text style={styles.text}>{question.question}</Text>
+
+            <ButtonContainer>
+              {question.answers.map(answer => (
+                <Button
+                  key={answer.id}
+                  text={answer.text}
+                  onPress={() => this.answer(answer.correct)}
+                />
+              ))}
+            </ButtonContainer>
+          </View>
+
+          <Text style={styles.text}>
+            {`${this.state.correctCount+this.state.wrongCount}/${this.state.totalCount}`}
+          </Text>
+        </SafeAreaView>
+        <Alert
+          correct={this.state.answerCorrect}
+          visible={this.state.answered}
+        />
+        <Results
+          correct={this.state.correctCount}
+          wrong={this.state.wrongCount}
+          visible={this.state.results}
+        />
+      </ScrollView>
+    )
+  }
+}
+
+export default Exam
diff --git a/vds-app/App/screens/QuizIndex.js b/vds-app/App/screens/QuizIndex.js
index c28b1e9..719371c 100644
--- a/vds-app/App/screens/QuizIndex.js
+++ b/vds-app/App/screens/QuizIndex.js
@@ -13,7 +13,34 @@ import physiopathologyQuestions from "../data/physiopathology"
 import pilotingTechniquesQuestions from "../data/pilotingTechniques"
 
 import { RowItem } from "../components/RowItem"
-import { colors, texts } from "../components/Variables"
+import { colors, texts, examScheme } from "../components/Variables"
+
+let examQuestions = []
+const allQuestions = {
+  aerodynamics: aerodynamicsQuestions,
+  firstAid: firstAidQuestions,
+  flightSafety: flightSafetyQuestions,
+  instruments: instrumentsQuestions,
+  legislation: legislationQuestions,
+  materials: materialsQuestions,
+  meteorology: meteorologyQuestions,
+  physiopathology: physiopathologyQuestions,
+  pilotingTechniques: pilotingTechniquesQuestions
+}
+
+const composeExamQuestions = () => {
+  examScheme.forEach( (elem) => {
+    let currentSection = allQuestions[elem.section]
+    for(let i=0; i<elem.questions; i++) {
+      const currentIndex = Math.floor(Math.random() * elem.questions)
+      //currentSection[currentIndex].question = elem.section + currentSection[currentIndex].question
+      examQuestions.push(currentSection[currentIndex])
+      currentSection = currentSection.filter( (item, index) => index != currentIndex)
+    }
+  })
+}
+
+composeExamQuestions()
 
 export default ({ navigation }) => (
   <ScrollView style={[{ backgroundColor: colors.dark_blue }]}>
@@ -82,9 +109,9 @@ export default ({ navigation }) => (
       })}/>
 
     <RowItem name={texts.exam} color={colors.blue} onPress={() =>
-      navigation.navigate("Quiz", {
+      navigation.navigate("Exam", {
         title: texts.exam,
-        questions: pilotingTechniquesQuestions,
+        questions: examQuestions,
         color: colors.blue
       })}/>
 
@@ -92,7 +119,7 @@ export default ({ navigation }) => (
       navigation.navigate("Quiz", {
         title: "TEST",
         questions: testQuestions,
-        color: colors.orange
+        color: colors.blue
       })}/>
 
   </ScrollView>

From 22e094ed76ea337c21571abf37659445d7bcadb1 Mon Sep 17 00:00:00 2001
From: Dslak <dslaky@gmail.com>
Date: Sun, 20 Oct 2019 19:30:00 +0200
Subject: [PATCH 2/4] examQuestions component

---
 vds-app/App/components/ExamQuestions.js | 43 +++++++++++++++++++++++++
 vds-app/App/screens/QuizIndex.js        | 30 ++---------------
 2 files changed, 45 insertions(+), 28 deletions(-)
 create mode 100644 vds-app/App/components/ExamQuestions.js

diff --git a/vds-app/App/components/ExamQuestions.js b/vds-app/App/components/ExamQuestions.js
new file mode 100644
index 0000000..2f2ab63
--- /dev/null
+++ b/vds-app/App/components/ExamQuestions.js
@@ -0,0 +1,43 @@
+import testQuestions from "../data/test"
+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 { examScheme } from "../components/Variables"
+
+let tmpQuestions = []
+
+const allQuestions = {
+  aerodynamics: aerodynamicsQuestions,
+  firstAid: firstAidQuestions,
+  flightSafety: flightSafetyQuestions,
+  instruments: instrumentsQuestions,
+  legislation: legislationQuestions,
+  materials: materialsQuestions,
+  meteorology: meteorologyQuestions,
+  physiopathology: physiopathologyQuestions,
+  pilotingTechniques: pilotingTechniquesQuestions
+}
+
+const generateQuestions = () => {
+
+  examScheme.forEach( (elem) => {
+    let currentSection = allQuestions[elem.section]
+    for(let i=0; i<elem.questions; i++) {
+      const currentIndex = Math.floor(Math.random() * elem.questions)
+      //currentSection[currentIndex].question = elem.section + currentSection[currentIndex].question
+      tmpQuestions.push(currentSection[currentIndex])
+      currentSection = currentSection.filter( (item, index) => index != currentIndex)
+    }
+  })
+}
+
+generateQuestions()
+
+export const examQuestions = tmpQuestions
diff --git a/vds-app/App/screens/QuizIndex.js b/vds-app/App/screens/QuizIndex.js
index 719371c..131d7f8 100644
--- a/vds-app/App/screens/QuizIndex.js
+++ b/vds-app/App/screens/QuizIndex.js
@@ -13,34 +13,8 @@ import physiopathologyQuestions from "../data/physiopathology"
 import pilotingTechniquesQuestions from "../data/pilotingTechniques"
 
 import { RowItem } from "../components/RowItem"
-import { colors, texts, examScheme } from "../components/Variables"
-
-let examQuestions = []
-const allQuestions = {
-  aerodynamics: aerodynamicsQuestions,
-  firstAid: firstAidQuestions,
-  flightSafety: flightSafetyQuestions,
-  instruments: instrumentsQuestions,
-  legislation: legislationQuestions,
-  materials: materialsQuestions,
-  meteorology: meteorologyQuestions,
-  physiopathology: physiopathologyQuestions,
-  pilotingTechniques: pilotingTechniquesQuestions
-}
-
-const composeExamQuestions = () => {
-  examScheme.forEach( (elem) => {
-    let currentSection = allQuestions[elem.section]
-    for(let i=0; i<elem.questions; i++) {
-      const currentIndex = Math.floor(Math.random() * elem.questions)
-      //currentSection[currentIndex].question = elem.section + currentSection[currentIndex].question
-      examQuestions.push(currentSection[currentIndex])
-      currentSection = currentSection.filter( (item, index) => index != currentIndex)
-    }
-  })
-}
-
-composeExamQuestions()
+import { colors, texts} from "../components/Variables"
+import { examQuestions } from "../components/ExamQuestions"
 
 export default ({ navigation }) => (
   <ScrollView style={[{ backgroundColor: colors.dark_blue }]}>

From 2b3f3da9d8d7a9d92652e9d8a01bca18dd421c8b Mon Sep 17 00:00:00 2001
From: Dslak <dslaky@gmail.com>
Date: Sun, 20 Oct 2019 20:16:22 +0200
Subject: [PATCH 3/4] add timer

---
 vds-app/App/components/Results.js |  2 +-
 vds-app/App/screens/Exam.js       | 36 ++++++++++++++++++++++++++++---
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/vds-app/App/components/Results.js b/vds-app/App/components/Results.js
index 30c8053..28d8099 100644
--- a/vds-app/App/components/Results.js
+++ b/vds-app/App/components/Results.js
@@ -72,7 +72,7 @@ export const Results = ({ correct, wrong, visible }) => {
   if (!visible) return null
 
   const total = wrong+correct
-  const percentage = (100/total) * correct
+  const percentage = total ? (100/total) * correct : 0
   const boxStyle = percentage >= 80 ? percentage >= 85 ? styles.box : styles.boxUnsafe : styles.boxWrong
   const percentStyle = percentage >= 80 ? percentage >= 85 ? styles.correct : styles.unsafe : styles.wrong
 
diff --git a/vds-app/App/screens/Exam.js b/vds-app/App/screens/Exam.js
index ada9393..3afe47b 100644
--- a/vds-app/App/screens/Exam.js
+++ b/vds-app/App/screens/Exam.js
@@ -20,6 +20,14 @@ const styles = StyleSheet.create({
     paddingVertical: 20,
     marginTop: 20,
   },
+  timer: {
+    color: colors.white,
+    fontSize: 30,
+    textAlign: "center",
+    fontWeight: "600",
+    paddingVertical: 10,
+    marginTop: 10,
+  },
   safearea: {
     flex: 1,
     marginTop: 20,
@@ -27,6 +35,9 @@ const styles = StyleSheet.create({
   }
 })
 
+let interval = null
+const maxTime = 10
+
 class Exam extends React.Component {
 
   state = {
@@ -39,7 +50,8 @@ class Exam extends React.Component {
                       ].id,
     answered: false,
     answerCorrect: false,
-    results: false
+    results: false,
+    timer: 0
   }
 
   answer = correct => {
@@ -67,7 +79,7 @@ class Exam extends React.Component {
     this.setState( (state) => {
       const updatedIndexes = state.availableIds.filter( item => item != state.activeQuestionId)
       const nextId = updatedIndexes[Math.floor(Math.random() * updatedIndexes.length)]
-      let resultsShow = false
+      let resultsShow = this.state.timer >= maxTime-1 || false
 
       if (!updatedIndexes.length) {
         resultsShow = true
@@ -77,7 +89,6 @@ class Exam extends React.Component {
       }
 
       return {
-        //totalCount: updatedIndexes.length,
         availableIds: updatedIndexes,
         activeQuestionId: nextId,
         answered: false,
@@ -90,6 +101,24 @@ class Exam extends React.Component {
     const questions = this.props.navigation.getParam("questions", [])
     const question = questions.filter(item => item.id == this.state.activeQuestionId)[0] || questions[0]
 
+    if(this.state.timer==0) {
+      interval = setInterval( () => {
+        this.setState( (state) => {
+          return {
+            timer: this.state.timer+1,
+            results: this.state.timer >= maxTime-1 || false
+          }
+        })
+      }, 1000)
+    }
+
+    if(this.state.timer >= maxTime) {
+      clearInterval(interval)
+      setTimeout( () => {
+        this.props.navigation.popToTop()
+      }, 5000)
+    }
+
     return (
       <ScrollView style={[
           styles.container,
@@ -98,6 +127,7 @@ class Exam extends React.Component {
       >
         <StatusBar barStyle="light-content" />
         <SafeAreaView style={styles.safearea}>
+          <Text style={styles.timer}>{new Date(this.state.timer * 1000).toISOString().substr(11, 8)}</Text>
           <View>
             <Text style={styles.text}>{question.question}</Text>
 

From 47568f9a98d6c14c6f1f0926df66af3c08923e56 Mon Sep 17 00:00:00 2001
From: Dslak <dslaky@gmail.com>
Date: Sun, 20 Oct 2019 20:36:00 +0200
Subject: [PATCH 4/4] simulation alert

---
 vds-app/App/components/Results.js   | 34 ++++++++++-------------------
 vds-app/App/components/RowItem.js   |  7 +++---
 vds-app/App/components/Variables.js |  2 +-
 vds-app/App/screens/Exam.js         | 15 +++++++------
 vds-app/App/screens/Quiz.js         |  1 +
 vds-app/App/screens/QuizIndex.js    | 27 +++++++++--------------
 6 files changed, 35 insertions(+), 51 deletions(-)

diff --git a/vds-app/App/components/Results.js b/vds-app/App/components/Results.js
index 28d8099..238c897 100644
--- a/vds-app/App/components/Results.js
+++ b/vds-app/App/components/Results.js
@@ -18,8 +18,8 @@ const styles = StyleSheet.create({
   box: {
     backgroundColor: colors.green_alpha,
     width: screen.width / 1.1,
-    height: screen.height / 2,
-    borderRadius: 5,
+    height: 320,
+    borderRadius: 15,
     borderColor: colors.white_alpha,
     borderWidth: 5,
     alignItems: "center",
@@ -28,8 +28,8 @@ const styles = StyleSheet.create({
   boxWrong: {
     backgroundColor: colors.red_alpha,
     width: screen.width / 1.1,
-    height: screen.height / 2,
-    borderRadius: 5,
+    height: 320,
+    borderRadius: 15,
     borderColor: colors.white_alpha,
     borderWidth: 5,
     alignItems: "center",
@@ -38,9 +38,9 @@ const styles = StyleSheet.create({
   boxUnsafe: {
     backgroundColor: colors.orange,
     width: screen.width / 1.1,
-    height: screen.height / 2,
-    borderRadius: 5,
-    borderColor: colors.orange,
+    height: 320,
+    borderRadius: 15,
+    borderColor: colors.white_alpha,
     borderWidth: 5,
     alignItems: "center",
     justifyContent: "center"
@@ -51,7 +51,7 @@ const styles = StyleSheet.create({
     textAlign: "center",
     letterSpacing: -0.02,
     fontWeight: "500",
-    lineHeight: 90
+    lineHeight: 50
   },
   textLabel: {
     paddingHorizontal: 20,
@@ -68,10 +68,9 @@ const styles = StyleSheet.create({
   }
 })
 
-export const Results = ({ correct, wrong, visible }) => {
+export const Results = ({ total, correct, wrong, visible }) => {
   if (!visible) return null
 
-  const total = wrong+correct
   const percentage = total ? (100/total) * correct : 0
   const boxStyle = percentage >= 80 ? percentage >= 85 ? styles.box : styles.boxUnsafe : styles.boxWrong
   const percentStyle = percentage >= 80 ? percentage >= 85 ? styles.correct : styles.unsafe : styles.wrong
@@ -80,22 +79,13 @@ export const Results = ({ correct, wrong, visible }) => {
     <View style={styles.container}>
       <View style={boxStyle}>
         <Text style={styles.text}>
-          <Text style={styles.textLabel}>{`${texts.corrects}: `}</Text>
-          <Text >
-            {`${correct}`}
-          </Text>
+          <Text style={styles.textLabel}>{`${texts.corrects}: ${correct}`}</Text>
         </Text>
         <Text style={styles.text}>
-          <Text style={styles.textLabel}>{`${texts.wrongs}: `}</Text>
-          <Text>
-            {`${wrong}`}
-          </Text>
+          <Text style={styles.textLabel}>{`${texts.wrongs}: ${wrong}`}</Text>
         </Text>
         <Text style={styles.text}>
-          <Text style={styles.textLabel}>{`${texts.percentage}: `}</Text>
-          <Text >
-            {`${Math.round(percentage)}%`}
-          </Text>
+          <Text style={styles.textLabel}>{`${texts.percentage}: ${Math.round(percentage)}%`}</Text>
         </Text>
       </View>
     </View>
diff --git a/vds-app/App/components/RowItem.js b/vds-app/App/components/RowItem.js
index 4930195..7c3009e 100644
--- a/vds-app/App/components/RowItem.js
+++ b/vds-app/App/components/RowItem.js
@@ -7,8 +7,7 @@ const styles = StyleSheet.create({
     paddingHorizontal: 15,
     paddingVertical: 20,
     backgroundColor: colors.blue,
-    borderBottomColor: colors.dark_blue,
-    borderBottomWidth: 1
+    marginBottom: 1
   },
   text: {
     fontSize: 18,
@@ -17,10 +16,10 @@ const styles = StyleSheet.create({
   }
 })
 
-export const RowItem = ({ onPress = () => {}, name, color }) => (
+export const RowItem = ({ onPress = () => {}, name, color, textColor }) => (
   <TouchableOpacity onPress={onPress} activeOpacity={0.8}>
     <View style={[styles.row, { backgroundColor: color }]}>
-      <Text style={styles.text}>{name}</Text>
+      <Text style={[styles.text, { color: textColor }]}>{name}</Text>
     </View>
   </TouchableOpacity>
 )
diff --git a/vds-app/App/components/Variables.js b/vds-app/App/components/Variables.js
index 87f951a..ec0a0d0 100644
--- a/vds-app/App/components/Variables.js
+++ b/vds-app/App/components/Variables.js
@@ -15,7 +15,7 @@ export const colors = {
 
 export const texts = {
   quizzes: "Seleziona un quiz",
-  exam: "Simulazione esame",
+  exam: "Simulazione esame (30 domande in 30min)",
   corrects: "Corrette",
   wrongs: "Sbagliate",
   percentage: "Percentuale",
diff --git a/vds-app/App/screens/Exam.js b/vds-app/App/screens/Exam.js
index 3afe47b..eb0a1e2 100644
--- a/vds-app/App/screens/Exam.js
+++ b/vds-app/App/screens/Exam.js
@@ -36,7 +36,7 @@ const styles = StyleSheet.create({
 })
 
 let interval = null
-const maxTime = 10
+const maxTime = 10 // 1800
 
 class Exam extends React.Component {
 
@@ -51,7 +51,7 @@ class Exam extends React.Component {
     answered: false,
     answerCorrect: false,
     results: false,
-    timer: 0
+    timer: maxTime
   }
 
   answer = correct => {
@@ -79,7 +79,7 @@ class Exam extends React.Component {
     this.setState( (state) => {
       const updatedIndexes = state.availableIds.filter( item => item != state.activeQuestionId)
       const nextId = updatedIndexes[Math.floor(Math.random() * updatedIndexes.length)]
-      let resultsShow = this.state.timer >= maxTime-1 || false
+      let resultsShow = this.state.timer <= 1 || false
 
       if (!updatedIndexes.length) {
         resultsShow = true
@@ -101,18 +101,18 @@ class Exam extends React.Component {
     const questions = this.props.navigation.getParam("questions", [])
     const question = questions.filter(item => item.id == this.state.activeQuestionId)[0] || questions[0]
 
-    if(this.state.timer==0) {
+    if(this.state.timer==maxTime) {
       interval = setInterval( () => {
         this.setState( (state) => {
           return {
-            timer: this.state.timer+1,
-            results: this.state.timer >= maxTime-1 || false
+            timer: this.state.timer-1,
+            results: this.state.timer <= 1 || false
           }
         })
       }, 1000)
     }
 
-    if(this.state.timer >= maxTime) {
+    if(this.state.timer < 1) {
       clearInterval(interval)
       setTimeout( () => {
         this.props.navigation.popToTop()
@@ -151,6 +151,7 @@ class Exam extends React.Component {
           visible={this.state.answered}
         />
         <Results
+          total={this.state.totalCount}
           correct={this.state.correctCount}
           wrong={this.state.wrongCount}
           visible={this.state.results}
diff --git a/vds-app/App/screens/Quiz.js b/vds-app/App/screens/Quiz.js
index 0760ef0..769d4cb 100644
--- a/vds-app/App/screens/Quiz.js
+++ b/vds-app/App/screens/Quiz.js
@@ -121,6 +121,7 @@ class Quiz extends React.Component {
           visible={this.state.answered}
         />
         <Results
+          total={this.state.totalCount}
           correct={this.state.correctCount}
           wrong={this.state.wrongCount}
           visible={this.state.results}
diff --git a/vds-app/App/screens/QuizIndex.js b/vds-app/App/screens/QuizIndex.js
index 131d7f8..79c450e 100644
--- a/vds-app/App/screens/QuizIndex.js
+++ b/vds-app/App/screens/QuizIndex.js
@@ -19,82 +19,75 @@ import { examQuestions } from "../components/ExamQuestions"
 export default ({ navigation }) => (
   <ScrollView style={[{ backgroundColor: colors.dark_blue }]}>
     <StatusBar barStyle="dark-content" />
-    <RowItem name={texts.aerodynamics} color={colors.blue} onPress={() =>
+    <RowItem name={texts.aerodynamics} color={colors.blue} textColor={colors.white} onPress={()=>
       navigation.navigate("Quiz", {
         title: texts.aerodynamics,
         questions: aerodynamicsQuestions,
         color: colors.blue
       })}/>
 
-    <RowItem name={texts.first_aid} color={colors.blue} onPress={() =>
+    <RowItem name={texts.first_aid} color={colors.blue} textColor={colors.white} onPress={()=>
       navigation.navigate("Quiz", {
         title: texts.first_aid,
         questions: firstAidQuestions,
         color: colors.blue
       })}/>
 
-    <RowItem name={texts.flight_safety} color={colors.blue} onPress={() =>
+    <RowItem name={texts.flight_safety} color={colors.blue} textColor={colors.white} onPress={()=>
       navigation.navigate("Quiz", {
         title: texts.flight_safety,
         questions: flightSafetyQuestions,
         color: colors.blue
       })}/>
 
-    <RowItem name={texts.instruments} color={colors.blue} onPress={() =>
+    <RowItem name={texts.instruments} color={colors.blue} textColor={colors.white} onPress={()=>
       navigation.navigate("Quiz", {
         title: texts.instruments,
         questions: instrumentsQuestions,
         color: colors.blue
       })}/>
 
-    <RowItem name={texts.legislation} color={colors.blue} onPress={() =>
+    <RowItem name={texts.legislation} color={colors.blue} textColor={colors.white} onPress={()=>
       navigation.navigate("Quiz", {
         title: texts.legislation,
         questions: legislationQuestions,
         color: colors.blue
       })}/>
 
-    <RowItem name={texts.materials} color={colors.blue} onPress={() =>
+    <RowItem name={texts.materials} color={colors.blue} textColor={colors.white} onPress={()=>
       navigation.navigate("Quiz", {
         title: texts.materials,
         questions: materialsQuestions,
         color: colors.blue
       })}/>
 
-    <RowItem name={texts.meteorology} color={colors.blue} onPress={() =>
+    <RowItem name={texts.meteorology} color={colors.blue} textColor={colors.white} onPress={()=>
       navigation.navigate("Quiz", {
         title: texts.meteorology,
         questions: meteorologyQuestions,
         color: colors.blue
       })}/>
 
-    <RowItem name={texts.physiopathology} color={colors.blue} onPress={() =>
+    <RowItem name={texts.physiopathology} color={colors.blue} textColor={colors.white} onPress={()=>
       navigation.navigate("Quiz", {
         title: texts.physiopathology,
         questions: physiopathologyQuestions,
         color: colors.blue
       })}/>
 
-    <RowItem name={texts.piloting_techniques} color={colors.blue} onPress={() =>
+    <RowItem name={texts.piloting_techniques} color={colors.blue} textColor={colors.white} onPress={()=>
       navigation.navigate("Quiz", {
         title: texts.piloting_techniques,
         questions: pilotingTechniquesQuestions,
         color: colors.blue
       })}/>
 
-    <RowItem name={texts.exam} color={colors.blue} onPress={() =>
+    <RowItem name={texts.exam} color={colors.yellow} textColor={colors.black} onPress={() =>
       navigation.navigate("Exam", {
         title: texts.exam,
         questions: examQuestions,
         color: colors.blue
       })}/>
 
-    <RowItem name="TEST" color={colors.orange} onPress={() =>
-      navigation.navigate("Quiz", {
-        title: "TEST",
-        questions: testQuestions,
-        color: colors.blue
-      })}/>
-
   </ScrollView>
 )