diff --git a/screenshots/Screenshot_20191022-123656_VDS Quiz.jpg b/screenshots/Screenshot_20191022-123656_VDS Quiz.jpg deleted file mode 100644 index ca8a25e..0000000 Binary files a/screenshots/Screenshot_20191022-123656_VDS Quiz.jpg and /dev/null differ diff --git a/screenshots/Screenshot_20191022-123700_VDS Quiz.jpg b/screenshots/Screenshot_20191022-123700_VDS Quiz.jpg deleted file mode 100644 index def5baa..0000000 Binary files a/screenshots/Screenshot_20191022-123700_VDS Quiz.jpg and /dev/null differ diff --git a/screenshots/Screenshot_20191022-123704_VDS Quiz.jpg b/screenshots/Screenshot_20191022-123704_VDS Quiz.jpg deleted file mode 100644 index 4aaa16f..0000000 Binary files a/screenshots/Screenshot_20191022-123704_VDS Quiz.jpg and /dev/null differ diff --git a/screenshots/Screenshot_20191022-123710_VDS Quiz.jpg b/screenshots/Screenshot_20191022-123710_VDS Quiz.jpg deleted file mode 100644 index c09ed95..0000000 Binary files a/screenshots/Screenshot_20191022-123710_VDS Quiz.jpg and /dev/null differ diff --git a/screenshots/Screenshot_20191022-123725_VDS Quiz.jpg b/screenshots/Screenshot_20191022-123725_VDS Quiz.jpg deleted file mode 100644 index b969c5f..0000000 Binary files a/screenshots/Screenshot_20191022-123725_VDS Quiz.jpg and /dev/null differ diff --git a/screenshots/Screenshot_20191022-123730_VDS Quiz.jpg b/screenshots/Screenshot_20191022-123730_VDS Quiz.jpg deleted file mode 100644 index 957d232..0000000 Binary files a/screenshots/Screenshot_20191022-123730_VDS Quiz.jpg and /dev/null differ diff --git a/screenshots/Screenshot_20191106-183306_Expo.jpg b/screenshots/Screenshot_20191106-183306_Expo.jpg deleted file mode 100644 index 4479d21..0000000 Binary files a/screenshots/Screenshot_20191106-183306_Expo.jpg and /dev/null differ diff --git a/screenshots/Screenshot_20191106-183334_Expo.jpg b/screenshots/Screenshot_20191106-183334_Expo.jpg deleted file mode 100644 index 4818f6d..0000000 Binary files a/screenshots/Screenshot_20191106-183334_Expo.jpg and /dev/null differ diff --git a/screenshots/Screenshot_20191106-183350_Expo.jpg b/screenshots/Screenshot_20191106-183350_Expo.jpg deleted file mode 100644 index 3d147af..0000000 Binary files a/screenshots/Screenshot_20191106-183350_Expo.jpg and /dev/null differ diff --git a/screenshots/Screenshot_20191107-112642_Expo.jpg b/screenshots/Screenshot_20191107-112642_Expo.jpg deleted file mode 100644 index 776d199..0000000 Binary files a/screenshots/Screenshot_20191107-112642_Expo.jpg and /dev/null differ diff --git a/screenshots/Screenshot_20191107-112650_MTP application.jpg b/screenshots/Screenshot_20191107-112650_MTP application.jpg deleted file mode 100644 index a827253..0000000 Binary files a/screenshots/Screenshot_20191107-112650_MTP application.jpg and /dev/null differ diff --git a/screenshots/Screenshot_20191130-144754_Expo.jpg b/screenshots/Screenshot_20191130-144754_Expo.jpg new file mode 100644 index 0000000..43269df Binary files /dev/null and b/screenshots/Screenshot_20191130-144754_Expo.jpg differ diff --git a/screenshots/Screenshot_20191130-144817_Expo.jpg b/screenshots/Screenshot_20191130-144817_Expo.jpg new file mode 100644 index 0000000..3af1b7b Binary files /dev/null and b/screenshots/Screenshot_20191130-144817_Expo.jpg differ diff --git a/screenshots/Screenshot_20191130-144827_Expo.jpg b/screenshots/Screenshot_20191130-144827_Expo.jpg new file mode 100644 index 0000000..1d2a4b4 Binary files /dev/null and b/screenshots/Screenshot_20191130-144827_Expo.jpg differ diff --git a/screenshots/Screenshot_20191130-144855_Expo.jpg b/screenshots/Screenshot_20191130-144855_Expo.jpg new file mode 100644 index 0000000..3d00b25 Binary files /dev/null and b/screenshots/Screenshot_20191130-144855_Expo.jpg differ diff --git a/screenshots/Screenshot_20191130-144912_Expo.jpg b/screenshots/Screenshot_20191130-144912_Expo.jpg new file mode 100644 index 0000000..5f5f1a8 Binary files /dev/null and b/screenshots/Screenshot_20191130-144912_Expo.jpg differ diff --git a/screenshots/Screenshot_20191130-144935_Expo.jpg b/screenshots/Screenshot_20191130-144935_Expo.jpg new file mode 100644 index 0000000..281cc38 Binary files /dev/null and b/screenshots/Screenshot_20191130-144935_Expo.jpg differ diff --git a/screenshots/Screenshot_20191130-144955_Expo.jpg b/screenshots/Screenshot_20191130-144955_Expo.jpg new file mode 100644 index 0000000..bd05aaf Binary files /dev/null and b/screenshots/Screenshot_20191130-144955_Expo.jpg differ diff --git a/screenshots/Screenshot_20191130-145006_Expo.jpg b/screenshots/Screenshot_20191130-145006_Expo.jpg new file mode 100644 index 0000000..8fdd5d9 Binary files /dev/null and b/screenshots/Screenshot_20191130-145006_Expo.jpg differ diff --git a/screenshots/Screenshot_20191130-145010_Expo.jpg b/screenshots/Screenshot_20191130-145010_Expo.jpg new file mode 100644 index 0000000..40b14f3 Binary files /dev/null and b/screenshots/Screenshot_20191130-145010_Expo.jpg differ diff --git a/screenshots/Screenshot_20191130-145026_Expo.jpg b/screenshots/Screenshot_20191130-145026_Expo.jpg new file mode 100644 index 0000000..d501b8c Binary files /dev/null and b/screenshots/Screenshot_20191130-145026_Expo.jpg differ diff --git a/screenshots/Screenshot_20191130-145035_Expo.jpg b/screenshots/Screenshot_20191130-145035_Expo.jpg new file mode 100644 index 0000000..271afb7 Binary files /dev/null and b/screenshots/Screenshot_20191130-145035_Expo.jpg differ diff --git a/screenshots/Screenshot_20191130-145447_Expo.jpg b/screenshots/Screenshot_20191130-145447_Expo.jpg new file mode 100644 index 0000000..aaa5932 Binary files /dev/null and b/screenshots/Screenshot_20191130-145447_Expo.jpg differ diff --git a/screenshots/Screenshot_20191130-145600_Expo.jpg b/screenshots/Screenshot_20191130-145600_Expo.jpg new file mode 100644 index 0000000..45bbf69 Binary files /dev/null and b/screenshots/Screenshot_20191130-145600_Expo.jpg differ diff --git a/screenshots/Screenshot_20191130-145607_Expo.jpg b/screenshots/Screenshot_20191130-145607_Expo.jpg new file mode 100644 index 0000000..4405afe Binary files /dev/null and b/screenshots/Screenshot_20191130-145607_Expo.jpg differ diff --git a/screenshots/g927-8.png b/screenshots/g927-8.png deleted file mode 100644 index a98e4fe..0000000 Binary files a/screenshots/g927-8.png and /dev/null differ diff --git a/screenshots/g933-1.png b/screenshots/g933-1.png deleted file mode 100644 index 5c47c59..0000000 Binary files a/screenshots/g933-1.png and /dev/null differ diff --git a/screenshots/g980-4.png b/screenshots/g980-4.png deleted file mode 100644 index 275676e..0000000 Binary files a/screenshots/g980-4.png and /dev/null differ diff --git a/screenshots/header.png b/screenshots/header.png index e740a48..1b61f23 100644 Binary files a/screenshots/header.png and b/screenshots/header.png differ diff --git a/screenshots/header.svg b/screenshots/header.svg index d69e705..27c9906 100644 --- a/screenshots/header.svg +++ b/screenshots/header.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/screenshots/header.png" - height="500" - width="1024" - inkscape:version="1.0beta1 (unknown)" - sodipodi:docname="header.svg" - xml:space="preserve" - viewBox="0 0 1024 500" - y="0px" - x="0px" + version="1.1" id="Ebene_1" - version="1.1"> @@ -44,6 +45,7 @@ + @@ -53,6 +55,7 @@ + @@ -62,6 +65,7 @@ + @@ -71,6 +75,7 @@ + @@ -80,14 +85,16 @@ + + inkscape:collect="always" + id="linearGradient940"> + id="stop936" /> + @@ -95,9 +102,10 @@ + id="stop938" /> + @@ -111,13 +119,15 @@ + + inkscape:collect="always" + id="linearGradient898"> + id="stop894" /> + @@ -125,9 +135,10 @@ + id="stop896" /> + @@ -141,13 +152,15 @@ + + inkscape:collect="always" + id="linearGradient862"> + id="stop858" /> + @@ -157,9 +170,10 @@ + id="stop860" /> + @@ -177,13 +191,15 @@ + + inkscape:collect="always" + id="linearGradient1177"> + id="stop1173" /> + @@ -193,9 +209,10 @@ + id="stop1175" /> + @@ -213,13 +230,15 @@ + + inkscape:collect="always" + id="linearGradient1113"> + id="stop1109" /> + @@ -229,9 +248,10 @@ + id="stop1111" /> + @@ -250,14 +270,16 @@ + + id="SVGID_1_" + x="0" + y="0" /> + @@ -277,16 +299,18 @@ + + xlink:href="#SVGID_1_" + x="0" + y="0" + width="100%" + height="100%" /> + @@ -306,6 +330,7 @@ + @@ -318,15 +343,16 @@ + 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 @@ + 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 @@ + 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 @@ + 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 @@ + maskUnits="userSpaceOnUse" + id="mask1236"> + cx="125" + id="circle1238" + style="fill:#ffffff;fill-opacity:1;stroke-width:1.02044" /> + @@ -417,15 +447,17 @@ + + maskUnits="userSpaceOnUse" + id="mask1243"> + cx="125" + id="circle1245" + style="fill:#ffffff;fill-opacity:1;stroke-width:1.02044" /> + @@ -443,15 +475,17 @@ + + id="linearGradient866" + gradientUnits="userSpaceOnUse" + x1="0" + y1="125" + x2="266.32431" + y2="147.05267" /> + @@ -465,15 +499,16 @@ + 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 @@ + 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 @@ + 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)" /> + @@ -513,15 +550,16 @@ + y1="-85.32769" + x1="6.22612" + gradientTransform="matrix(6.8965075,0,0,6.8965075,225.85819,355.64648)" + gradientUnits="userSpaceOnUse" + id="linearGradient1214" + xlink:href="#linearGradient1177" + inkscape:collect="always" /> + @@ -531,13 +569,14 @@ + y="0" + x="0" + xlink:href="#SVGID_1_" + style="overflow:visible" + id="use15-8" /> + @@ -551,16 +590,18 @@ + + y="0" + x="0" + xlink:href="#SVGID_1_" + style="overflow:visible" + id="use958" /> + @@ -574,32 +615,18 @@ + - - - - - - - + y2="452.36615" + x2="687.32172" + y1="-966.22083" + x1="649.34778" + id="linearGradient942-7" + xlink:href="#linearGradient940" + inkscape:collect="always" /> + @@ -607,15 +634,16 @@ + x2="929.01709" + y2="819.63794" + gradientUnits="userSpaceOnUse" /> + @@ -627,9 +655,9 @@ x2="283.17621" y1="-357.87811" x1="311.80994" - gradientTransform="translate(-71.635743,25.813861)" + gradientTransform="translate(733.62375,-279.8094)" gradientUnits="userSpaceOnUse" - id="linearGradient1107" + id="linearGradient932" xlink:href="#linearGradient898" inkscape:collect="always" /> @@ -638,16 +666,35 @@ + + + + + + + + + + id="linearGradient1109" + 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" /> + @@ -663,32 +710,34 @@ + + 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.65026776" + inkscape:cx="654.40877" + inkscape:cy="332.60449" + 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" /> + @@ -699,8 +748,8 @@ @@ -714,19 +763,21 @@ + + inkscape:label="root" + transform="translate(318.96439,1070.5177)"> + x="-461.50113" + height="1197.3634" + width="1529.104" + id="rect934" + style="fill:url(#linearGradient942-7);fill-opacity:1;stroke:none;stroke-width:0.942476" /> + @@ -734,15 +785,16 @@ + id="g938" + transform="matrix(0.87213479,0,0,0.48838862,-374.27503,-1001.1904)"> + cy="327.19742" + cx="223.79865" + id="path870" + style="fill:url(#linearGradient1107);fill-opacity:1;stroke:none" /> + @@ -750,13 +802,14 @@ + rx="1395.3616" + ry="400.51532" + transform="scale(-1)" + style="fill:url(#linearGradient900-4);fill-opacity:1;stroke:none;stroke-width:1.07597" + id="path870-0" /> + @@ -764,13 +817,14 @@ + cy="-802.784" + cx="-780.76215" + id="ellipse926" + style="fill:url(#linearGradient1109);fill-opacity:1;stroke:none;stroke-width:0.808527" + transform="matrix(-0.94066274,0.3393429,-0.10838861,-0.9941086,0,0)" /> + @@ -778,12 +832,13 @@ + cx="1029.0581" + cy="21.574158" + rx="1205.2823" + ry="400.51532" /> + @@ -797,6 +852,7 @@ + @@ -806,12 +862,13 @@ + + inkscape:export-filename="/docs/Dslak/vds_quiz/vds-app/App/assets/logo.png" + id="g1025" + transform="translate(-24.887482)"> @@ -825,20 +882,22 @@ + + inkscape:label="Logo"> + id="g1143" + transform="matrix(0.35998623,0,0,0.35998623,-42.164222,-65.574649)"> + d="m 672.40703,467.25673 -6.77524,1.30661 74.97254,389.30239 -0.47141,-0.32357 -197.56071,-286.99975 -5.68423,3.9197 187.35065,272.15611 -271.22673,-186.50204 -3.90622,5.68424 286.05689,196.69861 4.97035,7.21979 c -7.89486,-2.33569 -12.21956,-3.70204 -26.91255,-7.87979 -50.62074,-14.39357 -147.7665,-41.24891 -333.9553,-91.09589 l -1.79148,6.66754 c 186.17007,49.84195 283.30287,76.67971 333.861,91.05542 25.27909,7.18785 38.9119,11.25883 46.20121,13.52362 7.28936,2.26483 7.89327,2.5862 7.89327,2.5862 l 3.83889,1.81841 76.25221,-316.17523 -6.69448,-1.6164 -74.39338,308.41672 c -1.20877,-0.43127 -0.78654,-0.35434 -4.84908,-1.6164 -0.18044,-0.055 -0.94352,-0.2788 -1.13146,-0.33662 l 18.04945,-369.83866 -6.8965,-0.33653 -17.60495,360.81394 -3.31358,-2.2764 z" + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient1214);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6.89651px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-opacity:1" /> + @@ -846,13 +905,14 @@ + d="m 174.4,18.6 c 0,-0.1 -0.1,-0.2 -0.2,-0.3 -0.8,-1.2 -1.7,-2.3 -2.7,-3.3 0,0 0,0 0,0 -3.2,-3.2 -7.6,-5.4 -12.6,-5.9 -0.2,0 -0.5,0 -0.7,-0.1 -5.1,-0.3 -10,1.2 -14,3.9 -0.2,0.2 -0.3,0.2 -0.5,0.4 l 0.4,0.2 c 5.1,2.3 9.8,5.5 13.7,9.3 3.9,3.8 7.2,8.3 9.5,13.3 0.6,1.4 2.3,2.2 4,1.9 0.5,-0.1 0.9,-0.1 1.3,-0.2 1.8,-0.4 3.3,-1.6 3.8,-3.2 0,0 0,0 0,0 0.3,-1.2 0.6,-2.4 0.7,-3.7 0.6,-4.4 -0.4,-8.7 -2.7,-12.3" + clip-path="url(#SVGID_2_)" + id="path36" + inkscape:connector-curvature="0" + style="opacity:1;fill:#71e000;fill-opacity:1;stop-opacity:1" /> + @@ -860,13 +920,14 @@ + d="m 164.6,7.5 c -34,-23.1 -68.4,12.4 -74.3,36.5 -0.7,3.2 -0.2,5.2 1.6,6.8 3.2,2.1 5.1,2.2 8.3,1 C 108.5,48.4 115.9,34.2 132,19 148.3,3.9 157.3,5.7 164.6,7.5" + clip-path="url(#SVGID_2_)" + id="path38" + inkscape:connector-curvature="0" + style="opacity:1;stop-opacity:1" /> + @@ -880,17 +941,19 @@ + QUIZ + x="454.96796" + id="tspan1070" + sodipodi:role="line">QUIZ + @@ -898,16 +961,17 @@ VDS + x="725.32568" + id="tspan31-0" + sodipodi:role="line">VDS + @@ -921,125 +985,24 @@ - - - - - - - - - - - - - - - - - - - - @@ -1051,109 +1014,138 @@ - - - - - - - - - - - - - - - + id="image1175" + style="opacity:1;stop-opacity:1" /> + + + + + + + + + + - diff --git a/screenshots/ok/Screenshot_20191130-144754_Expo.jpg b/screenshots/ok/Screenshot_20191130-144754_Expo.jpg new file mode 100644 index 0000000..43269df Binary files /dev/null and b/screenshots/ok/Screenshot_20191130-144754_Expo.jpg differ diff --git a/screenshots/ok/Screenshot_20191130-144817_Expo.jpg b/screenshots/ok/Screenshot_20191130-144817_Expo.jpg new file mode 100644 index 0000000..3af1b7b Binary files /dev/null and b/screenshots/ok/Screenshot_20191130-144817_Expo.jpg differ diff --git a/screenshots/ok/Screenshot_20191130-144827_Expo.jpg b/screenshots/ok/Screenshot_20191130-144827_Expo.jpg new file mode 100644 index 0000000..1d2a4b4 Binary files /dev/null and b/screenshots/ok/Screenshot_20191130-144827_Expo.jpg differ diff --git a/screenshots/ok/Screenshot_20191130-144955_Expo.jpg b/screenshots/ok/Screenshot_20191130-144955_Expo.jpg new file mode 100644 index 0000000..bd05aaf Binary files /dev/null and b/screenshots/ok/Screenshot_20191130-144955_Expo.jpg differ diff --git a/screenshots/ok/Screenshot_20191130-145010_Expo.jpg b/screenshots/ok/Screenshot_20191130-145010_Expo.jpg new file mode 100644 index 0000000..40b14f3 Binary files /dev/null and b/screenshots/ok/Screenshot_20191130-145010_Expo.jpg differ diff --git a/screenshots/ok/Screenshot_20191130-145026_Expo.jpg b/screenshots/ok/Screenshot_20191130-145026_Expo.jpg new file mode 100644 index 0000000..d501b8c Binary files /dev/null and b/screenshots/ok/Screenshot_20191130-145026_Expo.jpg differ diff --git a/screenshots/ok/Screenshot_20191130-145600_Expo.jpg b/screenshots/ok/Screenshot_20191130-145600_Expo.jpg new file mode 100644 index 0000000..45bbf69 Binary files /dev/null and b/screenshots/ok/Screenshot_20191130-145600_Expo.jpg differ diff --git a/screenshots/ok/Screenshot_20191130-145607_Expo.jpg b/screenshots/ok/Screenshot_20191130-145607_Expo.jpg new file mode 100644 index 0000000..4405afe Binary files /dev/null and b/screenshots/ok/Screenshot_20191130-145607_Expo.jpg differ diff --git a/svg/header.svg b/svg/header.svg index b4c2b99..e8f5386 100644 --- a/svg/header.svg +++ b/svg/header.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" - version="1.1" - id="Ebene_1" - x="0px" - y="0px" - viewBox="0 0 1242 800" - xml:space="preserve" - sodipodi:docname="header.svg" - inkscape:version="1.0beta1 (unknown)" - width="1242" - height="800" - inkscape:export-filename="/docs/Dslak/vds_quiz/vds-app/App/assets/header.png" + inkscape:export-ydpi="120" inkscape:export-xdpi="120" - inkscape:export-ydpi="120"> @@ -38,7 +39,9 @@ - + + + @@ -50,33 +53,74 @@ + + + + + + + + id="linearGradient862"> + + + + + + + + + + + + + + + + + style="stop-color:#000000;stop-opacity:1;" /> + + style="stop-color:#000000;stop-opacity:0;" /> + @@ -84,20 +128,23 @@ + + id="linearGradient898" + inkscape:collect="always"> + style="stop-color:#ffffff;stop-opacity:0.1606186" /> + + style="stop-color:#ffffff;stop-opacity:0;" /> + @@ -105,22 +152,25 @@ + + id="linearGradient862-7" + inkscape:collect="always"> + style="stop-color:#56168b;stop-opacity:1;" /> + + style="stop-color:#7e20c9;stop-opacity:0" /> + @@ -132,22 +182,25 @@ + + id="linearGradient1177" + inkscape:collect="always"> + style="stop-color:#ffffff;stop-opacity:1;" /> + + style="stop-color:#ffffff;stop-opacity:0;" /> + @@ -159,22 +212,25 @@ + + id="linearGradient1113" + inkscape:collect="always"> + style="stop-color:#ffffff;stop-opacity:1;" /> + + style="stop-color:#ffffff;stop-opacity:0;" /> + @@ -187,14 +243,16 @@ + + id="SVGID_1_" + width="250" + height="91.900002" /> + @@ -208,16 +266,18 @@ + + y="0" + x="0" + xlink:href="#SVGID_1_" + style="overflow:visible" + id="use15" /> + @@ -231,6 +291,7 @@ + @@ -243,60 +304,64 @@ + y2="77.732155" + x2="77.917458" + y1="-85.32769" + x1="6.22612" + id="linearGradient1115" + xlink:href="#linearGradient1113" + inkscape:collect="always" /> + + y2="19.294325" + x2="122.02882" + y1="122.54591" + x1="132.76462" + id="linearGradient1179" + xlink:href="#linearGradient1177" + inkscape:collect="always" /> + + y1="122.54591" + x1="132.76462" + gradientTransform="matrix(0.83762215,0,0,0.92541661,-275.43157,-172.04418)" + gradientUnits="userSpaceOnUse" + id="linearGradient1183" + xlink:href="#linearGradient1177" + inkscape:collect="always" /> + + y1="122.54591" + x1="132.76462" + gradientTransform="matrix(-1.1876812,-0.35290398,0.38989322,-1.3121667,345.47458,152.00026)" + gradientUnits="userSpaceOnUse" + id="linearGradient1212" + xlink:href="#linearGradient1177" + inkscape:collect="always" /> + @@ -305,14 +370,15 @@ + id="mask1236" + maskUnits="userSpaceOnUse"> + cx="125" + cy="125" + r="125" /> + @@ -324,15 +390,17 @@ + + id="mask1243" + maskUnits="userSpaceOnUse"> + cx="125" + cy="125" + r="125" /> + @@ -344,15 +412,17 @@ + + y1="125" + x1="0" + gradientUnits="userSpaceOnUse" + id="linearGradient866" + xlink:href="#linearGradient862-7" + inkscape:collect="always" /> + @@ -363,67 +433,72 @@ + y2="716.57642" + x2="283.17621" + y1="-357.87811" + x1="311.80994" + id="linearGradient900" + xlink:href="#linearGradient898" + inkscape:collect="always" /> + + y1="-447.91309" + x1="1851.9196" + gradientTransform="matrix(1.0427705,0,0,0.62690293,-1088.8324,-991.72226)" + gradientUnits="userSpaceOnUse" + id="linearGradient928" + xlink:href="#linearGradient898" + inkscape:collect="always" /> + + y2="452.36615" + x2="687.32172" + y1="-966.22083" + x1="649.34778" + id="linearGradient942" + xlink:href="#linearGradient940" + inkscape:collect="always" /> + + id="linearGradient1214" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(6.8965075,0,0,6.8965075,225.85819,355.64648)" + x1="6.22612" + y1="-85.32769" + x2="77.917458" + y2="77.732155" /> + + xlink:href="#SVGID_1_" + x="0" + y="0" + width="100%" + height="100%" /> + @@ -431,16 +506,18 @@ + + xlink:href="#SVGID_1_" + x="0" + y="0" + width="100%" + height="100%" /> + @@ -448,29 +525,36 @@ + + + + + + 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)" /> + + x2="283.17621" + y2="716.57642" /> + @@ -479,72 +563,147 @@ x2="283.17621" y1="-357.87811" x1="311.80994" - gradientTransform="translate(733.62375,-279.8094)" + gradientTransform="translate(-71.635743,25.813861)" gradientUnits="userSpaceOnUse" - id="linearGradient932" + id="linearGradient1107" xlink:href="#linearGradient898" inkscape:collect="always" /> + + id="linearGradient1109" + xlink:href="#linearGradient898" + inkscape:collect="always" /> + + + + + + + + + + + + + + + + + - - - + id="linearGradient1020" + xlink:href="#linearGradient1012" + inkscape:collect="always" /> + + 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="69.850271" + inkscape:cx="-323.7301" + inkscape:zoom="0.175" + showgrid="false" + id="namedview43" + inkscape:window-height="719" + inkscape:window-width="1366" + inkscape:pageshadow="2" + inkscape:pageopacity="0" + guidetolerance="10" + gridtolerance="10" + objecttolerance="10" + borderopacity="1" + inkscape:document-rotation="0" + bordercolor="#666666" + pagecolor="#00468c" /> + @@ -552,8 +711,8 @@ @@ -564,64 +723,70 @@ + - + id="layer1" + inkscape:groupmode="layer"> + - + + + cx="223.79865" + cy="327.19742" + rx="1205.2823" + ry="400.51532" /> + + transform="scale(-1)" + ry="400.51532" + rx="1395.3616" + cy="-447.14417" + cx="-973.08563" /> + + cx="-796.11176" + cy="-905.92938" + rx="1088.3459" + ry="287.44949" /> + + cy="21.574158" + cx="1029.0581" + id="ellipse930" + style="fill:url(#linearGradient932);fill-opacity:1;stroke:none" /> + @@ -629,18 +794,73 @@ + + + + + + + + + + + inkscape:export-filename="/docs/Dslak/vds_quiz/vds-app/App/assets/logo.png" + inkscape:export-xdpi="120" + inkscape:export-ydpi="120"> @@ -651,42 +871,46 @@ + + inkscape:groupmode="layer"> + transform="matrix(0.39991483,0,0,0.39991483,378.35541,112.95654)" + id="g1143"> + id="path1094" + inkscape:connector-curvature="0" /> + + id="path36" + clip-path="url(#SVGID_2_)" + d="m 174.4,18.6 c 0,-0.1 -0.1,-0.2 -0.2,-0.3 -0.8,-1.2 -1.7,-2.3 -2.7,-3.3 0,0 0,0 0,0 -3.2,-3.2 -7.6,-5.4 -12.6,-5.9 -0.2,0 -0.5,0 -0.7,-0.1 -5.1,-0.3 -10,1.2 -14,3.9 -0.2,0.2 -0.3,0.2 -0.5,0.4 l 0.4,0.2 c 5.1,2.3 9.8,5.5 13.7,9.3 3.9,3.8 7.2,8.3 9.5,13.3 0.6,1.4 2.3,2.2 4,1.9 0.5,-0.1 0.9,-0.1 1.3,-0.2 1.8,-0.4 3.3,-1.6 3.8,-3.2 0,0 0,0 0,0 0.3,-1.2 0.6,-2.4 0.7,-3.7 0.6,-4.4 -0.4,-8.7 -2.7,-12.3" + class="st0" + transform="matrix(8.4971318,0,0,8.4971318,-528.76068,366.00368)" /> + + id="path38" + clip-path="url(#SVGID_2_)" + d="m 164.6,7.5 c -34,-23.1 -68.4,12.4 -74.3,36.5 -0.7,3.2 -0.2,5.2 1.6,6.8 3.2,2.1 5.1,2.2 8.3,1 C 108.5,48.4 115.9,34.2 132,19 148.3,3.9 157.3,5.7 164.6,7.5" + class="st1" + transform="matrix(8.4971318,0,0,8.4971318,-528.76068,366.00368)" /> + @@ -694,31 +918,34 @@ + QUIZ + x="454.96796" + y="974.00031" + style="stroke-width:16.6425">QUIZ + VDS + x="725.32568" + y="1077.8801" + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:'URW Gothic L';-inkscape-font-specification:'URW Gothic L Semi-Bold';fill:#71e000;fill-opacity:1;stroke-width:9.04156">VDS + @@ -726,9 +953,11 @@ + + diff --git a/svg/results.svg b/svg/results.svg index e97cf93..f3dbd7f 100644 --- a/svg/results.svg +++ b/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" - version="1.1" - id="Ebene_1" - x="0px" - y="0px" - viewBox="0 0 800 1400" - xml:space="preserve" - sodipodi:docname="results.svg" - inkscape:version="1.0beta1 (unknown)" - width="800" - height="1400" - inkscape:export-filename="/docs/Dslak/vds_quiz/vds-app/App/assets/error.jpg.png" + inkscape:export-ydpi="96" inkscape:export-xdpi="96" - inkscape:export-ydpi="96"> @@ -50,7 +51,9 @@ - + + + @@ -74,6 +77,7 @@ + @@ -86,6 +90,7 @@ + @@ -98,14 +103,16 @@ + + id="linearGradient940" + inkscape:collect="always"> + style="stop-color:#000000;stop-opacity:1;" /> + @@ -116,9 +123,10 @@ + style="stop-color:#000000;stop-opacity:0;" /> + @@ -138,13 +146,15 @@ + + id="linearGradient898" + inkscape:collect="always"> + style="stop-color:#ffffff;stop-opacity:0.1606186" /> + @@ -155,9 +165,10 @@ + style="stop-color:#ffffff;stop-opacity:0;" /> + @@ -177,13 +188,15 @@ + + id="linearGradient862" + inkscape:collect="always"> + style="stop-color:#56168b;stop-opacity:1;" /> + @@ -196,9 +209,10 @@ + style="stop-color:#7e20c9;stop-opacity:0" /> + @@ -222,13 +236,15 @@ + + id="linearGradient1177" + inkscape:collect="always"> + style="stop-color:#ffffff;stop-opacity:1;" /> + @@ -241,9 +257,10 @@ + style="stop-color:#ffffff;stop-opacity:0;" /> + @@ -267,13 +284,15 @@ + + id="linearGradient1113" + inkscape:collect="always"> + style="stop-color:#ffffff;stop-opacity:1;" /> + @@ -286,9 +305,10 @@ + style="stop-color:#ffffff;stop-opacity:0;" /> + @@ -313,14 +333,16 @@ + + id="SVGID_1_" + width="250" + height="91.900002" /> + @@ -346,16 +368,18 @@ + + y="0" + x="0" + xlink:href="#SVGID_1_" + style="overflow:visible" + id="use15" /> + @@ -381,6 +405,7 @@ + @@ -393,15 +418,16 @@ + y2="77.732155" + x2="77.917458" + y1="-85.32769" + x1="6.22612" + id="linearGradient1115" + xlink:href="#linearGradient1113" + inkscape:collect="always" /> + @@ -414,15 +440,16 @@ + y2="19.294325" + x2="122.02882" + y1="122.54591" + x1="132.76462" + id="linearGradient1179" + xlink:href="#linearGradient1177" + inkscape:collect="always" /> + @@ -435,15 +462,16 @@ + y1="122.54591" + x1="132.76462" + gradientTransform="matrix(0.83762215,0,0,0.92541661,-275.43157,-172.04418)" + gradientUnits="userSpaceOnUse" + id="linearGradient1183" + xlink:href="#linearGradient1177" + inkscape:collect="always" /> + @@ -456,15 +484,16 @@ + y1="122.54591" + x1="132.76462" + gradientTransform="matrix(-1.1876812,-0.35290398,0.38989322,-1.3121667,345.47458,152.00026)" + gradientUnits="userSpaceOnUse" + id="linearGradient1212" + xlink:href="#linearGradient1177" + inkscape:collect="always" /> + @@ -479,14 +508,15 @@ + id="mask1236" + maskUnits="userSpaceOnUse"> + cx="125" + cy="125" + r="125" /> + @@ -510,15 +540,17 @@ + + id="mask1243" + maskUnits="userSpaceOnUse"> + cx="125" + cy="125" + r="125" /> + @@ -542,15 +574,17 @@ + + y1="125" + x1="0" + gradientUnits="userSpaceOnUse" + id="linearGradient866" + xlink:href="#linearGradient862" + inkscape:collect="always" /> + @@ -567,15 +601,16 @@ + y2="716.57642" + x2="283.17621" + y1="-357.87811" + x1="311.80994" + id="linearGradient900" + xlink:href="#linearGradient898" + inkscape:collect="always" /> + @@ -586,15 +621,16 @@ + y1="-447.91309" + x1="1851.9196" + gradientTransform="matrix(1.0427705,0,0,0.62690293,-1088.8324,-991.72226)" + gradientUnits="userSpaceOnUse" + id="linearGradient928" + xlink:href="#linearGradient898" + inkscape:collect="always" /> + @@ -605,15 +641,16 @@ + y2="452.36615" + x2="687.32172" + y1="-966.22083" + x1="649.34778" + id="linearGradient942" + xlink:href="#linearGradient940" + inkscape:collect="always" /> + @@ -630,13 +667,14 @@ + xlink:href="#SVGID_1_" + x="0" + y="0" + width="100%" + height="100%" /> + @@ -656,16 +694,18 @@ + + xlink:href="#SVGID_1_" + x="0" + y="0" + width="100%" + height="100%" /> + @@ -703,113 +743,182 @@ + + y2="452.36615" + x2="687.32172" + y1="-966.22083" + x1="649.34778" + id="linearGradient942-7" + xlink:href="#linearGradient940" + inkscape:collect="always" /> + + xlink:href="#linearGradient898" + id="linearGradient900-4" + x1="311.80994" + y1="-357.87811" + x2="929.01709" + y2="819.63794" + gradientUnits="userSpaceOnUse" /> + + y1="-357.87811" + x1="311.80994" + gradientTransform="translate(733.62375,-279.8094)" + gradientUnits="userSpaceOnUse" + id="linearGradient932" + xlink:href="#linearGradient898" + inkscape:collect="always" /> + + id="linearGradient942-7-2" + x1="649.34778" + y1="-966.22083" + x2="687.32172" + y2="452.36615" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.73549165,0,0,0.53473221,1555.3804,-1455.006)" /> + + id="linearGradient978" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-71.635743,25.813861)" + x1="311.80994" + y1="-357.87811" + x2="283.17621" + y2="716.57642" /> + + id="linearGradient980" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1577052,0,0,1,-1315.1116,-748.52772)" + x1="311.80994" + y1="-357.87811" + x2="929.01709" + y2="819.63794" /> + + id="linearGradient982" + 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" /> + + id="linearGradient984" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(733.62375,-279.8094)" + x1="311.80994" + y1="-357.87811" + x2="283.17621" + y2="716.57642" /> + + + + + + + + + + + + + + @@ -822,35 +931,37 @@ + + 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="layer2" + inkscape:window-maximized="1" + inkscape:window-y="22" + inkscape:window-x="0" + inkscape:cy="207.80314" + inkscape:cx="-1207.6372" + inkscape:zoom="0.0875" + 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" + bordercolor="#666666" + pagecolor="#ffffff" /> + @@ -864,8 +975,8 @@ @@ -882,11 +993,12 @@ + + id="layer1" + inkscape:groupmode="layer"> @@ -896,36 +1008,39 @@ + height="1802.7738" + width="2086.2688" + id="rect907" + style="opacity:1;fill:#d38900;fill-opacity:0.993241;stroke-width:0.883929" /> + + width="2076.3242" + height="2565.9463" + x="-3507.884" + y="-1532.127" /> + + height="2141.8801" + width="2982.7158" + id="rect907-8-7" + style="opacity:1;fill:#0f951a;fill-opacity:0.993241;stroke-width:1.15203" /> + @@ -943,12 +1058,13 @@ + + inkscape:export-filename="/docs/Dslak/vds_quiz/vds-app/App/assets/logo.png" + inkscape:export-xdpi="120" + inkscape:export-ydpi="120"> @@ -965,75 +1081,91 @@ + + inkscape:groupmode="layer"> + + x="-319.18991" + height="606.03857" + width="1337.6455" + id="rect934" + style="fill:url(#linearGradient942-7);fill-opacity:1;stroke:none;stroke-width:0.627133" /> + + id="g938" + transform="matrix(0.53689327,0,0,0.99321963,28.061477,304.27388)"> + cy="327.19742" + cx="223.79865" + id="path870" + style="fill:url(#linearGradient900);fill-opacity:1;stroke:none" /> + + rx="1395.3616" + ry="400.51532" + transform="scale(-1)" + style="fill:url(#linearGradient900-4);fill-opacity:1;stroke:none;stroke-width:1.07597" + id="path870-0" /> + + cy="-802.784" + cx="-780.76215" + id="ellipse926" + 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)" /> + + cx="1029.0581" + cy="21.574158" + rx="1205.2823" + ry="400.51532" /> + @@ -1045,73 +1177,135 @@ + + height="1354.4559" + width="750.16998" + id="rect907-5-0" + style="opacity:1;fill:#0b7ac5;fill-opacity:0.992157;stroke-width:0.459434" + inkscape:export-filename="/docs/Dslak/vds_quiz/vds-app/App/assets/bg.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96" /> + + width="1337.6455" + height="606.03857" + x="1467.7904" + y="-1721.6595" + ry="0" /> + + transform="matrix(0.54245417,0,0,0.8642917,2126.6751,-109.30258)" + id="g938-8"> + cx="223.79865" + cy="327.19742" + rx="1205.2823" + ry="400.51532" /> + + transform="scale(-1)" + ry="400.51532" + rx="1395.3616" + cy="-447.14417" + cx="-973.08563" /> + + id="ellipse926-5" + cx="-780.76215" + cy="-802.784" + rx="1069.1677" + ry="251.08421" /> + + cy="21.574158" + cx="1029.0581" + id="ellipse930-8" + style="fill:url(#linearGradient984);fill-opacity:1;stroke:none" /> + + + + + + + + + + + diff --git a/vds-app/App/assets/bg.jpg b/vds-app/App/assets/bg.jpg index 1eb431a..fd8baca 100644 Binary files a/vds-app/App/assets/bg.jpg and b/vds-app/App/assets/bg.jpg differ diff --git a/vds-app/App/assets/header.png b/vds-app/App/assets/header.png index 8523485..118ba99 100644 Binary files a/vds-app/App/assets/header.png and b/vds-app/App/assets/header.png differ diff --git a/vds-app/App/components/Button.js b/vds-app/App/components/Button.js index c78e45d..1d89d81 100644 --- a/vds-app/App/components/Button.js +++ b/vds-app/App/components/Button.js @@ -8,8 +8,8 @@ const styles = StyleSheet.create({ borderWidth: 4, borderColor: 'transparent', borderRadius: 10, - paddingHorizontal: 10, - paddingVertical: 13, + paddingHorizontal: 20, + paddingVertical: 15, alignItems: "center", justifyContent: "center", width: "100%", @@ -25,6 +25,11 @@ const styles = StyleSheet.create({ fontSize: 15, textAlign: "center" }, + shadow: { + textShadowColor: 'rgba(0, 0, 0, 0.45)', + textShadowOffset: {width: -1, height: 1}, + textShadowRadius: 2 + }, buttonContainer: { flexDirection: "row", flexWrap: "wrap", @@ -35,13 +40,14 @@ const styles = StyleSheet.create({ } }) -export const Button = ({ text, subtitle = null, isBig = false, colorize = false, color = false, noPadding = false, noBorder = false, onPress = () => {} }) => { +export const Button = ({ text, subtitle = null, isBig = false, colorize = false, color = false, noPadding = false, noBorder = false, halfSize = false, hasShadow = false, onPress = false }) => { const buttonBig = isBig ? {fontSize: 25} : {} const isClicked = colorize.clicked == colorize.id let buttonColor = {backgroundColor: colors.white_alpha} let planeButton = noPadding ? { borderRadius: 0, marginTop: 0, borderWidth: 0, borderBottomWidth: 1, borderColor: colors.white_alpha} : {} let noBorderButton = noBorder ? { borderWidth: 0, borderBottomWidth: 0} : {} + let isHalf = halfSize ? { width: "48%", marginHorizontal: "1%"} : {} if(colorize && colorize.answered) { @@ -58,19 +64,36 @@ export const Button = ({ text, subtitle = null, isBig = false, colorize = false, buttonColor = {backgroundColor: color, borderColor: 'transparent'} } - if(subtitle) { - return ( - - {text} - {subtitle} - - ) + if(onPress) { + if(subtitle) { + return ( + + {text} + {subtitle} + + ) + } else { + return ( + + {text} + + ) + } } else { - return ( - - {text} - - ) + if(subtitle) { + return ( + + {text} + {subtitle} + + ) + } else { + return ( + + {text} + + ) + } } } diff --git a/vds-app/App/components/RowItem.js b/vds-app/App/components/RowItem.js index 7c3009e..242e7bf 100644 --- a/vds-app/App/components/RowItem.js +++ b/vds-app/App/components/RowItem.js @@ -1,6 +1,6 @@ import React from "react" import { View, Text, TouchableOpacity, StyleSheet } from "react-native" -import { colors } from "../components/Variables" +import { colors, texts } from "../components/Variables" const styles = StyleSheet.create({ row: { @@ -9,17 +9,44 @@ const styles = StyleSheet.create({ backgroundColor: colors.blue, marginBottom: 1 }, + container: { + paddingHorizontal: 20 + }, + button: { + backgroundColor: colors.white_alpha, + borderWidth: 4, + borderColor: 'transparent', + borderRadius: 10, + paddingHorizontal: 10, + paddingVertical: 13, + alignItems: "center", + justifyContent: "center", + width: "100%", + marginVertical: 5 + }, text: { - fontSize: 18, + fontSize: 20, + color: colors.white, + fontWeight: "500", + textShadowColor: 'rgba(0, 0, 0, 0.45)', + textShadowOffset: {width: -1, height: 1}, + textShadowRadius: 2 + }, + subtitle: { + fontSize: 14, color: colors.white, - fontWeight: "400" + fontWeight: "400", + textShadowColor: 'rgba(0, 0, 0, 0.45)', + textShadowOffset: {width: -1, height: 1}, + textShadowRadius: 2 } }) -export const RowItem = ({ onPress = () => {}, name, color, textColor }) => ( - - +export const RowItem = ({ onPress = () => {}, name, subtitle, textColor }) => ( + + {name} + ({subtitle} {texts.questions}) ) diff --git a/vds-app/App/components/TrueFalseQuestions.js b/vds-app/App/components/TrueFalseQuestions.js new file mode 100644 index 0000000..daefa6f --- /dev/null +++ b/vds-app/App/components/TrueFalseQuestions.js @@ -0,0 +1,47 @@ +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 = () => { + let fullQuestions = [] + + examScheme.forEach( (elem) => { + let currentSection = allQuestions[elem.section] + for(let i=0; i index != currentIndex) + } + +} + +generateQuestions() + +export const trueFalseQuestions = tmpQuestions diff --git a/vds-app/App/components/Variables.js b/vds-app/App/components/Variables.js index 92704f8..f581e12 100644 --- a/vds-app/App/components/Variables.js +++ b/vds-app/App/components/Variables.js @@ -1,13 +1,13 @@ export const colors = { white: "#fff", - white_alpha: "rgba(255, 255, 255, 0.3)", + white_alpha: "rgba(255, 255, 255, 0.2)", white_alpha2: "rgba(255, 255, 255, 0.5)", black: "#000", black_alpha: "rgba(0, 0, 0, 0.1)", purple: "#8c0072", purple_light: "#a30085", - blue: "#1385d0", - dark_blue: "#1279be", + blue: "#0080d0", + dark_blue: "#0072be", red: "#af321e", red_alpha: "rgba(175, 50, 30, 0.9)", red_light: "#af5d44", @@ -23,6 +23,7 @@ export const colors = { export const texts = { quizzes: "Seleziona un argomento", section_quizzes: "Quiz per argomento", + section_quizzes_subtitle: "Esercitati su argomenti specifici", exam: "Simulazione esame", exam_simulation: "30 domande in 30min", exam_passed: "Esame superato!", @@ -44,7 +45,7 @@ export const texts = { piloting_techniques: "Tecniche di pilotaggio", restart: "Ricomincia!", recap: "Visualizza errori", - recapTitle: "Riepilogo domande sbagliate", + recapTitle: "Riepilogo risposte sbagliate", infoTitle: "Informazioni App", dictionaryTitle: "Terminologia", dictionarySubtitle: "Dizionario ICAO e abbreviazioni", @@ -69,7 +70,11 @@ export const texts = { materials: "Materiali", flightSafety: "Sicurezza del volo", examScheme: "Schema domande d'esame", - resultsScheme: "Calcolo risultati" + resultsScheme: "Calcolo risultati", + true: "Vero", + false: "Falso", + trueFalse: "Test Vero/Falso", + trueFalseSubtitle: "10 domande casuali con risposte Vero/Falso" } export const examScheme = [ diff --git a/vds-app/App/data/flightSafety.js b/vds-app/App/data/flightSafety.js index c6d104c..19d6135 100644 --- a/vds-app/App/data/flightSafety.js +++ b/vds-app/App/data/flightSafety.js @@ -95,7 +95,7 @@ const questions = [ }, { "id": "3", - "text": "può non essere pericoloso se l’esperienza è molta. DEL VOLO" + "text": "può non essere pericoloso se l’esperienza è molta." } ] }, diff --git a/vds-app/App/data/physiopathology.js b/vds-app/App/data/physiopathology.js index cf3d53d..589912a 100644 --- a/vds-app/App/data/physiopathology.js +++ b/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." } ] }, @@ -186,16 +186,16 @@ const questions = [ "answers": [ { "id": "1", - "text": "1 no.", + "text": "no.", "correct": true }, { "id": "2", - "text": "2 – si." + "text": "si." }, { "id": "3", - "text": "3 sì, se l’equilibrio è affinato da adeguato addestramento." + "text": "sì, se l’equilibrio è affinato da adeguato addestramento." } ] } diff --git a/vds-app/App/index.js b/vds-app/App/index.js index 4b7a832..8135c11 100644 --- a/vds-app/App/index.js +++ b/vds-app/App/index.js @@ -4,9 +4,12 @@ import Splash from "./screens/Splash" import Banner from "./screens/Banner" 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 Dictionary from "./screens/Dictionary" import { colors, texts} from "./components/Variables" @@ -15,86 +18,79 @@ const MainStack = createStackNavigator({ Splash: { screen: Splash, navigationOptions: ({ navigation }) => ({ - header: null, - backgroundColor: colors.yellow, - headerStyle: { - backgroundColor: colors.yellow - } + header: null + }) + }, + RecapTrueFalse: { + screen: RecapTrueFalse, + navigationOptions: ({ navigation }) => ({ + header: null }) }, Recap: { screen: Recap, navigationOptions: ({ navigation }) => ({ - header: null, - backgroundColor: colors.yellow, - headerStyle: { - backgroundColor: colors.yellow - } + header: null }) }, Results: { screen: Results, navigationOptions: ({ navigation }) => ({ - header: null, - backgroundColor: colors.yellow, - headerStyle: { - backgroundColor: colors.yellow - } + header: null + }) + }, + ResultsTrueFalse: { + screen: ResultsTrueFalse, + navigationOptions: ({ navigation }) => ({ + header: null }) }, Info: { screen: Info, navigationOptions: ({ navigation }) => ({ - header: null, + header: null }) }, Dictionary: { screen: Dictionary, navigationOptions: ({ navigation }) => ({ - header: null, + header: null }) }, Banner: { screen: Banner, navigationOptions: ({ navigation }) => ({ - header: null, - backgroundColor: colors.yellow, - headerStyle: { - backgroundColor: colors.yellow - } + header: null }) }, QuizIndex: { screen: QuizIndex, navigationOptions: ({ navigation }) => ({ - headerTitle: texts.quizzes, - headerTintColor: colors.white, - backgroundColor: colors.dark_blue, - headerStyle: { - backgroundColor: colors.dark_blue - } + header: null }) }, Quiz: { screen: Quiz, navigationOptions: ({ navigation }) => ({ - headerTitle: navigation.getParam("title"), - headerTintColor: colors.white, - headerStyle: { - backgroundColor: navigation.getParam("color"), - borderBottomColor: navigation.getParam("color") - } + header: null + }) + }, + TrueFalse: { + screen: TrueFalse, + navigationOptions: ({ navigation }) => ({ + header: null +// headerTitle: navigation.getParam("title"), +// headerTintColor: colors.white, +// headerStyle: { +// backgroundColor: navigation.getParam("color"), +// 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") - } + header: null }) } }) diff --git a/vds-app/App/screens/Dictionary.js b/vds-app/App/screens/Dictionary.js index eca4b81..190a59b 100644 --- a/vds-app/App/screens/Dictionary.js +++ b/vds-app/App/screens/Dictionary.js @@ -1,47 +1,24 @@ import React from "react" -import { View, ScrollView, StyleSheet, StatusBar, Text, SafeAreaView, Dimensions, Image, BackHandler, Linking} from "react-native" +import { View, ScrollView, StyleSheet, StatusBar, Text, SafeAreaView, Dimensions, ImageBackground, BackHandler, Linking} from "react-native" import { AdMobBanner } from "expo-ads-admob" import { Button, ButtonContainer } from "../components/Button" import { colors, texts, credentials} from "../components/Variables" import { abbreviations, alphabeth, numbers} from "../data/dictionary" +const bgImage = require("../assets/bg.jpg") const screen = Dimensions.get("window") const styles = StyleSheet.create({ container: { - backgroundColor: colors.dark_blue, flex: 1 }, safearea: { flex: 1, marginTop: 30, - marginBottom: 30, justifyContent: "space-between", paddingHorizontal: 20 }, - bannerContainer: { - flex: 1, - alignItems: "center", - justifyContent: "center" - }, - banner: { - width: 320, - height: 60, - marginVertical: 10 - }, - box: { - width: screen.width-40, - paddingHorizontal: 20, - backgroundColor: colors.white, - borderRadius: 10, - overflow: "hidden" - }, - - scrollView: { - margin: 0, - height: screen.height-350 - }, buttonContainer: { marginHorizontal: 0, @@ -120,6 +97,39 @@ const styles = StyleSheet.create({ lineHeight: 30, fontSize: 26, fontWeight: "600" + }, + + + box: { + width: screen.width-40, + paddingHorizontal: 20, + paddingVertical: 10, + backgroundColor: colors.white, + borderRadius: 10, + overflow: "hidden" + }, + + scrollView: { + margin: 10, + height: screen.height-400 + }, + + bg: { + width: "100%", + height: "100%" + }, + bannerContainer: { + flex: 1, + alignItems: "center", + justifyContent: "center", + height: 60 + }, + banner: { + flex: 1, + alignItems: "center", + justifyContent: "center", + width: 320, + height: 60 } }) @@ -178,8 +188,8 @@ class Dictionary extends React.Component { render() { return ( + - @@ -231,6 +241,7 @@ class Dictionary extends React.Component { + ) } } diff --git a/vds-app/App/screens/Exam.js b/vds-app/App/screens/Exam.js index 96cf918..1a2d637 100644 --- a/vds-app/App/screens/Exam.js +++ b/vds-app/App/screens/Exam.js @@ -45,7 +45,12 @@ const styles = StyleSheet.create({ textAlign: "center", fontWeight: "600", paddingVertical: 10, - marginTop: 10, + marginTop: 30, + backgroundColor: colors.white_alpha, + borderRadius: 25, + textShadowColor: 'rgba(0, 0, 0, 0.45)', + textShadowOffset: {width: -1, height: 1}, + textShadowRadius: 2 }, safearea: { flex: 1, @@ -91,7 +96,7 @@ class Exam extends React.Component { handleBackButton = () => { - const tmpQuestions = [] + let tmpQuestions = [] examScheme.forEach( (elem) => { let currentSection = allQuestions[elem.section] for(let i=0; i - - - - {!this.state.results ? - - - {question.question} - - - {question.answers.map( (answer, index) => ( -