Browse Source

Changing some assets and redefining some data-menu spacings

master
GabrielTrettel 3 years ago
parent
commit
8ea7e14c70
  1. 2
      src/app/assets/dataMenu/aguaRio.svg
  2. 2
      src/app/assets/dataMenu/alagamento.svg
  3. 2
      src/app/assets/dataMenu/chuva.svg
  4. 2
      src/app/assets/dataMenu/pluviometroArtesanal.svg
  5. 2
      src/app/assets/dataMenu/pluviometroOficial.svg
  6. 1
      src/app/assets/dataMenu/suceptibilitiesAreas.svg
  7. 2
      src/app/assets/floodZonesAssets/floodZones-logo.svg
  8. 2
      src/app/assets/pluviometer/PluviometroOficial.svg
  9. 2
      src/app/assets/pluviometer/pluviometer-logo.svg
  10. 26
      src/app/components/MapDataMenu.js
  11. 6
      src/app/components/SvgLabeledButton.js
  12. 4
      src/app/config/assets.js
  13. 10
      src/app/screens/SharingDataScreen.js

2
src/app/assets/dataMenu/aguaRio.svg
File diff suppressed because it is too large
View File

2
src/app/assets/dataMenu/alagamento.svg
File diff suppressed because it is too large
View File

2
src/app/assets/dataMenu/chuva.svg

