claude refactorings, flutter best practices, platform dependent changes, general cleanup

lib/state/app/infrastructure/data_loader/data_loader.dart

@@ -6,9 +6,9 @@ import 'package:dio/dio.dart';
 abstract class DataLoader<TResult> {
   final Dio dio;
   DataLoader(this.dio) {
-    dio.options.connectTimeout = const Duration(seconds: 10).inMilliseconds;
-    dio.options.sendTimeout = const Duration(seconds: 30).inMilliseconds;
-    dio.options.receiveTimeout = const Duration(seconds: 30).inMilliseconds;
+    dio.options.connectTimeout = const Duration(seconds: 10);
+    dio.options.sendTimeout = const Duration(seconds: 30);
+    dio.options.receiveTimeout = const Duration(seconds: 30);
   }
 
   Future<TResult> run() async {
@@ -26,7 +26,7 @@ abstract class DataLoader<TResult> {
       ));
     } catch(trace, e) {
       log(trace.toString());
-      throw(e);
+      throw e;
     }
   }
 

lib/state/app/infrastructure/loadable_state/bloc/loadable_state_bloc.dart

@@ -1,8 +1,8 @@
 import 'dart:async';
 
-import 'package:bloc/bloc.dart';
 import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:jiffy/jiffy.dart';
 
 import 'loadable_state_event.dart';
@@ -21,7 +21,7 @@ class LoadableStateBloc extends Bloc<LoadableStateEvent, LoadableStateState> {
       }
     });
 
-    emitConnectivity(List<ConnectivityResult> result) => add(ConnectivityChanged(LoadableStateState(connections: result)));
+    void emitConnectivity(List<ConnectivityResult> result) => add(ConnectivityChanged(LoadableStateState(connections: result)));
 
     Connectivity().checkConnectivity().then(emitConnectivity);
     _updateStream = Connectivity().onConnectivityChanged.listen(emitConnectivity);

lib/state/app/infrastructure/loadable_state/view/loadable_state_consumer.dart

@@ -1,10 +1,9 @@
-import 'package:bloc/bloc.dart';
 import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 
 import '../../../../../widget/conditional_wrapper.dart';
-import '../../utilityWidgets/bloc_module.dart';
-import '../../utilityWidgets/loadableHydratedBloc/loadable_hydrated_bloc_event.dart';
+import '../../utility_widgets/bloc_module.dart';
+import '../../utility_widgets/loadable_hydrated_bloc/loadable_hydrated_bloc_event.dart';
 import '../bloc/loadable_state_bloc.dart';
 import '../bloc/loadable_state_state.dart';
 import '../loadable_state.dart';

lib/state/app/infrastructure/loadable_state/view/loadable_state_error_screen.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 
 import '../../../../../widget/info_dialog.dart';
 import '../bloc/loadable_state_bloc.dart';

lib/state/app/infrastructure/utility_widgets/loadable_hydrated_bloc/loadable_hydrated_bloc.dart

@@ -3,10 +3,10 @@ import 'dart:developer';
 import 'package:hydrated_bloc/hydrated_bloc.dart';
 
 import '../../../../../api/errors/error_mapper.dart';
-import '../../loadableState/loading_error.dart';
+import '../../loadable_state/loadable_state.dart';
+import '../../loadable_state/loading_error.dart';
 import '../../repository/repository.dart';
 import 'loadable_hydrated_bloc_event.dart';
-import '../../loadableState/loadable_state.dart';
 import 'loadable_save_context.dart';
 
 abstract class LoadableHydratedBloc<
@@ -90,7 +90,7 @@ abstract class LoadableHydratedBloc<
   }
 
   @override
-  fromJson(Map<String, dynamic> json) {
+  LoadableState<TState> fromJson(Map<String, dynamic> json) {
     var rawData = LoadableSaveContext.unwrap(json);
     return LoadableState(
       isLoading: true,

lib/state/app/infrastructure/utility_widgets/loadable_hydrated_bloc/loadable_hydrated_bloc_event.dart

@@ -1,4 +1,4 @@
-import '../../loadableState/loading_error.dart';
+import '../../loadable_state/loading_error.dart';
 
 class LoadableHydratedBlocEvent<TState> {}
 class Emit<TState> extends LoadableHydratedBlocEvent<TState> {

lib/state/app/infrastructure/utility_widgets/loadable_hydrated_bloc/loadable_save_context.dart

@@ -19,5 +19,5 @@ abstract class LoadableSaveContext with _$LoadableSaveContext {
       {dataKey: data, metaKey: LoadableSaveContext(timestamp: lastFetch).toJson()};
 
   static ({Map<String, dynamic> data, LoadableSaveContext meta}) unwrap(Map<String, dynamic> data) =>
-      (data: data[dataKey] as Map<String, dynamic>, meta: LoadableSaveContext.fromJson(data[metaKey]));
+      (data: data[dataKey] as Map<String, dynamic>, meta: LoadableSaveContext.fromJson(data[metaKey] as Map<String, dynamic>));
 }