Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feat/freezed #123

Merged
merged 6 commits into from
Oct 16, 2023
Merged

Feat/freezed #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7da49fa
Removed toJson calls in UI in favour of WeatherCard Data Class
shatanikmahanty Oct 16, 2023
3b4a704
Installed freezed
shatanikmahanty Oct 16, 2023
3695746
Refactored weather.dart to use freezed models
shatanikmahanty Oct 16, 2023
4124fbb
Null check bug fixed
shatanikmahanty Oct 16, 2023
dd2faf0
Merge branch 'feat/refactor' into feat/freezed
shatanikmahanty Oct 16, 2023
a5939c9
Freezed weather.dart model classes
shatanikmahanty Oct 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 29 additions & 32 deletions lib/app/api/api.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import 'dart:developer';

import 'package:dio/dio.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
Expand All @@ -7,17 +9,15 @@ import 'package:rain/app/data/weather.dart';
import 'package:rain/main.dart';

class WeatherAPI {
final Dio dio = Dio()
..options.baseUrl = 'https://api.open-meteo.com/v1/forecast?';
final Dio dio = Dio()..options.baseUrl = 'https://api.open-meteo.com/v1/forecast?';
final Dio dioLocation = Dio();

Future<MainWeatherCache> getWeatherData(double? lat, double? lon) async {
String url =
'latitude=$lat&longitude=$lon&hourly=temperature_2m,relativehumidity_2m,apparent_temperature,precipitation,rain,weathercode,surface_pressure,visibility,evapotranspiration,windspeed_10m,winddirection_10m,windgusts_10m,cloudcover,uv_index,dewpoint_2m,precipitation_probability,shortwave_radiation&daily=weathercode,temperature_2m_max,temperature_2m_min,apparent_temperature_max,apparent_temperature_min,sunrise,sunset,precipitation_sum,precipitation_probability_max,windspeed_10m_max,windgusts_10m_max,uv_index_max,rain_sum,winddirection_10m_dominant&forecast_days=12&timezone=auto';
String urlWeather;
settings.measurements == 'imperial' && settings.degrees == 'fahrenheit'
? urlWeather =
'$url&temperature_unit=fahrenheit&windspeed_unit=mph&precipitation_unit=inch'
? urlWeather = '$url&temperature_unit=fahrenheit&windspeed_unit=mph&precipitation_unit=inch'
: settings.measurements == 'imperial'
? urlWeather = '$url&windspeed_unit=mph&precipitation_unit=inch'
: settings.degrees == 'fahrenheit'
Expand All @@ -26,41 +26,41 @@ class WeatherAPI {
try {
Response response = await dio.get(urlWeather);
WeatherDataApi weatherData = WeatherDataApi.fromJson(response.data);
log("weatherData: ${response.data}");
return MainWeatherCache(
time: weatherData.hourly.time,
temperature2M: weatherData.hourly.temperature2M,
relativehumidity2M: weatherData.hourly.relativehumidity2M,
relativehumidity2M: weatherData.hourly.relativeHumidity2M,
apparentTemperature: weatherData.hourly.apparentTemperature,
precipitation: weatherData.hourly.precipitation,
rain: weatherData.hourly.rain,
weathercode: weatherData.hourly.weathercode,
weathercode: weatherData.hourly.weatherCode,
surfacePressure: weatherData.hourly.surfacePressure,
visibility: weatherData.hourly.visibility,
evapotranspiration: weatherData.hourly.evapotranspiration,
windspeed10M: weatherData.hourly.windspeed10M,
winddirection10M: weatherData.hourly.winddirection10M,
windgusts10M: weatherData.hourly.windgusts10M,
cloudcover: weatherData.hourly.cloudcover,
windspeed10M: weatherData.hourly.windSpeed10M,
winddirection10M: weatherData.hourly.windDirection10M,
windgusts10M: weatherData.hourly.windGusts10M,
cloudcover: weatherData.hourly.cloudCover,
uvIndex: weatherData.hourly.uvIndex,
dewpoint2M: weatherData.hourly.dewpoint2M,
precipitationProbability: weatherData.hourly.precipitationProbability,
shortwaveRadiation: weatherData.hourly.shortwaveRadiation,
timeDaily: weatherData.daily.time,
weathercodeDaily: weatherData.daily.weathercode,
weathercodeDaily: weatherData.daily.weatherCode,
temperature2MMax: weatherData.daily.temperature2MMax,
temperature2MMin: weatherData.daily.temperature2MMin,
apparentTemperatureMax: weatherData.daily.apparentTemperatureMax,
apparentTemperatureMin: weatherData.daily.apparentTemperatureMin,
sunrise: weatherData.daily.sunrise,
sunset: weatherData.daily.sunset,
precipitationSum: weatherData.daily.precipitationSum,
precipitationProbabilityMax:
weatherData.daily.precipitationProbabilityMax,
windspeed10MMax: weatherData.daily.windspeed10MMax,
windgusts10MMax: weatherData.daily.windgusts10MMax,
precipitationProbabilityMax: weatherData.daily.precipitationProbabilityMax,
windspeed10MMax: weatherData.daily.windSpeed10MMax,
windgusts10MMax: weatherData.daily.windGusts10MMax,
uvIndexMax: weatherData.daily.uvIndexMax,
rainSum: weatherData.daily.rainSum,
winddirection10MDominant: weatherData.daily.winddirection10MDominant,
winddirection10MDominant: weatherData.daily.windDirection10MDominant,
timezone: weatherData.timezone,
timestamp: DateTime.now(),
);
Expand All @@ -72,14 +72,12 @@ class WeatherAPI {
}
}

Future<WeatherCard> getWeatherCard(double? lat, double? lon, String city,
String district, String timezone) async {
Future<WeatherCard> getWeatherCard(double? lat, double? lon, String city, String district, String timezone) async {
String url =
'latitude=$lat&longitude=$lon&hourly=temperature_2m,relativehumidity_2m,apparent_temperature,precipitation,rain,weathercode,surface_pressure,visibility,evapotranspiration,windspeed_10m,winddirection_10m,windgusts_10m,cloudcover,uv_index,dewpoint_2m,precipitation_probability,shortwave_radiation&daily=weathercode,temperature_2m_max,temperature_2m_min,apparent_temperature_max,apparent_temperature_min,sunrise,sunset,precipitation_sum,precipitation_probability_max,windspeed_10m_max,windgusts_10m_max,uv_index_max,rain_sum,winddirection_10m_dominant&forecast_days=12&timezone=auto';
String urlWeather;
settings.measurements == 'imperial' && settings.degrees == 'fahrenheit'
? urlWeather =
'$url&temperature_unit=fahrenheit&windspeed_unit=mph&precipitation_unit=inch'
? urlWeather = '$url&temperature_unit=fahrenheit&windspeed_unit=mph&precipitation_unit=inch'
: settings.measurements == 'imperial'
? urlWeather = '$url&windspeed_unit=mph&precipitation_unit=inch'
: settings.degrees == 'fahrenheit'
Expand All @@ -91,38 +89,37 @@ class WeatherAPI {
return WeatherCard(
time: weatherData.hourly.time,
temperature2M: weatherData.hourly.temperature2M,
relativehumidity2M: weatherData.hourly.relativehumidity2M,
relativehumidity2M: weatherData.hourly.relativeHumidity2M,
apparentTemperature: weatherData.hourly.apparentTemperature,
precipitation: weatherData.hourly.precipitation,
rain: weatherData.hourly.rain,
weathercode: weatherData.hourly.weathercode,
weathercode: weatherData.hourly.weatherCode,
surfacePressure: weatherData.hourly.surfacePressure,
visibility: weatherData.hourly.visibility,
evapotranspiration: weatherData.hourly.evapotranspiration,
windspeed10M: weatherData.hourly.windspeed10M,
winddirection10M: weatherData.hourly.winddirection10M,
windgusts10M: weatherData.hourly.windgusts10M,
cloudcover: weatherData.hourly.cloudcover,
windspeed10M: weatherData.hourly.windSpeed10M,
winddirection10M: weatherData.hourly.windDirection10M,
windgusts10M: weatherData.hourly.windGusts10M,
cloudcover: weatherData.hourly.cloudCover,
uvIndex: weatherData.hourly.uvIndex,
dewpoint2M: weatherData.hourly.dewpoint2M,
precipitationProbability: weatherData.hourly.precipitationProbability,
shortwaveRadiation: weatherData.hourly.shortwaveRadiation,
timeDaily: weatherData.daily.time,
weathercodeDaily: weatherData.daily.weathercode,
weathercodeDaily: weatherData.daily.weatherCode,
temperature2MMax: weatherData.daily.temperature2MMax,
temperature2MMin: weatherData.daily.temperature2MMin,
apparentTemperatureMax: weatherData.daily.apparentTemperatureMax,
apparentTemperatureMin: weatherData.daily.apparentTemperatureMin,
sunrise: weatherData.daily.sunrise,
sunset: weatherData.daily.sunset,
precipitationSum: weatherData.daily.precipitationSum,
precipitationProbabilityMax:
weatherData.daily.precipitationProbabilityMax,
windspeed10MMax: weatherData.daily.windspeed10MMax,
windgusts10MMax: weatherData.daily.windgusts10MMax,
precipitationProbabilityMax: weatherData.daily.precipitationProbabilityMax,
windspeed10MMax: weatherData.daily.windSpeed10MMax,
windgusts10MMax: weatherData.daily.windGusts10MMax,
uvIndexMax: weatherData.daily.uvIndexMax,
rainSum: weatherData.daily.rainSum,
winddirection10MDominant: weatherData.daily.winddirection10MDominant,
winddirection10MDominant: weatherData.daily.windDirection10MDominant,
lat: lat,
lon: lon,
city: city,
Expand Down
198 changes: 58 additions & 140 deletions lib/app/api/weather.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,150 +1,68 @@
class WeatherDataApi {
Hourly hourly;
Daily daily;
String timezone;
import 'package:freezed_annotation/freezed_annotation.dart';

WeatherDataApi({
required this.hourly,
required this.daily,
required this.timezone,
});
//ignore_for_file: invalid_annotation_target

factory WeatherDataApi.fromJson(Map<String, dynamic> json) => WeatherDataApi(
hourly: Hourly.fromJson(json['hourly']),
daily: Daily.fromJson(json['daily']),
timezone: json['timezone'],
);
}
part 'weather.freezed.dart';
part 'weather.g.dart';

@freezed
class WeatherDataApi with _$WeatherDataApi {
const factory WeatherDataApi({
required Hourly hourly,
required Daily daily,
required String timezone,
}) = _WeatherDataApi;

class Hourly {
List<String>? time;
List<int>? weathercode;
List<double>? temperature2M;
List<double?>? apparentTemperature;
List<double?>? precipitation;
List<double?>? rain;
List<int?>? relativehumidity2M;
List<double?>? surfacePressure;
List<double?>? visibility;
List<double?>? evapotranspiration;
List<double?>? windspeed10M;
List<int?>? winddirection10M;
List<double?>? windgusts10M;
List<int?>? cloudcover;
List<double?>? uvIndex;
List<double?>? dewpoint2M;
List<int?>? precipitationProbability;
List<double?>? shortwaveRadiation;
factory WeatherDataApi.fromJson(Map<String, dynamic> json) => _$WeatherDataApiFromJson(json);
}

Hourly({
this.time,
this.temperature2M,
this.relativehumidity2M,
this.apparentTemperature,
this.precipitation,
this.rain,
this.weathercode,
this.surfacePressure,
this.visibility,
this.evapotranspiration,
this.windspeed10M,
this.winddirection10M,
this.windgusts10M,
this.cloudcover,
this.uvIndex,
this.dewpoint2M,
this.precipitationProbability,
this.shortwaveRadiation,
});
@freezed
class Hourly with _$Hourly {
const factory Hourly({
List<String>? time,
@JsonKey(name: 'weathercode') List<int>? weatherCode,
@JsonKey(name: 'temperature_2m') List<double>? temperature2M,
@JsonKey(name: 'apparent_temperature') List<double?>? apparentTemperature,
List<double?>? precipitation,
List<double?>? rain,
@JsonKey(name: 'relativehumidity_2m') List<int?>? relativeHumidity2M,
@JsonKey(name: 'surface_pressure') List<double?>? surfacePressure,
List<double?>? visibility,
List<double?>? evapotranspiration,
@JsonKey(name: 'windspeed_10m') List<double?>? windSpeed10M,
@JsonKey(name: 'winddirection_10m') List<int?>? windDirection10M,
@JsonKey(name: 'windgusts_10m') List<double?>? windGusts10M,
@JsonKey(name: 'cloudcover') List<int?>? cloudCover,
@JsonKey(name: 'uv_index') List<double?>? uvIndex,
@JsonKey(name: 'dewpoint_2m') List<double?>? dewpoint2M,
@JsonKey(name: 'precipitation_probability') List<int?>? precipitationProbability,
@JsonKey(name: 'shortwave_radiation') List<double?>? shortwaveRadiation,
}) = _Hourly;

factory Hourly.fromJson(Map<String, dynamic> json) => Hourly(
time: List<String>.from(json['time'].map((x) => x)),
weathercode: List<int>.from(json['weathercode'].map((x) => x)),
temperature2M: List<double>.from(json['temperature_2m'].map((x) => x)),
apparentTemperature:
List<double?>.from(json['apparent_temperature'].map((x) => x)),
relativehumidity2M:
List<int?>.from(json['relativehumidity_2m'].map((x) => x)),
precipitation: List<double>.from(json['precipitation'].map((x) => x)),
rain: List<double?>.from(json['rain'].map((x) => x)),
surfacePressure:
List<double?>.from(json['surface_pressure'].map((x) => x)),
visibility: List<double?>.from(json['visibility'].map((x) => x)),
evapotranspiration:
List<double?>.from(json['evapotranspiration'].map((x) => x)),
windspeed10M: List<double?>.from(json['windspeed_10m'].map((x) => x)),
winddirection10M:
List<int?>.from(json['winddirection_10m'].map((x) => x)),
windgusts10M: List<double?>.from(json['windgusts_10m'].map((x) => x)),
cloudcover: List<int?>.from(json['cloudcover'].map((x) => x)),
uvIndex: List<double?>.from(json['uv_index'].map((x) => x)),
dewpoint2M: List<double?>.from(json['dewpoint_2m'].map((x) => x)),
precipitationProbability:
List<int?>.from(json['precipitation_probability'].map((x) => x)),
shortwaveRadiation:
List<double?>.from(json['shortwave_radiation'].map((x) => x)),
);
factory Hourly.fromJson(Map<String, dynamic> json) => _$HourlyFromJson(json);
}

class Daily {
List<DateTime>? time;
List<int?>? weathercode;
List<double?>? temperature2MMax;
List<double?>? temperature2MMin;
List<double?>? apparentTemperatureMax;
List<double?>? apparentTemperatureMin;
List<String>? sunrise;
List<String>? sunset;
List<double?>? precipitationSum;
List<int?>? precipitationProbabilityMax;
List<double?>? windspeed10MMax;
List<double?>? windgusts10MMax;
List<double?>? uvIndexMax;
List<double?>? rainSum;
List<int?>? winddirection10MDominant;
List<DateTime> _dateTimeFromJson(List<dynamic>? json) => json?.map((x) => DateTime.parse(x)).toList() ?? [];

Daily({
this.time,
this.weathercode,
this.temperature2MMax,
this.temperature2MMin,
this.apparentTemperatureMax,
this.apparentTemperatureMin,
this.sunrise,
this.sunset,
this.precipitationSum,
this.precipitationProbabilityMax,
this.windspeed10MMax,
this.windgusts10MMax,
this.uvIndexMax,
this.rainSum,
this.winddirection10MDominant,
});
@freezed
class Daily with _$Daily {
const factory Daily({
@JsonKey(fromJson: _dateTimeFromJson) List<DateTime>? time,
@JsonKey(name: 'weathercode') List<int?>? weatherCode,
@JsonKey(name: 'temperature_2m_max') List<double?>? temperature2MMax,
@JsonKey(name: 'temperature_2m_min') List<double?>? temperature2MMin,
@JsonKey(name: 'apparent_temperature_max') List<double?>? apparentTemperatureMax,
@JsonKey(name: 'apparent_temperature_min') List<double?>? apparentTemperatureMin,
@JsonKey(name: 'precipitation_sum') List<double?>? precipitationSum,
List<String>? sunrise,
List<String>? sunset,
@JsonKey(name: 'precipitation_probability_max') List<int?>? precipitationProbabilityMax,
@JsonKey(name: 'windspeed_10m_max') List<double?>? windSpeed10MMax,
@JsonKey(name: 'windgusts_10m_max') List<double?>? windGusts10MMax,
@JsonKey(name: 'uv_index_max') List<double?>? uvIndexMax,
@JsonKey(name: 'rain_sum') List<double?>? rainSum,
@JsonKey(name: 'winddirection_10m_dominant') List<int?>? windDirection10MDominant,
}) = _Daily;

factory Daily.fromJson(Map<String, dynamic> json) => Daily(
time: List<DateTime>.from(json['time'].map((x) => DateTime.parse(x))),
weathercode: List<int?>.from(json['weathercode'].map((x) => x)),
temperature2MMax:
List<double?>.from(json['temperature_2m_max'].map((x) => x)),
temperature2MMin:
List<double?>.from(json['temperature_2m_min'].map((x) => x)),
apparentTemperatureMax:
List<double?>.from(json['apparent_temperature_max'].map((x) => x)),
apparentTemperatureMin:
List<double?>.from(json['apparent_temperature_min'].map((x) => x)),
sunrise: List<String>.from(json['sunrise'].map((x) => x)),
sunset: List<String>.from(json['sunset'].map((x) => x)),
precipitationSum:
List<double?>.from(json['precipitation_sum'].map((x) => x)),
precipitationProbabilityMax: List<int?>.from(
json['precipitation_probability_max'].map((x) => x)),
windspeed10MMax:
List<double?>.from(json['windspeed_10m_max'].map((x) => x)),
windgusts10MMax:
List<double?>.from(json['windgusts_10m_max'].map((x) => x)),
uvIndexMax: List<double?>.from(json['uv_index_max'].map((x) => x)),
rainSum: List<double?>.from(json['rain_sum'].map((x) => x)),
winddirection10MDominant:
List<int?>.from(json['winddirection_10m_dominant'].map((x) => x)),
);
factory Daily.fromJson(Map<String, dynamic> json) => _$DailyFromJson(json);
}
Loading