@ -1 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 150 150"><g id="f817185d-370e-4e96-a1e6-422cebaa6c80" data-name="Camada 2"><rect width="150" height="150" fill="#fff"/></g><g id="f31556a3-2e8c-4c6d-b9ee-ad9bb4bcd49d" data-name="Camada 1"><path d="M133.24,76a21.77,21.77,0,0,1-21.76,21.77H40.53A21.77,21.77,0,0,1,28.35,57.94a3.58,3.58,0,0,0,1.22-4.51,20.16,20.16,0,0,1-2-8.83,20.53,20.53,0,0,1,20.5-20.51,20.23,20.23,0,0,1,9.07,2.11A3.58,3.58,0,0,0,61,25.75,34.11,34.11,0,0,1,116.76,52.1v.13a3.58,3.58,0,0,0,2.33,3.35A21.87,21.87,0,0,1,133.24,76Z" fill="#3b7097" opacity="0.2"/><path d="M34.76,75.64a25.34,25.34,0,0,1,7.43-17.93,25.62,25.62,0,0,1,3.74-3.08A24.1,24.1,0,0,1,57.3,22.49c.47-.23.94-.44,1.43-.63A24.1,24.1,0,0,0,28,54.63,25.35,25.35,0,0,0,42.22,101H56.11l.06-.31A25.37,25.37,0,0,1,34.76,75.64Z" fill="#fff"/><path d="M140.4,76v0a28.91,28.91,0,0,1-28.92,28.9H40.53A28.92,28.92,0,0,1,20.08,55.53c.6-.6,1.24-1.18,1.9-1.74A27.67,27.67,0,0,1,48.07,16.94a27.26,27.26,0,0,1,10.14,1.92,41.26,41.26,0,0,1,65.64,31A29.07,29.07,0,0,1,140.4,76ZM126.87,91.37A21.61,21.61,0,0,0,133.24,76a21.87,21.87,0,0,0-14.15-20.4,3.58,3.58,0,0,1-2.33-3.35V52.1A34.11,34.11,0,0,0,61,25.75a3.58,3.58,0,0,1-3.86.45,20.23,20.23,0,0,0-9.07-2.11A20.53,20.53,0,0,0,27.57,44.6a20.16,20.16,0,0,0,2,8.83,3.58,3.58,0,0,1-1.22,4.51A21.77,21.77,0,0,0,40.53,97.75h71A21.62,21.62,0,0,0,126.87,91.37Z" fill="#3b7097"/><path d="M120.07,113.05a3.58,3.58,0,0,1,0,5.06l-3.62,3.63,0,0a3.58,3.58,0,0,1-5-5.08l3.62-3.63,0,0A3.58,3.58,0,0,1,120.07,113.05Z" fill="#3b7097"/><path d="M105.2,131a3.57,3.57,0,0,1-1,3.48l-3.62,3.62,0,0a3.58,3.58,0,1,1-5-5.08l3.62-3.62a3.58,3.58,0,0,1,6,1.58Z" fill="#3b7097"/><path d="M97.58,113.05a3.58,3.58,0,0,1,0,5.06L94,121.74a3.58,3.58,0,0,1-5.06-5.06l3.63-3.63A3.58,3.58,0,0,1,97.58,113.05Z" fill="#3b7097"/><path d="M81.77,129.38a3.57,3.57,0,0,1,0,5.06l-3.63,3.62a3.57,3.57,0,1,1-5-5.06l3.62-3.62A3.57,3.57,0,0,1,81.77,129.38Z" fill="#3b7097"/><path d="M75.12,113.05a3.58,3.58,0,0,1,0,5.06l-3.62,3.63a3.58,3.58,0,1,1-5.06-5.06l3.62-3.63A3.59,3.59,0,0,1,75.12,113.05Z" fill="#3b7097"/><path d="M59.3,129.38a3.57,3.57,0,0,1,0,5.06l-3.62,3.62A3.58,3.58,0,0,1,50.62,133l3.62-3.62A3.57,3.57,0,0,1,59.3,129.38Z" fill="#3b7097"/><path d="M52.65,113.05a3.57,3.57,0,0,1,0,5.06L49,121.74l-.05,0a3.57,3.57,0,1,1-5-5.1l3.63-3.63A3.58,3.58,0,0,1,52.65,113.05Z" fill="#3b7097"/><path d="M36.84,129.38a3.57,3.57,0,0,1,0,5.06l-3.63,3.62A3.57,3.57,0,1,1,28.16,133l3.62-3.62A3.57,3.57,0,0,1,36.84,129.38Z" fill="#3b7097"/><path d="M30.19,113.05a3.58,3.58,0,0,1,0,5.06l-3.62,3.63a3.58,3.58,0,1,1-5.06-5.06l3.62-3.63A3.59,3.59,0,0,1,30.19,113.05Z" fill="#3b7097"/></g></svg>
<svg xmlns="http://www.w3.org/2000/svg" width="141" height="142" viewBox="0 0 141 142"><g id="ffed0ab0-dbf9-4229-a4ba-134985dfa8a9" data-name="Camada 1"><path d="M118.35,45.86a41.27,41.27,0,0,0-65.64-31A27.68,27.68,0,0,0,16.48,49.82c-.66.55-1.3,1.13-1.9,1.74A28.92,28.92,0,0,0,35,100.93h71A28.92,28.92,0,0,0,134.9,72v0A29.1,29.1,0,0,0,118.35,45.86Zm3,41.54A21.57,21.57,0,0,1,106,93.77H35A21.76,21.76,0,0,1,22.85,54a3.58,3.58,0,0,0,1.22-4.51,20.2,20.2,0,0,1-2-8.84,20.52,20.52,0,0,1,20.5-20.5,20.23,20.23,0,0,1,9.07,2.11,3.58,3.58,0,0,0,3.86-.45,34.11,34.11,0,0,1,55.76,26.34v.14a3.58,3.58,0,0,0,2.33,3.35A21.86,21.86,0,0,1,127.74,72,21.63,21.63,0,0,1,121.37,87.4Z" fill="#3b7097"/><path d="M37,125.4,33.4,129a3.58,3.58,0,0,0,5.06,5.07l3.62-3.63a3.57,3.57,0,1,0-5-5.06Z" fill="#3b7097"/><path d="M82,125.4,78.33,129a3.58,3.58,0,0,0,5.06,5.07L87,130.46A3.57,3.57,0,1,0,82,125.4Z" fill="#3b7097"/><path d="M24.69,109.08a3.57,3.57,0,0,0-5.06,0L16,112.7a3.58,3.58,0,1,0,5.06,5.06l3.62-3.62a3.58,3.58,0,0,0,0-5.06Z" fill="#3b7097"/><path d="M69.62,109.08a3.57,3.57,0,0,0-5.06,0l-3.62,3.62A3.58,3.58,0,0,0,66,117.76l3.62-3.62A3.58,3.58,0,0,0,69.62,109.08Z" fill="#3b7097"/><path d="M109.49,109.08l-3.62,3.62a3.58,3.58,0,1,0,5,5.08l0,0,3.62-3.62a3.58,3.58,0,1,0-5-5.08Z" fill="#3b7097"/><path d="M29.18,72.63a25.47,25.47,0,0,1,11.16-21A24.12,24.12,0,0,1,51.71,19.47c.47-.22.95-.43,1.43-.63A24.1,24.1,0,0,0,22.45,51.61,25.35,25.35,0,0,0,36.64,98H50.53l0-.31A25.35,25.35,0,0,1,29.18,72.63Z" fill="#3b7097" opacity="0.2"/></g></svg>

2
src/app/assets/dataMenu/pluviometroArtesanal.svg

