From 85768c60b2f582bb939f5bc5bdd6be4c3a876dbb Mon Sep 17 00:00:00 2001
From: GabrielTrettel <gabrielmtrettel@gmail.com>
Date: Fri, 26 Feb 2021 15:46:00 -0300
Subject: [PATCH] Changing assets in River Level

---
 src/app/assets/river_normal.svg               | 130 ++++++++++++++++--
 .../screens/RiverFloodSharingDataScreen.js    |  23 +---
 2 files changed, 117 insertions(+), 36 deletions(-)

diff --git a/src/app/assets/river_normal.svg b/src/app/assets/river_normal.svg
index d4d5bfe..bdbdec4 100644
--- a/src/app/assets/river_normal.svg
+++ b/src/app/assets/river_normal.svg
@@ -1,16 +1,116 @@
-<svg width="80" height="80" viewBox="0 0 80 80" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="80" height="80" rx="6" fill="#006493"/>
-<path d="M61.2188 14.7969L57.2344 18.7812V22.7656L54.0469 25.9531V33.125L58.0312 29.1406H63.6094V14.7969H61.2188Z" fill="#816551"/>
-<path d="M52.4531 45.875H63.6094V29.1406H58.0312L52.4531 34.7188V45.875Z" fill="#AC876C"/>
-<path d="M52.4531 45.875C54.2134 45.875 55.6406 44.4478 55.6406 42.6875C55.6406 40.9272 54.2134 39.5 52.4531 39.5C51.4706 39.5 50.6028 39.9542 50.0179 40.6531C49.8019 39.1032 48.4847 37.9062 46.875 37.9062C45.6112 37.9062 44.529 38.6473 44.0134 39.7136C43.6628 39.5813 43.2875 39.5 42.8906 39.5C42.4938 39.5 42.1185 39.5813 41.7678 39.7136C41.2522 38.6473 40.1701 37.9062 38.9062 37.9062C37.146 37.9062 35.7188 39.3335 35.7188 41.0938C34.3983 41.0938 33.3281 42.164 33.3281 43.4844C33.3281 44.8048 34.3983 45.875 35.7188 45.875H52.4531Z" fill="#8BD2F5"/>
-<path d="M38.1257 40.5117C38.1103 40.5379 38.1019 40.5661 38.0889 40.5927C38.1019 40.5657 38.1109 40.5379 38.1257 40.5117Z" fill="#8BD2F5"/>
-<path d="M38.005 40.7877C37.9765 40.8869 37.9598 40.9889 37.9598 41.0937C37.9598 40.9889 37.9771 40.8869 38.005 40.7877Z" fill="#8BD2F5"/>
-<path d="M33.2031 29V29.4031L34.3923 30.2094V32.225L36.7707 33.8375V36.6594L38.5545 37.8688V40.0376C38.9903 39.6994 39.6236 39.4813 40.3383 39.4813C41.2813 39.4813 42.0887 39.8562 42.4734 40.3955C42.7351 40.3286 43.0151 40.2875 43.3112 40.2875C43.6073 40.2875 43.8874 40.3286 44.149 40.3955C44.5337 39.8562 45.3412 39.4813 46.2842 39.4813C47.4853 39.4813 48.4682 40.0868 48.6293 40.8708C49.0657 40.5173 49.7132 40.2875 50.4464 40.2875V37.8688L51.6356 37.0625V33.4344L54.0139 31.8219V29.8063L55.2031 29H33.2031Z" fill="#8BD2F5"/>
-<path d="M38.3099 40.2633C38.3068 40.2665 38.3049 40.2706 38.3018 40.2738C38.3043 40.2701 38.3068 40.2665 38.3099 40.2633Z" fill="#8BD2F5"/>
-<path d="M33.3281 43.4844C33.3281 42.164 34.3983 41.0938 35.7188 41.0938C35.7188 40.2905 36.0255 39.5661 36.5156 39.0059C36.5156 36.9771 36.5156 34.7188 36.5156 34.7188L25.3594 23.5625H22.1719L18.9844 20.375H15.7969V45.875H35.7188C34.3983 45.875 33.3281 44.8048 33.3281 43.4844Z" fill="#AC876C"/>
-<path d="M18.9844 20.375L22.1719 23.5625H25.3594L34.125 32.3281V26.75L30.9375 23.5625V19.5781L26.1562 14.7969H19.7812L17.3906 17.1875V20.375H18.9844Z" fill="#816551"/>
-<path d="M63.6094 46.6719H15.7969C15.357 46.6719 15 46.3157 15 45.875V20.375C15 19.9343 15.357 19.5781 15.7969 19.5781H18.9844C19.1955 19.5781 19.3987 19.6618 19.5478 19.8116L22.5018 22.7656H25.3594C25.5705 22.7656 25.7737 22.8493 25.9228 22.9991L37.079 34.1554C37.2288 34.3044 37.3125 34.5068 37.3125 34.7188V38.99H35.7188V35.0487L25.0295 24.3594H22.1719C21.9607 24.3594 21.7575 24.2757 21.6085 24.1259L18.6545 21.1719H16.5938V45.0781H62.8125V29.9375H58.3612L53.25 35.0487V38.7031C53.25 38.9151 53.1663 39.1175 53.0165 39.2665L52.0714 40.2116L50.9446 39.0848L51.6562 38.3732V34.7188C51.6562 34.5068 51.7399 34.3044 51.8897 34.1554L57.4679 28.5772C57.6169 28.4274 57.8201 28.3438 58.0312 28.3438H63.6094C64.0493 28.3438 64.4062 28.7 64.4062 29.1406V45.875C64.4062 46.3157 64.0493 46.6719 63.6094 46.6719Z" fill="black"/>
-<path d="M34.9219 32.3281H33.3281V27.0799L30.3741 24.1259C30.2243 23.9769 30.1406 23.7745 30.1406 23.5625V19.908L25.8263 15.5938H20.1112L18.1875 17.5174V20.375H16.5938V17.1875C16.5938 16.9755 16.6774 16.7731 16.8272 16.6241L19.2179 14.2335C19.3669 14.0837 19.5701 14 19.7812 14H26.1562C26.3674 14 26.5706 14.0837 26.7196 14.2335L31.5009 19.0147C31.6507 19.1637 31.7344 19.3662 31.7344 19.5781V23.2326L34.6884 26.1866C34.8382 26.3356 34.9219 26.538 34.9219 26.75V32.3281Z" fill="black"/>
-<path d="M54.8438 33.125H53.25V25.9531C53.25 25.7412 53.3337 25.5387 53.4835 25.3897L56.4375 22.4357V18.7812C56.4375 18.5693 56.5212 18.3669 56.671 18.2179L60.6554 14.2335C60.8044 14.0837 61.0076 14 61.2188 14H63.6094C64.0492 14 64.4062 14.3562 64.4062 14.7969V29.1406H62.8125V15.5938H61.5487L58.0312 19.1112V22.7656C58.0312 22.9776 57.9476 23.18 57.7978 23.329L54.8438 26.283V33.125Z" fill="black"/>
-<path d="M25.3848 66H23.6553L19.2188 8.9385V66H17.4893V56.0469H19.2188L23.6689 63.1357V56.0469H25.3848V66ZM27.132 62.2334C27.132 61.5088 27.2756 60.8571 27.5627 60.2783C27.8498 59.695 28.2531 59.2484 28.7727 58.9385C29.2922 58.624 29.8892 58.4668 30.5637 58.4668C31.5617 58.4668 32.3706 58.7881 32.9904 59.4307C33.6148 60.0732 33.952 60.9255 34.0021 61.9873L34.009 62.377C34.009 63.1061 33.8677 63.7578 33.5852 64.332C33.3072 64.9062 32.9061 65.3506 32.382 65.665C31.8625 65.9795 31.2609 66.1367 30.5773 66.1367C29.5337 66.1367 28.6975 65.7904 28.0686 65.0977C27.4442 64.4004 27.132 63.473 27.132 62.3154V62.2334ZM28.7932 62.377C28.7932 63.138 28.9504 63.735 29.2648 64.168C29.5793 64.5964 30.0168 64.8105 30.5773 64.8105C31.1379 64.8105 31.5731 64.5918 31.883 64.1543C32.1975 63.7168 32.3547 63.0765 32.3547 62.2334C32.3547 61.486 32.1929 60.8936 31.8693 60.4561C31.5503 60.0186 31.1151 59.7998 30.5637 59.7998C30.0214 59.7998 29.5907 60.0163 29.2717 60.4492C28.9527 60.8776 28.7932 61.5202 28.7932 62.377ZM39.4613 60.1211C39.2426 60.0846 39.017 60.0664 38.7846 60.0664C38.0235 60.0664 37.5108 60.3581 37.2465 60.9414V66H35.5854V58.6035H37.1713L37.2123 59.4307C37.6133 58.7881 38.1693 58.4668 38.8803 58.4668C39.1173 58.4668 39.3132 58.4987 39.4682 58.5625L39.4613 60.1211ZM42.2477 58.6035L42.2955 59.376C42.815 58.7699 43.526 58.4668 44.4283 58.4668C45.4173 58.4668 46.094 58.8451 46.4586 59.6016C46.9964 58.8451 47.7529 58.4668 48.7281 58.4668C49.5439 58.4668 50.15 58.6924 50.5465 59.1436C50.9475 59.5947 51.1526 60.2601 51.1617 61.1396V66H49.5006V61.1875C49.5006 60.7181 49.398 60.374 49.193 60.1553C48.9879 59.9365 48.6484 59.8271 48.1744 59.8271C47.7962 59.8271 47.4863 59.9297 47.2447 60.1348C47.0077 60.3353 46.8414 60.5996 46.7457 60.9277L46.7525 66H45.0914V61.1328C45.0686 60.2624 44.6243 59.8271 43.7584 59.8271C43.093 59.8271 42.6214 60.0983 42.3434 60.6406V66H40.6822V58.6035H42.2477ZM57.4617 66C57.3888 65.8587 57.325 65.6286 57.2703 65.3096C56.7417 65.861 56.0945 66.1367 55.3289 66.1367C54.5861 66.1367 53.9799 65.9248 53.5105 65.501C53.0411 65.0771 52.8064 64.5531 52.8064 63.9287C52.8064 63.1403 53.0981 62.5365 53.6814 62.1172C54.2693 61.6934 55.1079 61.4814 56.1971 61.4814H57.2156V60.9961C57.2156 60.6133 57.1085 60.3079 56.8943 60.0801C56.6801 59.8477 56.3543 59.7314 55.9168 59.7314C55.5385 59.7314 55.2286 59.8271 54.9871 60.0186C54.7456 60.2054 54.6248 60.4447 54.6248 60.7363H52.9637C52.9637 60.3307 53.0981 59.9525 53.367 59.6016C53.6359 59.2461 54.0005 58.9681 54.4607 58.7676C54.9256 58.5671 55.4428 58.4668 56.0125 58.4668C56.8784 58.4668 57.5688 58.6855 58.0838 59.123C58.5988 59.556 58.8631 60.1667 58.8768 60.9551V64.291C58.8768 64.9564 58.9702 65.4873 59.157 65.8838V66H57.4617ZM55.6365 64.8037C55.9646 64.8037 56.2723 64.724 56.5594 64.5645C56.851 64.4049 57.0698 64.1908 57.2156 63.9219V62.5273H56.3201C55.7049 62.5273 55.2423 62.6344 54.9324 62.8486C54.6225 63.0628 54.4676 63.3659 54.4676 63.7578C54.4676 64.0768 54.5724 64.332 54.782 64.5234C54.9962 64.7103 55.2811 64.8037 55.6365 64.8037ZM62.5586 66H60.8975V55.5H62.5586V66Z" fill="white"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="80"
+   height="80"
+   viewBox="0 0 80 80"
+   fill="none"
+   version="1.1"
+   id="svg30"
+   sodipodi:docname="river_normal.svg"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata36">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs34" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1013"
+     id="namedview32"
+     showgrid="false"
+     inkscape:zoom="7.85"
+     inkscape:cx="58.238927"
+     inkscape:cy="40"
+     inkscape:window-x="0"
+     inkscape:window-y="37"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg30" />
+  <rect
+     width="80"
+     height="80"
+     rx="6"
+     fill="#006493"
+     id="rect2" />
+  <path
+     d="M61.2188 14.7969L57.2344 18.7812V22.7656L54.0469 25.9531V33.125L58.0312 29.1406H63.6094V14.7969H61.2188Z"
+     fill="#816551"
+     id="path4" />
+  <path
+     d="M52.4531 45.875H63.6094V29.1406H58.0312L52.4531 34.7188V45.875Z"
+     fill="#AC876C"
+     id="path6" />
+  <path
+     d="M52.4531 45.875C54.2134 45.875 55.6406 44.4478 55.6406 42.6875C55.6406 40.9272 54.2134 39.5 52.4531 39.5C51.4706 39.5 50.6028 39.9542 50.0179 40.6531C49.8019 39.1032 48.4847 37.9062 46.875 37.9062C45.6112 37.9062 44.529 38.6473 44.0134 39.7136C43.6628 39.5813 43.2875 39.5 42.8906 39.5C42.4938 39.5 42.1185 39.5813 41.7678 39.7136C41.2522 38.6473 40.1701 37.9062 38.9062 37.9062C37.146 37.9062 35.7188 39.3335 35.7188 41.0938C34.3983 41.0938 33.3281 42.164 33.3281 43.4844C33.3281 44.8048 34.3983 45.875 35.7188 45.875H52.4531Z"
+     fill="#8BD2F5"
+     id="path8" />
+  <path
+     d="M38.1257 40.5117C38.1103 40.5379 38.1019 40.5661 38.0889 40.5927C38.1019 40.5657 38.1109 40.5379 38.1257 40.5117Z"
+     fill="#8BD2F5"
+     id="path10" />
+  <path
+     d="M38.005 40.7877C37.9765 40.8869 37.9598 40.9889 37.9598 41.0937C37.9598 40.9889 37.9771 40.8869 38.005 40.7877Z"
+     fill="#8BD2F5"
+     id="path12" />
+  <path
+     d="M33.2031 29V29.4031L34.3923 30.2094V32.225L36.7707 33.8375V36.6594L38.5545 37.8688V40.0376C38.9903 39.6994 39.6236 39.4813 40.3383 39.4813C41.2813 39.4813 42.0887 39.8562 42.4734 40.3955C42.7351 40.3286 43.0151 40.2875 43.3112 40.2875C43.6073 40.2875 43.8874 40.3286 44.149 40.3955C44.5337 39.8562 45.3412 39.4813 46.2842 39.4813C47.4853 39.4813 48.4682 40.0868 48.6293 40.8708C49.0657 40.5173 49.7132 40.2875 50.4464 40.2875V37.8688L51.6356 37.0625V33.4344L54.0139 31.8219V29.8063L55.2031 29H33.2031Z"
+     fill="#8BD2F5"
+     id="path14" />
+  <path
+     d="M38.3099 40.2633C38.3068 40.2665 38.3049 40.2706 38.3018 40.2738C38.3043 40.2701 38.3068 40.2665 38.3099 40.2633Z"
+     fill="#8BD2F5"
+     id="path16" />
+  <path
+     d="M33.3281 43.4844C33.3281 42.164 34.3983 41.0938 35.7188 41.0938C35.7188 40.2905 36.0255 39.5661 36.5156 39.0059C36.5156 36.9771 36.5156 34.7188 36.5156 34.7188L25.3594 23.5625H22.1719L18.9844 20.375H15.7969V45.875H35.7188C34.3983 45.875 33.3281 44.8048 33.3281 43.4844Z"
+     fill="#AC876C"
+     id="path18" />
+  <path
+     d="M18.9844 20.375L22.1719 23.5625H25.3594L34.125 32.3281V26.75L30.9375 23.5625V19.5781L26.1562 14.7969H19.7812L17.3906 17.1875V20.375H18.9844Z"
+     fill="#816551"
+     id="path20" />
+  <path
+     d="M63.6094 46.6719H15.7969C15.357 46.6719 15 46.3157 15 45.875V20.375C15 19.9343 15.357 19.5781 15.7969 19.5781H18.9844C19.1955 19.5781 19.3987 19.6618 19.5478 19.8116L22.5018 22.7656H25.3594C25.5705 22.7656 25.7737 22.8493 25.9228 22.9991L37.079 34.1554C37.2288 34.3044 37.3125 34.5068 37.3125 34.7188V38.99H35.7188V35.0487L25.0295 24.3594H22.1719C21.9607 24.3594 21.7575 24.2757 21.6085 24.1259L18.6545 21.1719H16.5938V45.0781H62.8125V29.9375H58.3612L53.25 35.0487V38.7031C53.25 38.9151 53.1663 39.1175 53.0165 39.2665L52.0714 40.2116L50.9446 39.0848L51.6562 38.3732V34.7188C51.6562 34.5068 51.7399 34.3044 51.8897 34.1554L57.4679 28.5772C57.6169 28.4274 57.8201 28.3438 58.0312 28.3438H63.6094C64.0493 28.3438 64.4062 28.7 64.4062 29.1406V45.875C64.4062 46.3157 64.0493 46.6719 63.6094 46.6719Z"
+     fill="black"
+     id="path22" />
+  <path
+     d="M34.9219 32.3281H33.3281V27.0799L30.3741 24.1259C30.2243 23.9769 30.1406 23.7745 30.1406 23.5625V19.908L25.8263 15.5938H20.1112L18.1875 17.5174V20.375H16.5938V17.1875C16.5938 16.9755 16.6774 16.7731 16.8272 16.6241L19.2179 14.2335C19.3669 14.0837 19.5701 14 19.7812 14H26.1562C26.3674 14 26.5706 14.0837 26.7196 14.2335L31.5009 19.0147C31.6507 19.1637 31.7344 19.3662 31.7344 19.5781V23.2326L34.6884 26.1866C34.8382 26.3356 34.9219 26.538 34.9219 26.75V32.3281Z"
+     fill="black"
+     id="path24" />
+  <path
+     d="M54.8438 33.125H53.25V25.9531C53.25 25.7412 53.3337 25.5387 53.4835 25.3897L56.4375 22.4357V18.7812C56.4375 18.5693 56.5212 18.3669 56.671 18.2179L60.6554 14.2335C60.8044 14.0837 61.0076 14 61.2188 14H63.6094C64.0492 14 64.4062 14.3562 64.4062 14.7969V29.1406H62.8125V15.5938H61.5487L58.0312 19.1112V22.7656C58.0312 22.9776 57.9476 23.18 57.7978 23.329L54.8438 26.283V33.125Z"
+     fill="black"
+     id="path26" />
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14px;line-height:0.299999px;font-family:MathJax_Main;-inkscape-font-specification:'MathJax_Main, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none"
+     x="14.485116"
+     y="65.575226"
+     id="text40"><tspan
+       sodipodi:role="line"
+       id="tspan38"
+       x="14.485116"
+       y="65.575226"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14px;font-family:roboto;-inkscape-font-specification:roboto;fill:#ffffff">Normal</tspan></text>
 </svg>
