Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MVVM Architecture #5

Merged
merged 14 commits into from
Dec 24, 2024
Merged

MVVM Architecture #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
beaa8fa
Switched station_line_labels to MVVM
YarosMallorca Dec 20, 2024
12774ad
Upgraded mallorca_transit_services package
YarosMallorca Dec 21, 2024
3ab6600
Fixed disposal in station_line_labels_viewmodel
YarosMallorca Dec 21, 2024
e74b7f2
Switched timeline_sheet to MVVM
YarosMallorca Dec 21, 2024
4a7b0d7
Switched station_sheet to MVVM
YarosMallorca Dec 21, 2024
710a8e6
Refactored providers & settings picker
YarosMallorca Dec 21, 2024
5256675
Added disposal to station_viewmodel
YarosMallorca Dec 21, 2024
ae9486e
Switched Routes tab to MVVM
YarosMallorca Dec 22, 2024
a42db27
Switched Stations to MVVM
YarosMallorca Dec 22, 2024
63e4734
Switched timetable viewer to MVVM
YarosMallorca Dec 22, 2024
cee7613
Switched nearby to MVVM
YarosMallorca Dec 22, 2024
ab06822
Fixed UI regression introduced by refactor
YarosMallorca Dec 22, 2024
b2abd08
Station line labels now scrollable on long list
YarosMallorca Dec 22, 2024
00959bf
Switched map to MVVM
YarosMallorca Dec 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions lib/apis/location.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,26 @@ import 'package:geolocator/geolocator.dart';

/// A class that provides methods for interacting with location services.
class LocationApi {
LocationPermission permission = LocationPermission.denied;

/// Checks the permission status for accessing the device's location.
///
/// Returns the current permission status.
Future<LocationPermission> checkPermission() async {
permission = await Geolocator.checkPermission();
return permission;
Future<LocationPermission> permissionStatus() async {
return await Geolocator.checkPermission();
}

/// Requests permission to access the device's location.
///
/// Returns `true` if the permission is granted, `false` otherwise.
Future<bool> requestPermission() async {
permission = await Geolocator.checkPermission();
Future<LocationPermission> requestPermission() async {
LocationPermission permission = await Geolocator.checkPermission();
if (permission == LocationPermission.denied) {
permission = await Geolocator.requestPermission();
if (permission == LocationPermission.denied) {
permission = LocationPermission.deniedForever;
}
}

return permission == LocationPermission.whileInUse ||
permission == LocationPermission.always;
return permission;
}

/// Retrieves the current device location.
Expand Down
265 changes: 265 additions & 0 deletions lib/components/bottom_sheets/station/station_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,265 @@
import 'package:flutter/material.dart';
import 'package:intl/intl.dart';
import 'package:latlong2/latlong.dart';
import 'package:mallorca_transit_services/mallorca_transit_services.dart';
import 'package:provider/provider.dart';
import 'package:skeletonizer/skeletonizer.dart';
import 'package:url_launcher/url_launcher.dart';
import 'package:via_mallorca/components/station_line_labels/station_line_labels_view.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:via_mallorca/providers/map_provider.dart';
import 'package:via_mallorca/providers/tracking_provider.dart';
import 'station_viewmodel.dart';

class StationSheet extends StatelessWidget {
final Station station;

const StationSheet({super.key, required this.station});

@override
Widget build(BuildContext context) {
return ChangeNotifierProvider(
create: (_) => StationSheetViewModel(station)..initialize(),
child: Consumer<StationSheetViewModel>(
builder: (context, viewModel, child) {
return Stack(
children: [
SizedBox(
width: double.infinity,
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16.0),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
const SizedBox(height: 24),
Column(
children: [
Text(
"${station.name} (${station.code})",
style: const TextStyle(fontSize: 24),
),
if (station.ref != null) Text(station.ref!),
const SizedBox(height: 16),
StationLineLabels(station: station),
const SizedBox(height: 32),
_buildDeparturesList(context, viewModel),
],
),
],
),
),
),
Positioned(
top: 0,
right: 0,
child: IconButton(
icon: const Icon(Icons.close),
onPressed: () => Navigator.of(context).pop(),
),
),
Positioned(
top: 16,
left: 16,
child: Column(
children: [
IconButton(
icon: const Icon(Icons.directions),
onPressed: () => launchUrl(Uri(
scheme: "geo",
path: "${station.lat},${station.long}",
query: "q=${station.lat},${station.long}")),
),
const SizedBox(height: 8),
IconButton(
icon: Icon(viewModel.isFavourite
? Icons.star
: Icons.star_outline),
onPressed: viewModel.toggleFavourite,
),
],
),
),
],
);
},
),
);
}