@ -1 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 150 150"><g id="a038fce1-27a2-498a-bfa8-8124710f6976" data-name="Camada 2"><rect width="150" height="150" fill="#fff"/></g><g id="ac559167-f77d-4c9d-a667-cdf90aebb90c" data-name="Camada 1"><rect x="61.2" y="36.69" width="27.54" height="102.74" fill="#ececec"/><path d="M91.31,142H58.64V34.12H91.31Zm-27.54-5.13h22.4V39.26H63.77Z" fill="#3b7097"/><rect x="63.13" y="35.56" width="11.95" height="103.42" fill="#d9d9d9"/><path d="M62.53,110.68l1.09-2.05c4.32-2.66,5.51-4,9.36-1.16.34.26.68.51,1,.74l2.84,2.06c2.68,2.15,5-.31,5.72-.89l2.87-2.17a2,2,0,0,1,3.19,1.53v27.71a2,2,0,0,1-1.88,2l-22.1,1a2,2,0,0,1-2-1.88l-1-25.06A1.94,1.94,0,0,1,62.53,110.68Z" fill="#9fdfff"/><path d="M75.07,109l-1-.75c-.37-.23-.71-.48-1-.74-3.85-2.86-5-1.5-9.36,1.16l-1.09,2.05a1.94,1.94,0,0,0-.93,1.75l1,25.06a2,2,0,0,0,2,1.88l10.4-.45Z" fill="#7dd6f9"/><path d="M91.31,142H58.64V34.12H91.31Zm-27.54-5.13h22.4V39.26H63.77Z" fill="#727272"/><path d="M42.45,10.57h65.09a0,0,0,0,1,0,0v3.17A21.71,21.71,0,0,1,85.84,35.45H64.16A21.71,21.71,0,0,1,42.45,13.73V10.57A0,0,0,0,1,42.45,10.57Z" fill="#ececec"/><path d="M82.91,38H67.09a27.23,27.23,0,0,1-27.2-27.2V8h70.22v2.81A27.23,27.23,0,0,1,82.91,38ZM45.14,13.13a22.1,22.1,0,0,0,22,19.75H82.91a22.1,22.1,0,0,0,22-19.75Z" fill="#3b7097"/><path d="M45,10.5H74.9a0,0,0,0,1,0,0V35.56a0,0,0,0,1,0,0h-8A21.87,21.87,0,0,1,45,13.69V10.5A0,0,0,0,1,45,10.5Z" fill="#d9d9d9"/><path d="M82.91,38H67.09a27.23,27.23,0,0,1-27.2-27.2V8h70.22v2.81A27.23,27.23,0,0,1,82.91,38ZM45.14,13.13a22.1,22.1,0,0,0,22,19.75H82.91a22.1,22.1,0,0,0,22-19.75Z" fill="#727272"/><rect x="58.91" y="58.81" width="19.68" height="2.05" fill="#727272"/><rect x="58.91" y="72.94" width="19.68" height="2.05" fill="#727272"/><rect x="58.91" y="87.07" width="19.68" height="2.05" fill="#727272"/><rect x="58.91" y="101.19" width="19.68" height="2.05" fill="#727272"/><rect x="58.91" y="115.32" width="19.68" height="2.05" fill="#727272"/></g></svg>
<svg xmlns="http://www.w3.org/2000/svg" width="150" height="140" viewBox="0 0 150 140"><g id="b61690fe-17b8-491c-bd67-2dcddc2c6756" data-name="Camada 1"><rect x="61.2" y="31.69" width="27.54" height="102.74" fill="#ececec"/><path d="M91.31,137H58.64V29.12H91.31Zm-27.54-5.13h22.4V34.26H63.77Z" fill="#3b7097"/><rect x="63.13" y="30.56" width="11.95" height="103.42" fill="#d9d9d9"/><path d="M62.53,105.68l1.09-2.05c4.32-2.66,5.51-4,9.36-1.16.34.26.68.51,1,.74l2.84,2.06c2.68,2.15,5-.31,5.72-.89l2.87-2.17a2,2,0,0,1,3.19,1.53v27.71a2,2,0,0,1-1.88,2l-22.1,1a2,2,0,0,1-2-1.88l-1-25.06A1.94,1.94,0,0,1,62.53,105.68Z" fill="#9fdfff"/><path d="M75.07,104l-1-.75c-.37-.23-.71-.48-1-.74-3.85-2.86-5-1.5-9.36,1.16l-1.09,2.05a1.94,1.94,0,0,0-.93,1.75l1,25.06a2,2,0,0,0,2,1.88l10.4-.45Z" fill="#7dd6f9"/><path d="M91.31,137H58.64V29.12H91.31Zm-27.54-5.13h22.4V34.26H63.77Z" fill="#727272"/><path d="M42.45,5.57h65.09a0,0,0,0,1,0,0V8.73A21.71,21.71,0,0,1,85.84,30.45H64.16A21.71,21.71,0,0,1,42.45,8.73V5.57A0,0,0,0,1,42.45,5.57Z" fill="#ececec"/><path d="M82.91,33H67.09a27.23,27.23,0,0,1-27.2-27.2V3h70.22V5.81A27.23,27.23,0,0,1,82.91,33ZM45.14,8.13a22.1,22.1,0,0,0,22,19.75H82.91a22.1,22.1,0,0,0,22-19.75Z" fill="#3b7097"/><path d="M45,5.5H74.9a0,0,0,0,1,0,0V30.56a0,0,0,0,1,0,0h-8A21.87,21.87,0,0,1,45,8.69V5.5A0,0,0,0,1,45,5.5Z" fill="#d9d9d9"/><path d="M82.91,33H67.09a27.23,27.23,0,0,1-27.2-27.2V3h70.22V5.81A27.23,27.23,0,0,1,82.91,33ZM45.14,8.13a22.1,22.1,0,0,0,22,19.75H82.91a22.1,22.1,0,0,0,22-19.75Z" fill="#727272"/><rect x="58.91" y="53.81" width="19.68" height="2.05" fill="#727272"/><rect x="58.91" y="67.94" width="19.68" height="2.05" fill="#727272"/><rect x="58.91" y="82.07" width="19.68" height="2.05" fill="#727272"/><rect x="58.91" y="96.19" width="19.68" height="2.05" fill="#727272"/><rect x="58.91" y="110.32" width="19.68" height="2.05" fill="#727272"/></g></svg>

