null safety fix

lib/data/api/api_util.dart

@@ -1,20 +1,19 @@
-import 'package:habr_flutter_clean_arch/data/api/request/get_day_body.dart';
-import 'package:habr_flutter_clean_arch/data/mapper/day_mapper.dart';
-import 'package:meta/meta.dart';
-import 'package:habr_flutter_clean_arch/data/api/service/sunrise_service.dart';
-import 'package:habr_flutter_clean_arch/domain/model/day.dart';
-
-class ApiUtil {
- final SunriseService _sunriseService;
-
- ApiUtil(this._sunriseService);
-
- Future<Day> getDay({
- @required double latitude,
- @required double longitude,
- }) async {
- final body = GetDayBody(latitude: latitude, longitude: longitude);
- final result = await _sunriseService.getDay(body);
- return DayMapper.fromApi(result);
- }
-}
+import 'package:habr_flutter_clean_arch/data/api/request/get_day_body.dart';
+import 'package:habr_flutter_clean_arch/data/mapper/day_mapper.dart';
+import 'package:habr_flutter_clean_arch/data/api/service/sunrise_service.dart';
+import 'package:habr_flutter_clean_arch/domain/model/day.dart';
+
+class ApiUtil {
+ final SunriseService _sunriseService;
+
+ ApiUtil(this._sunriseService);
+
+ Future<Day> getDay({
+ required double latitude,
+ required double longitude,
+ }) async {
+ final body = GetDayBody(latitude: latitude, longitude: longitude);
+ final result = await _sunriseService.getDay(body);
+ return DayMapper.fromApi(result);
+ }
+}

lib/data/api/model/api_day.dart

@@ -1,12 +1,12 @@
-class ApiDay {
- final String sunrise;
- final String sunset;
- final String solarNoon;
- final num dayLength;
-
- ApiDay.fromApi(Map<String, dynamic> map)
- : sunrise = map['results']['sunrise'],
- sunset = map['results']['sunset'],
- solarNoon = map['results']['solar_noon'],
- dayLength = map['results']['day_length'];
-}
+class ApiDay {
+ final String sunrise;
+ final String sunset;
+ final String solarNoon;
+ final num dayLength;
+
+ ApiDay.fromApi(Map<String, dynamic> map)
+ : sunrise = map['results']['sunrise'],
+ sunset = map['results']['sunset'],
+ solarNoon = map['results']['solar_noon'],
+ dayLength = map['results']['day_length'];
+}

lib/data/api/request/get_day_body.dart

@@ -1,19 +1,17 @@
-import 'package:meta/meta.dart';
-
-class GetDayBody {
- final double latitude;
- final double longitude;
-
- GetDayBody({
- @required this.latitude,
- @required this.longitude,
- });
-
- Map<String, dynamic> toApi() {
- return {
- 'lat': latitude,
- 'lng': longitude,
- 'formatted': 0,
- };
- }
-}
+class GetDayBody {
+ final double latitude;
+ final double longitude;
+
+ GetDayBody({
+ required this.latitude,
+ required this.longitude,
+ });
+
+ Map<String, dynamic> toApi() {
+ return {
+ 'lat': latitude,
+ 'lng': longitude,
+ 'formatted': 0,
+ };
+ }
+}

lib/data/api/service/sunrise_service.dart

@@ -1,19 +1,19 @@
-import 'package:dio/dio.dart';
-import 'package:habr_flutter_clean_arch/data/api/model/api_day.dart';
-import 'package:habr_flutter_clean_arch/data/api/request/get_day_body.dart';
-
-class SunriseService {
- static const _BASE_URL = 'https://api.sunrise-sunset.org';
-
- final Dio _dio = Dio(
- BaseOptions(baseUrl: _BASE_URL),
- );
-
- Future<ApiDay> getDay(GetDayBody body) async {
- final response = await _dio.get(
- '/json',
- queryParameters: body.toApi(),
- );
- return ApiDay.fromApi(response.data);
- }
-}
+import 'package:dio/dio.dart';
+import 'package:habr_flutter_clean_arch/data/api/model/api_day.dart';
+import 'package:habr_flutter_clean_arch/data/api/request/get_day_body.dart';
+
+class SunriseService {
+ static const _base_url = 'https://api.sunrise-sunset.org';
+
+ final Dio _dio = Dio(
+ BaseOptions(baseUrl: _base_url),
+ );
+
+ Future<ApiDay> getDay(GetDayBody body) async {
+ final response = await _dio.get(
+ '/json',
+ queryParameters: body.toApi(),
+ );
+ return ApiDay.fromApi(response.data);
+ }
+}

lib/data/mapper/day_mapper.dart

