diff --git a/lib/content_views/tour_list_page.dart b/lib/content_views/tour_list_page.dart index 22ac92d..a0e3d2e 100644 --- a/lib/content_views/tour_list_page.dart +++ b/lib/content_views/tour_list_page.dart @@ -63,7 +63,7 @@ class _TourListPageState extends State { return Util.getWaitWidget(context); } - late List jobWidgets = _createjobWidgets(); + late List jobWidgets = _createTourWidgets(); return Padding( padding: const EdgeInsets.all(18.0), @@ -124,14 +124,26 @@ class _TourListPageState extends State { ); } - List _createjobWidgets() { - List jobWidgets = []; + List _createTourWidgets() { + List tourWidgets = []; + + JobTour? lastTour; for (var tour in _tours) { + bool tourActive = false; + + if (lastTour == null) { + tourActive = true; + } else { + if (lastTour.state != 0) { + tourActive = true; + } + } + Color color = Colors.transparent; switch (tour.state) { case 0: - color = Colors.white; + color = tourActive ? Colors.white : Colors.grey; break; case 1: @@ -143,11 +155,15 @@ class _TourListPageState extends State { break; } - jobWidgets.add( + lastTour = tour; + + tourWidgets.add( ListTile( contentPadding: const EdgeInsets.all(0), onTap: () { - _clicked(tour); + if (tourActive) { + _clicked(tour); + } }, title: Container( decoration: BoxDecoration( @@ -179,7 +195,7 @@ class _TourListPageState extends State { ); } - return jobWidgets; + return tourWidgets; } void _clicked(JobTour tour) { diff --git a/lib/popups/map_popup.dart b/lib/popups/map_popup.dart index e1207cf..b93bfae 100644 --- a/lib/popups/map_popup.dart +++ b/lib/popups/map_popup.dart @@ -9,7 +9,7 @@ import 'package:stadtbote/tools/util.dart'; import '../model/job_tour.dart'; showMapPopup(BuildContext context, JobTour currentTour, List tourList) async { - /*await showDialog( + await showDialog( context: context, builder: (BuildContext context) { return AlertDialog( @@ -188,5 +188,5 @@ showMapPopup(BuildContext context, JobTour currentTour, List tourList) ), )); })); - });*/ + }); }