Skip to content

Commit 46ee9ca

Browse files
committed
Fixes
1 parent 5d8f762 commit 46ee9ca

35 files changed

+896
-130
lines changed

build.yaml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
targets:
2+
$default:
3+
builders:
4+
freezed:
5+
options:
6+
map:
7+
maybe_map: true
8+
#targets:
9+
# $default:
10+
# builders:
11+
# freezed:
12+
# enabled: true
13+
# options:
14+
# # Tells Freezed not to format .freezed.dart files.
15+
# # This can significantly speed up code-generation.
16+
# format: true
17+
# # Disable the generation of copyWith/== for the entire project
18+
# copy_with: true
19+
# equal: true
20+
# # `when` and `map` can be enabled/disabled entirely by setting them to `true`/`false`
21+
# map:
22+
# map: true
23+
# map_or_null: true
24+
# maybe_map: true
25+
# when:
26+
# when: true
27+
# when_or_null: true
28+
# maybe_when: true

lib/app/app.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ class MyApp extends StatelessWidget {
4545
),
4646
BlocProvider(
4747
create: (context) => LaunchesBloc(
48-
repository: RepositoryProvider.of<LaunchesRepository>(context),
48+
RepositoryProvider.of<LaunchesRepository>(context),
4949
)..add(
50-
LaunchesFetched(),
50+
const LaunchesEvent.load(),
5151
),
5252
),
5353
BlocProvider<InitBloc>(

lib/bloc/news/news_bloc.freezed.dart

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/config/environment.dart

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
import 'package:bloc/bloc.dart';
12
import 'package:flutter/foundation.dart';
23
import 'package:flutter_bloc_app_template/config/build_type.dart';
4+
import 'package:talker_bloc_logger/talker_bloc_logger_observer.dart';
35

46
/// A class for managing environment configurations based on different
57
/// build types.
@@ -62,5 +64,6 @@ class Environment<T> implements Listenable {
6264
required T config,
6365
}) {
6466
_instance ??= Environment<T>._(buildType, config);
67+
Bloc.observer = TalkerBlocObserver();
6568
}
6669
}

lib/data/network/api_result.freezed.dart

Lines changed: 9 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/data/network/data_source/launches_network_data_source.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ abstract class LaunchesDataSource {
99
int? offset,
1010
int? launchYear,
1111
int? launchSuccess,
12-
int? order,
12+
String? order,
1313
});
1414
}
1515

@@ -25,7 +25,7 @@ class LaunchesNetworkDataSource implements LaunchesDataSource {
2525
int? offset,
2626
int? launchYear,
2727
int? launchSuccess,
28-
int? order}) async {
28+
String? order}) async {
2929
try {
3030
final list = await _service.fetchLaunches(
3131
hasId: hasId,

lib/data/network/model/launch/network_launch_model.dart

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import 'package:flutter_bloc_app_template/data/network/model/launch/timestamp_serializer.dart';
12
import 'package:freezed_annotation/freezed_annotation.dart';
23

34
part 'network_launch_model.freezed.dart';
@@ -8,6 +9,9 @@ abstract class NetworkLaunchModel with _$NetworkLaunchModel {
89
const factory NetworkLaunchModel({
910
@JsonKey(name: '_id') required String id,
1011
@JsonKey(name: 'mission_name') String? missionName,
12+
@TimestampSerializer()
13+
@JsonKey(name: 'launch_date_utc')
14+
DateTime? launchDate,
1115
@JsonKey(name: 'rocket') NetworkRocketModel? rocket,
1216
@JsonKey(name: 'launch_success') @Default(false) bool success,
1317
@JsonKey(name: 'links') NetworkLaunchLinksModel? links,
@@ -23,8 +27,8 @@ abstract class NetworkLaunchModel with _$NetworkLaunchModel {
2327
abstract class NetworkRocketModel with _$NetworkRocketModel {
2428
const factory NetworkRocketModel({
2529
@JsonKey(name: 'rocket_id') required String id,
26-
@JsonKey(name: 'type') String? type,
27-
@JsonKey(name: 'name') String? name,
30+
@JsonKey(name: 'rocket_type') String? type,
31+
@JsonKey(name: 'rocket_name') String? name,
2832
}) = _NetworkRocketModel;
2933

3034
const NetworkRocketModel._();

lib/data/network/model/launch/network_launch_model.freezed.dart

Lines changed: 44 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/data/network/model/launch/network_launch_model.g.dart

Lines changed: 7 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)