Browse Source

update result graphics

master
Dslak 6 years ago
parent
commit
015f5c1146
  1. 637
      svg/results.svg
  2. 1
      vds-app/.expo-shared/assets.json
  3. BIN
      vds-app/App/assets/bg.jpg
  4. BIN
      vds-app/App/assets/panorama.jpg
  5. BIN
      vds-app/App/assets/panorama2.jpg
  6. 2
      vds-app/App/components/ExamQuestions.js
  7. 19
      vds-app/App/components/Results.js
  8. 2
      vds-app/App/data/physiopathology.js
  9. 2
      vds-app/App/screens/Exam.js
  10. 19
      vds-app/App/screens/Quiz.js
  11. 7
      vds-app/App/screens/QuizIndex.js
  12. 4
      vds-app/app.json

637
svg/results.svg

@ -8,19 +8,19 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
inkscape:export-ydpi="96"
inkscape:export-xdpi="96"
inkscape:export-filename="/docs/Dslak/vds_quiz/vds-app/App/assets/unsafe.jpg.png"
height="800"
width="800"
inkscape:version="1.0beta1 (unknown)"
sodipodi:docname="results.svg"
xml:space="preserve"
viewBox="0 0 800 800"
y="0px"
x="0px"
version="1.1"
id="Ebene_1"
version="1.1"><metadata
x="0px"
y="0px"
viewBox="0 0 800 800"
xml:space="preserve"
sodipodi:docname="results.svg"
inkscape:version="1.0beta1 (unknown)"
width="800"
height="800"
inkscape:export-filename="/docs/Dslak/vds_quiz/vds-app/App/assets/unsafe.jpg.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96"><metadata
id="metadata47">
<rdf:RDF>
<cc:Work
@ -34,6 +34,7 @@
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
@ -44,6 +45,7 @@
<dc:title />
@ -53,6 +55,7 @@
</cc:Work>
@ -62,6 +65,7 @@
</rdf:RDF>
@ -71,6 +75,7 @@
</metadata>
@ -80,14 +85,16 @@
<defs
id="defs45"><linearGradient
id="linearGradient940"
inkscape:collect="always">
inkscape:collect="always"
id="linearGradient940">
<stop
id="stop936"
style="stop-color:#000000;stop-opacity:1;"
offset="0"
style="stop-color:#000000;stop-opacity:1;" />
id="stop936" />
@ -95,9 +102,10 @@
<stop
id="stop938"
style="stop-color:#000000;stop-opacity:0;"
offset="1"
style="stop-color:#000000;stop-opacity:0;" />
id="stop938" />
@ -111,13 +119,15 @@
<linearGradient
id="linearGradient898"
inkscape:collect="always">
inkscape:collect="always"
id="linearGradient898">
<stop
id="stop894"
style="stop-color:#ffffff;stop-opacity:0.1606186"
offset="0"
style="stop-color:#ffffff;stop-opacity:0.1606186" />
id="stop894" />
@ -125,9 +135,10 @@
<stop
id="stop896"
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
style="stop-color:#ffffff;stop-opacity:0;" />
id="stop896" />
@ -141,13 +152,15 @@
<linearGradient
id="linearGradient862"
inkscape:collect="always">
inkscape:collect="always"
id="linearGradient862">
<stop
id="stop858"
style="stop-color:#56168b;stop-opacity:1;"
offset="0"
style="stop-color:#56168b;stop-opacity:1;" />
id="stop858" />
@ -157,9 +170,10 @@
<stop
id="stop860"
style="stop-color:#7e20c9;stop-opacity:0"
offset="1"
style="stop-color:#7e20c9;stop-opacity:0" />
id="stop860" />
@ -177,13 +191,15 @@
<linearGradient
id="linearGradient1177"
inkscape:collect="always">
inkscape:collect="always"
id="linearGradient1177">
<stop
id="stop1173"
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
style="stop-color:#ffffff;stop-opacity:1;" />
id="stop1173" />
@ -193,9 +209,10 @@
<stop
id="stop1175"
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
style="stop-color:#ffffff;stop-opacity:0;" />
id="stop1175" />
@ -213,13 +230,15 @@
<linearGradient
id="linearGradient1113"
inkscape:collect="always">
inkscape:collect="always"
id="linearGradient1113">
<stop
id="stop1109"
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
style="stop-color:#ffffff;stop-opacity:1;" />
id="stop1109" />
@ -229,9 +248,10 @@
<stop
id="stop1111"
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
style="stop-color:#ffffff;stop-opacity:0;" />
id="stop1111" />
@ -250,14 +270,16 @@
<defs
id="defs13">
<rect
y="0"
x="0"
id="SVGID_1_"
height="91.900002"
width="250"
height="91.900002" />
id="SVGID_1_"
x="0"
y="0" />
@ -277,16 +299,18 @@
<clipPath
id="SVGID_2_">
<use
height="100%"
width="100%"
y="0"
x="0"
xlink:href="#SVGID_1_"
id="use15"
style="overflow:visible"
id="use15" />
xlink:href="#SVGID_1_"
x="0"
y="0"
width="100%"
height="100%" />
@ -306,6 +330,7 @@
@ -318,15 +343,16 @@
<linearGradient
gradientTransform="translate(0,158.1)"
gradientUnits="userSpaceOnUse"
y2="77.732155"
x2="77.917458"
y1="-85.32769"
x1="6.22612"
id="linearGradient1115"
inkscape:collect="always"
xlink:href="#linearGradient1113"
inkscape:collect="always" />
id="linearGradient1115"
x1="6.22612"
y1="-85.32769"
x2="77.917458"
y2="77.732155"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(0,158.1)" />
@ -336,15 +362,16 @@
<linearGradient
gradientTransform="matrix(1.4791905,0,0,1.4791905,25.462738,22.270725)"
gradientUnits="userSpaceOnUse"
y2="19.294325"
x2="122.02882"
y1="122.54591"
x1="132.76462"
id="linearGradient1179"
inkscape:collect="always"
xlink:href="#linearGradient1177"
inkscape:collect="always" />
id="linearGradient1179"
x1="132.76462"
y1="122.54591"
x2="122.02882"
y2="19.294325"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.4791905,0,0,1.4791905,25.462738,22.270725)" />
@ -354,15 +381,16 @@
<linearGradient
y2="19.294325"
x2="122.02882"
y1="122.54591"
x1="132.76462"
gradientTransform="matrix(0.83762215,0,0,0.92541661,-275.43157,-172.04418)"
gradientUnits="userSpaceOnUse"
id="linearGradient1183"
inkscape:collect="always"
xlink:href="#linearGradient1177"
inkscape:collect="always" />
id="linearGradient1183"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.83762215,0,0,0.92541661,-275.43157,-172.04418)"
x1="132.76462"
y1="122.54591"
x2="122.02882"
y2="19.294325" />
@ -372,15 +400,16 @@
<linearGradient
y2="19.294325"
x2="122.02882"
y1="122.54591"
x1="132.76462"
gradientTransform="matrix(-1.1876812,-0.35290398,0.38989322,-1.3121667,345.47458,152.00026)"
gradientUnits="userSpaceOnUse"
id="linearGradient1212"
inkscape:collect="always"
xlink:href="#linearGradient1177"
inkscape:collect="always" />
id="linearGradient1212"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-1.1876812,-0.35290398,0.38989322,-1.3121667,345.47458,152.00026)"
x1="132.76462"
y1="122.54591"
x2="122.02882"
y2="19.294325" />
@ -392,14 +421,15 @@
<mask
id="mask1236"
maskUnits="userSpaceOnUse">
maskUnits="userSpaceOnUse"
id="mask1236">
<circle
style="fill:#ffffff;fill-opacity:1;stroke-width:1.02044"
id="circle1238"
cx="125"
r="125"
cy="125"
r="125" />
cx="125"
id="circle1238"
style="fill:#ffffff;fill-opacity:1;stroke-width:1.02044" />
@ -417,15 +447,17 @@
<mask
id="mask1243"
maskUnits="userSpaceOnUse">
maskUnits="userSpaceOnUse"
id="mask1243">
<circle
style="fill:#ffffff;fill-opacity:1;stroke-width:1.02044"
id="circle1245"
cx="125"
r="125"
cy="125"
r="125" />
cx="125"
id="circle1245"
style="fill:#ffffff;fill-opacity:1;stroke-width:1.02044" />
@ -443,15 +475,17 @@
<linearGradient
y2="147.05267"
x2="266.32431"
y1="125"
x1="0"
gradientUnits="userSpaceOnUse"
id="linearGradient866"
inkscape:collect="always"
xlink:href="#linearGradient862"
inkscape:collect="always" />
id="linearGradient866"
gradientUnits="userSpaceOnUse"
x1="0"
y1="125"
x2="266.32431"
y2="147.05267" />
@ -465,15 +499,16 @@
<linearGradient
gradientTransform="translate(-71.635743,25.813861)"
gradientUnits="userSpaceOnUse"
y2="716.57642"
x2="283.17621"
y1="-357.87811"
x1="311.80994"
id="linearGradient900"
inkscape:collect="always"
xlink:href="#linearGradient898"
inkscape:collect="always" />
id="linearGradient900"
x1="311.80994"
y1="-357.87811"
x2="283.17621"
y2="716.57642"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(-71.635743,25.813861)" />
@ -481,15 +516,16 @@
<linearGradient
y2="691.98407"
x2="-391.84567"
y1="-447.91309"
x1="1851.9196"
gradientTransform="matrix(1.0427705,0,0,0.62690293,-1088.8324,-991.72226)"
gradientUnits="userSpaceOnUse"
id="linearGradient928"
inkscape:collect="always"
xlink:href="#linearGradient898"
inkscape:collect="always" />
id="linearGradient928"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.0427705,0,0,0.62690293,-1088.8324,-991.72226)"
x1="1851.9196"
y1="-447.91309"
x2="-391.84567"
y2="691.98407" />
@ -497,15 +533,16 @@
<linearGradient
gradientTransform="matrix(1,0,0,2.1631993,-67.336207,-293.4148)"
gradientUnits="userSpaceOnUse"
y2="452.36615"
x2="687.32172"
y1="-966.22083"
x1="649.34778"
id="linearGradient942"
inkscape:collect="always"
xlink:href="#linearGradient940"
inkscape:collect="always" />
id="linearGradient942"
x1="649.34778"
y1="-966.22083"
x2="687.32172"
y2="452.36615"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,2.1631993,-67.336207,-293.4148)" />
@ -519,13 +556,14 @@
<clipPath
id="SVGID_2_-2">
<use
id="use15-8"
style="overflow:visible"
xlink:href="#SVGID_1_"
x="0"
y="0"
height="100%"
width="100%"
height="100%" />
y="0"
x="0"
xlink:href="#SVGID_1_"
style="overflow:visible"
id="use15-8" />
@ -539,16 +577,18 @@
<clipPath
id="clipPath960">
<use
id="use958"
style="overflow:visible"
xlink:href="#SVGID_1_"
x="0"
y="0"
height="100%"
width="100%"
height="100%" />
y="0"
x="0"
xlink:href="#SVGID_1_"
style="overflow:visible"
id="use958" />
@ -580,32 +620,88 @@
<linearGradient
gradientTransform="matrix(0.73549165,0,0,0.53473221,-122.70061,-41.695048)"
gradientUnits="userSpaceOnUse"
y2="452.36615"
x2="687.32172"
y1="-966.22083"
x1="649.34778"
id="linearGradient942-7"
inkscape:collect="always"
xlink:href="#linearGradient940"
inkscape:collect="always" />
id="linearGradient942-7"
x1="649.34778"
y1="-966.22083"
x2="687.32172"
y2="452.36615"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.73549165,0,0,0.53473221,-122.70061,-41.695048)" />
<linearGradient
gradientUnits="userSpaceOnUse"
y2="819.63794"
x2="929.01709"
y1="-357.87811"
x1="311.80994"
id="linearGradient900-4"
xlink:href="#linearGradient898"
inkscape:collect="always"
gradientTransform="matrix(1.1577052,0,0,1,-1315.1116,-748.52772)" />
<linearGradient
gradientTransform="matrix(1.1577052,0,0,1,-1315.1116,-748.52772)"
inkscape:collect="always"
xlink:href="#linearGradient898"
id="linearGradient900-4"
id="linearGradient932"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(733.62375,-279.8094)"
x1="311.80994"
y1="-357.87811"
x2="929.01709"
y2="819.63794"
gradientUnits="userSpaceOnUse" />
x2="283.17621"
y2="716.57642" />
<linearGradient
gradientTransform="matrix(0.73549165,0,0,0.53473221,1987.5114,-479.80513)"
gradientUnits="userSpaceOnUse"
y2="452.36615"
x2="687.32172"
y1="-966.22083"
x1="649.34778"
id="linearGradient942-7-2"
xlink:href="#linearGradient940"
inkscape:collect="always" />
<linearGradient
y2="716.57642"
x2="283.17621"
y1="-357.87811"
x1="311.80994"
gradientTransform="translate(-71.635743,25.813861)"
gradientUnits="userSpaceOnUse"
id="linearGradient978"
xlink:href="#linearGradient898"
inkscape:collect="always" />
<linearGradient
y2="819.63794"
x2="929.01709"
y1="-357.87811"
x1="311.80994"
gradientTransform="matrix(1.1577052,0,0,1,-1315.1116,-748.52772)"
gradientUnits="userSpaceOnUse"
id="linearGradient980"
xlink:href="#linearGradient898"
inkscape:collect="always" />
<linearGradient
y2="691.98407"
x2="-391.84567"
y1="-447.91309"
x1="1851.9196"
gradientTransform="matrix(1.0427705,0,0,0.62690293,-1088.8324,-991.72226)"
gradientUnits="userSpaceOnUse"
id="linearGradient982"
xlink:href="#linearGradient898"
inkscape:collect="always" />
<linearGradient
y2="716.57642"
x2="283.17621"
@ -613,11 +709,9 @@
x1="311.80994"
gradientTransform="translate(733.62375,-279.8094)"
gradientUnits="userSpaceOnUse"
id="linearGradient932"
id="linearGradient984"
xlink:href="#linearGradient898"
inkscape:collect="always" />
</defs>
@ -627,35 +721,37 @@
<sodipodi:namedview
inkscape:showpageshadow="false"
showborder="true"
borderlayer="true"
fit-margin-bottom="0"
fit-margin-right="0"
fit-margin-left="0"
fit-margin-top="0"
inkscape:snap-global="false"
inkscape:current-layer="layer1"
inkscape:window-maximized="1"
inkscape:window-y="22"
inkscape:window-x="0"
inkscape:cy="666.25655"
inkscape:cx="-515.1138"
inkscape:zoom="0.175"
showgrid="false"
id="namedview43"
inkscape:window-height="719"
inkscape:window-width="1366"
inkscape:pageshadow="2"
inkscape:pageopacity="1"
guidetolerance="10"
gridtolerance="10"
objecttolerance="10"
borderopacity="1"
inkscape:document-rotation="0"
pagecolor="#ffffff"
bordercolor="#666666"
pagecolor="#ffffff" />
inkscape:document-rotation="0"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="1"
inkscape:pageshadow="2"
inkscape:window-width="1366"
inkscape:window-height="719"
id="namedview43"
showgrid="false"
inkscape:zoom="0.0875"
inkscape:cx="-1207.6372"
inkscape:cy="207.80314"
inkscape:window-x="0"
inkscape:window-y="22"
inkscape:window-maximized="1"
inkscape:current-layer="layer2"
inkscape:snap-global="false"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
borderlayer="true"
showborder="true"
inkscape:showpageshadow="false" />
@ -666,8 +762,8 @@
<style
id="style10"
type="text/css">
type="text/css"
id="style10">
.st0{clip-path:url(#SVGID_2_);}
.st1{clip-path:url(#SVGID_2_);fill:#FFFFFF;}
</style>
@ -681,11 +777,12 @@
<g
transform="translate(318.96439,1070.5177)"
inkscape:label="root"
inkscape:groupmode="layer"
id="layer1"
inkscape:groupmode="layer">
inkscape:label="root"
transform="translate(318.96439,1070.5177)">
@ -695,30 +792,33 @@
<rect
y="-1479.5974"
x="-1457.7026"
height="1613.8571"
width="2982.7158"
style="opacity:1;fill:#d38900;fill-opacity:0.993241"
id="rect907"
style="opacity:1;fill:#d38900;fill-opacity:0.99324107" />
<rect
style="opacity:1;fill:#b41111;fill-opacity:0.993241"
id="rect907-8"
width="2982.7158"
height="1613.8571"
x="-4244.4434"
y="-1257.4875" />
x="-1832.6398"
y="-1463.5505" />
<rect
y="-961.82635"
x="-4378.9487"
y="-1257.4875"
x="-4244.4434"
height="1613.8571"
width="2982.7158"
id="rect907-8"
style="opacity:1;fill:#b41111;fill-opacity:0.993241" />
<rect
style="opacity:1;fill:#00a40d;fill-opacity:0.993241"
id="rect907-8-7"
style="opacity:1;fill:#00a40d;fill-opacity:0.993241" />
width="2982.7158"
height="1613.8571"
x="-4378.9487"
y="-961.82635" />
</g>
@ -730,12 +830,13 @@
<g
transform="translate(-24.887482)"
id="g1025"
inkscape:export-filename="/docs/Dslak/vds_quiz/vds-app/App/assets/logo.png"
inkscape:export-ydpi="120"
inkscape:export-xdpi="120"
inkscape:export-ydpi="120">
inkscape:export-filename="/docs/Dslak/vds_quiz/vds-app/App/assets/logo.png"
id="g1025"
transform="translate(-24.887482)">
@ -749,68 +850,127 @@
<g
inkscape:label="Logo"
inkscape:groupmode="layer"
id="layer2"
inkscape:groupmode="layer">
inkscape:label="Logo">
<rect
ry="0"
y="-308.34857"
x="-210.29063"
height="606.03857"
width="1337.6455"
style="fill:url(#linearGradient942-7);fill-opacity:1;stroke:none;stroke-width:0.627133"
id="rect934"
style="fill:url(#linearGradient942-7);fill-opacity:1;stroke:none;stroke-width:0.627133" />
width="1337.6455"
height="606.03857"
x="-210.29063"
y="-308.34857"
ry="0" />
<g
id="g938"
transform="matrix(0.63334715,0,0,0.58549327,-46.569578,223.1593)">
transform="matrix(0.63334715,0,0,0.58549327,-46.569578,223.1593)"
id="g938">
<ellipse
ry="400.51532"
rx="1205.2823"
cy="327.19742"
cx="223.79865"
style="fill:url(#linearGradient900);fill-opacity:1;stroke:none"
id="path870"
style="fill:url(#linearGradient900);fill-opacity:1;stroke:none" />
cx="223.79865"
cy="327.19742"
rx="1205.2823"
ry="400.51532" />
<ellipse
cx="-973.08563"
cy="-447.14417"
rx="1395.3616"
ry="400.51532"
transform="scale(-1)"
id="path870-0"
style="fill:url(#linearGradient900-4);fill-opacity:1;stroke:none;stroke-width:1.07597"
id="path870-0" />
transform="scale(-1)"
ry="400.51532"
rx="1395.3616"
cy="-447.14417"
cx="-973.08563" />
<ellipse
ry="251.08421"
rx="1069.1677"
cy="-802.784"
cx="-780.76215"
id="ellipse926"
transform="matrix(-0.94066274,0.3393429,-0.10838861,-0.9941086,0,0)"
style="fill:url(#linearGradient928);fill-opacity:1;stroke:none;stroke-width:0.808527"
transform="matrix(-0.94066274,0.3393429,-0.10838861,-0.9941086,0,0)" />
id="ellipse926"
cx="-780.76215"
cy="-802.784"
rx="1069.1677"
ry="251.08421" />
<ellipse
style="fill:url(#linearGradient932);fill-opacity:1;stroke:none"
id="ellipse930"
cx="1029.0581"
cy="21.574158"
ry="400.51532"
rx="1205.2823"
ry="400.51532" />
cy="21.574158"
cx="1029.0581"
id="ellipse930"
style="fill:url(#linearGradient932);fill-opacity:1;stroke:none" />
</g>
<rect
inkscape:export-ydpi="96"
inkscape:export-xdpi="96"
inkscape:export-filename="/docs/Dslak/vds_quiz/vds-app/App/assets/bg.png"
style="opacity:1;fill:#1279be;fill-opacity:0.99215686;stroke-width:0.459434"
id="rect907-5-0"
width="750.16998"
height="1354.4559"
x="2135.1257"
y="-447.99728" />
<rect
ry="0"
y="-746.45868"
x="1899.9214"
height="606.03857"
width="1337.6455"
id="rect934-3"
style="fill:url(#linearGradient942-7-2);fill-opacity:1;stroke:none;stroke-width:0.627133" />
<g
id="g938-8"
transform="matrix(0.54245417,0,0,0.8642917,2126.6751,-109.30258)">
<ellipse
ry="400.51532"
rx="1205.2823"
cy="327.19742"
cx="223.79865"
id="path870-1"
style="fill:url(#linearGradient978);fill-opacity:1;stroke:none" />
<ellipse
cx="-973.08563"
cy="-447.14417"
rx="1395.3616"
ry="400.51532"
transform="scale(-1)"
style="fill:url(#linearGradient980);fill-opacity:1;stroke:none;stroke-width:1.07597"
id="path870-0-6" />
<ellipse
ry="251.08421"
rx="1069.1677"
cy="-802.784"
cx="-780.76215"
id="ellipse926-5"
style="fill:url(#linearGradient982);fill-opacity:1;stroke:none;stroke-width:0.808527"
transform="matrix(-0.94066274,0.3393429,-0.10838861,-0.9941086,0,0)" />
<ellipse
style="fill:url(#linearGradient984);fill-opacity:1;stroke:none"
id="ellipse930-8"
cx="1029.0581"
cy="21.574158"
rx="1205.2823"
ry="400.51532" />
</g>
</g>
@ -819,4 +979,5 @@
</svg>

Before

Width:  |  Height:  |  Size: 9.6 KiB

After

Width:  |  Height:  |  Size: 13 KiB

1
vds-app/.expo-shared/assets.json

@ -0,0 +1 @@
{}

BIN
vds-app/App/assets/bg.jpg

Binary file not shown.

Before

Width:  |  Height:  |  Size: 262 KiB

After

Width:  |  Height:  |  Size: 20 KiB

BIN
vds-app/App/assets/panorama.jpg

Binary file not shown.

Before

Width:  |  Height:  |  Size: 41 KiB

BIN
vds-app/App/assets/panorama2.jpg

Binary file not shown.

Before

Width:  |  Height:  |  Size: 54 KiB

2
vds-app/App/components/ExamQuestions.js

@ -30,8 +30,8 @@ const generateQuestions = () => {
let currentSection = allQuestions[elem.section]
for(let i=0; i<elem.questions; i++) {
const currentIndex = Math.floor(Math.random() * currentSection.length)
currentSection = currentSection.filter( (item, index) => index != currentIndex)
tmpQuestions.push(currentSection[currentIndex])
currentSection = currentSection.filter( (item, index) => index != currentIndex)
}
})
}

19
vds-app/App/components/Results.js

@ -6,8 +6,6 @@ const screen = Dimensions.get("window")
const imgError = require("../assets/error.jpg")
const imgUnsafe = require("../assets/unsafe.jpg")
const imgPassed = require("../assets/passed.jpg")
const imgPanorama = require("../assets/panorama.jpg")
const imgPanorama2 = require("../assets/panorama2.jpg")
const styles = StyleSheet.create({
container: {
@ -25,9 +23,10 @@ const styles = StyleSheet.create({
top: (screen.height/2)-220,
width: screen.width-50,
borderRadius: 15,
height: 420,
borderColor: colors.white_alpha,
borderWidth: 0
backgroundColor: colors.white_alpha,
borderColor: colors.white,
borderWidth: 4,
paddingVertical: 30
},
text: {
color: colors.white,
@ -83,20 +82,18 @@ export const Results = ({ results, visible }) => {
//const percentage = results.totalPoints ? (100/results.totalPoints) * results.points : 0
const percentage = results.total ? (100/results.total) * results.correct : 0
let bgImage = results.points >= 80 ? results.points >= 85 ? imgPassed : imgUnsafe : imgError
let imgPanoramaResult = results.points >= 80 ? imgPanorama : imgPanorama2
//let imgPanoramaResult = results.points >= 80 ? imgPanorama : imgPanorama2
if(!results.isExam) {
bgImage = percentage >= 80 ? percentage >= 85 ? imgPassed : imgUnsafe : imgError
imgPanoramaResult = percentage >= 80 ? imgPanorama : imgPanorama2
//imgPanoramaResult = percentage >= 80 ? imgPanorama : imgPanorama2
}
return (
<ImageBackground source={imgPanoramaResult} style={[styles.bg, styles.container]} resizeMode="cover">
<ImageBackground source={bgImage} style={[styles.bg, styles.container]} resizeMode="cover">
<View style={styles.box}>
<ImageBackground source={bgImage} style={styles.bg} imageStyle={styles.bgStyle} resizeMode="cover">
<Text style={styles.text}>
<Text style={styles.textLabel}>{`${texts.corrects}: ${results.correct}`}</Text>
@ -117,8 +114,8 @@ export const Results = ({ results, visible }) => {
</Text> : <Text/>
}
</ImageBackground>
</View>
</ImageBackground>
)

2
vds-app/App/data/physiopathology.js

@ -95,7 +95,7 @@ const questions = [
},
{
id: "3",
text: "Permanenza ad alta quota dopo lungo periodo di ambientamento. DEL VOLO"
text: "Permanenza ad alta quota dopo lungo periodo di ambientamento."
}
]
},

2
vds-app/App/screens/Exam.js

@ -73,7 +73,7 @@ class Exam extends React.Component {
},
() => {
if(this.state.timer > 1 || (this.state.correctCount+this.state.wrongCount) < this.state.totalCount) {
setTimeout(() => this.nextQuestion(), correct ? 750 : 2000)
setTimeout(() => this.nextQuestion(), correct ? 750 : 3500)
}
}
)

19
vds-app/App/screens/Quiz.js

@ -1,14 +1,15 @@
import React from "react"
import { View, ScrollView, StyleSheet, StatusBar, Text, SafeAreaView } from "react-native"
import { View, ScrollView, StyleSheet, StatusBar, Text, SafeAreaView, ImageBackground } 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 bgImage = require("../assets/bg.jpg")
const styles = StyleSheet.create({
container: {
backgroundColor: colors.blue,
flex: 1
},
text: {
@ -23,7 +24,11 @@ const styles = StyleSheet.create({
marginTop: 20,
paddingHorizontal: 20,
justifyContent: "space-between"
}
},
bg: {
width: "100%",
height: "100%"
},
})
class Quiz extends React.Component {
@ -93,11 +98,8 @@ class Quiz extends React.Component {
const question = questions.filter(item => item.id == this.state.activeQuestionId)[0] || questions[0]
return (
<ScrollView style={[
styles.container,
{ backgroundColor: this.props.navigation.getParam("color") }
]}
>
<ImageBackground source={bgImage} style={styles.bg} resizeMode="cover">
<ScrollView style={ styles.container } >
<StatusBar barStyle="light-content" />
{!this.state.results ?
@ -135,6 +137,7 @@ class Quiz extends React.Component {
visible={this.state.results}
/>
</ScrollView>
</ImageBackground>
)
}
}

7
vds-app/App/screens/QuizIndex.js

@ -21,6 +21,13 @@ export default ({ navigation }) => (
<ScrollView style={[{ backgroundColor: colors.dark_blue }]}>
<StatusBar barStyle="dark-content" />
<RowItem name="TEST" color={colors.blue} textColor={colors.white} onPress={()=>
navigation.navigate("Quiz", {
title: "TEST",
questions: testQuestions,
color: colors.blue
})}/>
<RowItem name={texts.aerodynamics} color={colors.blue} textColor={colors.white} onPress={()=>
navigation.navigate("Quiz", {
title: texts.aerodynamics,

4
vds-app/app.json

@ -8,7 +8,7 @@
"ios",
"android"
],
"version": "1.3.0",
"version": "1.3.5",
"orientation": "portrait",
"icon": "./assets/icon.png",
"splash": {
@ -26,7 +26,7 @@
"icon": "./assets/icon.png",
"package": "com.dslak.vdsquiz",
"permissions": [],
"versionCode": 3,
"versionCode": 4,
"config": {
"googleMobileAdsAppId": "ca-app-pub-4145771316565790~1876877627"
}

Loading…
Cancel
Save