update bloc data flow implementation

Author: LonelyCpp

lib/main.dart

@@ -1,32 +1,51 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_weather/src/api/api_keys.dart';
+import 'package:flutter_weather/src/bloc/weather_bloc_observre.dart';
 import 'package:flutter_weather/src/screens/routes.dart';
 import 'package:flutter_weather/src/screens/weather_screen.dart';
 import 'package:bloc/bloc.dart';
 import 'package:flutter_weather/src/themes.dart';
 import 'package:flutter_weather/src/utils/constants.dart';
 import 'package:flutter_weather/src/utils/converters.dart';
 import 'package:shared_preferences/shared_preferences.dart';
+import 'package:http/http.dart' as http;
 
-void main() {
- BlocSupervisor().delegate = SimpleBlocDelegate();
- runApp(AppStateContainer(child: WeatherApp()));
-}
+import 'src/api/weather_api_client.dart';
+import 'src/bloc/weather_bloc.dart';
+import 'src/repository/weather_repository.dart';
 
-class SimpleBlocDelegate extends BlocDelegate {
- @override
- onTransition(Bloc bloc, Transition transition) {
- super.onTransition(bloc, transition);
- print(transition);
- }
+void main() {
+ Bloc.observer = SimpleBlocObserver();
+
+ final WeatherRepository weatherRepository = WeatherRepository(
+ weatherApiClient: WeatherApiClient(
+ httpClient: http.Client(),
+ apiKey: ApiKey.OPEN_WEATHER_MAP,
+ ),
+ );
+
+ runApp(AppStateContainer(
+ child: WeatherApp(weatherRepository: weatherRepository),
+ ));
 }
 
 class WeatherApp extends StatelessWidget {
+ final WeatherRepository weatherRepository;
+
+ WeatherApp({Key key, @required this.weatherRepository})
+ : assert(weatherRepository != null),
+ super(key: key);
+
  @override
  Widget build(BuildContext context) {
  return MaterialApp(
  title: 'Flutter Weather App',
  theme: AppStateContainer.of(context).theme,
- home: WeatherScreen(),
+ home: BlocProvider(
+ create: (context) => WeatherBloc(weatherRepository: weatherRepository),
+ child: WeatherScreen(),
+ ),
  routes: Routes.mainRoute,
  );
  }
@@ -43,9 +62,9 @@ class AppStateContainer extends StatefulWidget {
  _AppStateContainerState createState() => _AppStateContainerState();
 
  static _AppStateContainerState of(BuildContext context) {
- return (context.inheritFromWidgetOfExactType(_InheritedStateContainer)
-  as _InheritedStateContainer)
-  .data;
+ var widget =
+ context.dependOnInheritedWidgetOfExactType<_InheritedStateContainer>();
+ return widget.data;
  }
 }
 
@@ -54,7 +73,6 @@ class _AppStateContainerState extends State<AppStateContainer> {
  int themeCode = Themes.DARK_THEME_CODE;
  TemperatureUnit temperatureUnit = TemperatureUnit.celsius;
 
-
  @override
  initState() {
  super.initState();

lib/src/api/weather_api_client.dart

@@ -20,7 +20,8 @@ class WeatherApiClient {
  final url =
  '$baseUrl/data/2.5/weather?lat=$latitude&lon=$longitude&appid=$apiKey';
  print('fetching $url');
- final res = await this.httpClient.get(url);
+
+ final res = await this.httpClient.get(Uri.parse(url));
  if (res.statusCode != 200) {
  throw HTTPException(res.statusCode, "unable to fetch weather data");
  }
@@ -31,7 +32,8 @@ class WeatherApiClient {
  Future<Weather> getWeatherData(String cityName) async {
  final url = '$baseUrl/data/2.5/weather?q=$cityName&appid=$apiKey';
  print('fetching $url');
- final res = await this.httpClient.get(url);
+ final res = await this.httpClient.get(Uri.parse(url));
+
  if (res.statusCode != 200) {
  throw HTTPException(res.statusCode, "unable to fetch weather data");
  }
@@ -42,7 +44,7 @@ class WeatherApiClient {
  Future<List<Weather>> getForecast(String cityName) async {
  final url = '$baseUrl/data/2.5/forecast?q=$cityName&appid=$apiKey';
  print('fetching $url');
- final res = await this.httpClient.get(url);
+ final res = await this.httpClient.get(Uri.parse(url));
  if (res.statusCode != 200) {
  throw HTTPException(res.statusCode, "unable to fetch weather data");
  }

lib/src/bloc/weather_bloc.dart

@@ -7,11 +7,14 @@ import 'package:flutter_weather/src/bloc/weather_state.dart';
 import 'package:flutter_weather/src/repository/weather_repository.dart';
 import 'package:flutter_weather/src/api/http_exception.dart';
 
+import 'weather_state.dart';
+
 class WeatherBloc extends Bloc<WeatherEvent, WeatherState> {
  final WeatherRepository weatherRepository;
 
  WeatherBloc({@required this.weatherRepository})
- : assert(weatherRepository != null);
+ : assert(weatherRepository != null),
+ super(WeatherEmpty());
 
  @override
  WeatherState get initialState {

lib/src/bloc/weather_bloc_observre.dart

@@ -0,0 +1,21 @@
+import 'package:bloc/bloc.dart';
+
+class SimpleBlocObserver extends BlocObserver {
+ @override
+ void onEvent(Bloc bloc, Object event) {
+ super.onEvent(bloc, event);
+ print('onEvent $event');
+ }
+
+ @override
+ onTransition(Bloc bloc, Transition transition) {
+ super.onTransition(bloc, transition);
+ print('onTransition $transition');
+ }
+
+ @override
+ void onError(BlocBase bloc, Object error, StackTrace stackTrace) {
+ print('onError $error');
+ super.onError(bloc, error, stackTrace);
+ }
+}

lib/src/bloc/weather_event.dart

@@ -1,7 +1,7 @@
 import 'package:equatable/equatable.dart';
 
 abstract class WeatherEvent extends Equatable {
- WeatherEvent([List props = const []]) : super(props);
+ WeatherEvent();
 }
 
 class FetchWeather extends WeatherEvent {
@@ -10,7 +10,8 @@ class FetchWeather extends WeatherEvent {
  final double latitude;
 
  FetchWeather({this.cityName, this.longitude, this.latitude})
- : assert(cityName != null || longitude != null || latitude != null),
- super([cityName, longitude, latitude]);
-}
+ : assert(cityName != null || longitude != null || latitude != null);
 
+ @override
+ List<Object> get props => [cityName, longitude, latitude];
+}

lib/src/bloc/weather_state.dart

@@ -3,7 +3,10 @@ import 'package:meta/meta.dart';
 import 'package:equatable/equatable.dart';
 
 abstract class WeatherState extends Equatable {
- WeatherState([List props = const []]) : super(props);
+ WeatherState();
+
+ @override
+ List<Object> get props => [];
 }
 
 class WeatherEmpty extends WeatherState {}
@@ -13,15 +16,17 @@ class WeatherLoading extends WeatherState {}
 class WeatherLoaded extends WeatherState {
  final Weather weather;
 
- WeatherLoaded({@required this.weather})
- : assert(weather != null),
- super([weather]);
+ WeatherLoaded({@required this.weather}) : assert(weather != null);
+
+ @override
+ List<Object> get props => [weather];
 }
 
 class WeatherError extends WeatherState {
  final int errorCode;
 
- WeatherError({@required this.errorCode})
- : assert(errorCode != null),
- super([errorCode]);
+ WeatherError({@required this.errorCode}) : assert(errorCode != null);
+
+ @override
+ List<Object> get props => [errorCode];
 }