implemented RMV public transit module including trip search, station departures, and nearby stop lookup, added "Marianum Connect" API integration with bearer token authentication and auto-refresh logic, integrated geolocator for location-based station search, added persistent storage for favorite stations and recent trip queries, and implemented comprehensive UI for journey details, trip results, and disruption alerts
This commit is contained in:
@@ -0,0 +1,29 @@
|
||||
import '../../../../../api/connect/rmv/rmv_models.dart';
|
||||
import '../../../infrastructure/utility_widgets/loadable_hydrated_bloc/loadable_hydrated_bloc.dart';
|
||||
import '../../../infrastructure/utility_widgets/loadable_hydrated_bloc/loadable_hydrated_bloc_event.dart';
|
||||
import '../repository/rmv_repository.dart';
|
||||
import 'rmv_event.dart';
|
||||
import 'rmv_state.dart';
|
||||
|
||||
class RmvBloc
|
||||
extends LoadableHydratedBloc<RmvEvent, RmvState, RmvRepository> {
|
||||
List<HimMessage> getDisruptions() => innerState?.disruptions ?? const [];
|
||||
|
||||
@override
|
||||
RmvState fromNothing() => const RmvState();
|
||||
|
||||
@override
|
||||
RmvState fromStorage(Map<String, dynamic> json) => RmvState.fromJson(json);
|
||||
|
||||
@override
|
||||
Map<String, dynamic>? toStorage(RmvState state) => state.toJson();
|
||||
|
||||
@override
|
||||
Future<void> gatherData() async {
|
||||
final disruptions = await repo.disruptions();
|
||||
add(DataGathered((state) => state.copyWith(disruptions: disruptions)));
|
||||
}
|
||||
|
||||
@override
|
||||
RmvRepository repository() => RmvRepository();
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
import '../../../infrastructure/utility_widgets/loadable_hydrated_bloc/loadable_hydrated_bloc_event.dart';
|
||||
import 'rmv_state.dart';
|
||||
|
||||
abstract class RmvEvent extends LoadableHydratedBlocEvent<RmvState> {}
|
||||
@@ -0,0 +1,15 @@
|
||||
import 'package:freezed_annotation/freezed_annotation.dart';
|
||||
|
||||
import '../../../../../api/connect/rmv/rmv_models.dart';
|
||||
|
||||
part 'rmv_state.freezed.dart';
|
||||
part 'rmv_state.g.dart';
|
||||
|
||||
@freezed
|
||||
abstract class RmvState with _$RmvState {
|
||||
const factory RmvState({@Default(<HimMessage>[]) List<HimMessage> disruptions}) =
|
||||
_RmvState;
|
||||
|
||||
factory RmvState.fromJson(Map<String, Object?> json) =>
|
||||
_$RmvStateFromJson(json);
|
||||
}
|
||||
@@ -0,0 +1,283 @@
|
||||
// GENERATED CODE - DO NOT MODIFY BY HAND
|
||||
// coverage:ignore-file
|
||||
// ignore_for_file: type=lint
|
||||
// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
|
||||
|
||||
part of 'rmv_state.dart';
|
||||
|
||||
// **************************************************************************
|
||||
// FreezedGenerator
|
||||
// **************************************************************************
|
||||
|
||||
// dart format off
|
||||
T _$identity<T>(T value) => value;
|
||||
|
||||
/// @nodoc
|
||||
mixin _$RmvState {
|
||||
|
||||
List<HimMessage> get disruptions;
|
||||
/// Create a copy of RmvState
|
||||
/// with the given fields replaced by the non-null parameter values.
|
||||
@JsonKey(includeFromJson: false, includeToJson: false)
|
||||
@pragma('vm:prefer-inline')
|
||||
$RmvStateCopyWith<RmvState> get copyWith => _$RmvStateCopyWithImpl<RmvState>(this as RmvState, _$identity);
|
||||
|
||||
/// Serializes this RmvState to a JSON map.
|
||||
Map<String, dynamic> toJson();
|
||||
|
||||
|
||||
@override
|
||||
bool operator ==(Object other) {
|
||||
return identical(this, other) || (other.runtimeType == runtimeType&&other is RmvState&&const DeepCollectionEquality().equals(other.disruptions, disruptions));
|
||||
}
|
||||
|
||||
@JsonKey(includeFromJson: false, includeToJson: false)
|
||||
@override
|
||||
int get hashCode => Object.hash(runtimeType,const DeepCollectionEquality().hash(disruptions));
|
||||
|
||||
@override
|
||||
String toString() {
|
||||
return 'RmvState(disruptions: $disruptions)';
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
/// @nodoc
|
||||
abstract mixin class $RmvStateCopyWith<$Res> {
|
||||
factory $RmvStateCopyWith(RmvState value, $Res Function(RmvState) _then) = _$RmvStateCopyWithImpl;
|
||||
@useResult
|
||||
$Res call({
|
||||
List<HimMessage> disruptions
|
||||
});
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
/// @nodoc
|
||||
class _$RmvStateCopyWithImpl<$Res>
|
||||
implements $RmvStateCopyWith<$Res> {
|
||||
_$RmvStateCopyWithImpl(this._self, this._then);
|
||||
|
||||
final RmvState _self;
|
||||
final $Res Function(RmvState) _then;
|
||||
|
||||
/// Create a copy of RmvState
|
||||
/// with the given fields replaced by the non-null parameter values.
|
||||
@pragma('vm:prefer-inline') @override $Res call({Object? disruptions = null,}) {
|
||||
return _then(_self.copyWith(
|
||||
disruptions: null == disruptions ? _self.disruptions : disruptions // ignore: cast_nullable_to_non_nullable
|
||||
as List<HimMessage>,
|
||||
));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
/// Adds pattern-matching-related methods to [RmvState].
|
||||
extension RmvStatePatterns on RmvState {
|
||||
/// A variant of `map` that fallback to returning `orElse`.
|
||||
///
|
||||
/// It is equivalent to doing:
|
||||
/// ```dart
|
||||
/// switch (sealedClass) {
|
||||
/// case final Subclass value:
|
||||
/// return ...;
|
||||
/// case _:
|
||||
/// return orElse();
|
||||
/// }
|
||||
/// ```
|
||||
|
||||
@optionalTypeArgs TResult maybeMap<TResult extends Object?>(TResult Function( _RmvState value)? $default,{required TResult orElse(),}){
|
||||
final _that = this;
|
||||
switch (_that) {
|
||||
case _RmvState() when $default != null:
|
||||
return $default(_that);case _:
|
||||
return orElse();
|
||||
|
||||
}
|
||||
}
|
||||
/// A `switch`-like method, using callbacks.
|
||||
///
|
||||
/// Callbacks receives the raw object, upcasted.
|
||||
/// It is equivalent to doing:
|
||||
/// ```dart
|
||||
/// switch (sealedClass) {
|
||||
/// case final Subclass value:
|
||||
/// return ...;
|
||||
/// case final Subclass2 value:
|
||||
/// return ...;
|
||||
/// }
|
||||
/// ```
|
||||
|
||||
@optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _RmvState value) $default,){
|
||||
final _that = this;
|
||||
switch (_that) {
|
||||
case _RmvState():
|
||||
return $default(_that);case _:
|
||||
throw StateError('Unexpected subclass');
|
||||
|
||||
}
|
||||
}
|
||||
/// A variant of `map` that fallback to returning `null`.
|
||||
///
|
||||
/// It is equivalent to doing:
|
||||
/// ```dart
|
||||
/// switch (sealedClass) {
|
||||
/// case final Subclass value:
|
||||
/// return ...;
|
||||
/// case _:
|
||||
/// return null;
|
||||
/// }
|
||||
/// ```
|
||||
|
||||
@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _RmvState value)? $default,){
|
||||
final _that = this;
|
||||
switch (_that) {
|
||||
case _RmvState() when $default != null:
|
||||
return $default(_that);case _:
|
||||
return null;
|
||||
|
||||
}
|
||||
}
|
||||
/// A variant of `when` that fallback to an `orElse` callback.
|
||||
///
|
||||
/// It is equivalent to doing:
|
||||
/// ```dart
|
||||
/// switch (sealedClass) {
|
||||
/// case Subclass(:final field):
|
||||
/// return ...;
|
||||
/// case _:
|
||||
/// return orElse();
|
||||
/// }
|
||||
/// ```
|
||||
|
||||
@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( List<HimMessage> disruptions)? $default,{required TResult orElse(),}) {final _that = this;
|
||||
switch (_that) {
|
||||
case _RmvState() when $default != null:
|
||||
return $default(_that.disruptions);case _:
|
||||
return orElse();
|
||||
|
||||
}
|
||||
}
|
||||
/// A `switch`-like method, using callbacks.
|
||||
///
|
||||
/// As opposed to `map`, this offers destructuring.
|
||||
/// It is equivalent to doing:
|
||||
/// ```dart
|
||||
/// switch (sealedClass) {
|
||||
/// case Subclass(:final field):
|
||||
/// return ...;
|
||||
/// case Subclass2(:final field2):
|
||||
/// return ...;
|
||||
/// }
|
||||
/// ```
|
||||
|
||||
@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( List<HimMessage> disruptions) $default,) {final _that = this;
|
||||
switch (_that) {
|
||||
case _RmvState():
|
||||
return $default(_that.disruptions);case _:
|
||||
throw StateError('Unexpected subclass');
|
||||
|
||||
}
|
||||
}
|
||||
/// A variant of `when` that fallback to returning `null`
|
||||
///
|
||||
/// It is equivalent to doing:
|
||||
/// ```dart
|
||||
/// switch (sealedClass) {
|
||||
/// case Subclass(:final field):
|
||||
/// return ...;
|
||||
/// case _:
|
||||
/// return null;
|
||||
/// }
|
||||
/// ```
|
||||
|
||||
@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( List<HimMessage> disruptions)? $default,) {final _that = this;
|
||||
switch (_that) {
|
||||
case _RmvState() when $default != null:
|
||||
return $default(_that.disruptions);case _:
|
||||
return null;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/// @nodoc
|
||||
@JsonSerializable()
|
||||
|
||||
class _RmvState implements RmvState {
|
||||
const _RmvState({final List<HimMessage> disruptions = const <HimMessage>[]}): _disruptions = disruptions;
|
||||
factory _RmvState.fromJson(Map<String, dynamic> json) => _$RmvStateFromJson(json);
|
||||
|
||||
final List<HimMessage> _disruptions;
|
||||
@override@JsonKey() List<HimMessage> get disruptions {
|
||||
if (_disruptions is EqualUnmodifiableListView) return _disruptions;
|
||||
// ignore: implicit_dynamic_type
|
||||
return EqualUnmodifiableListView(_disruptions);
|
||||
}
|
||||
|
||||
|
||||
/// Create a copy of RmvState
|
||||
/// with the given fields replaced by the non-null parameter values.
|
||||
@override @JsonKey(includeFromJson: false, includeToJson: false)
|
||||
@pragma('vm:prefer-inline')
|
||||
_$RmvStateCopyWith<_RmvState> get copyWith => __$RmvStateCopyWithImpl<_RmvState>(this, _$identity);
|
||||
|
||||
@override
|
||||
Map<String, dynamic> toJson() {
|
||||
return _$RmvStateToJson(this, );
|
||||
}
|
||||
|
||||
@override
|
||||
bool operator ==(Object other) {
|
||||
return identical(this, other) || (other.runtimeType == runtimeType&&other is _RmvState&&const DeepCollectionEquality().equals(other._disruptions, _disruptions));
|
||||
}
|
||||
|
||||
@JsonKey(includeFromJson: false, includeToJson: false)
|
||||
@override
|
||||
int get hashCode => Object.hash(runtimeType,const DeepCollectionEquality().hash(_disruptions));
|
||||
|
||||
@override
|
||||
String toString() {
|
||||
return 'RmvState(disruptions: $disruptions)';
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
/// @nodoc
|
||||
abstract mixin class _$RmvStateCopyWith<$Res> implements $RmvStateCopyWith<$Res> {
|
||||
factory _$RmvStateCopyWith(_RmvState value, $Res Function(_RmvState) _then) = __$RmvStateCopyWithImpl;
|
||||
@override @useResult
|
||||
$Res call({
|
||||
List<HimMessage> disruptions
|
||||
});
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
/// @nodoc
|
||||
class __$RmvStateCopyWithImpl<$Res>
|
||||
implements _$RmvStateCopyWith<$Res> {
|
||||
__$RmvStateCopyWithImpl(this._self, this._then);
|
||||
|
||||
final _RmvState _self;
|
||||
final $Res Function(_RmvState) _then;
|
||||
|
||||
/// Create a copy of RmvState
|
||||
/// with the given fields replaced by the non-null parameter values.
|
||||
@override @pragma('vm:prefer-inline') $Res call({Object? disruptions = null,}) {
|
||||
return _then(_RmvState(
|
||||
disruptions: null == disruptions ? _self._disruptions : disruptions // ignore: cast_nullable_to_non_nullable
|
||||
as List<HimMessage>,
|
||||
));
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
// dart format on
|
||||
@@ -0,0 +1,19 @@
|
||||
// GENERATED CODE - DO NOT MODIFY BY HAND
|
||||
|
||||
part of 'rmv_state.dart';
|
||||
|
||||
// **************************************************************************
|
||||
// JsonSerializableGenerator
|
||||
// **************************************************************************
|
||||
|
||||
_RmvState _$RmvStateFromJson(Map<String, dynamic> json) => _RmvState(
|
||||
disruptions:
|
||||
(json['disruptions'] as List<dynamic>?)
|
||||
?.map((e) => HimMessage.fromJson(e as Map<String, dynamic>))
|
||||
.toList() ??
|
||||
const <HimMessage>[],
|
||||
);
|
||||
|
||||
Map<String, dynamic> _$RmvStateToJson(_RmvState instance) => <String, dynamic>{
|
||||
'disruptions': instance.disruptions,
|
||||
};
|
||||
@@ -0,0 +1,73 @@
|
||||
import '../../../../../api/connect/rmv/queries/get_arrivals.dart';
|
||||
import '../../../../../api/connect/rmv/queries/get_departures.dart';
|
||||
import '../../../../../api/connect/rmv/queries/get_disruptions.dart';
|
||||
import '../../../../../api/connect/rmv/queries/get_journey_detail.dart';
|
||||
import '../../../../../api/connect/rmv/queries/more_trips.dart';
|
||||
import '../../../../../api/connect/rmv/queries/nearby_stops.dart';
|
||||
import '../../../../../api/connect/rmv/queries/search_stops.dart';
|
||||
import '../../../../../api/connect/rmv/queries/search_trips.dart';
|
||||
import '../../../../../api/connect/rmv/rmv_models.dart';
|
||||
import '../../../infrastructure/repository/repository.dart';
|
||||
import '../bloc/rmv_state.dart';
|
||||
|
||||
class RmvRepository extends Repository<RmvState> {
|
||||
Future<List<StopLocation>> searchStops(String query, {int max = 10}) =>
|
||||
SearchStops(query: query, max: max).run();
|
||||
|
||||
Future<List<StopLocation>> nearbyStops({
|
||||
required double lat,
|
||||
required double lon,
|
||||
int radiusMeters = 1000,
|
||||
int max = 20,
|
||||
}) => NearbyStops(
|
||||
lat: lat,
|
||||
lon: lon,
|
||||
radiusMeters: radiusMeters,
|
||||
max: max,
|
||||
).run();
|
||||
|
||||
Future<List<Departure>> departures(
|
||||
String stopId, {
|
||||
DateTime? when,
|
||||
int durationMinutes = 60,
|
||||
int maxJourneys = -1,
|
||||
}) => GetDepartures(
|
||||
stopId: stopId,
|
||||
when: when,
|
||||
durationMinutes: durationMinutes,
|
||||
maxJourneys: maxJourneys,
|
||||
).run();
|
||||
|
||||
Future<List<Arrival>> arrivals(
|
||||
String stopId, {
|
||||
DateTime? when,
|
||||
int durationMinutes = 60,
|
||||
int maxJourneys = -1,
|
||||
}) => GetArrivals(
|
||||
stopId: stopId,
|
||||
when: when,
|
||||
durationMinutes: durationMinutes,
|
||||
maxJourneys: maxJourneys,
|
||||
).run();
|
||||
|
||||
Future<TripSearchResult> searchTrips({
|
||||
required String fromStopId,
|
||||
required String toStopId,
|
||||
DateTime? when,
|
||||
bool searchByArrival = false,
|
||||
}) => SearchTrips(
|
||||
fromStopId: fromStopId,
|
||||
toStopId: toStopId,
|
||||
when: when,
|
||||
searchByArrival: searchByArrival,
|
||||
).run();
|
||||
|
||||
Future<TripSearchResult> moreTrips(String ctx) =>
|
||||
MoreTrips(ctx: ctx).run();
|
||||
|
||||
Future<JourneyDetail> journeyDetail(String ref, {DateTime? date}) =>
|
||||
GetJourneyDetail(journeyRef: ref, date: date).run();
|
||||
|
||||
Future<List<HimMessage>> disruptions({DateTime? when}) =>
|
||||
GetDisruptions(when: when).run();
|
||||
}
|
||||
Reference in New Issue
Block a user