diff --git a/src/app/assets/floodZonesAssets/notpassableIcon.svg b/src/app/assets/floodZonesAssets/notpassableIcon.svg
new file mode 100644
index 0000000..de5fbb0
--- /dev/null
+++ b/src/app/assets/floodZonesAssets/notpassableIcon.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/app/assets/floodZonesAssets/passableIcon.svg b/src/app/assets/floodZonesAssets/passableIcon.svg
new file mode 100644
index 0000000..e335bb6
--- /dev/null
+++ b/src/app/assets/floodZonesAssets/passableIcon.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/app/assets/rain/SVG_chuvaForte.svg b/src/app/assets/rain/SVG_chuvaForte.svg
new file mode 100644
index 0000000..444d89a
--- /dev/null
+++ b/src/app/assets/rain/SVG_chuvaForte.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/app/assets/rain/SVG_chuvaFraca.svg b/src/app/assets/rain/SVG_chuvaFraca.svg
new file mode 100644
index 0000000..995ad04
--- /dev/null
+++ b/src/app/assets/rain/SVG_chuvaFraca.svg
@@ -0,0 +1 @@
+
diff --git a/src/app/assets/rain/SVG_chuvaModerada.svg b/src/app/assets/rain/SVG_chuvaModerada.svg
new file mode 100644
index 0000000..0697a05
--- /dev/null
+++ b/src/app/assets/rain/SVG_chuvaModerada.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/app/assets/rain/SVG_semChuva.svg b/src/app/assets/rain/SVG_semChuva.svg
new file mode 100644
index 0000000..2b0dae2
--- /dev/null
+++ b/src/app/assets/rain/SVG_semChuva.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/app/assets/rain/chuva_forte.svg b/src/app/assets/rain/chuva_forte.svg
index 444d89a..3735ddc 100644
--- a/src/app/assets/rain/chuva_forte.svg
+++ b/src/app/assets/rain/chuva_forte.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/app/assets/rain/chuva_fraca.svg b/src/app/assets/rain/chuva_fraca.svg
index d084f96..a874f0d 100644
--- a/src/app/assets/rain/chuva_fraca.svg
+++ b/src/app/assets/rain/chuva_fraca.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/app/assets/rain/chuva_moderada.svg b/src/app/assets/rain/chuva_moderada.svg
index 0697a05..a86a788 100644
--- a/src/app/assets/rain/chuva_moderada.svg
+++ b/src/app/assets/rain/chuva_moderada.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/app/assets/rain/sem_chuva.svg b/src/app/assets/rain/sem_chuva.svg
index 2b0dae2..2388577 100644
--- a/src/app/assets/rain/sem_chuva.svg
+++ b/src/app/assets/rain/sem_chuva.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/app/assets/river/SVG_RioAlto.svg b/src/app/assets/river/SVG_RioAlto.svg
new file mode 100644
index 0000000..8e26882
--- /dev/null
+++ b/src/app/assets/river/SVG_RioAlto.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/app/assets/river/SVG_RioBaixo.svg b/src/app/assets/river/SVG_RioBaixo.svg
new file mode 100644
index 0000000..b171a34
--- /dev/null
+++ b/src/app/assets/river/SVG_RioBaixo.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/app/assets/river/SVG_RioExtravasado.svg b/src/app/assets/river/SVG_RioExtravasado.svg
new file mode 100644
index 0000000..af546ac
--- /dev/null
+++ b/src/app/assets/river/SVG_RioExtravasado.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/app/assets/river/SVG_RioNormal.svg b/src/app/assets/river/SVG_RioNormal.svg
new file mode 100644
index 0000000..954ad00
--- /dev/null
+++ b/src/app/assets/river/SVG_RioNormal.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/app/assets/river/river_extravasado.svg b/src/app/assets/river/river_extravasado.svg
index af546ac..46fbf5b 100644
--- a/src/app/assets/river/river_extravasado.svg
+++ b/src/app/assets/river/river_extravasado.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
diff --git a/src/app/assets/river/river_high.svg b/src/app/assets/river/river_high.svg
index 8e26882..4777330 100644
--- a/src/app/assets/river/river_high.svg
+++ b/src/app/assets/river/river_high.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
diff --git a/src/app/assets/river/river_low.svg b/src/app/assets/river/river_low.svg
index b171a34..1c11c7a 100644
--- a/src/app/assets/river/river_low.svg
+++ b/src/app/assets/river/river_low.svg
@@ -1 +1,2 @@
-
\ No newline at end of file
+
+
diff --git a/src/app/assets/river/river_normal.svg b/src/app/assets/river/river_normal.svg
index 954ad00..4d7ce25 100644
--- a/src/app/assets/river/river_normal.svg
+++ b/src/app/assets/river/river_normal.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/app/components/AssembleModalObject.js b/src/app/components/AssembleModalObject.js
index d63dae1..ab64cfd 100644
--- a/src/app/components/AssembleModalObject.js
+++ b/src/app/components/AssembleModalObject.js
@@ -7,10 +7,10 @@ const custom_assets = {
pluviometer: assets.PluviometerIcon,
officialPluviometer: assets.OfficialPluviometer,
floodZones: assets.floodZones,
- riverLevel: ["Low", "Normal", "High", "Flooding"].map((key) => {
+ riverLevel: ["low", "normal", "high", "flooding"].map((key) => {
return assets.riverLevel[key];
}),
- rainLevel: ["Rain_0_5", "Rain_1_5", "Rain_2_5", "Rain_3_5"].map((key) => {
+ rainLevel: ["rain_0_5", "rain_1_5", "rain_2_5", "rain_3_5"].map((key) => {
return assets.rainLevel[key];
}),
};
diff --git a/src/app/config/assets.js b/src/app/config/assets.js
index aedb737..1c29fb7 100644
--- a/src/app/config/assets.js
+++ b/src/app/config/assets.js
@@ -28,15 +28,25 @@ import PinNublado from "../assets/rain/PinNublado";
import PinChuvaFraca from "../assets/rain/PinChuvaFraca";
import PinChuvaModerada from "../assets/rain/PinChuvaModerada";
import PinChuvaForte from "../assets/rain/PinChuvaForte";
+import SVGPinSemChuva from "../assets/rain/SVG_semChuva.svg";
+import SVGPinChuvaFraca from "../assets/rain/SVG_chuvaFraca.svg";
+import SVGPinChuvaModerada from "../assets/rain/SVG_chuvaModerada.svg";
+import SVGPinChuvaForte from "../assets/rain/SVG_chuvaForte.svg";
import PinRioBaixo from "../assets/river/PinRioBaixo";
import PinRioNormal from "../assets/river/PinRioNormal";
import PinRioExtravasado from "../assets/river/PinRioExtravasado";
import PinRioCheio from "../assets/river/PinRioCheio";
import PinPluviometroArt from "../assets/pluviometer/PinPluviometroArt";
+import SVGPinRioBaixo from "../assets/river/SVG_RioBaixo.svg";
+import SVGPinRioAlto from "../assets/river/SVG_RioAlto.svg";
+import SVGPinRioNormal from "../assets/river/SVG_RioNormal.svg";
+import SVGPinRioExtravasado from "../assets/river/SVG_RioExtravasado.svg";
import FloodPassable from "../assets/floodZonesAssets/passable.svg";
import FloodNotPassable from "../assets/floodZonesAssets/not_passable.svg";
+import FloodPassableIcon from "../assets/floodZonesAssets/passableIcon.svg";
+import FloodNotPassableIcon from "../assets/floodZonesAssets/notpassableIcon.svg";
import PinPluviometerOfficial from "../assets/pluviometer/PinPluviometerOfficial";
import AboutScreenLogos from "../assets/logos/AboutScreenLogos";
@@ -51,42 +61,45 @@ export default {
FloodZonesIcon: FloodZones,
passable: FloodPassable,
notPassable: FloodNotPassable,
+ passableIcon: FloodPassableIcon,
+ notPassableIcon: FloodNotPassableIcon,
+
},
riverLevel: {
RiverIcon: RiverIcon,
low_pin: PinRioBaixo,
- low: require("../assets/river/rio_baixo.png"),
+ low: SVGPinRioBaixo,
Low: RiverLow,
normal_pin: PinRioNormal,
- normal: require("../assets/river/rio_normal.png"),
+ normal: SVGPinRioNormal,
Normal: RiverNormal,
high_pin: PinRioCheio,
- high: require("../assets/river/rio_alto.png"),
+ high: SVGPinRioAlto,
High: RiverHigh,
flooding_pin: PinRioExtravasado,
- flooding: require("../assets/river/rio_transbordando.png"),
+ flooding: SVGPinRioExtravasado,
Flooding: RiverFlood,
},
rainLevel: {
RainIcon: RainIcon,
rain_0_5_pin: PinNublado,
- rain_0_5: require("../assets/rain/sem_chuva.png"),
+ rain_0_5: SVGPinSemChuva,
Rain_0_5: RainNot,
- rain_1_5: require("../assets/rain/chuva_fraca.png"),
+ rain_1_5: SVGPinChuvaFraca,
rain_1_5_pin: PinChuvaFraca,
Rain_1_5: RainLow,
- rain_2_5: require("../assets/rain/chuva_logo.png"),
+ rain_2_5: SVGPinChuvaModerada,
rain_2_5_pin: PinChuvaModerada,
Rain_2_5: RainMedium,
- rain_3_5: require("../assets/rain/chuva_forte.png"),
+ rain_3_5: SVGPinChuvaForte,
rain_3_5_pin: PinChuvaForte,
Rain_3_5: RainHigh,
},
diff --git a/src/app/hooks/useFormsAswers.js b/src/app/hooks/useFormsAswers.js
index 8a3e17d..fbf66e2 100644
--- a/src/app/hooks/useFormsAswers.js
+++ b/src/app/hooks/useFormsAswers.js
@@ -12,7 +12,7 @@ const custom_assets = {
riverLevel: ["low", "normal", "high", "flooding"].map((key) => {
return assets.riverLevel[key];
}),
- rainLevel: ["rain_0_5", "rain_1_5", "rain_2_5", "rain_3_5"].map((key) => {
+ rainLevel: ["rain_0_5_pin", "rain_1_5_pin", "rain_2_5_pin", "rain_3_5_pin"].map((key) => {
return assets.rainLevel[key];
}),
};
diff --git a/src/app/screens/SharingFloodZonesScreen.js b/src/app/screens/SharingFloodZonesScreen.js
index 7dc5d16..ff6828d 100644
--- a/src/app/screens/SharingFloodZonesScreen.js
+++ b/src/app/screens/SharingFloodZonesScreen.js
@@ -86,7 +86,7 @@ function SharingFloodZonesScreen(props) {
style={{ marginRight: 17 }}
label={"TRANSITÁVEL"}
isToggle={passable == 1}
- SvgImage={assets.floodZones.passable}
+ SvgImage={assets.floodZones.passableIcon}
onPress={() => {
setPassable(1);
setFloodSituation("TRANSITÁVEL");
@@ -100,7 +100,7 @@ function SharingFloodZonesScreen(props) {
}}
label={"INTRANSITÁVEL"}
isToggle={passable == 0}
- SvgImage={assets.floodZones.notPassable}
+ SvgImage={assets.floodZones.notPassableIcon}
/>