2
src/app/assets/dataMenu/pluviometroOficial.svg

@ -1 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 150 150"><g id="f377c9e6-a8c3-4a87-aff8-7b8fd8304542" data-name="Camada 2"><rect width="150" height="150" fill="#fff"/></g><g id="a195a4b6-c3c8-4b0e-abdd-1b56fb675640" data-name="Camada 1"><rect x="61.2" y="36.69" width="27.54" height="102.74" fill="#ececec"/><path d="M91.31,142H58.64V34.12H91.31Zm-27.54-5.13h22.4V39.26H63.77Z" fill="#3b7097"/><rect x="63.13" y="35.56" width="11.95" height="103.42" fill="#d9d9d9"/><path d="M62.53,110.68l1.09-2.05c4.32-2.66,5.51-4,9.36-1.16.34.26.68.51,1,.74l2.84,2.06c2.68,2.15,5-.31,5.72-.89l2.87-2.17a2,2,0,0,1,3.19,1.53v27.71a2,2,0,0,1-1.88,2l-22.1,1a2,2,0,0,1-2-1.88l-1-25.06A1.94,1.94,0,0,1,62.53,110.68Z" fill="#9fdfff"/><path d="M75.07,109l-1-.75c-.37-.23-.71-.48-1-.74-3.85-2.86-5-1.5-9.36,1.16l-1.09,2.05a1.94,1.94,0,0,0-.93,1.75l1,25.06a2,2,0,0,0,2,1.88l10.4-.45Z" fill="#7dd6f9"/><path d="M91.31,142H58.64V34.12H91.31Zm-27.54-5.13h22.4V39.26H63.77Z" fill="#727272"/><path d="M42.45,10.57h65.09a0,0,0,0,1,0,0v3.17A21.71,21.71,0,0,1,85.84,35.45H64.16A21.71,21.71,0,0,1,42.45,13.73V10.57a0,0,0,0,1,0,0Z" fill="#ececec"/><path d="M82.91,38H67.09a27.23,27.23,0,0,1-27.2-27.2V8h70.22v2.81A27.23,27.23,0,0,1,82.91,38ZM45.14,13.13a22.1,22.1,0,0,0,22,19.75H82.91a22.1,22.1,0,0,0,22-19.75Z" fill="#3b7097"/><path d="M45,10.5H74.9a0,0,0,0,1,0,0V35.56a0,0,0,0,1,0,0h-8A21.87,21.87,0,0,1,45,13.69V10.5A0,0,0,0,1,45,10.5Z" fill="#d9d9d9"/><path d="M82.91,38H67.09a27.23,27.23,0,0,1-27.2-27.2V8h70.22v2.81A27.23,27.23,0,0,1,82.91,38ZM45.14,13.13a22.1,22.1,0,0,0,22,19.75H82.91a22.1,22.1,0,0,0,22-19.75Z" fill="#727272"/><rect x="58.91" y="58.81" width="19.68" height="2.05" fill="#727272"/><rect x="58.91" y="72.94" width="19.68" height="2.05" fill="#727272"/><rect x="58.91" y="87.07" width="19.68" height="2.05" fill="#727272"/><rect x="58.91" y="101.19" width="19.68" height="2.05" fill="#727272"/><rect x="58.91" y="115.32" width="19.68" height="2.05" fill="#727272"/><circle cx="99.74" cy="32.38" r="13.26" fill="#4086f4"/><polygon points="98.47 37.7 92.67 31.9 94.05 30.52 98.39 34.86 105.36 27.06 106.81 28.35 98.47 37.7" fill="#fff"/></g></svg>
<svg xmlns="http://www.w3.org/2000/svg" width="141" height="142" viewBox="0 0 141 142"><g id="f4991d4a-2ccc-4994-8064-5ed2591d5769" data-name="Camada 1"><rect x="54.01" y="32.69" width="27.54" height="102.74" fill="#ececec"/><path d="M84.11,138H51.44V30.12H84.11Zm-27.53-5.13H79V35.26H56.58Z" fill="#3b7097"/><rect x="55.93" y="31.56" width="11.95" height="103.42" fill="#d9d9d9"/><path d="M55.34,106.68l1.09-2.05c4.32-2.66,5.51-4,9.35-1.16.35.26.69.51,1,.74l2.84,2.06c2.69,2.15,5-.31,5.72-.89l2.88-2.17a2,2,0,0,1,3.19,1.53v27.71a2,2,0,0,1-1.88,2l-22.1,1a2,2,0,0,1-2-1.88l-1-25.06A2,2,0,0,1,55.34,106.68Z" fill="#9fdfff"/><path d="M67.87,105l-1-.75c-.36-.23-.7-.48-1-.74-3.84-2.86-5-1.5-9.35,1.16l-1.09,2.05a2,2,0,0,0-.94,1.75l1,25.06a2,2,0,0,0,2,1.88l10.39-.45Z" fill="#7dd6f9"/><path d="M84.11,138H51.44V30.12H84.11Zm-27.53-5.13H79V35.26H56.58Z" fill="#727272"/><path d="M35.26,6.57h65.09a0,0,0,0,1,0,0V9.73A21.71,21.71,0,0,1,78.64,31.45H57A21.71,21.71,0,0,1,35.26,9.73V6.57A0,0,0,0,1,35.26,6.57Z" fill="#ececec"/><path d="M75.72,34H59.89a27.23,27.23,0,0,1-27.2-27.2V4h70.23V6.81A27.23,27.23,0,0,1,75.72,34ZM38,9.13A22.1,22.1,0,0,0,59.89,28.88H75.72a22.11,22.11,0,0,0,22-19.75Z" fill="#3b7097"/><path d="M37.85,6.5H67.71a0,0,0,0,1,0,0V31.56a0,0,0,0,1,0,0h-8A21.87,21.87,0,0,1,37.85,9.69V6.5A0,0,0,0,1,37.85,6.5Z" fill="#d9d9d9"/><path d="M75.72,34H59.89a27.23,27.23,0,0,1-27.2-27.2V4h70.23V6.81A27.23,27.23,0,0,1,75.72,34ZM38,9.13A22.1,22.1,0,0,0,59.89,28.88H75.72a22.11,22.11,0,0,0,22-19.75Z" fill="#727272"/><rect x="51.72" y="54.81" width="19.68" height="2.05" fill="#727272"/><rect x="51.72" y="68.94" width="19.68" height="2.05" fill="#727272"/><rect x="51.72" y="83.07" width="19.68" height="2.05" fill="#727272"/><rect x="51.72" y="97.19" width="19.68" height="2.05" fill="#727272"/><rect x="51.72" y="111.32" width="19.68" height="2.05" fill="#727272"/><circle cx="95.05" cy="28.38" r="13.26" fill="#4086f4"/><polygon points="93.78 33.7 87.98 27.9 89.36 26.52 93.7 30.86 100.67 23.06 102.12 24.35 93.78 33.7" fill="#fff"/></g></svg>

