diff --git a/src/app/assets/ddangelorb.png b/src/app/assets/ddangelorb.png
deleted file mode 100644
index 348ff24..0000000
Binary files a/src/app/assets/ddangelorb.png and /dev/null differ
diff --git a/src/app/assets/defesa_civil.png b/src/app/assets/defesa_civil.png
deleted file mode 100644
index 06f0d87..0000000
Binary files a/src/app/assets/defesa_civil.png and /dev/null differ
diff --git a/src/app/assets/floodZones-logo.svg b/src/app/assets/floodZonesAssets/floodZones-logo.svg
similarity index 100%
rename from src/app/assets/floodZones-logo.svg
rename to src/app/assets/floodZonesAssets/floodZones-logo.svg
diff --git a/src/app/assets/pontos_alagamento_peq.png b/src/app/assets/floodZonesAssets/pontos_alagamento_peq.png
similarity index 100%
rename from src/app/assets/pontos_alagamento_peq.png
rename to src/app/assets/floodZonesAssets/pontos_alagamento_peq.png
diff --git a/src/app/assets/diario_pluviometrico.png b/src/app/assets/pluviometer/diario_pluviometrico.png
similarity index 100%
rename from src/app/assets/diario_pluviometrico.png
rename to src/app/assets/pluviometer/diario_pluviometrico.png
diff --git a/src/app/assets/pluviometer-logo.svg b/src/app/assets/pluviometer/pluviometer-logo.svg
similarity index 100%
rename from src/app/assets/pluviometer-logo.svg
rename to src/app/assets/pluviometer/pluviometer-logo.svg
diff --git a/src/app/assets/pluviometro.png b/src/app/assets/pluviometer/pluviometro.png
similarity index 100%
rename from src/app/assets/pluviometro.png
rename to src/app/assets/pluviometer/pluviometro.png
diff --git a/src/app/assets/previsao_tempo.png b/src/app/assets/previsao_tempo.png
deleted file mode 100644
index 47d61f0..0000000
Binary files a/src/app/assets/previsao_tempo.png and /dev/null differ
diff --git a/src/app/assets/chuva_forte.png b/src/app/assets/rain/chuva_forte.png
similarity index 100%
rename from src/app/assets/chuva_forte.png
rename to src/app/assets/rain/chuva_forte.png
diff --git a/src/app/assets/chuva_forte.svg b/src/app/assets/rain/chuva_forte.svg
similarity index 100%
rename from src/app/assets/chuva_forte.svg
rename to src/app/assets/rain/chuva_forte.svg
diff --git a/src/app/assets/chuva_fraca.png b/src/app/assets/rain/chuva_fraca.png
similarity index 100%
rename from src/app/assets/chuva_fraca.png
rename to src/app/assets/rain/chuva_fraca.png
diff --git a/src/app/assets/chuva_fraca.svg b/src/app/assets/rain/chuva_fraca.svg
similarity index 100%
rename from src/app/assets/chuva_fraca.svg
rename to src/app/assets/rain/chuva_fraca.svg
diff --git a/src/app/assets/chuva_logo.png b/src/app/assets/rain/chuva_logo.png
similarity index 100%
rename from src/app/assets/chuva_logo.png
rename to src/app/assets/rain/chuva_logo.png
diff --git a/src/app/assets/chuva_moderada.svg b/src/app/assets/rain/chuva_moderada.svg
similarity index 100%
rename from src/app/assets/chuva_moderada.svg
rename to src/app/assets/rain/chuva_moderada.svg
diff --git a/src/app/assets/chuva_muito_forte.png b/src/app/assets/rain/chuva_muito_forte.png
similarity index 100%
rename from src/app/assets/chuva_muito_forte.png
rename to src/app/assets/rain/chuva_muito_forte.png
diff --git a/src/app/assets/chuva_muito_forte.svg b/src/app/assets/rain/chuva_muito_forte.svg
similarity index 100%
rename from src/app/assets/chuva_muito_forte.svg
rename to src/app/assets/rain/chuva_muito_forte.svg
diff --git a/src/app/assets/chuva_pancadas.png b/src/app/assets/rain/chuva_pancadas.png
similarity index 100%
rename from src/app/assets/chuva_pancadas.png
rename to src/app/assets/rain/chuva_pancadas.png
diff --git a/src/app/assets/chuva_peq.png b/src/app/assets/rain/chuva_peq.png
similarity index 100%
rename from src/app/assets/chuva_peq.png
rename to src/app/assets/rain/chuva_peq.png
diff --git a/src/app/assets/rain-icon.svg b/src/app/assets/rain/rain-icon.svg
similarity index 100%
rename from src/app/assets/rain-icon.svg
rename to src/app/assets/rain/rain-icon.svg
diff --git a/src/app/assets/sem_chuva.png b/src/app/assets/rain/sem_chuva.png
similarity index 100%
rename from src/app/assets/sem_chuva.png
rename to src/app/assets/rain/sem_chuva.png
diff --git a/src/app/assets/sem_chuva.svg b/src/app/assets/rain/sem_chuva.svg
similarity index 100%
rename from src/app/assets/sem_chuva.svg
rename to src/app/assets/rain/sem_chuva.svg
diff --git a/src/app/assets/nivel_rio.png b/src/app/assets/river/nivel_rio.png
similarity index 100%
rename from src/app/assets/nivel_rio.png
rename to src/app/assets/river/nivel_rio.png
diff --git a/src/app/assets/rio_alto.png b/src/app/assets/river/rio_alto.png
similarity index 100%
rename from src/app/assets/rio_alto.png
rename to src/app/assets/river/rio_alto.png
diff --git a/src/app/assets/rio_baixo.png b/src/app/assets/river/rio_baixo.png
similarity index 100%
rename from src/app/assets/rio_baixo.png
rename to src/app/assets/river/rio_baixo.png
diff --git a/src/app/assets/rio_normal.png b/src/app/assets/river/rio_normal.png
similarity index 100%
rename from src/app/assets/rio_normal.png
rename to src/app/assets/river/rio_normal.png
diff --git a/src/app/assets/rio_transbordando.png b/src/app/assets/river/rio_transbordando.png
similarity index 100%
rename from src/app/assets/rio_transbordando.png
rename to src/app/assets/river/rio_transbordando.png
diff --git a/src/app/assets/river-logo.svg b/src/app/assets/river/river-logo.svg
similarity index 100%
rename from src/app/assets/river-logo.svg
rename to src/app/assets/river/river-logo.svg
diff --git a/src/app/assets/river-extravasado.svg b/src/app/assets/river/river_extravasado.svg
similarity index 100%
rename from src/app/assets/river-extravasado.svg
rename to src/app/assets/river/river_extravasado.svg
diff --git a/src/app/assets/river/river_extravasado_toggle.svg b/src/app/assets/river/river_extravasado_toggle.svg
new file mode 100644
index 0000000..d63d14c
--- /dev/null
+++ b/src/app/assets/river/river_extravasado_toggle.svg
@@ -0,0 +1,16 @@
+
diff --git a/src/app/assets/river_high.svg b/src/app/assets/river/river_high.svg
similarity index 100%
rename from src/app/assets/river_high.svg
rename to src/app/assets/river/river_high.svg
diff --git a/src/app/assets/river/river_high_toggle.svg b/src/app/assets/river/river_high_toggle.svg
new file mode 100644
index 0000000..43d4ec9
--- /dev/null
+++ b/src/app/assets/river/river_high_toggle.svg
@@ -0,0 +1,16 @@
+
diff --git a/src/app/assets/river_low.svg b/src/app/assets/river/river_low.svg
similarity index 100%
rename from src/app/assets/river_low.svg
rename to src/app/assets/river/river_low.svg
diff --git a/src/app/assets/river/river_low_toggle.svg b/src/app/assets/river/river_low_toggle.svg
new file mode 100644
index 0000000..22c4bcd
--- /dev/null
+++ b/src/app/assets/river/river_low_toggle.svg
@@ -0,0 +1,16 @@
+
diff --git a/src/app/assets/river/river_normal.svg b/src/app/assets/river/river_normal.svg
new file mode 100644
index 0000000..27852ad
--- /dev/null
+++ b/src/app/assets/river/river_normal.svg
@@ -0,0 +1,16 @@
+
diff --git a/src/app/assets/river/river_normal_toggle.svg b/src/app/assets/river/river_normal_toggle.svg
new file mode 100644
index 0000000..224fd0e
--- /dev/null
+++ b/src/app/assets/river/river_normal_toggle.svg
@@ -0,0 +1,16 @@
+
diff --git a/src/app/assets/river_normal.svg b/src/app/assets/river_normal.svg
deleted file mode 100644
index bdbdec4..0000000
--- a/src/app/assets/river_normal.svg
+++ /dev/null
@@ -1,116 +0,0 @@
-
-
diff --git a/src/app/config/assets.js b/src/app/config/assets.js
index 86d5f6c..05ab648 100644
--- a/src/app/config/assets.js
+++ b/src/app/config/assets.js
@@ -1,18 +1,22 @@
-import Pluviometer from "../assets/pluviometer-logo.svg";
-import RainIcon from "../assets/rain-icon.svg";
-import RiverIcon from "../assets/river-logo.svg";
-import FloodZones from "../assets/floodZones-logo.svg";
-import RiverFlood from "../assets/river-extravasado.svg";
-import RiverLow from "../assets/river_low.svg";
-import RiverHigh from "../assets/river_high.svg";
-import RiverNormal from "../assets/river_normal.svg";
-import RainNot from "../assets/sem_chuva.svg";
-import RainLow from "../assets/chuva_fraca.svg";
-import RainMedium from "../assets/chuva_moderada.svg";
-import RainHigh from "../assets/chuva_forte.svg";
-import RainVeryHigh from "../assets/chuva_muito_forte.svg";
-import FloodZonesPassable from "../assets/alagamento_transitavel.svg";
-import FloodZonesNotPassable from "../assets/alagamento_intransitavel.svg";
+import Pluviometer from "../assets/pluviometer/pluviometer-logo.svg";
+import RainIcon from "../assets/rain/rain-icon.svg";
+import RiverIcon from "../assets/river/river-logo.svg";
+import FloodZones from "../assets/floodZonesAssets/floodZones-logo.svg";
+
+import RiverFlood from "../assets/river/river_extravasado.svg";
+import RiverLow from "../assets/river/river_low.svg";
+import RiverHigh from "../assets/river/river_high.svg";
+import RiverNormal from "../assets/river/river_normal.svg";
+import RiverFloodToggle from "../assets/river/river_extravasado_toggle.svg";
+import RiverLowToggle from "../assets/river/river_low_toggle.svg";
+import RiverHighToggle from "../assets/river/river_high_toggle.svg";
+import RiverNormalToggle from "../assets/river/river_normal_toggle.svg";
+
+import RainNot from "../assets/rain/sem_chuva.svg";
+import RainLow from "../assets/rain/chuva_fraca.svg";
+import RainMedium from "../assets/rain/chuva_moderada.svg";
+import RainHigh from "../assets/rain/chuva_forte.svg";
+import RainVeryHigh from "../assets/rain/chuva_muito_forte.svg";
export default {
floodZones: {
@@ -21,37 +25,43 @@ export default {
passable_toggle: require("../assets/floodZonesAssets/Transitavel_c.png"),
passable_2: require("../assets/floodZonesAssets/passable_2.png"),
- Passable: FloodZonesPassable,
notPassable: require("../assets/floodZonesAssets/not_passable_icon.png"),
notPassable2: require("../assets/floodZonesAssets/notpassable_2_toggle.png"),
notPassable_toggle: require("../assets/floodZonesAssets/Intransitavel_c.png"),
- NotPassable: FloodZonesNotPassable,
},
riverLevel: {
RiverIcon: RiverIcon,
- low: require("../assets/rio_baixo.png"),
+
+ low: require("../assets/river/rio_baixo.png"),
Low: RiverLow,
- normal: require("../assets/rio_normal.png"),
+ LowToggle: RiverLowToggle,
+
+ normal: require("../assets/river/rio_normal.png"),
Normal: RiverNormal,
- high: require("../assets/rio_alto.png"),
+ NormalToggle: RiverNormalToggle,
+
+ high: require("../assets/river/rio_alto.png"),
High: RiverHigh,
- flooding: require("../assets/rio_transbordando.png"),
+ HighToggle: RiverHighToggle,
+
+ flooding: require("../assets/river/rio_transbordando.png"),
Flooding: RiverFlood,
+ FloodingToggle: RiverFloodToggle,
},
rainLevel: {
RainIcon: RainIcon,
- rain_0_5: require("../assets/sem_chuva.png"),
+ rain_0_5: require("../assets/rain/sem_chuva.png"),
Rain_0_5: RainNot,
- rain_1_5: require("../assets/chuva_fraca.png"),
+ rain_1_5: require("../assets/rain/chuva_fraca.png"),
Rain_1_5: RainLow,
- rain_2_5: require("../assets/chuva_peq.png"),
+ rain_2_5: require("../assets/rain/chuva_peq.png"),
Rain_2_5: RainMedium,
- rain_3_5: require("../assets/chuva_forte.png"),
+ rain_3_5: require("../assets/rain/chuva_forte.png"),
Rain_3_5: RainHigh,
- rain_4_5: require("../assets/chuva_muito_forte.png"),
+ rain_4_5: require("../assets/rain/chuva_muito_forte.png"),
Rain_4_5: RainVeryHigh,
- rain_5_5: require("../assets/chuva_pancadas.png"),
+ rain_5_5: require("../assets/rain/chuva_pancadas.png"),
},
- pluviometer: require("../assets/diario_pluviometrico.png"),
+ pluviometer: require("../assets/pluviometer/diario_pluviometrico.png"),
PluviometerIcon: Pluviometer,
};
diff --git a/src/app/screens/RiverFloodSharingDataScreen.js b/src/app/screens/RiverFloodSharingDataScreen.js
index d0e4253..363be19 100644
--- a/src/app/screens/RiverFloodSharingDataScreen.js
+++ b/src/app/screens/RiverFloodSharingDataScreen.js
@@ -46,7 +46,8 @@ function RiverFloodSharingDataScreen(props) {
const [date, setDate] = useState(moment());
const [time, setTime] = useState(moment());
- const dims = scaleDimsFromWidth(85, 85, 20);
+ const dims = scaleDimsFromWidth(80, 80, 20);
+
return (
setRiverScale(0)}>
-
-
+
+ {riverScale == 0 ? (
+
+ ) : (
+
+ )}
setRiverScale(1)}>
-
-
+
+ {riverScale == 1 ? (
+
+ ) : (
+
+ )}
setRiverScale(2)}>
-
-
+
+ {riverScale == 2 ? (
+
+ ) : (
+
+ )}
setRiverScale(3)}>
-
-
+
+ {riverScale == 3 ? (
+
+ ) : (
+
+ )}
@@ -169,8 +174,6 @@ function RiverFloodSharingDataScreen(props) {
);
}
-const dims = scaleDimsFromWidth(85, 85, 4);
-
const styles = StyleSheet.create({
container: {
padding: 10,
@@ -187,11 +190,6 @@ const styles = StyleSheet.create({
flexDirection: "row",
justifyContent: "space-between",
},
- text: {
- fontSize: dimensions.text.default,
- textAlign: "center",
- marginTop: 10,
- },
error_txt: {
fontSize: 18,
color: colors.danger,