Widget _buildDeparturesList(
BuildContext context, StationSheetViewModel viewModel) {
if (viewModel.hasError) {
return Padding(
padding: const EdgeInsets.only(bottom: 32.0),
child: Card(
color: Theme.of(context).colorScheme.errorContainer,
child: Padding(
padding: const EdgeInsets.all(4.0),
child: ListTile(
title: Text(AppLocalizations.of(context)!.info,
style: const TextStyle(fontSize: 24)),
subtitle: Text(
AppLocalizations.of(context)!.noDepartures,
style: TextStyle(
fontSize: 16, color: Theme.of(context).colorScheme.error),
),
),
)),
);
}

final departures = viewModel.departures ?? [];
return RefreshIndicator(
onRefresh: viewModel.fetchDepartures,
child: ConstrainedBox(
constraints:
BoxConstraints(maxHeight: MediaQuery.of(context).size.height * 0.5),
child: Skeletonizer(
enabled: departures.isEmpty,
child: ListView.separated(
separatorBuilder: (context, index) => const SizedBox(height: 8),
shrinkWrap: true,
itemCount: departures.isEmpty ? 5 : departures.length,
itemBuilder: (context, index) {
if (departures.isEmpty) {
// Show a loading skeleton if there are no departures yet.
return Card(
child: Padding(
padding: const EdgeInsets.all(4.0),
child: ListTile(
title: Text(AppLocalizations.of(context)!.loading,
style: const TextStyle(fontSize: 20)),
subtitle: Text(
AppLocalizations.of(context)!.pleaseWait,
style: const TextStyle(fontSize: 16),
),
)));
}
Departure departure = departures[index];
return Consumer<TrackingProvider>(
builder: (context, trackingProvider, _) {
return Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(16),
border: trackingProvider.trackingTripId ==
departure.realTrip?.id &&
departure.realTrip != null
? Border.all(
color: Theme.of(context)
.colorScheme
.tertiary
.withValues(alpha: 1),
width: 3)
: null),
child: Card(
child: Padding(
padding: const EdgeInsets.all(4.0),
child: ListTile(
title: Text(
"${departure.lineCode}${departure.destination != null ? " - ${departure.destination}" : ""}",
style: const TextStyle(fontSize: 20)),
subtitle: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(departure.name,
style: const TextStyle(fontSize: 16)),

// Display the estimated arrival time of the departure.
Builder(
builder: (context) {
final minutesDifference = departure
.estimatedArrival
.difference(DateTime.now())
.inMinutes;
final estimatedArrivalTime = DateFormat.Hm()
.format(departure.estimatedArrival);
String arrivalText;
Color textColor;

if (minutesDifference < 0) {
arrivalText = AppLocalizations.of(context)!
.arrivingLate;
textColor =
Theme.of(context).colorScheme.error;
} else if (minutesDifference > 59) {
arrivalText = estimatedArrivalTime;
textColor =
Theme.of(context).colorScheme.onSurface;
} else {
arrivalText =
"$minutesDifference ${AppLocalizations.of(context)!.min} ($estimatedArrivalTime)";
textColor =
Theme.of(context).colorScheme.onSurface;
}

return Text(
arrivalText,
style: TextStyle(
fontSize: 16, color: textColor),
);
},
),
],
),
trailing: Row(
mainAxisAlignment: MainAxisAlignment.end,
mainAxisSize: MainAxisSize.min,
children: [
if (departure.realTrip != null) ...[
const SizedBox(width: 12),
Material(
color: Colors.transparent,
borderRadius: BorderRadius.circular(50),
child: InkWell(
borderRadius: BorderRadius.circular(50),
onTap: () async {
final line = await RouteLine.getLine(
departure.lineCode);
if (context.mounted) {
Provider.of<MapProvider>(context,
listen: false)
.viewRoute(line, context, true);
Provider.of<TrackingProvider>(context,
listen: false)
.startTracking(
departure.realTrip!.id,
departure.lineCode,
LatLng(departure.realTrip!.lat,
departure.realTrip!.long),
station.id);
Provider.of<MapProvider>(context,
listen: false)
.updateLocation(
LatLng(departure.realTrip!.lat,
departure.realTrip!.long),
15);
}
},
child: Column(
mainAxisSize: MainAxisSize.min,
mainAxisAlignment:
MainAxisAlignment.center,
children: [
const Icon(Icons.directions_bus),
const SizedBox(height: 4),
Text(AppLocalizations.of(context)!
.track),
],
),
),
),
]
],
),
),
),
),
);
});
}),
),
),
);
}
}
73 changes: 73 additions & 0 deletions lib/components/bottom_sheets/station/station_viewmodel.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
import 'package:flutter/material.dart';
import 'package:via_mallorca/apis/local_storage.dart';
import 'package:mallorca_transit_services/mallorca_transit_services.dart';

class StationSheetViewModel extends ChangeNotifier {
final Station station;

StationSheetViewModel(this.station);

bool isFavourite = false;
List<Departure>? departures;
bool isLoading = true;
bool hasError = false;
final int numberOfDepartures = 10;

Future<void> initialize() async {
await _loadFavouriteStatus();
await fetchDepartures();
}

Future<void> _loadFavouriteStatus() async {
final favourites = await LocalStorageApi.getFavouriteStations();
isFavourite = favourites.contains(station.code.toString());
if (!_isDisposed) {
notifyListeners();
}
}

Future<void> toggleFavourite() async {
final favourites = await LocalStorageApi.getFavouriteStations();

if (isFavourite) {
favourites.remove(station.code.toString());
} else {
favourites.add(station.code.toString());
}
await LocalStorageApi.setFavouriteStations(favourites);
isFavourite = !isFavourite;
if (!_isDisposed) {
notifyListeners();
}
}

Future<void> fetchDepartures() async {
try {
isLoading = true;
hasError = false;
if (!_isDisposed) {
notifyListeners();
}

departures = await Departures.getDepartures(
stationCode: station.code,
numberOfDepartures: numberOfDepartures,
);
} catch (e) {
hasError = true;
} finally {
isLoading = false;
if (!_isDisposed) {
notifyListeners();
}
}
}

bool _isDisposed = false;

@override
void dispose() {
_isDisposed = true;
super.dispose();
}
}
Loading