1
src/app/assets/dataMenu/suceptibilitiesAreas.svg
File diff suppressed because it is too large
View File

2
src/app/assets/floodZonesAssets/floodZones-logo.svg
File diff suppressed because it is too large
View File

2
src/app/assets/pluviometer/PluviometroOficial.svg

@ -1 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 600 600"><defs><style>.cls-1{fill:none;stroke-width:25.51px;}.cls-1,.cls-2{stroke:#fff;stroke-linecap:round;stroke-linejoin:round;}.cls-2,.cls-3{fill:#fff;}.cls-2{stroke-width:22.68px;}</style></defs><g id="Camada_2" data-name="Camada 2"><polygon class="cls-1" points="376.95 192.82 376.36 192.82 376.36 123.03 193.54 123.03 193.54 193.57 194.56 193.57 221.62 240.65 221.62 240.65 246.71 574 321.99 574 346.94 240.65 347.08 240.65 376.95 192.82"/><polygon class="cls-2" points="364.37 311.91 354.13 311.91 234 311.91 239.83 365.41 354.13 365.41 354.13 365.86 389.15 365.86 389.15 396.26 424.61 396.26 424.61 365.86 424.61 365.69 424.61 311.91 364.37 311.91"/><path class="cls-3" d="M313.82,73.54a28.9,28.9,0,1,1-57.79,0c0-16,28.9-58.54,28.9-58.54S313.82,57.59,313.82,73.54Z"/></g></svg>
<svg xmlns="http://www.w3.org/2000/svg" width="141" height="142" viewBox="0 0 141 142"><g id="f4991d4a-2ccc-4994-8064-5ed2591d5769" data-name="Camada 1"><rect x="54.01" y="32.69" width="27.54" height="102.74" fill="#ececec"/><path d="M84.11,138H51.44V30.12H84.11Zm-27.53-5.13H79V35.26H56.58Z" fill="#3b7097"/><rect x="55.93" y="31.56" width="11.95" height="103.42" fill="#d9d9d9"/><path d="M55.34,106.68l1.09-2.05c4.32-2.66,5.51-4,9.35-1.16.35.26.69.51,1,.74l2.84,2.06c2.69,2.15,5-.31,5.72-.89l2.88-2.17a2,2,0,0,1,3.19,1.53v27.71a2,2,0,0,1-1.88,2l-22.1,1a2,2,0,0,1-2-1.88l-1-25.06A2,2,0,0,1,55.34,106.68Z" fill="#9fdfff"/><path d="M67.87,105l-1-.75c-.36-.23-.7-.48-1-.74-3.84-2.86-5-1.5-9.35,1.16l-1.09,2.05a2,2,0,0,0-.94,1.75l1,25.06a2,2,0,0,0,2,1.88l10.39-.45Z" fill="#7dd6f9"/><path d="M84.11,138H51.44V30.12H84.11Zm-27.53-5.13H79V35.26H56.58Z" fill="#727272"/><path d="M35.26,6.57h65.09a0,0,0,0,1,0,0V9.73A21.71,21.71,0,0,1,78.64,31.45H57A21.71,21.71,0,0,1,35.26,9.73V6.57A0,0,0,0,1,35.26,6.57Z" fill="#ececec"/><path d="M75.72,34H59.89a27.23,27.23,0,0,1-27.2-27.2V4h70.23V6.81A27.23,27.23,0,0,1,75.72,34ZM38,9.13A22.1,22.1,0,0,0,59.89,28.88H75.72a22.11,22.11,0,0,0,22-19.75Z" fill="#3b7097"/><path d="M37.85,6.5H67.71a0,0,0,0,1,0,0V31.56a0,0,0,0,1,0,0h-8A21.87,21.87,0,0,1,37.85,9.69V6.5A0,0,0,0,1,37.85,6.5Z" fill="#d9d9d9"/><path d="M75.72,34H59.89a27.23,27.23,0,0,1-27.2-27.2V4h70.23V6.81A27.23,27.23,0,0,1,75.72,34ZM38,9.13A22.1,22.1,0,0,0,59.89,28.88H75.72a22.11,22.11,0,0,0,22-19.75Z" fill="#727272"/><rect x="51.72" y="54.81" width="19.68" height="2.05" fill="#727272"/><rect x="51.72" y="68.94" width="19.68" height="2.05" fill="#727272"/><rect x="51.72" y="83.07" width="19.68" height="2.05" fill="#727272"/><rect x="51.72" y="97.19" width="19.68" height="2.05" fill="#727272"/><rect x="51.72" y="111.32" width="19.68" height="2.05" fill="#727272"/><circle cx="95.05" cy="28.38" r="13.26" fill="#4086f4"/><polygon points="93.78 33.7 87.98 27.9 89.36 26.52 93.7 30.86 100.67 23.06 102.12 24.35 93.78 33.7" fill="#fff"/></g></svg>