@@ -1,13 +1,13 @@
-import 'package:habr_flutter_clean_arch/data/api/model/api_day.dart';
-import 'package:habr_flutter_clean_arch/domain/model/day.dart';
-
-class DayMapper {
- static Day fromApi(ApiDay day) {
- return Day(
- sunrise: DateTime.tryParse(day.sunrise),
- sunset: DateTime.tryParse(day.sunset),
- solarNoon: DateTime.tryParse(day.solarNoon),
- dayLength: day.dayLength.toInt(),
- );
- }
-}
+import 'package:habr_flutter_clean_arch/data/api/model/api_day.dart';
+import 'package:habr_flutter_clean_arch/domain/model/day.dart';
+
+class DayMapper {
+ static Day fromApi(ApiDay day) {
+ return Day(
+ sunrise: DateTime.tryParse(day.sunrise)!,
+ sunset: DateTime.tryParse(day.sunset)!,
+ solarNoon: DateTime.tryParse(day.solarNoon)!,
+ dayLength: day.dayLength.toInt(),
+ );
+ }
+}

lib/data/repository/day_data_repository.dart

@@ -1,14 +1,16 @@
-import 'package:habr_flutter_clean_arch/data/api/api_util.dart';
-import 'package:habr_flutter_clean_arch/domain/model/day.dart';
-import 'package:habr_flutter_clean_arch/domain/repository/day_repository.dart';
-
-class DayDataRepository extends DayRepository {
- final ApiUtil _apiUtil;
-
- DayDataRepository(this._apiUtil);
-
- @override
- Future<Day> getDay({double latitude, double longitude}) {
- return _apiUtil.getDay(latitude: latitude, longitude: longitude);
- }
-}
+import 'package:habr_flutter_clean_arch/data/api/api_util.dart';
+import 'package:habr_flutter_clean_arch/domain/model/day.dart';
+import 'package:habr_flutter_clean_arch/domain/repository/day_repository.dart';
+
+class DayDataRepository extends DayRepository {
+ final ApiUtil _apiUtil;
+
+ DayDataRepository(this._apiUtil);
+
+ @override
+ Future<Day> getDay({ required double latitude, required double longitude}) {
+
+ return _apiUtil.getDay(latitude: latitude, longitude: longitude);
+
+ }
+}

lib/domain/model/day.dart

@@ -1,15 +1,14 @@
-import 'package:meta/meta.dart';
-
-class Day {
- final DateTime sunrise;
- final DateTime sunset;
- final DateTime solarNoon;
- final int dayLength;
-
- Day({
- @required this.sunrise,
- @required this.sunset,
- @required this.solarNoon,
- @required this.dayLength,
- });
-}
+
+class Day {
+ final DateTime sunrise;
+ final DateTime sunset;
+ final DateTime solarNoon;
+ final int dayLength;
+
+ Day({
+ required this.sunrise,
+ required this.sunset,
+ required this.solarNoon,
+ required this.dayLength,
+ });
+}

lib/domain/repository/day_repository.dart

@@ -1,9 +1,8 @@
-import 'package:meta/meta.dart';
-import 'package:habr_flutter_clean_arch/domain/model/day.dart';
-
-abstract class DayRepository {
- Future<Day> getDay({
- @required double latitude,
- @required double longitude,
- });
-}
+import 'package:habr_flutter_clean_arch/domain/model/day.dart';
+
+abstract class DayRepository {
+ Future<Day> getDay({
+ required double latitude,
+ required double longitude,
+ });
+}

lib/domain/state/home/home_state.dart

@@ -1,31 +1,34 @@
-import 'package:mobx/mobx.dart';
-import 'package:meta/meta.dart';
-import 'package:habr_flutter_clean_arch/domain/repository/day_repository.dart';
-import 'package:habr_flutter_clean_arch/domain/model/day.dart';
-
-part 'home_state.g.dart';
-
-class HomeState = HomeStateBase with _$HomeState;
-
-abstract class HomeStateBase with Store {
- HomeStateBase(this._dayRepository);
-
- final DayRepository _dayRepository;
-
- @observable
- Day day;
-
- @observable
- bool isLoading = false;
-
- @action
- Future<void> getDay({
- @required double latitude,
- @required double longitude,
- }) async {
- isLoading = true;
- final data = await _dayRepository.getDay(latitude: latitude, longitude: longitude);
- day = data;
- isLoading = false;
- }
-}
+import 'package:mobx/mobx.dart';
+import 'package:habr_flutter_clean_arch/domain/repository/day_repository.dart';
+import 'package:habr_flutter_clean_arch/domain/model/day.dart';
+
+part 'home_state.g.dart';
+
+class HomeState = HomeStateBase with _$HomeState;
+
+abstract class HomeStateBase with Store {
+ final DayRepository _dayRepository;
+
+ HomeStateBase(this._dayRepository);
+
+ @observable
+ late Day day;
+
+ @observable
+ bool isLoading = false;
+ @observable
+ bool isGeted = false;
+
+
+ @action
+ Future<void> getDay({
+ required double latitude,
+ required double longitude,
+ }) async {
+ isLoading = true;
+ final data = await _dayRepository.getDay(latitude: latitude, longitude: longitude);
+ day = data;
+ isGeted = true;
+ isLoading = false;
+ }
+}