diff --git a/src/app/screens/RiverFloodSharingDataScreen.js b/src/app/screens/RiverFloodSharingDataScreen.js
index 0e05af9..cbbe12a 100644
--- a/src/app/screens/RiverFloodSharingDataScreen.js
+++ b/src/app/screens/RiverFloodSharingDataScreen.js
@@ -38,20 +38,9 @@ function RiverFloodSharingDataScreen(props) {
   const [date, setDate] = useState(moment());
   const [time, setTime] = useState(moment());
 
-  const dims = scaleDimsFromWidth(85, 85, 30);
+  const dims = scaleDimsFromWidth(85, 85, 20);
   return (
     <Screen style={styles.container}>
-      <Text
-        style={{
-          fontSize: dimensions.text.header,
-          fontWeight: "bold",
-          color: colors.primary,
-          textAlign: "center",
-          marginBottom: 30,
-        }}
-      >
-        Nível da água do rio
-      </Text>
       <KeyboardAwareScrollView
         resetScrollToCoords={{ x: 0, y: 0 }}
         scrollEnabled={true}
@@ -96,9 +85,7 @@ function RiverFloodSharingDataScreen(props) {
                   <assets.riverLevel.Normal {...dims} />
                 </View>
               </TouchableNativeFeedback>
-            </View>
 
-            <View style={{ ...styles.imgs_row, marginTop: 10 }}>
               <TouchableNativeFeedback onPress={() => setRiverScale(2)}>
                 <View
                   borderColor={riverScale == 2 ? colors.primary : colors.white}
@@ -174,7 +161,7 @@ function RiverFloodSharingDataScreen(props) {
   );
 }
 
-const dims = scaleDimsFromWidth(85, 85, 42);
+const dims = scaleDimsFromWidth(85, 85, 4);
 
 const styles = StyleSheet.create({
   container: {
@@ -183,16 +170,10 @@ const styles = StyleSheet.create({
   },
   img_block: {
     borderRadius: 5,
-    padding: 10,
     borderStyle: "dotted",
     borderColor: colors.white,
     borderWidth: borderWidth,
     alignItems: "center",
-    width: dims.width,
-  },
-  floodingLogo: {
-    width: dims.width * 0.8,
-    height: dims.height * 0.8,
   },
   imgs_row: {
     flexDirection: "row",