2
src/app/assets/pluviometer/pluviometer-logo.svg

@ -1 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 150 150"><g id="a038fce1-27a2-498a-bfa8-8124710f6976" data-name="Camada 2"><rect width="150" height="150" fill="#fff"/></g><g id="ac559167-f77d-4c9d-a667-cdf90aebb90c" data-name="Camada 1"><rect x="61.2" y="36.69" width="27.54" height="102.74" fill="#ececec"/><path d="M91.31,142H58.64V34.12H91.31Zm-27.54-5.13h22.4V39.26H63.77Z" fill="#3b7097"/><rect x="63.13" y="35.56" width="11.95" height="103.42" fill="#d9d9d9"/><path d="M62.53,110.68l1.09-2.05c4.32-2.66,5.51-4,9.36-1.16.34.26.68.51,1,.74l2.84,2.06c2.68,2.15,5-.31,5.72-.89l2.87-2.17a2,2,0,0,1,3.19,1.53v27.71a2,2,0,0,1-1.88,2l-22.1,1a2,2,0,0,1-2-1.88l-1-25.06A1.94,1.94,0,0,1,62.53,110.68Z" fill="#9fdfff"/><path d="M75.07,109l-1-.75c-.37-.23-.71-.48-1-.74-3.85-2.86-5-1.5-9.36,1.16l-1.09,2.05a1.94,1.94,0,0,0-.93,1.75l1,25.06a2,2,0,0,0,2,1.88l10.4-.45Z" fill="#7dd6f9"/><path d="M91.31,142H58.64V34.12H91.31Zm-27.54-5.13h22.4V39.26H63.77Z" fill="#727272"/><path d="M42.45,10.57h65.09a0,0,0,0,1,0,0v3.17A21.71,21.71,0,0,1,85.84,35.45H64.16A21.71,21.71,0,0,1,42.45,13.73V10.57A0,0,0,0,1,42.45,10.57Z" fill="#ececec"/><path d="M82.91,38H67.09a27.23,27.23,0,0,1-27.2-27.2V8h70.22v2.81A27.23,27.23,0,0,1,82.91,38ZM45.14,13.13a22.1,22.1,0,0,0,22,19.75H82.91a22.1,22.1,0,0,0,22-19.75Z" fill="#3b7097"/><path d="M45,10.5H74.9a0,0,0,0,1,0,0V35.56a0,0,0,0,1,0,0h-8A21.87,21.87,0,0,1,45,13.69V10.5A0,0,0,0,1,45,10.5Z" fill="#d9d9d9"/><path d="M82.91,38H67.09a27.23,27.23,0,0,1-27.2-27.2V8h70.22v2.81A27.23,27.23,0,0,1,82.91,38ZM45.14,13.13a22.1,22.1,0,0,0,22,19.75H82.91a22.1,22.1,0,0,0,22-19.75Z" fill="#727272"/><rect x="58.91" y="58.81" width="19.68" height="2.05" fill="#727272"/><rect x="58.91" y="72.94" width="19.68" height="2.05" fill="#727272"/><rect x="58.91" y="87.07" width="19.68" height="2.05" fill="#727272"/><rect x="58.91" y="101.19" width="19.68" height="2.05" fill="#727272"/><rect x="58.91" y="115.32" width="19.68" height="2.05" fill="#727272"/></g></svg>
<svg xmlns="http://www.w3.org/2000/svg" width="150" height="140" viewBox="0 0 150 140"><g id="b61690fe-17b8-491c-bd67-2dcddc2c6756" data-name="Camada 1"><rect x="61.2" y="31.69" width="27.54" height="102.74" fill="#ececec"/><path d="M91.31,137H58.64V29.12H91.31Zm-27.54-5.13h22.4V34.26H63.77Z" fill="#3b7097"/><rect x="63.13" y="30.56" width="11.95" height="103.42" fill="#d9d9d9"/><path d="M62.53,105.68l1.09-2.05c4.32-2.66,5.51-4,9.36-1.16.34.26.68.51,1,.74l2.84,2.06c2.68,2.15,5-.31,5.72-.89l2.87-2.17a2,2,0,0,1,3.19,1.53v27.71a2,2,0,0,1-1.88,2l-22.1,1a2,2,0,0,1-2-1.88l-1-25.06A1.94,1.94,0,0,1,62.53,105.68Z" fill="#9fdfff"/><path d="M75.07,104l-1-.75c-.37-.23-.71-.48-1-.74-3.85-2.86-5-1.5-9.36,1.16l-1.09,2.05a1.94,1.94,0,0,0-.93,1.75l1,25.06a2,2,0,0,0,2,1.88l10.4-.45Z" fill="#7dd6f9"/><path d="M91.31,137H58.64V29.12H91.31Zm-27.54-5.13h22.4V34.26H63.77Z" fill="#727272"/><path d="M42.45,5.57h65.09a0,0,0,0,1,0,0V8.73A21.71,21.71,0,0,1,85.84,30.45H64.16A21.71,21.71,0,0,1,42.45,8.73V5.57A0,0,0,0,1,42.45,5.57Z" fill="#ececec"/><path d="M82.91,33H67.09a27.23,27.23,0,0,1-27.2-27.2V3h70.22V5.81A27.23,27.23,0,0,1,82.91,33ZM45.14,8.13a22.1,22.1,0,0,0,22,19.75H82.91a22.1,22.1,0,0,0,22-19.75Z" fill="#3b7097"/><path d="M45,5.5H74.9a0,0,0,0,1,0,0V30.56a0,0,0,0,1,0,0h-8A21.87,21.87,0,0,1,45,8.69V5.5A0,0,0,0,1,45,5.5Z" fill="#d9d9d9"/><path d="M82.91,33H67.09a27.23,27.23,0,0,1-27.2-27.2V3h70.22V5.81A27.23,27.23,0,0,1,82.91,33ZM45.14,8.13a22.1,22.1,0,0,0,22,19.75H82.91a22.1,22.1,0,0,0,22-19.75Z" fill="#727272"/><rect x="58.91" y="53.81" width="19.68" height="2.05" fill="#727272"/><rect x="58.91" y="67.94" width="19.68" height="2.05" fill="#727272"/><rect x="58.91" y="82.07" width="19.68" height="2.05" fill="#727272"/><rect x="58.91" y="96.19" width="19.68" height="2.05" fill="#727272"/><rect x="58.91" y="110.32" width="19.68" height="2.05" fill="#727272"/></g></svg>

