From ef9a0574c2c19cdfc90df9a5569e396e0cd606e0 Mon Sep 17 00:00:00 2001 From: GabrielTrettel Date: Tue, 17 Aug 2021 18:50:27 -0300 Subject: [PATCH] Changing icons in weather forecast screen --- src/app/assets/weather/chuva_fraca.svg | 1 + src/app/assets/weather/weather_0_sunny.svg | 335 +----------------- .../assets/weather/weather_1_cloudy_sun.svg | 43 +-- src/app/assets/weather/weather_2_rain.svg | 60 +--- .../assets/weather/weather_3_heavy_rain.svg | 150 +------- src/app/assets/weather/weather_4_cloudy.svg | 15 +- src/app/assets/weather/weather_5_clean.svg | 279 +-------------- src/app/screens/ForecastScreen.js | 83 +++-- 8 files changed, 62 insertions(+), 904 deletions(-) create mode 100644 src/app/assets/weather/chuva_fraca.svg diff --git a/src/app/assets/weather/chuva_fraca.svg b/src/app/assets/weather/chuva_fraca.svg new file mode 100644 index 0000000..a19ce23 --- /dev/null +++ b/src/app/assets/weather/chuva_fraca.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/app/assets/weather/weather_0_sunny.svg b/src/app/assets/weather/weather_0_sunny.svg index 7a710e9..dde527a 100644 --- a/src/app/assets/weather/weather_0_sunny.svg +++ b/src/app/assets/weather/weather_0_sunny.svg @@ -1,334 +1 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/src/app/assets/weather/weather_1_cloudy_sun.svg b/src/app/assets/weather/weather_1_cloudy_sun.svg index fb67892..49d8b22 100644 --- a/src/app/assets/weather/weather_1_cloudy_sun.svg +++ b/src/app/assets/weather/weather_1_cloudy_sun.svg @@ -1,42 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/src/app/assets/weather/weather_2_rain.svg b/src/app/assets/weather/weather_2_rain.svg index e89ea97..389c907 100644 --- a/src/app/assets/weather/weather_2_rain.svg +++ b/src/app/assets/weather/weather_2_rain.svg @@ -1,59 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/src/app/assets/weather/weather_3_heavy_rain.svg b/src/app/assets/weather/weather_3_heavy_rain.svg index 547df8b..70a1f64 100644 --- a/src/app/assets/weather/weather_3_heavy_rain.svg +++ b/src/app/assets/weather/weather_3_heavy_rain.svg @@ -1,149 +1 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/src/app/assets/weather/weather_4_cloudy.svg b/src/app/assets/weather/weather_4_cloudy.svg index 87ee5d7..8df1169 100644 --- a/src/app/assets/weather/weather_4_cloudy.svg +++ b/src/app/assets/weather/weather_4_cloudy.svg @@ -1,14 +1 @@ - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/src/app/assets/weather/weather_5_clean.svg b/src/app/assets/weather/weather_5_clean.svg index e3c01b1..eedc226 100644 --- a/src/app/assets/weather/weather_5_clean.svg +++ b/src/app/assets/weather/weather_5_clean.svg @@ -1,278 +1 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/src/app/screens/ForecastScreen.js b/src/app/screens/ForecastScreen.js index 0f30666..2f0492d 100644 --- a/src/app/screens/ForecastScreen.js +++ b/src/app/screens/ForecastScreen.js @@ -64,7 +64,14 @@ function WeatherInput(weather_index, weather_title) { > {weather_title} - + + + + {WeatherInput(forecast.today_forecast.morning_weather_index, "Manhã")} + {border()} - + @@ -152,17 +164,30 @@ function weekDayList(day_forecast) { ({day_forecast.date}) - - - {day_forecast.rain_fall_mm} mm - + + + + + + + + {day_forecast.rain_fall_mm} mm + + ); } function renderWeekForecast(forecast) { - var i = 0; return ( {forecast.next_forecast.map(weekDayList)} @@ -208,9 +233,9 @@ function renderScreen(forecast) { const [swipePosition, setSwipePosition] = useState(null); useEffect(() => { - if (swipePosition ) { + if (swipePosition) { day == 0 ? swipePosition.openLeft() : swipePosition.openRight(); - } + } }, [day]); return ( @@ -219,21 +244,23 @@ function renderScreen(forecast) { {forecastDay(day, setDay)} {currentLocationAndDate(forecast, day)} - - setSwipePosition(ref)} - renderRightActions={() => renderWeekForecast(forecast)} - onSwipeableOpen={() => {setDay(1)}} - onSwipeableClose={() => {setDay(0)}} + - setSwipePosition(ref)} + renderRightActions={() => renderWeekForecast(forecast)} + onSwipeableOpen={() => { + setDay(1); + }} + onSwipeableClose={() => { + setDay(0); + }} > {renderTodayForecast(forecast)} - - + + ); }