diff --git a/src/app/assets/floodZonesAssets/Intransitavel_c.png b/src/app/assets/floodZonesAssets/Intransitavel_c.png new file mode 100644 index 0000000..182fe7b Binary files /dev/null and b/src/app/assets/floodZonesAssets/Intransitavel_c.png differ diff --git a/src/app/assets/floodZonesAssets/Transitavel_c.png b/src/app/assets/floodZonesAssets/Transitavel_c.png new file mode 100644 index 0000000..5015478 Binary files /dev/null and b/src/app/assets/floodZonesAssets/Transitavel_c.png differ diff --git a/src/app/assets/floodZonesAssets/notpassable_2_toggle.png b/src/app/assets/floodZonesAssets/notpassable_2_toggle.png new file mode 100644 index 0000000..511b7cc Binary files /dev/null and b/src/app/assets/floodZonesAssets/notpassable_2_toggle.png differ diff --git a/src/app/assets/floodZonesAssets/passable_2.png b/src/app/assets/floodZonesAssets/passable_2.png new file mode 100644 index 0000000..e85f22b Binary files /dev/null and b/src/app/assets/floodZonesAssets/passable_2.png differ diff --git a/src/app/config/assets.js b/src/app/config/assets.js index 8101b69..86d5f6c 100644 --- a/src/app/config/assets.js +++ b/src/app/config/assets.js @@ -11,12 +11,21 @@ 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"; export default { floodZones: { FloodZonesIcon: FloodZones, passable: require("../assets/floodZonesAssets/passable_icon.png"), + 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, diff --git a/src/app/screens/SharingFloodZonesScreen.js b/src/app/screens/SharingFloodZonesScreen.js index 8d1842a..bb6a377 100644 --- a/src/app/screens/SharingFloodZonesScreen.js +++ b/src/app/screens/SharingFloodZonesScreen.js @@ -75,28 +75,34 @@ function SharingFloodZonesScreen(props) { > setPassable(1)}> - - - Transitável + + {passable == 1 ? ( + + ) : ( + + )} setPassable(0)}> - - - Intransitável + + {passable == 0 ? ( + + ) : ( + + )} @@ -156,7 +162,7 @@ function SharingFloodZonesScreen(props) { ); } const borderWidth = 4; -const dims = scaleDimsFromWidth(150, 80, 42.0); +const dims = scaleDimsFromWidth(93, 106, 30.0); const styles = StyleSheet.create({ container: { @@ -165,22 +171,20 @@ const styles = StyleSheet.create({ }, image: { - width: dims.width * 0.9, - height: dims.height * 0.9, + width: dims.width, + height: dims.height, resizeMode: "contain", }, img_block: { borderRadius: 5, - padding: 10, borderStyle: "dotted", borderColor: colors.white, borderWidth: borderWidth, alignItems: "center", - width: dims.width, }, imgs_container: { flexDirection: "row", - justifyContent: "space-between", + justifyContent: "space-evenly", }, text: {