-
Notifications
You must be signed in to change notification settings - Fork 6
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.
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
null safety fix #3
Open
deushon
wants to merge
15
commits into
san-smith:master
Choose a base branch
from
deushon:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
af657a8
Fix to null safety
deushon 4242c8e
FIX path
deushon 3c5cad4
FIX path
deushon 6b8a374
FIX path
deushon 7846947
FIX path
deushon d45fc88
FIX path
deushon 0c3723b
FIX path
deushon 123ea0f
FIX path
deushon 71a1153
Delete data directory
deushon 51b47ff
Delete domain directory
deushon 79c60e9
Delete internal directory
deushon 626e24e
Delete presentation directory
deushon 56d2f31
Delete main.dart
deushon 693a9ba
Null safety FIX
deushon 19ce780
FIX SDK V
deushon File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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']; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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, | ||
}; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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(), | ||
); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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); | ||
|
||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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, | ||
}); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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, | ||
}); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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; | ||
} | ||
} |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Для чего потребовалось вводить новое поле?