diff --git a/vds-app/App/components/Variables.js b/vds-app/App/components/Variables.js index a3ebb93..a4a6cfc 100644 --- a/vds-app/App/components/Variables.js +++ b/vds-app/App/components/Variables.js @@ -73,7 +73,7 @@ export const texts = { materials: "Materiali", flightSafety: "Sicurezza del volo", examScheme: "Schema domande d'esame", - setupScheme: "Setup dell'applicazione", + setupScheme: "Configurazione dell'applicazione", setupRandomCheck: "Visualizza le domande per argomento in ordine casuale", setupExcludeDelta: "Escludi le domande relative all'esame per deltaplano", resultsScheme: "Calcolo risultati", @@ -81,7 +81,8 @@ export const texts = { false: "Falso", trueFalse: "Test Vero/Falso", trueFalseSubtitle: "10 domande casuali con risposte Vero/Falso", - goToQuestion: "Vai ad una domanda specifica..." + goToQuestion: "Seleziona ad una domanda specifica...", + lens: "\uD83D\uDD0D" } export const examScheme = [ diff --git a/vds-app/App/screens/Quiz.js b/vds-app/App/screens/Quiz.js index a0aea26..0d7d14b 100644 --- a/vds-app/App/screens/Quiz.js +++ b/vds-app/App/screens/Quiz.js @@ -48,17 +48,20 @@ const styles = StyleSheet.create({ height: "100%" }, dropdown: { + marginTop: 20, color: colors.white, fontSize: 16, + borderRadius: 10, width: "100%", - textAlign: "center", + textAlign: "left", fontWeight: "600", - backgroundColor: 'transparent', + backgroundColor: colors.white_alpha }, dropdownItem: { color: colors.white, - fontSize: 20, - textAlign: "center", + fontSize: 16, + borderRadius: 10, + textAlign: "left", fontWeight: "600" }, bannerContainer: { @@ -232,7 +235,6 @@ class Quiz extends React.Component { this.jumpTo(itemValue, itemIndex)} diff --git a/vds-app/App/screens/Setup.js b/vds-app/App/screens/Setup.js index a107cab..0d5ac86 100644 --- a/vds-app/App/screens/Setup.js +++ b/vds-app/App/screens/Setup.js @@ -1,17 +1,17 @@ import React from "react" -import { View, ScrollView, StyleSheet, StatusBar, Text, CheckBox, SafeAreaView, Dimensions, Image, BackHandler, AsyncStorage} from "react-native" +import { View, ScrollView, StyleSheet, StatusBar, Text, CheckBox, SafeAreaView, Dimensions, Image, ImageBackground, BackHandler, AsyncStorage} from "react-native" import { Button, ButtonContainer } from "../components/Button" import { colors, texts, examScheme, resultsScheme} from "../components/Variables" +const bgImage = require("../assets/bg.jpg") const screen = Dimensions.get("window") -const header = require("../assets/header.png") const pkg = require('../../app.json') const styles = StyleSheet.create({ container: { - backgroundColor: colors.dark_blue, + //backgroundColor: colors.dark_blue, flex: 1 }, safearea: { @@ -20,7 +20,10 @@ const styles = StyleSheet.create({ justifyContent: "space-between", paddingHorizontal: 10 }, - + bg: { + width: "100%", + height: "100%" + }, box: { width: screen.width-20, paddingHorizontal: 10 @@ -36,7 +39,8 @@ const styles = StyleSheet.create({ textShadowRadius: 5 }, title: { - paddingTop: 30, + paddingTop: 40, + paddingBottom: 20, color: colors.white, fontSize: 18, textTransform: "uppercase", @@ -171,45 +175,47 @@ class Setup extends React.Component { render() { return ( - - - - - - - - {texts.setupScheme} - + + + + + + + + + {texts.setupScheme} + + + + + + this.changeSetup('randomQuestions')} + style={styles.checkbox} + /> + {texts.setupRandomCheck} + + + + this.changeSetup('excludeDelta')} + style={styles.checkbox} + /> + {texts.setupExcludeDelta} + - - - this.changeSetup('randomQuestions')} - style={styles.checkbox} - /> - {texts.setupRandomCheck} - - this.changeSetup('excludeDelta')} - style={styles.checkbox} - /> - {texts.setupExcludeDelta} - - - + - - - - + - + + ) } } diff --git a/vds-app/app.json b/vds-app/app.json index 836bcd9..2d6a06b 100644 --- a/vds-app/app.json +++ b/vds-app/app.json @@ -8,7 +8,7 @@ "ios", "android" ], - "version": "3.1.1", + "version": "3.5.1", "orientation": "portrait", "icon": "./assets/icon.png", "splash": {