26
src/app/components/MapDataMenu.js

@ -47,10 +47,10 @@ function DataOriginSelector({ dataOriginToShow, setDataOriginToShow }) {
return ( return (
<Shadow <Shadow
viewStyle={{ width: "100%", height: 40 }} viewStyle={{ width: "100%", height: 40 }}
offset={[0, 4]}
distance={4}
offset={[0, 3]}
distance={3}
radius={0} radius={0}
startColor="rgba(0, 0, 0, 0.25)"
startColor="rgba(0, 0, 0, 0.15)"
paintInside={true} paintInside={true}
> >
<View <View
@ -99,33 +99,27 @@ const dataOptions = {
name: "Área de suscetibilidade", name: "Área de suscetibilidade",
code: "susceptibilityAreas", code: "susceptibilityAreas",
source: "CPRM", source: "CPRM",
icon: assets.floodZones.FloodZonesIcon,
icon: assets.SusceptibilityAreas,
}, },
{ {
name: "Pluviômetro automático", name: "Pluviômetro automático",
code: "automaticPluviometer", code: "automaticPluviometer",
source: "Cemaden", source: "Cemaden",
icon: assets.floodZones.FloodZonesIcon,
icon: assets.OfficialPluviometer,
}, },
], ],
citzen: [ citzen: [
{
name: "Risco de inundação",
code: "floodRisk",
source: null,
icon: assets.floodZones.FloodZonesIcon,
},
{ {
name: "Pluviômetro artesanal", name: "Pluviômetro artesanal",
code: "pluviometer", code: "pluviometer",
source: null, source: null,
icon: assets.floodZones.FloodZonesIcon,
icon: assets.PluviometerIcon,
}, },
{ {
name: "Intensidade de chuva", name: "Intensidade de chuva",
code: "rain", code: "rain",
source: null, source: null,
icon: assets.floodZones.FloodZonesIcon,
icon: assets.rainLevel.Rain_1_5,
}, },
{ {
name: "Área de alagamento", name: "Área de alagamento",
@ -137,7 +131,7 @@ const dataOptions = {
name: "Água do rio", name: "Água do rio",
code: "riverFlood", code: "riverFlood",
source: null, source: null,
icon: assets.floodZones.FloodZonesIcon,
icon: assets.riverLevel.High,
}, },
], ],
}; };
@ -185,7 +179,7 @@ function ListDataOptions(
paddingBottom: 16, paddingBottom: 16,
}} }}
> >
<option.icon width={34} height={24} />
<option.icon width={44} height={31} />
<View <View
style={{ style={{
@ -215,7 +209,7 @@ function ListDataOptions(
<View <View
style={{ style={{
alignContent: "flex-end", alignContent: "flex-end",
width: 100,
width: 120,
height: 36, height: 36,
justifyContent: "center", justifyContent: "center",
borderRadius: 6, borderRadius: 6,

6
src/app/components/SvgLabeledButton.js

@ -18,7 +18,7 @@ export default function SvgLabeledButton({
const dims = scaleDimsFromWidth(width, height, 16); const dims = scaleDimsFromWidth(width, height, 16);
return ( return (
<Shadow <Shadow
viewStyle={[{ width: 130, height: 130 }, style]}
viewStyle={[{ width: 150, height: 150 }, style]}
offset={[0, 3]} offset={[0, 3]}
distance={3} distance={3}
radius={4} radius={4}
@ -53,8 +53,8 @@ const styles = StyleSheet.create({
backgroundColor: colors.primary, backgroundColor: colors.primary,
borderWidth: 6, borderWidth: 6,
borderRadius: 6, borderRadius: 6,
width: 130,
height: 130,
width: 150,
height: 150,
}, },
innerContainer: { innerContainer: {
overflow: "hidden", overflow: "hidden",

4
src/app/config/assets.js

@ -1,4 +1,6 @@
import Pluviometer from "../assets/pluviometer/pluviometer-logo.svg"; import Pluviometer from "../assets/pluviometer/pluviometer-logo.svg";
import OfficialPluviometer from "../assets/pluviometer/PluviometroOficial.svg"
import SusceptibilityAreas from "../assets/dataMenu/suceptibilitiesAreas.svg"
import RainIcon from "../assets/rain/rain-icon.svg"; import RainIcon from "../assets/rain/rain-icon.svg";
import RiverIcon from "../assets/river/river-logo.svg"; import RiverIcon from "../assets/river/river-logo.svg";
import FloodZones from "../assets/floodZonesAssets/floodZones-logo.svg"; import FloodZones from "../assets/floodZonesAssets/floodZones-logo.svg";
@ -91,5 +93,7 @@ export default {
officialPluviometer: require("../assets/pluviometer/pluviometroOficial.png"), officialPluviometer: require("../assets/pluviometer/pluviometroOficial.png"),
officialPluviometer_pin: require("../assets/pluviometer/PinPluviometroOficial.png"), officialPluviometer_pin: require("../assets/pluviometer/PinPluviometroOficial.png"),
PluviometerIcon: Pluviometer, PluviometerIcon: Pluviometer,
OfficialPluviometer: OfficialPluviometer,
AppLogoTitle: AppLogoTitle, AppLogoTitle: AppLogoTitle,
SusceptibilityAreas: SusceptibilityAreas,
}; };

10
src/app/screens/SharingDataScreen.js

@ -1,16 +1,12 @@
import React, { useEffect, useState } from "react"; import React, { useEffect, useState } from "react";
import { StyleSheet, View } from "react-native"; import { StyleSheet, View } from "react-native";
import { TouchableOpacity, ScrollView } from "react-native";
import { ScrollView } from "react-native";
import assets from "../config/assets"; import assets from "../config/assets";
import { scaleDimsFromWidth, dimensions } from "../config/dimensions";
import { dimensions } from "../config/dimensions";
import SvgLabeledButton from "../components/SvgLabeledButton"; import SvgLabeledButton from "../components/SvgLabeledButton";
import HeaderBarMenu from "../components/HeaderBarMenu";
//1/3
function SharingDataScreen({ navigation }) { function SharingDataScreen({ navigation }) {
const dims = scaleDimsFromWidth(93, 106, 35);
// const dims = { width: "100%", height: "100%" };
return ( return (
<View style={styles.container}> <View style={styles.container}>
@ -34,7 +30,7 @@ function SharingDataScreen({ navigation }) {
<SvgLabeledButton <SvgLabeledButton
label={"CHUVA"} label={"CHUVA"}
onPress={() => navigation.navigate("RainSharingData")} onPress={() => navigation.navigate("RainSharingData")}
SvgImage={assets.rainLevel.RainIcon}
SvgImage={assets.rainLevel.Rain_1_5}
/> />
</View> </View>

Loading…
Cancel
Save