diff --git a/.fvmrc b/.fvmrc
index 8f59eb5..319d8c9 100644
--- a/.fvmrc
+++ b/.fvmrc
@@ -1,3 +1,3 @@
 {
-  "flutter": "3.22.2"
+  "flutter": "3.24.2"
 }
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
index ba6e797..37d122d 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,3 +1,3 @@
 {
-  "dart.flutterSdkPath": ".fvm/versions/3.22.2"
+  "dart.flutterSdkPath": ".fvm/versions/3.24.2"
 }
\ No newline at end of file
diff --git a/lib/failure/app_failure.freezed.dart b/lib/failure/app_failure.freezed.dart
index 0296dec..bd41bdf 100644
--- a/lib/failure/app_failure.freezed.dart
+++ b/lib/failure/app_failure.freezed.dart
@@ -12,7 +12,7 @@ part of 'app_failure.dart';
 T _$identity<T>(T value) => value;
 
 final _privateConstructorUsedError = UnsupportedError(
-    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#custom-getters-and-methods');
+    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
 
 /// @nodoc
 mixin _$AppFailure {
@@ -24,8 +24,8 @@ mixin _$AppFailure {
 
 /// @nodoc
 
-class _$_AppFailure extends _AppFailure {
-  const _$_AppFailure(
+class _$AppFailureImpl extends _AppFailure {
+  const _$AppFailureImpl(
       {required this.message,
       required this.name,
       this.uriPath,
@@ -47,10 +47,10 @@ class _$_AppFailure extends _AppFailure {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_AppFailure &&
+            other is _$AppFailureImpl &&
             (identical(other.message, message) || other.message == message) &&
             (identical(other.name, name) || other.name == name) &&
             (identical(other.uriPath, uriPath) || other.uriPath == uriPath) &&
@@ -68,7 +68,7 @@ abstract class _AppFailure extends AppFailure {
       {required final String message,
       required final String name,
       final String? uriPath,
-      final int? statusCode}) = _$_AppFailure;
+      final int? statusCode}) = _$AppFailureImpl;
   const _AppFailure._() : super._();
 
   @override
diff --git a/lib/failure/local_failure.freezed.dart b/lib/failure/local_failure.freezed.dart
index e93c25b..65a3941 100644
--- a/lib/failure/local_failure.freezed.dart
+++ b/lib/failure/local_failure.freezed.dart
@@ -12,7 +12,7 @@ part of 'local_failure.dart';
 T _$identity<T>(T value) => value;
 
 final _privateConstructorUsedError = UnsupportedError(
-    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#custom-getters-and-methods');
+    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
 
 /// @nodoc
 mixin _$LocalFailure {
@@ -24,8 +24,8 @@ mixin _$LocalFailure {
 
 /// @nodoc
 
-class _$_LocalFailure implements _LocalFailure {
-  const _$_LocalFailure(
+class _$LocalFailureImpl implements _LocalFailure {
+  const _$LocalFailureImpl(
       {required this.name,
       required this.message,
       this.uriPath,
@@ -46,10 +46,10 @@ class _$_LocalFailure implements _LocalFailure {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_LocalFailure &&
+            other is _$LocalFailureImpl &&
             (identical(other.name, name) || other.name == name) &&
             (identical(other.message, message) || other.message == message) &&
             (identical(other.uriPath, uriPath) || other.uriPath == uriPath) &&
@@ -67,7 +67,7 @@ abstract class _LocalFailure implements LocalFailure {
       {required final String name,
       required final String message,
       final String? uriPath,
-      final int? statusCode}) = _$_LocalFailure;
+      final int? statusCode}) = _$LocalFailureImpl;
 
   @override
   String get name;
diff --git a/lib/failure/network_failure.freezed.dart b/lib/failure/network_failure.freezed.dart
index e991935..7ccc22f 100644
--- a/lib/failure/network_failure.freezed.dart
+++ b/lib/failure/network_failure.freezed.dart
@@ -12,7 +12,7 @@ part of 'network_failure.dart';
 T _$identity<T>(T value) => value;
 
 final _privateConstructorUsedError = UnsupportedError(
-    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#custom-getters-and-methods');
+    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
 
 /// @nodoc
 mixin _$NetworkFailure {
@@ -21,7 +21,9 @@ mixin _$NetworkFailure {
   String get uriPath => throw _privateConstructorUsedError;
   int get statusCode => throw _privateConstructorUsedError;
 
-  @JsonKey(ignore: true)
+  /// Create a copy of NetworkFailure
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
   $NetworkFailureCopyWith<NetworkFailure> get copyWith =>
       throw _privateConstructorUsedError;
 }
@@ -45,6 +47,8 @@ class _$NetworkFailureCopyWithImpl<$Res, $Val extends NetworkFailure>
   // ignore: unused_field
   final $Res Function($Val) _then;
 
+  /// Create a copy of NetworkFailure
+  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
   $Res call({
@@ -75,24 +79,26 @@ class _$NetworkFailureCopyWithImpl<$Res, $Val extends NetworkFailure>
 }
 
 /// @nodoc
-abstract class _$$_NetworkFailureCopyWith<$Res>
+abstract class _$$NetworkFailureImplCopyWith<$Res>
     implements $NetworkFailureCopyWith<$Res> {
-  factory _$$_NetworkFailureCopyWith(
-          _$_NetworkFailure value, $Res Function(_$_NetworkFailure) then) =
-      __$$_NetworkFailureCopyWithImpl<$Res>;
+  factory _$$NetworkFailureImplCopyWith(_$NetworkFailureImpl value,
+          $Res Function(_$NetworkFailureImpl) then) =
+      __$$NetworkFailureImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call({String name, String message, String uriPath, int statusCode});
 }
 
 /// @nodoc
-class __$$_NetworkFailureCopyWithImpl<$Res>
-    extends _$NetworkFailureCopyWithImpl<$Res, _$_NetworkFailure>
-    implements _$$_NetworkFailureCopyWith<$Res> {
-  __$$_NetworkFailureCopyWithImpl(
-      _$_NetworkFailure _value, $Res Function(_$_NetworkFailure) _then)
+class __$$NetworkFailureImplCopyWithImpl<$Res>
+    extends _$NetworkFailureCopyWithImpl<$Res, _$NetworkFailureImpl>
+    implements _$$NetworkFailureImplCopyWith<$Res> {
+  __$$NetworkFailureImplCopyWithImpl(
+      _$NetworkFailureImpl _value, $Res Function(_$NetworkFailureImpl) _then)
       : super(_value, _then);
 
+  /// Create a copy of NetworkFailure
+  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
   $Res call({
@@ -101,7 +107,7 @@ class __$$_NetworkFailureCopyWithImpl<$Res>
     Object? uriPath = null,
     Object? statusCode = null,
   }) {
-    return _then(_$_NetworkFailure(
+    return _then(_$NetworkFailureImpl(
       name: null == name
           ? _value.name
           : name // ignore: cast_nullable_to_non_nullable
@@ -124,8 +130,8 @@ class __$$_NetworkFailureCopyWithImpl<$Res>
 
 /// @nodoc
 
-class _$_NetworkFailure implements _NetworkFailure {
-  const _$_NetworkFailure(
+class _$NetworkFailureImpl implements _NetworkFailure {
+  const _$NetworkFailureImpl(
       {required this.name,
       required this.message,
       required this.uriPath,
@@ -146,10 +152,10 @@ class _$_NetworkFailure implements _NetworkFailure {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_NetworkFailure &&
+            other is _$NetworkFailureImpl &&
             (identical(other.name, name) || other.name == name) &&
             (identical(other.message, message) || other.message == message) &&
             (identical(other.uriPath, uriPath) || other.uriPath == uriPath) &&
@@ -161,11 +167,14 @@ class _$_NetworkFailure implements _NetworkFailure {
   int get hashCode =>
       Object.hash(runtimeType, name, message, uriPath, statusCode);
 
-  @JsonKey(ignore: true)
+  /// Create a copy of NetworkFailure
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
   @override
   @pragma('vm:prefer-inline')
-  _$$_NetworkFailureCopyWith<_$_NetworkFailure> get copyWith =>
-      __$$_NetworkFailureCopyWithImpl<_$_NetworkFailure>(this, _$identity);
+  _$$NetworkFailureImplCopyWith<_$NetworkFailureImpl> get copyWith =>
+      __$$NetworkFailureImplCopyWithImpl<_$NetworkFailureImpl>(
+          this, _$identity);
 }
 
 abstract class _NetworkFailure implements NetworkFailure {
@@ -173,7 +182,7 @@ abstract class _NetworkFailure implements NetworkFailure {
       {required final String name,
       required final String message,
       required final String uriPath,
-      required final int statusCode}) = _$_NetworkFailure;
+      required final int statusCode}) = _$NetworkFailureImpl;
 
   @override
   String get name;
@@ -183,8 +192,11 @@ abstract class _NetworkFailure implements NetworkFailure {
   String get uriPath;
   @override
   int get statusCode;
+
+  /// Create a copy of NetworkFailure
+  /// with the given fields replaced by the non-null parameter values.
   @override
-  @JsonKey(ignore: true)
-  _$$_NetworkFailureCopyWith<_$_NetworkFailure> get copyWith =>
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  _$$NetworkFailureImplCopyWith<_$NetworkFailureImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
diff --git a/lib/feature/common/states/api_state.freezed.dart b/lib/feature/common/states/api_state.freezed.dart
index 2df0317..e54b89b 100644
--- a/lib/feature/common/states/api_state.freezed.dart
+++ b/lib/feature/common/states/api_state.freezed.dart
@@ -12,7 +12,7 @@ part of 'api_state.dart';
 T _$identity<T>(T value) => value;
 
 final _privateConstructorUsedError = UnsupportedError(
-    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#custom-getters-and-methods');
+    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
 
 /// @nodoc
 mixin _$ApiRequestState<T, E> {
@@ -70,8 +70,8 @@ mixin _$ApiRequestState<T, E> {
 
 /// @nodoc
 
-class _$IDLE<T, E> implements IDLE<T, E> {
-  const _$IDLE();
+class _$IDLEImpl<T, E> implements IDLE<T, E> {
+  const _$IDLEImpl();
 
   @override
   String toString() {
@@ -79,9 +79,9 @@ class _$IDLE<T, E> implements IDLE<T, E> {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
-        (other.runtimeType == runtimeType && other is _$IDLE<T, E>);
+        (other.runtimeType == runtimeType && other is _$IDLEImpl<T, E>);
   }
 
   @override
@@ -163,13 +163,13 @@ class _$IDLE<T, E> implements IDLE<T, E> {
 }
 
 abstract class IDLE<T, E> implements ApiRequestState<T, E> {
-  const factory IDLE() = _$IDLE<T, E>;
+  const factory IDLE() = _$IDLEImpl<T, E>;
 }
 
 /// @nodoc
 
-class _$LOADING<T, E> implements LOADING<T, E> {
-  const _$LOADING();
+class _$LOADINGImpl<T, E> implements LOADING<T, E> {
+  const _$LOADINGImpl();
 
   @override
   String toString() {
@@ -177,9 +177,9 @@ class _$LOADING<T, E> implements LOADING<T, E> {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
-        (other.runtimeType == runtimeType && other is _$LOADING<T, E>);
+        (other.runtimeType == runtimeType && other is _$LOADINGImpl<T, E>);
   }
 
   @override
@@ -261,13 +261,13 @@ class _$LOADING<T, E> implements LOADING<T, E> {
 }
 
 abstract class LOADING<T, E> implements ApiRequestState<T, E> {
-  const factory LOADING() = _$LOADING<T, E>;
+  const factory LOADING() = _$LOADINGImpl<T, E>;
 }
 
 /// @nodoc
 
-class _$DATA<T, E> implements DATA<T, E> {
-  const _$DATA({required this.data});
+class _$DATAImpl<T, E> implements DATA<T, E> {
+  const _$DATAImpl({required this.data});
 
   @override
   final T data;
@@ -278,10 +278,10 @@ class _$DATA<T, E> implements DATA<T, E> {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$DATA<T, E> &&
+            other is _$DATAImpl<T, E> &&
             const DeepCollectionEquality().equals(other.data, data));
   }
 
@@ -365,15 +365,15 @@ class _$DATA<T, E> implements DATA<T, E> {
 }
 
 abstract class DATA<T, E> implements ApiRequestState<T, E> {
-  const factory DATA({required final T data}) = _$DATA<T, E>;
+  const factory DATA({required final T data}) = _$DATAImpl<T, E>;
 
   T get data;
 }
 
 /// @nodoc
 
-class _$FAILED<T, E> implements FAILED<T, E> {
-  const _$FAILED({required this.reason});
+class _$FAILEDImpl<T, E> implements FAILED<T, E> {
+  const _$FAILEDImpl({required this.reason});
 
   @override
   final E reason;
@@ -384,10 +384,10 @@ class _$FAILED<T, E> implements FAILED<T, E> {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$FAILED<T, E> &&
+            other is _$FAILEDImpl<T, E> &&
             const DeepCollectionEquality().equals(other.reason, reason));
   }
 
@@ -471,7 +471,7 @@ class _$FAILED<T, E> implements FAILED<T, E> {
 }
 
 abstract class FAILED<T, E> implements ApiRequestState<T, E> {
-  const factory FAILED({required final E reason}) = _$FAILED<T, E>;
+  const factory FAILED({required final E reason}) = _$FAILEDImpl<T, E>;
 
   E get reason;
 }
diff --git a/lib/feature/location/infrastructure/location_repository.dart b/lib/feature/location/infrastructure/location_repository.dart
index 7347e9f..93fb255 100644
--- a/lib/feature/location/infrastructure/location_repository.dart
+++ b/lib/feature/location/infrastructure/location_repository.dart
@@ -6,8 +6,11 @@ class LocationRepositoryImpl implements LocationRepository {
   @override
   Future<Position> getCoordinates() async {
     Position position = await Geolocator.getCurrentPosition(
-        desiredAccuracy: LocationAccuracy.best,
-        forceAndroidLocationManager: true);
+      locationSettings: AndroidSettings(
+        accuracy: LocationAccuracy.best,
+        distanceFilter: 10,
+      ),
+    );
     return position;
   }
 
diff --git a/lib/feature/weather/domain/entity/weather_basic_entity.freezed.dart b/lib/feature/weather/domain/entity/weather_basic_entity.freezed.dart
index 5021372..f692ca7 100644
--- a/lib/feature/weather/domain/entity/weather_basic_entity.freezed.dart
+++ b/lib/feature/weather/domain/entity/weather_basic_entity.freezed.dart
@@ -12,7 +12,7 @@ part of 'weather_basic_entity.dart';
 T _$identity<T>(T value) => value;
 
 final _privateConstructorUsedError = UnsupportedError(
-    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#custom-getters-and-methods');
+    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
 
 /// @nodoc
 mixin _$WeatherBasicEntity {
@@ -27,8 +27,8 @@ mixin _$WeatherBasicEntity {
 
 /// @nodoc
 
-class _$_WeatherBasicEntity extends _WeatherBasicEntity {
-  const _$_WeatherBasicEntity(
+class _$WeatherBasicEntityImpl extends _WeatherBasicEntity {
+  const _$WeatherBasicEntityImpl(
       {required this.cityName,
       required this.temp,
       required this.condition,
@@ -59,10 +59,10 @@ class _$_WeatherBasicEntity extends _WeatherBasicEntity {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_WeatherBasicEntity &&
+            other is _$WeatherBasicEntityImpl &&
             (identical(other.cityName, cityName) ||
                 other.cityName == cityName) &&
             (identical(other.temp, temp) || other.temp == temp) &&
@@ -90,7 +90,7 @@ abstract class _WeatherBasicEntity extends WeatherBasicEntity {
       required final String? dateTime,
       required final String? imgUrl,
       required final String? feelsLike,
-      required final String? description}) = _$_WeatherBasicEntity;
+      required final String? description}) = _$WeatherBasicEntityImpl;
   const _WeatherBasicEntity._() : super._();
 
   @override
diff --git a/lib/feature/weather/domain/entity/weather_detail_entity.freezed.dart b/lib/feature/weather/domain/entity/weather_detail_entity.freezed.dart
index 2227fdc..8b544fa 100644
--- a/lib/feature/weather/domain/entity/weather_detail_entity.freezed.dart
+++ b/lib/feature/weather/domain/entity/weather_detail_entity.freezed.dart
@@ -12,7 +12,7 @@ part of 'weather_detail_entity.dart';
 T _$identity<T>(T value) => value;
 
 final _privateConstructorUsedError = UnsupportedError(
-    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#custom-getters-and-methods');
+    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
 
 /// @nodoc
 mixin _$WeatherDetailEntity {
@@ -26,8 +26,8 @@ mixin _$WeatherDetailEntity {
 
 /// @nodoc
 
-class _$_WeatherDetailEntity extends _WeatherDetailEntity {
-  const _$_WeatherDetailEntity(
+class _$WeatherDetailEntityImpl extends _WeatherDetailEntity {
+  const _$WeatherDetailEntityImpl(
       {required this.windValue,
       required this.humidityValue,
       required this.gustValue,
@@ -55,10 +55,10 @@ class _$_WeatherDetailEntity extends _WeatherDetailEntity {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_WeatherDetailEntity &&
+            other is _$WeatherDetailEntityImpl &&
             (identical(other.windValue, windValue) ||
                 other.windValue == windValue) &&
             (identical(other.humidityValue, humidityValue) ||
@@ -85,7 +85,7 @@ abstract class _WeatherDetailEntity extends WeatherDetailEntity {
       required final String? gustValue,
       required final String? pressureValue,
       required final String? sunriseValue,
-      required final String? sunsetValue}) = _$_WeatherDetailEntity;
+      required final String? sunsetValue}) = _$WeatherDetailEntityImpl;
   const _WeatherDetailEntity._() : super._();
 
   @override
diff --git a/lib/feature/weather/domain/entity/weather_full_entity.freezed.dart b/lib/feature/weather/domain/entity/weather_full_entity.freezed.dart
index 2eab359..9b60fbd 100644
--- a/lib/feature/weather/domain/entity/weather_full_entity.freezed.dart
+++ b/lib/feature/weather/domain/entity/weather_full_entity.freezed.dart
@@ -12,7 +12,7 @@ part of 'weather_full_entity.dart';
 T _$identity<T>(T value) => value;
 
 final _privateConstructorUsedError = UnsupportedError(
-    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#custom-getters-and-methods');
+    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
 
 /// @nodoc
 mixin _$WeatherFullEntity {
@@ -27,8 +27,8 @@ mixin _$WeatherFullEntity {
 
 /// @nodoc
 
-class _$_WeatherFullEntity extends _WeatherFullEntity {
-  const _$_WeatherFullEntity(
+class _$WeatherFullEntityImpl extends _WeatherFullEntity {
+  const _$WeatherFullEntityImpl(
       {final List<WeatherInsideEntity>? weather,
       this.main,
       this.wind,
@@ -68,10 +68,10 @@ class _$_WeatherFullEntity extends _WeatherFullEntity {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_WeatherFullEntity &&
+            other is _$WeatherFullEntityImpl &&
             const DeepCollectionEquality().equals(other._weather, _weather) &&
             (identical(other.main, main) || other.main == main) &&
             (identical(other.wind, wind) || other.wind == wind) &&
@@ -101,7 +101,7 @@ abstract class _WeatherFullEntity extends WeatherFullEntity {
       final int? dt,
       final SysInsideEntity? sys,
       final String? name,
-      final String? cod}) = _$_WeatherFullEntity;
+      final String? cod}) = _$WeatherFullEntityImpl;
   const _WeatherFullEntity._() : super._();
 
   @override
@@ -130,8 +130,8 @@ mixin _$MainInsideEntity {
 
 /// @nodoc
 
-class _$_MainInsideEntity extends _MainInsideEntity {
-  const _$_MainInsideEntity(
+class _$MainInsideEntityImpl extends _MainInsideEntity {
+  const _$MainInsideEntityImpl(
       {this.temp, this.feelsLike, this.pressure, this.humidity})
       : super._();
 
@@ -150,10 +150,10 @@ class _$_MainInsideEntity extends _MainInsideEntity {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_MainInsideEntity &&
+            other is _$MainInsideEntityImpl &&
             (identical(other.temp, temp) || other.temp == temp) &&
             (identical(other.feelsLike, feelsLike) ||
                 other.feelsLike == feelsLike) &&
@@ -173,7 +173,7 @@ abstract class _MainInsideEntity extends MainInsideEntity {
       {final double? temp,
       final double? feelsLike,
       final int? pressure,
-      final int? humidity}) = _$_MainInsideEntity;
+      final int? humidity}) = _$MainInsideEntityImpl;
   const _MainInsideEntity._() : super._();
 
   @override
@@ -194,8 +194,8 @@ mixin _$SysInsideEntity {
 
 /// @nodoc
 
-class _$_SysInsideEntity extends _SysInsideEntity {
-  const _$_SysInsideEntity({this.sunrise, this.sunset}) : super._();
+class _$SysInsideEntityImpl extends _SysInsideEntity {
+  const _$SysInsideEntityImpl({this.sunrise, this.sunset}) : super._();
 
   @override
   final int? sunrise;
@@ -208,10 +208,10 @@ class _$_SysInsideEntity extends _SysInsideEntity {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_SysInsideEntity &&
+            other is _$SysInsideEntityImpl &&
             (identical(other.sunrise, sunrise) || other.sunrise == sunrise) &&
             (identical(other.sunset, sunset) || other.sunset == sunset));
   }
@@ -222,7 +222,7 @@ class _$_SysInsideEntity extends _SysInsideEntity {
 
 abstract class _SysInsideEntity extends SysInsideEntity {
   const factory _SysInsideEntity({final int? sunrise, final int? sunset}) =
-      _$_SysInsideEntity;
+      _$SysInsideEntityImpl;
   const _SysInsideEntity._() : super._();
 
   @override
@@ -240,8 +240,8 @@ mixin _$WeatherInsideEntity {
 
 /// @nodoc
 
-class _$_WeatherInsideEntity extends _WeatherInsideEntity {
-  const _$_WeatherInsideEntity({this.main, this.description, this.icon})
+class _$WeatherInsideEntityImpl extends _WeatherInsideEntity {
+  const _$WeatherInsideEntityImpl({this.main, this.description, this.icon})
       : super._();
 
   @override
@@ -257,10 +257,10 @@ class _$_WeatherInsideEntity extends _WeatherInsideEntity {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_WeatherInsideEntity &&
+            other is _$WeatherInsideEntityImpl &&
             (identical(other.main, main) || other.main == main) &&
             (identical(other.description, description) ||
                 other.description == description) &&
@@ -275,7 +275,7 @@ abstract class _WeatherInsideEntity extends WeatherInsideEntity {
   const factory _WeatherInsideEntity(
       {final String? main,
       final String? description,
-      final String? icon}) = _$_WeatherInsideEntity;
+      final String? icon}) = _$WeatherInsideEntityImpl;
   const _WeatherInsideEntity._() : super._();
 
   @override
@@ -294,8 +294,8 @@ mixin _$WindInsideEntity {
 
 /// @nodoc
 
-class _$_WindInsideEntity extends _WindInsideEntity {
-  const _$_WindInsideEntity({this.speed, this.gust}) : super._();
+class _$WindInsideEntityImpl extends _WindInsideEntity {
+  const _$WindInsideEntityImpl({this.speed, this.gust}) : super._();
 
   @override
   final double? speed;
@@ -308,10 +308,10 @@ class _$_WindInsideEntity extends _WindInsideEntity {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_WindInsideEntity &&
+            other is _$WindInsideEntityImpl &&
             (identical(other.speed, speed) || other.speed == speed) &&
             (identical(other.gust, gust) || other.gust == gust));
   }
@@ -322,7 +322,7 @@ class _$_WindInsideEntity extends _WindInsideEntity {
 
 abstract class _WindInsideEntity extends WindInsideEntity {
   const factory _WindInsideEntity({final double? speed, final double? gust}) =
-      _$_WindInsideEntity;
+      _$WindInsideEntityImpl;
   const _WindInsideEntity._() : super._();
 
   @override
diff --git a/lib/feature/weather/infrastructure/dto/weather_model/weather_dto.freezed.dart b/lib/feature/weather/infrastructure/dto/weather_model/weather_dto.freezed.dart
index c9d82c7..d917006 100644
--- a/lib/feature/weather/infrastructure/dto/weather_model/weather_dto.freezed.dart
+++ b/lib/feature/weather/infrastructure/dto/weather_model/weather_dto.freezed.dart
@@ -12,7 +12,7 @@ part of 'weather_dto.dart';
 T _$identity<T>(T value) => value;
 
 final _privateConstructorUsedError = UnsupportedError(
-    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#custom-getters-and-methods');
+    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
 
 WeatherDTO _$WeatherDTOFromJson(Map<String, dynamic> json) {
   return _WeatherDTO.fromJson(json);
@@ -28,13 +28,14 @@ mixin _$WeatherDTO {
   String? get name => throw _privateConstructorUsedError;
   String? get cod => throw _privateConstructorUsedError;
 
+  /// Serializes this WeatherDTO to a JSON map.
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
 }
 
 /// @nodoc
 @JsonSerializable()
-class _$_WeatherDTO implements _WeatherDTO {
-  const _$_WeatherDTO(
+class _$WeatherDTOImpl implements _WeatherDTO {
+  const _$WeatherDTOImpl(
       {final List<Weather>? weather,
       this.main,
       this.wind,
@@ -44,8 +45,8 @@ class _$_WeatherDTO implements _WeatherDTO {
       this.cod})
       : _weather = weather;
 
-  factory _$_WeatherDTO.fromJson(Map<String, dynamic> json) =>
-      _$$_WeatherDTOFromJson(json);
+  factory _$WeatherDTOImpl.fromJson(Map<String, dynamic> json) =>
+      _$$WeatherDTOImplFromJson(json);
 
   final List<Weather>? _weather;
   @override
@@ -76,10 +77,10 @@ class _$_WeatherDTO implements _WeatherDTO {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_WeatherDTO &&
+            other is _$WeatherDTOImpl &&
             const DeepCollectionEquality().equals(other._weather, _weather) &&
             (identical(other.main, main) || other.main == main) &&
             (identical(other.wind, wind) || other.wind == wind) &&
@@ -89,7 +90,7 @@ class _$_WeatherDTO implements _WeatherDTO {
             (identical(other.cod, cod) || other.cod == cod));
   }
 
-  @JsonKey(ignore: true)
+  @JsonKey(includeFromJson: false, includeToJson: false)
   @override
   int get hashCode => Object.hash(
       runtimeType,
@@ -103,7 +104,7 @@ class _$_WeatherDTO implements _WeatherDTO {
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_WeatherDTOToJson(
+    return _$$WeatherDTOImplToJson(
       this,
     );
   }
@@ -117,10 +118,10 @@ abstract class _WeatherDTO implements WeatherDTO {
       final int? dt,
       final Sys? sys,
       final String? name,
-      final String? cod}) = _$_WeatherDTO;
+      final String? cod}) = _$WeatherDTOImpl;
 
   factory _WeatherDTO.fromJson(Map<String, dynamic> json) =
-      _$_WeatherDTO.fromJson;
+      _$WeatherDTOImpl.fromJson;
 
   @override
   List<Weather>? get weather;
@@ -149,15 +150,17 @@ mixin _$Main {
   int? get pressure => throw _privateConstructorUsedError;
   int? get humidity => throw _privateConstructorUsedError;
 
+  /// Serializes this Main to a JSON map.
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
 }
 
 /// @nodoc
 @JsonSerializable()
-class _$_Main implements _Main {
-  const _$_Main({this.temp, this.feelsLike, this.pressure, this.humidity});
+class _$MainImpl implements _Main {
+  const _$MainImpl({this.temp, this.feelsLike, this.pressure, this.humidity});
 
-  factory _$_Main.fromJson(Map<String, dynamic> json) => _$$_MainFromJson(json);
+  factory _$MainImpl.fromJson(Map<String, dynamic> json) =>
+      _$$MainImplFromJson(json);
 
   @override
   final double? temp;
@@ -174,10 +177,10 @@ class _$_Main implements _Main {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_Main &&
+            other is _$MainImpl &&
             (identical(other.temp, temp) || other.temp == temp) &&
             (identical(other.feelsLike, feelsLike) ||
                 other.feelsLike == feelsLike) &&
@@ -187,14 +190,14 @@ class _$_Main implements _Main {
                 other.humidity == humidity));
   }
 
-  @JsonKey(ignore: true)
+  @JsonKey(includeFromJson: false, includeToJson: false)
   @override
   int get hashCode =>
       Object.hash(runtimeType, temp, feelsLike, pressure, humidity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_MainToJson(
+    return _$$MainImplToJson(
       this,
     );
   }
@@ -205,9 +208,9 @@ abstract class _Main implements Main {
       {final double? temp,
       final double? feelsLike,
       final int? pressure,
-      final int? humidity}) = _$_Main;
+      final int? humidity}) = _$MainImpl;
 
-  factory _Main.fromJson(Map<String, dynamic> json) = _$_Main.fromJson;
+  factory _Main.fromJson(Map<String, dynamic> json) = _$MainImpl.fromJson;
 
   @override
   double? get temp;
@@ -228,15 +231,17 @@ mixin _$Sys {
   int? get sunrise => throw _privateConstructorUsedError;
   int? get sunset => throw _privateConstructorUsedError;
 
+  /// Serializes this Sys to a JSON map.
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
 }
 
 /// @nodoc
 @JsonSerializable()
-class _$_Sys implements _Sys {
-  const _$_Sys({this.sunrise, this.sunset});
+class _$SysImpl implements _Sys {
+  const _$SysImpl({this.sunrise, this.sunset});
 
-  factory _$_Sys.fromJson(Map<String, dynamic> json) => _$$_SysFromJson(json);
+  factory _$SysImpl.fromJson(Map<String, dynamic> json) =>
+      _$$SysImplFromJson(json);
 
   @override
   final int? sunrise;
@@ -249,30 +254,30 @@ class _$_Sys implements _Sys {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_Sys &&
+            other is _$SysImpl &&
             (identical(other.sunrise, sunrise) || other.sunrise == sunrise) &&
             (identical(other.sunset, sunset) || other.sunset == sunset));
   }
 
-  @JsonKey(ignore: true)
+  @JsonKey(includeFromJson: false, includeToJson: false)
   @override
   int get hashCode => Object.hash(runtimeType, sunrise, sunset);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_SysToJson(
+    return _$$SysImplToJson(
       this,
     );
   }
 }
 
 abstract class _Sys implements Sys {
-  const factory _Sys({final int? sunrise, final int? sunset}) = _$_Sys;
+  const factory _Sys({final int? sunrise, final int? sunset}) = _$SysImpl;
 
-  factory _Sys.fromJson(Map<String, dynamic> json) = _$_Sys.fromJson;
+  factory _Sys.fromJson(Map<String, dynamic> json) = _$SysImpl.fromJson;
 
   @override
   int? get sunrise;
@@ -290,16 +295,17 @@ mixin _$Weather {
   String? get description => throw _privateConstructorUsedError;
   String? get icon => throw _privateConstructorUsedError;
 
+  /// Serializes this Weather to a JSON map.
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
 }
 
 /// @nodoc
 @JsonSerializable()
-class _$_Weather implements _Weather {
-  const _$_Weather({this.main, this.description, this.icon});
+class _$WeatherImpl implements _Weather {
+  const _$WeatherImpl({this.main, this.description, this.icon});
 
-  factory _$_Weather.fromJson(Map<String, dynamic> json) =>
-      _$$_WeatherFromJson(json);
+  factory _$WeatherImpl.fromJson(Map<String, dynamic> json) =>
+      _$$WeatherImplFromJson(json);
 
   @override
   final String? main;
@@ -314,23 +320,23 @@ class _$_Weather implements _Weather {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_Weather &&
+            other is _$WeatherImpl &&
             (identical(other.main, main) || other.main == main) &&
             (identical(other.description, description) ||
                 other.description == description) &&
             (identical(other.icon, icon) || other.icon == icon));
   }
 
-  @JsonKey(ignore: true)
+  @JsonKey(includeFromJson: false, includeToJson: false)
   @override
   int get hashCode => Object.hash(runtimeType, main, description, icon);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_WeatherToJson(
+    return _$$WeatherImplToJson(
       this,
     );
   }
@@ -340,9 +346,9 @@ abstract class _Weather implements Weather {
   const factory _Weather(
       {final String? main,
       final String? description,
-      final String? icon}) = _$_Weather;
+      final String? icon}) = _$WeatherImpl;
 
-  factory _Weather.fromJson(Map<String, dynamic> json) = _$_Weather.fromJson;
+  factory _Weather.fromJson(Map<String, dynamic> json) = _$WeatherImpl.fromJson;
 
   @override
   String? get main;
@@ -361,15 +367,17 @@ mixin _$Wind {
   double? get speed => throw _privateConstructorUsedError;
   double? get gust => throw _privateConstructorUsedError;
 
+  /// Serializes this Wind to a JSON map.
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
 }
 
 /// @nodoc
 @JsonSerializable()
-class _$_Wind implements _Wind {
-  const _$_Wind({this.speed, this.gust});
+class _$WindImpl implements _Wind {
+  const _$WindImpl({this.speed, this.gust});
 
-  factory _$_Wind.fromJson(Map<String, dynamic> json) => _$$_WindFromJson(json);
+  factory _$WindImpl.fromJson(Map<String, dynamic> json) =>
+      _$$WindImplFromJson(json);
 
   @override
   final double? speed;
@@ -382,30 +390,30 @@ class _$_Wind implements _Wind {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_Wind &&
+            other is _$WindImpl &&
             (identical(other.speed, speed) || other.speed == speed) &&
             (identical(other.gust, gust) || other.gust == gust));
   }
 
-  @JsonKey(ignore: true)
+  @JsonKey(includeFromJson: false, includeToJson: false)
   @override
   int get hashCode => Object.hash(runtimeType, speed, gust);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_WindToJson(
+    return _$$WindImplToJson(
       this,
     );
   }
 }
 
 abstract class _Wind implements Wind {
-  const factory _Wind({final double? speed, final double? gust}) = _$_Wind;
+  const factory _Wind({final double? speed, final double? gust}) = _$WindImpl;
 
-  factory _Wind.fromJson(Map<String, dynamic> json) = _$_Wind.fromJson;
+  factory _Wind.fromJson(Map<String, dynamic> json) = _$WindImpl.fromJson;
 
   @override
   double? get speed;
diff --git a/lib/feature/weather/infrastructure/dto/weather_model/weather_dto.g.dart b/lib/feature/weather/infrastructure/dto/weather_model/weather_dto.g.dart
index b7d99db..79d6a26 100644
--- a/lib/feature/weather/infrastructure/dto/weather_model/weather_dto.g.dart
+++ b/lib/feature/weather/infrastructure/dto/weather_model/weather_dto.g.dart
@@ -6,8 +6,8 @@ part of 'weather_dto.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-_$_WeatherDTO _$$_WeatherDTOFromJson(Map<String, dynamic> json) =>
-    _$_WeatherDTO(
+_$WeatherDTOImpl _$$WeatherDTOImplFromJson(Map<String, dynamic> json) =>
+    _$WeatherDTOImpl(
       weather: (json['weather'] as List<dynamic>?)
           ?.map((e) => Weather.fromJson(e as Map<String, dynamic>))
           .toList(),
@@ -17,7 +17,7 @@ _$_WeatherDTO _$$_WeatherDTOFromJson(Map<String, dynamic> json) =>
       wind: json['wind'] == null
           ? null
           : Wind.fromJson(json['wind'] as Map<String, dynamic>),
-      dt: json['dt'] as int?,
+      dt: (json['dt'] as num?)?.toInt(),
       sys: json['sys'] == null
           ? null
           : Sys.fromJson(json['sys'] as Map<String, dynamic>),
@@ -25,7 +25,7 @@ _$_WeatherDTO _$$_WeatherDTOFromJson(Map<String, dynamic> json) =>
       cod: json['cod'] as String?,
     );
 
-Map<String, dynamic> _$$_WeatherDTOToJson(_$_WeatherDTO instance) =>
+Map<String, dynamic> _$$WeatherDTOImplToJson(_$WeatherDTOImpl instance) =>
     <String, dynamic>{
       'weather': instance.weather?.map((e) => e.toJson()).toList(),
       'main': instance.main?.toJson(),
@@ -36,49 +36,52 @@ Map<String, dynamic> _$$_WeatherDTOToJson(_$_WeatherDTO instance) =>
       'cod': instance.cod,
     };
 
-_$_Main _$$_MainFromJson(Map<String, dynamic> json) => _$_Main(
+_$MainImpl _$$MainImplFromJson(Map<String, dynamic> json) => _$MainImpl(
       temp: (json['temp'] as num?)?.toDouble(),
       feelsLike: (json['feels_like'] as num?)?.toDouble(),
-      pressure: json['pressure'] as int?,
-      humidity: json['humidity'] as int?,
+      pressure: (json['pressure'] as num?)?.toInt(),
+      humidity: (json['humidity'] as num?)?.toInt(),
     );
 
-Map<String, dynamic> _$$_MainToJson(_$_Main instance) => <String, dynamic>{
+Map<String, dynamic> _$$MainImplToJson(_$MainImpl instance) =>
+    <String, dynamic>{
       'temp': instance.temp,
       'feels_like': instance.feelsLike,
       'pressure': instance.pressure,
       'humidity': instance.humidity,
     };
 
-_$_Sys _$$_SysFromJson(Map<String, dynamic> json) => _$_Sys(
-      sunrise: json['sunrise'] as int?,
-      sunset: json['sunset'] as int?,
+_$SysImpl _$$SysImplFromJson(Map<String, dynamic> json) => _$SysImpl(
+      sunrise: (json['sunrise'] as num?)?.toInt(),
+      sunset: (json['sunset'] as num?)?.toInt(),
     );
 
-Map<String, dynamic> _$$_SysToJson(_$_Sys instance) => <String, dynamic>{
+Map<String, dynamic> _$$SysImplToJson(_$SysImpl instance) => <String, dynamic>{
       'sunrise': instance.sunrise,
       'sunset': instance.sunset,
     };
 
-_$_Weather _$$_WeatherFromJson(Map<String, dynamic> json) => _$_Weather(
+_$WeatherImpl _$$WeatherImplFromJson(Map<String, dynamic> json) =>
+    _$WeatherImpl(
       main: json['main'] as String?,
       description: json['description'] as String?,
       icon: json['icon'] as String?,
     );
 
-Map<String, dynamic> _$$_WeatherToJson(_$_Weather instance) =>
+Map<String, dynamic> _$$WeatherImplToJson(_$WeatherImpl instance) =>
     <String, dynamic>{
       'main': instance.main,
       'description': instance.description,
       'icon': instance.icon,
     };
 
-_$_Wind _$$_WindFromJson(Map<String, dynamic> json) => _$_Wind(
+_$WindImpl _$$WindImplFromJson(Map<String, dynamic> json) => _$WindImpl(
       speed: (json['speed'] as num?)?.toDouble(),
       gust: (json['gust'] as num?)?.toDouble(),
     );
 
-Map<String, dynamic> _$$_WindToJson(_$_Wind instance) => <String, dynamic>{
+Map<String, dynamic> _$$WindImplToJson(_$WindImpl instance) =>
+    <String, dynamic>{
       'speed': instance.speed,
       'gust': instance.gust,
     };
diff --git a/lib/networking/network_api_service.g.dart b/lib/networking/network_api_service.g.dart
index 92c79a9..c1055b7 100644
--- a/lib/networking/network_api_service.g.dart
+++ b/lib/networking/network_api_service.g.dart
@@ -12,6 +12,7 @@ class _NetworkApiService implements NetworkApiService {
   _NetworkApiService(
     this._dio, {
     this.baseUrl,
+    this.errorLogger,
   }) {
     baseUrl ??= 'https://api.openweathermap.org/data/2.5';
   }
@@ -20,6 +21,8 @@ class _NetworkApiService implements NetworkApiService {
 
   String? baseUrl;
 
+  final ParseErrorLogger? errorLogger;
+
   @override
   Future<WeatherDTO> getWeather(
     String cityName,
@@ -34,24 +37,30 @@ class _NetworkApiService implements NetworkApiService {
     };
     final _headers = <String, dynamic>{};
     const Map<String, dynamic>? _data = null;
-    final _result = await _dio
-        .fetch<Map<String, dynamic>>(_setStreamType<WeatherDTO>(Options(
+    final _options = _setStreamType<WeatherDTO>(Options(
       method: 'GET',
       headers: _headers,
       extra: _extra,
     )
-            .compose(
-              _dio.options,
-              '/weather',
-              queryParameters: queryParameters,
-              data: _data,
-            )
-            .copyWith(
-                baseUrl: _combineBaseUrls(
-              _dio.options.baseUrl,
-              baseUrl,
-            ))));
-    final _value = WeatherDTO.fromJson(_result.data!);
+        .compose(
+          _dio.options,
+          '/weather',
+          queryParameters: queryParameters,
+          data: _data,
+        )
+        .copyWith(
+            baseUrl: _combineBaseUrls(
+          _dio.options.baseUrl,
+          baseUrl,
+        )));
+    final _result = await _dio.fetch<Map<String, dynamic>>(_options);
+    late WeatherDTO _value;
+    try {
+      _value = WeatherDTO.fromJson(_result.data!);
+    } on Object catch (e, s) {
+      errorLogger?.logError(e, s, _options);
+      rethrow;
+    }
     return _value;
   }
 
diff --git a/lib/routes/router.dart b/lib/routes/router.dart
index bd263fd..5d45e01 100644
--- a/lib/routes/router.dart
+++ b/lib/routes/router.dart
@@ -5,7 +5,7 @@ import 'package:weather_app/feature/location/presentation/screen/initial_locatio
 part 'router.gr.dart';
 
 @AutoRouterConfig()
-class AppRouter extends _$AppRouter {
+class AppRouter extends RootStackRouter {
   @override
   RouteType get defaultRouteType =>
       const RouteType.adaptive(); //.cupertino, .adaptive ..etc
diff --git a/lib/routes/router.gr.dart b/lib/routes/router.gr.dart
index 78a2e00..f1ebbc1 100644
--- a/lib/routes/router.gr.dart
+++ b/lib/routes/router.gr.dart
@@ -9,27 +9,6 @@
 
 part of 'router.dart';
 
-abstract class _$AppRouter extends RootStackRouter {
-  // ignore: unused_element
-  _$AppRouter({super.navigatorKey});
-
-  @override
-  final Map<String, PageFactory> pagesMap = {
-    InitialLocationRoute.name: (routeData) {
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: const InitialLocationScreen(),
-      );
-    },
-    WeatherInformationRoute.name: (routeData) {
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: const WeatherInformationScreen(),
-      );
-    },
-  };
-}
-
 /// generated route for
 /// [InitialLocationScreen]
 class InitialLocationRoute extends PageRouteInfo<void> {
@@ -41,7 +20,12 @@ class InitialLocationRoute extends PageRouteInfo<void> {
 
   static const String name = 'InitialLocationRoute';
 
-  static const PageInfo<void> page = PageInfo<void>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const InitialLocationScreen();
+    },
+  );
 }
 
 /// generated route for
@@ -55,5 +39,10 @@ class WeatherInformationRoute extends PageRouteInfo<void> {
 
   static const String name = 'WeatherInformationRoute';
 
-  static const PageInfo<void> page = PageInfo<void>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const WeatherInformationScreen();
+    },
+  );
 }
diff --git a/pubspec.lock b/pubspec.lock
index 14df0ec..ad93e0e 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -5,26 +5,31 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: ae92f5d747aee634b87f89d9946000c2de774be1d6ac3e58268224348cd0101a
+      sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834
       url: "https://pub.dev"
     source: hosted
-    version: "61.0.0"
+    version: "72.0.0"
+  _macros:
+    dependency: transitive
+    description: dart
+    source: sdk
+    version: "0.3.2"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      sha256: ea3d8652bda62982addfd92fdc2d0214e5f82e43325104990d4f4c4a2a313562
+      sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139
       url: "https://pub.dev"
     source: hosted
-    version: "5.13.0"
+    version: "6.7.0"
   args:
     dependency: transitive
     description:
       name: args
-      sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596
+      sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.2"
+    version: "2.5.0"
   async:
     dependency: transitive
     description:
@@ -37,18 +42,18 @@ packages:
     dependency: "direct main"
     description:
       name: auto_route
-      sha256: "72f21e8b6cbbe25f02ea69183e024996530bf495cc1b077a49e0ec6726f0c271"
+      sha256: b83e8ce46da7228cdd019b5a11205454847f0a971bca59a7529b98df9876889b
       url: "https://pub.dev"
     source: hosted
-    version: "7.8.3"
+    version: "9.2.2"
   auto_route_generator:
     dependency: "direct dev"
     description:
       name: auto_route_generator
-      sha256: e7aa9ab44b77cd31a4619d94db645ab5736e543fd0b4c6058c281249e479dfb8
+      sha256: c9086eb07271e51b44071ad5cff34e889f3156710b964a308c2ab590769e79e6
       url: "https://pub.dev"
     source: hosted
-    version: "7.3.1"
+    version: "9.0.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -77,34 +82,34 @@ packages:
     dependency: transitive
     description:
       name: build_daemon
-      sha256: "5f02d73eb2ba16483e693f80bee4f088563a820e47d1027d4cdfe62b5bb43e65"
+      sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "4.0.2"
   build_resolvers:
     dependency: transitive
     description:
       name: build_resolvers
-      sha256: "64e12b0521812d1684b1917bc80945625391cb9bdd4312536b1d69dcb6133ed8"
+      sha256: "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.1"
+    version: "2.4.2"
   build_runner:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: "10c6bcdbf9d049a0b666702cf1cee4ddfdc38f02a19d35ae392863b47519848b"
+      sha256: dd09dd4e2b078992f42aac7f1a622f01882a8492fef08486b27ddde929c19f04
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.6"
+    version: "2.4.12"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
-      sha256: c9e32d21dd6626b5c163d48b037ce906bbe428bc23ab77bcd77bb21e593b6185
+      sha256: f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0
       url: "https://pub.dev"
     source: hosted
-    version: "7.2.11"
+    version: "7.3.2"
   built_collection:
     dependency: transitive
     description:
@@ -117,10 +122,10 @@ packages:
     dependency: transitive
     description:
       name: built_value
-      sha256: a8de5955205b4d1dbbbc267daddf2178bd737e4bab8987c04a500478c9651e74
+      sha256: c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb
       url: "https://pub.dev"
     source: hosted
-    version: "8.6.3"
+    version: "8.9.2"
   characters:
     dependency: transitive
     description:
@@ -149,10 +154,10 @@ packages:
     dependency: transitive
     description:
       name: code_builder
-      sha256: "1be9be30396d7e4c0db42c35ea6ccd7cc6a1e19916b5dc64d6ac216b5544d677"
+      sha256: f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37
       url: "https://pub.dev"
     source: hosted
-    version: "4.7.0"
+    version: "4.10.0"
   collection:
     dependency: transitive
     description:
@@ -173,34 +178,42 @@ packages:
     dependency: transitive
     description:
       name: crypto
-      sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab
+      sha256: ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.3"
+    version: "3.0.5"
   cupertino_icons:
     dependency: "direct main"
     description:
       name: cupertino_icons
-      sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d
+      sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.6"
+    version: "1.0.8"
   dart_style:
     dependency: transitive
     description:
       name: dart_style
-      sha256: "1efa911ca7086affd35f463ca2fc1799584fb6aa89883cf0af8e3664d6a02d55"
+      sha256: "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.3.6"
   dio:
     dependency: transitive
     description:
       name: dio
-      sha256: "417e2a6f9d83ab396ec38ff4ea5da6c254da71e4db765ad737a42af6930140b7"
+      sha256: "5598aa796bbf4699afd5c67c0f5f6e2ed542afc956884b9cd58c306966efc260"
       url: "https://pub.dev"
     source: hosted
-    version: "5.3.3"
+    version: "5.7.0"
+  dio_web_adapter:
+    dependency: transitive
+    description:
+      name: dio_web_adapter
+      sha256: "33259a9276d6cea88774a0000cfae0d861003497755969c92faa223108620dc8"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.0"
   fake_async:
     dependency: transitive
     description:
@@ -213,10 +226,10 @@ packages:
     dependency: transitive
     description:
       name: ffi
-      sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878"
+      sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.3"
   file:
     dependency: transitive
     description:
@@ -242,18 +255,18 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_hooks
-      sha256: "4618087243264d5f745b2a719a9fc610768f723da570efc2d0eaefe1efcbae70"
+      sha256: cde36b12f7188c85286fba9b38cc5a902e7279f36dd676967106c041dc9dde70
       url: "https://pub.dev"
     source: hosted
-    version: "0.20.2"
+    version: "0.20.5"
   flutter_riverpod:
     dependency: transitive
     description:
       name: flutter_riverpod
-      sha256: fcea39b84b666649280f6f678bc0bb479253bf865abc0387a8b11dac6477bf92
+      sha256: "0f1974eff5bbe774bf1d870e406fc6f29e3d6f1c46bd9c58e7172ff68a785d7d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.1"
+    version: "2.5.1"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -276,106 +289,106 @@ packages:
     dependency: "direct dev"
     description:
       name: freezed
-      sha256: "2df89855fe181baae3b6d714dc3c4317acf4fccd495a6f36e5e00f24144c6c3b"
+      sha256: "44c19278dd9d89292cf46e97dc0c1e52ce03275f40a97c5a348e802a924bf40e"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.1"
+    version: "2.5.7"
   freezed_annotation:
     dependency: "direct main"
     description:
       name: freezed_annotation
-      sha256: c3fd9336eb55a38cc1bbd79ab17573113a8deccd0ecbbf926cca3c62803b5c2d
+      sha256: c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.1"
+    version: "2.4.4"
   frontend_server_client:
     dependency: transitive
     description:
       name: frontend_server_client
-      sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612"
+      sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.0"
+    version: "4.0.0"
   geocoding:
     dependency: "direct main"
     description:
       name: geocoding
-      sha256: b34c0501bbbaf3190b85bef3078b27cf66c28a8915c6d3af50d67f356aa7da31
+      sha256: d580c801cba9386b4fac5047c4c785a4e19554f46be42f4f5e5b7deacd088a66
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "3.0.0"
   geocoding_android:
     dependency: transitive
     description:
       name: geocoding_android
-      sha256: "609db1d71bc364dd9d0616f72a41c01e0c74f3a3807efb85e0d5a67e57baf50f"
+      sha256: "1b13eca79b11c497c434678fed109c2be020b158cec7512c848c102bc7232603"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "3.3.1"
   geocoding_ios:
     dependency: transitive
     description:
       name: geocoding_ios
-      sha256: c85495ce8fb34e4fbd2dd8fc5f79263d622d9f88c4af948c965daf6b27a7f3a1
+      sha256: "94ddba60387501bd1c11e18dca7c5a9e8c645d6e3da9c38b9762434941870c24"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "3.0.1"
   geocoding_platform_interface:
     dependency: transitive
     description:
       name: geocoding_platform_interface
-      sha256: "8848605d307d844d89937cdb4b8ad7dfa880552078f310fa24d8a460f6dddab4"
+      sha256: "8c2c8226e5c276594c2e18bfe88b19110ed770aeb7c1ab50ede570be8b92229b"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "3.2.0"
   geolocator:
     dependency: "direct main"
     description:
       name: geolocator
-      sha256: "5c23f3613f50586c0bbb2b8f970240ae66b3bd992088cf60dd5ee2e6f7dde3a8"
+      sha256: "0ec58b731776bc43097fcf751f79681b6a8f6d3bc737c94779fe9f1ad73c1a81"
       url: "https://pub.dev"
     source: hosted
-    version: "9.0.2"
+    version: "13.0.1"
   geolocator_android:
     dependency: transitive
     description:
       name: geolocator_android
-      sha256: "93906636752ea4d4e778afa981fdfe7409f545b3147046300df194330044d349"
+      sha256: "7aefc530db47d90d0580b552df3242440a10fe60814496a979aa67aa98b1fd47"
       url: "https://pub.dev"
     source: hosted
-    version: "4.3.1"
+    version: "4.6.1"
   geolocator_apple:
     dependency: transitive
     description:
       name: geolocator_apple
-      sha256: ab90ae811c42ec2f6021e01eca71df00dee6ff1e69d2c2dafd4daeb0b793f73d
+      sha256: bc2aca02423ad429cb0556121f56e60360a2b7d694c8570301d06ea0c00732fd
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.3.7"
   geolocator_platform_interface:
     dependency: transitive
     description:
       name: geolocator_platform_interface
-      sha256: b7aca62aa05d7e610c396a53a1936ff87fce2f735d76e93fde9269c341c46a25
+      sha256: "386ce3d9cce47838355000070b1d0b13efb5bc430f8ecda7e9238c8409ace012"
       url: "https://pub.dev"
     source: hosted
-    version: "4.1.1"
+    version: "4.2.4"
   geolocator_web:
     dependency: transitive
     description:
       name: geolocator_web
-      sha256: "59083f7e0871b78299918d92bf930a14377f711d2d1156c558cd5ebae6c20d58"
+      sha256: "2ed69328e05cd94e7eb48bb0535f5fc0c0c44d1c4fa1e9737267484d05c29b5e"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "4.1.1"
   geolocator_windows:
     dependency: transitive
     description:
       name: geolocator_windows
-      sha256: "4f4218f122a6978d0ad655fa3541eea74c67417440b09f0657238810d5af6bdc"
+      sha256: "53da08937d07c24b0d9952eb57a3b474e29aae2abf9dd717f7e1230995f13f0e"
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.3"
+    version: "0.2.3"
   glob:
     dependency: transitive
     description:
@@ -388,34 +401,34 @@ packages:
     dependency: "direct main"
     description:
       name: google_fonts
-      sha256: "2776c66b3e97c6cdd58d1bd3281548b074b64f1fd5c8f82391f7456e38849567"
+      sha256: b1ac0fe2832c9cc95e5e88b57d627c5e68c223b9657f4b96e1487aa9098c7b82
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.5"
+    version: "6.2.1"
   graphs:
     dependency: transitive
     description:
       name: graphs
-      sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19
+      sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.3.2"
   hooks_riverpod:
     dependency: "direct main"
     description:
       name: hooks_riverpod
-      sha256: a5242fee89736eaf7e5565c271e2d87b0aeb9953ee936de819339366aebc6882
+      sha256: "97266a91c994951a06ef0ff3a1c7fb261e52ec7f74e87f0614ea0b7411b859b2"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.1"
+    version: "2.5.2"
   http:
     dependency: transitive
     description:
       name: http
-      sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525"
+      sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.2"
   http_multi_server:
     dependency: transitive
     description:
@@ -436,10 +449,10 @@ packages:
     dependency: "direct main"
     description:
       name: intl
-      sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
+      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
       url: "https://pub.dev"
     source: hosted
-    version: "0.18.1"
+    version: "0.19.0"
   io:
     dependency: transitive
     description:
@@ -452,42 +465,42 @@ packages:
     dependency: transitive
     description:
       name: js
-      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
+      sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.7"
+    version: "0.7.1"
   json_annotation:
     dependency: transitive
     description:
       name: json_annotation
-      sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467
+      sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1"
       url: "https://pub.dev"
     source: hosted
-    version: "4.8.1"
+    version: "4.9.0"
   json_serializable:
     dependency: "direct dev"
     description:
       name: json_serializable
-      sha256: aa1f5a8912615733e0fdc7a02af03308933c93235bdc8d50d0b0c8a8ccb0b969
+      sha256: ea1432d167339ea9b5bb153f0571d0039607a873d6e04e0117af043f14a1fd4b
       url: "https://pub.dev"
     source: hosted
-    version: "6.7.1"
+    version: "6.8.0"
   leak_tracker:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
+      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.4"
+    version: "10.0.5"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
+      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.3"
+    version: "3.0.5"
   leak_tracker_testing:
     dependency: transitive
     description:
@@ -504,6 +517,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.0"
+  macros:
+    dependency: transitive
+    description:
+      name: macros
+      sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.2-main.4"
   matcher:
     dependency: transitive
     description:
@@ -516,26 +537,26 @@ packages:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
+      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.0"
+    version: "0.11.1"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
+      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
       url: "https://pub.dev"
     source: hosted
-    version: "1.12.0"
+    version: "1.15.0"
   mime:
     dependency: transitive
     description:
       name: mime
-      sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e
+      sha256: "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.4"
+    version: "1.0.6"
   package_config:
     dependency: transitive
     description:
@@ -556,26 +577,26 @@ packages:
     dependency: transitive
     description:
       name: path_provider
-      sha256: a1aa8aaa2542a6bc57e381f132af822420216c80d4781f7aa085ca3229208aaa
+      sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.4"
   path_provider_android:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: "6b8b19bd80da4f11ce91b2d1fb931f3006911477cec227cce23d3253d80df3f1"
+      sha256: "6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.2.10"
   path_provider_foundation:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: "19314d595120f82aca0ba62787d58dde2cc6b5df7d2f0daf72489e38d1b57f2d"
+      sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.4.0"
   path_provider_linux:
     dependency: transitive
     description:
@@ -588,42 +609,42 @@ packages:
     dependency: transitive
     description:
       name: path_provider_platform_interface
-      sha256: "94b1e0dd80970c1ce43d5d4e050a9918fce4f4a775e6142424c30a29a363265c"
+      sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   path_provider_windows:
     dependency: transitive
     description:
       name: path_provider_windows
-      sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170"
+      sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.1"
+    version: "2.3.0"
   petitparser:
     dependency: transitive
     description:
       name: petitparser
-      sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750
+      sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27
       url: "https://pub.dev"
     source: hosted
-    version: "5.4.0"
+    version: "6.0.2"
   platform:
     dependency: transitive
     description:
       name: platform
-      sha256: ae68c7bfcd7383af3629daafb32fb4e8681c7154428da4febcff06200585f102
+      sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.2"
+    version: "3.1.5"
   plugin_platform_interface:
     dependency: transitive
     description:
       name: plugin_platform_interface
-      sha256: da3fdfeccc4d4ff2da8f8c556704c08f912542c5fb3cf2233ed75372384a034d
+      sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.6"
+    version: "2.1.8"
   pool:
     dependency: transitive
     description:
@@ -652,34 +673,34 @@ packages:
     dependency: transitive
     description:
       name: pubspec_parse
-      sha256: c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367
+      sha256: c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.3"
+    version: "1.3.0"
   retrofit:
     dependency: "direct main"
     description:
       name: retrofit
-      sha256: "13a2865c0d97da580ea4e3c64d412d81f365fd5b26be2a18fca9582e021da37a"
+      sha256: "479cc534c2d83296dac6ae16933dd77e7a52bb54cf7e75e6eb83ee51928c8465"
       url: "https://pub.dev"
     source: hosted
-    version: "4.1.0"
+    version: "4.3.0"
   retrofit_generator:
     dependency: "direct dev"
     description:
       name: retrofit_generator
-      sha256: af46d19e82210850632e539b0d585dea8ed0c9a49b9ac6741306e19f8e83c90d
+      sha256: "0e5045314ddc250f75b8ec38794129b32b51bd82e0f67157cb948488187d502d"
       url: "https://pub.dev"
     source: hosted
-    version: "8.1.1"
+    version: "9.0.0"
   riverpod:
     dependency: transitive
     description:
       name: riverpod
-      sha256: ff676bd8a715c7085692fe4919564f78fb90d33b10a1c5c14e740581857cc914
+      sha256: f21b32ffd26a36555e501b04f4a5dca43ed59e16343f1a30c13632b2351dfa4d
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.1"
+    version: "2.5.1"
   shelf:
     dependency: transitive
     description:
@@ -692,10 +713,10 @@ packages:
     dependency: transitive
     description:
       name: shelf_web_socket
-      sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1"
+      sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.4"
+    version: "2.0.0"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -705,10 +726,10 @@ packages:
     dependency: transitive
     description:
       name: source_gen
-      sha256: fc0da689e5302edb6177fdd964efcb7f58912f43c28c2047a808f5bfff643d16
+      sha256: "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832"
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.0"
+    version: "1.5.0"
   source_helper:
     dependency: transitive
     description:
@@ -725,6 +746,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.10.0"
+  sprintf:
+    dependency: transitive
+    description:
+      name: sprintf
+      sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23"
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.0.0"
   stack_trace:
     dependency: transitive
     description:
@@ -777,10 +806,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
+      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.0"
+    version: "0.7.2"
   timing:
     dependency: transitive
     description:
@@ -789,14 +818,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.1"
-  tuple:
-    dependency: transitive
-    description:
-      name: tuple
-      sha256: a97ce2013f240b2f3807bcbaf218765b6f301c3eff91092bcfa23a039e7dd151
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.2"
   typed_data:
     dependency: transitive
     description:
@@ -809,10 +830,10 @@ packages:
     dependency: transitive
     description:
       name: uuid
-      sha256: "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313"
+      sha256: f33d6bb662f0e4f79dcd7ada2e6170f3b3a2530c28fc41f49a411ddedd576a77
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.7"
+    version: "4.5.0"
   vector_math:
     dependency: transitive
     description:
@@ -825,10 +846,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
+      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
       url: "https://pub.dev"
     source: hosted
-    version: "14.2.1"
+    version: "14.2.5"
   watcher:
     dependency: transitive
     description:
@@ -837,38 +858,46 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.0"
-  web_socket_channel:
+  web:
     dependency: transitive
     description:
-      name: web_socket_channel
-      sha256: d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b
+      name: web
+      sha256: d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.0"
-  win32:
+    version: "1.0.0"
+  web_socket:
     dependency: transitive
     description:
-      name: win32
-      sha256: "350a11abd2d1d97e0cc7a28a81b781c08002aa2864d9e3f192ca0ffa18b06ed3"
+      name: web_socket
+      sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83"
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.9"
+    version: "0.1.6"
+  web_socket_channel:
+    dependency: transitive
+    description:
+      name: web_socket_channel
+      sha256: "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.1"
   xdg_directories:
     dependency: transitive
     description:
       name: xdg_directories
-      sha256: "589ada45ba9e39405c198fe34eb0f607cddb2108527e658136120892beac46d2"
+      sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.3"
+    version: "1.0.4"
   xml:
     dependency: transitive
     description:
       name: xml
-      sha256: "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84"
+      sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.0"
+    version: "6.5.0"
   yaml:
     dependency: transitive
     description:
@@ -878,5 +907,5 @@ packages:
     source: hosted
     version: "3.1.2"
 sdks:
-  dart: ">=3.3.0 <4.0.0"
-  flutter: ">=3.18.0-18.0.pre.54"
+  dart: ">=3.5.0-259.0.dev <4.0.0"
+  flutter: ">=3.22.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 72eee29..f9a82e5 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -21,28 +21,28 @@ environment:
   sdk: ">=3.0.1 <4.0.0"
 
 dependencies:
-  auto_route: ^7.8.3
-  cupertino_icons: ^1.0.6
+  auto_route: ^9.2.2
+  cupertino_icons: ^1.0.8
   flutter:
     sdk: flutter
-  flutter_hooks: ^0.20.0
+  flutter_hooks: ^0.20.5
   fpdart: ^1.1.0
-  freezed_annotation: ^2.4.1
-  geocoding: ^2.1.0
-  geolocator: ^9.0.2
-  google_fonts: ^4.0.3
-  hooks_riverpod: ^2.3.10
-  intl: ^0.18.0
-  retrofit: ^4.1.0
+  freezed_annotation: ^2.4.4
+  geocoding: ^3.0.0
+  geolocator: ^13.0.1
+  google_fonts: ^6.2.1
+  hooks_riverpod: ^2.5.2
+  intl: ^0.19.0
+  retrofit: ^4.3.0
 
 dev_dependencies:
-  auto_route_generator: ^7.3.1
-  build_runner: ^2.4.6
+  auto_route_generator: ^9.0.0
+  build_runner: ^2.4.12
   flutter_test:
     sdk: flutter
-  freezed: ^2.4.1
-  json_serializable: ^6.7.1
-  retrofit_generator: ^8.1.0
+  freezed: ^2.5.7
+  json_serializable: ^6.8.0
+  retrofit_generator: ^9.0.0
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
 # The following section is specific to Flutter.