marco/floodwatch
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

refactored overlay loading indicator code

Browse Source
This commit is contained in:
marco
2025-01-28 15:36:14 +01:00
parent 9c9992919d
commit 68b0d5834d
2 changed files with 121 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

153
lib/pages/landing_page.dart
View File

@@ -1,6 +1,8 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../model/flood_station.dart';
import '../services/overlay_service.dart';
import '../widgets/flood_station_list_view.dart'; import '../widgets/flood_station_list_view.dart';
import '../services/flood_station_provider.dart'; import '../services/flood_station_provider.dart';
import '../widgets/loading_notifier.dart'; import '../widgets/loading_notifier.dart';
@@ -14,10 +16,14 @@ class LandingPage extends StatefulWidget {
State<LandingPage> createState() => _LandingPageState(); State<LandingPage> createState() => _LandingPageState();
} }
class _LandingPageState extends State<LandingPage> { class _LandingPageState extends State<LandingPage> with OverlayService {
late FloodStationProvider floodStationProvider; late FloodStationProvider floodStationProvider;
OverlayEntry? _overlayEntry;
int loadingTimes = 0; @override
void dispose() {
super.dispose();
removeLoadingNotifier(); // Clean up overlay if needed
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@@ -25,91 +31,80 @@ class _LandingPageState extends State<LandingPage> {
return Column( return Column(
children: [ children: [
StationFilter( StationFilter(
onChanged: (filterText) { onChanged: (filterText) => _handleFilterChange(filterText),
if (filterText.isEmpty) {
floodStationProvider.filtered = false;
setState(() {});
return;
}
showLoadingNotifier(context: context, message: 'Loading');
floodStationProvider.loadFilteredStations(filterText);
floodStationProvider.filteredStationsFuture
?.then((_) => removeLoadingNotifier());
floodStationProvider.filtered = true;
},
), ),
_shouldShowList() _buildStationList(),
? Expanded(
child: FloodStationListView(
stations: floodStationProvider.filtered
? floodStationProvider.filteredStations
: floodStationProvider.allStations,
onItemTapped: (station) {
floodStationProvider.selectedStation = station;
Navigator.of(context).pushNamed(FloodStationPage.routeName);
},
),
)
: Expanded(
child: Center(
child: ElevatedButton(
onPressed: () {
showLoadingNotifier(context: context, message: 'Loading');
floodStationProvider
.loadAllStations()
.whenComplete(() => removeLoadingNotifier());
},
child: Text('Load all Stations'),
),
),
),
], ],
); );
} }
Widget _buildStationList() {
if (!_shouldShowList()) {
return Expanded(
child: Center(
child: ElevatedButton(
onPressed: _handleLoadAllStations,
child: const Text('Load all Stations'),
),
),
);
}
return Expanded(
child: FloodStationListView(
stations: floodStationProvider.filtered
? floodStationProvider.filteredStations
: floodStationProvider.allStations,
onItemTapped: _navigateToStationDetail,
),
);
}
void _handleFilterChange(String filterText) {
if (filterText.isEmpty) {
floodStationProvider.filtered = false;
setState(() {});
return;
}
showLoadingNotifier(
context: context,
message: 'Loading',
onDismiss: () {
floodStationProvider.cancelFilterLoading();
},
);
floodStationProvider.loadFilteredStations(filterText);
floodStationProvider.filteredStationsFuture
?.then((_) => removeLoadingNotifier());
floodStationProvider.filtered = true;
}
void _handleLoadAllStations() {
showLoadingNotifier(
context: context,
message: 'Loading',
onDismiss: () {
floodStationProvider.cancelFilterLoading();
},
);
floodStationProvider
.loadAllStations()
.whenComplete(() => removeLoadingNotifier());
}
void _navigateToStationDetail(FloodStation station) {
floodStationProvider.selectedStation = station;
Navigator.of(context).pushNamed(FloodStationPage.routeName);
}
bool _shouldShowList() { bool _shouldShowList() {
if (!floodStationProvider.filtered && if (!floodStationProvider.filtered &&
floodStationProvider.allStations.isNotEmpty) { floodStationProvider.allStations.isNotEmpty) {
return true; return true;
} }
if (floodStationProvider.filtered) { return floodStationProvider.filtered;
return true;
}
return false;
}
Future<void> showLoadingNotifier({
required BuildContext context,
required String message,
}) async {
if (_overlayEntry != null) return;
OverlayState? overlayState = Overlay.of(context);
_overlayEntry = OverlayEntry(
builder: (c) {
return Positioned(
bottom: 16,
left: 0,
right: 0,
child: Center(
child: LoadingNotifier(
message: 'Loading',
onDismissed: () {
floodStationProvider.cancelFilterLoading();
removeLoadingNotifier();
},
),
),
);
},
);
overlayState.insert(_overlayEntry!);
overlayState.setState(() {});
}
void removeLoadingNotifier() {
if (_overlayEntry != null) {
_overlayEntry?.remove();
_overlayEntry = null;
}
} }
} }

47
lib/services/overlay_service.dart Normal file
View File

@@ -0,0 +1,47 @@
import 'package:flutter/material.dart';
import '../widgets/loading_notifier.dart';
mixin OverlayService {
OverlayEntry? _overlayEntry;
Future<void> showLoadingNotifier({
required BuildContext context,
required String message,
required VoidCallback onDismiss,
}) async {
if (_overlayEntry != null) return;
final overlayState = Overlay.of(context);
_overlayEntry = OverlayEntry(
builder: (context) => Positioned(
bottom: 85,
left: 0,
right: 0,
child: Center(
child: LoadingNotifier(
message: message,
onDismissed: () {
onDismiss();
removeLoadingNotifier();
},
),
),
),
);
overlayState.insert(_overlayEntry!);
// overlayState.setState(() {});
}
void removeLoadingNotifier() {
if (_overlayEntry != null) {
_overlayEntry?.remove();
_overlayEntry = null;
}
}
void dispose() {
removeLoadingNotifier();
}
}