feat(retry): jeder dynamisch geladene Request hat im Fehlerfall einen Retry
Inventur aller Lese-Requests (Tour, Fahrzeuge, Zahlungsmethoden,
Foto-Vorschauen) und aller Stellen, an denen ihr Fehlerzustand gerendert wird.
Geschlossene Luecken:
- Sortieren-Seite: TourLoadFailed fiel in den Lade-Zweig -> Endlos-Spinner
ohne Ausweg. Jetzt Fehlerseite mit 'Erneut versuchen' im Header-Rahmen
- Home: scheiterte beim Start CarLoad oder LoadTour, wurde die Phase nie
geladen -> Endlos-Spinner. Jetzt Fehlerseite mit Retry (+ Drawer)
- Beladen-/Auswaehlen-Seite: Fehlerseite stand ohne Scaffold/Header/Drawer
da; jetzt im selben Rahmen wie die uebrigen Zustaende
- Hintergrund-Reload (refreshError): Snackbar jetzt MIT Retry-Aktion und
zentral im PhaseStepper-Header -> gilt in allen Phasen (vorher nur
Ausliefern, ohne Retry; auf Sortieren/Beladen blieb der Fehler stumm)
- AttachmentImage: Fehleranzeige ist antippbar ('Erneut laden')
Zahlungsmethoden haben den Retry bereits aus dem vorigen Commit.
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
This commit is contained in:
@ -35,16 +35,9 @@ class DeliveryOverviewPage extends StatelessWidget {
|
|||||||
carId: carId,
|
carId: carId,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
body: BlocConsumer<TourBloc, TourState>(
|
// Die Refresh-Fehler-Snackbar (inkl. Retry) sitzt zentral im
|
||||||
listenWhen: (prev, next) =>
|
// PhaseStepper-Header (`_ReloadButton`) und gilt damit für alle Phasen.
|
||||||
next is TourLoaded && next.refreshError != null,
|
body: BlocBuilder<TourBloc, TourState>(
|
||||||
listener: (context, state) {
|
|
||||||
if (state is TourLoaded && state.refreshError != null) {
|
|
||||||
ScaffoldMessenger.of(context).showSnackBar(
|
|
||||||
SnackBar(content: Text(state.refreshError!)),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
builder: (context, state) {
|
builder: (context, state) {
|
||||||
switch (state) {
|
switch (state) {
|
||||||
case TourLoaded(:final details):
|
case TourLoaded(:final details):
|
||||||
|
|||||||
@ -370,7 +370,14 @@ class _DeliverySelectionPageState extends State<DeliverySelectionPage> {
|
|||||||
return BlocBuilder<TourBloc, TourState>(
|
return BlocBuilder<TourBloc, TourState>(
|
||||||
builder: (context, state) {
|
builder: (context, state) {
|
||||||
if (state is TourLoadFailed) {
|
if (state is TourLoadFailed) {
|
||||||
return const DeliveryLoadingFailedPage();
|
// Mit Scaffold + Drawer: die Fehlerseite (inkl. „Erneut versuchen")
|
||||||
|
// stand bisher nackt ohne Material-Rahmen da, und der Fahrer kam
|
||||||
|
// nicht an Einstellungen/Logout.
|
||||||
|
return Scaffold(
|
||||||
|
drawer: const HomeAppDrawer(),
|
||||||
|
appBar: AppBar(title: const Text('Lieferungen auswählen')),
|
||||||
|
body: const DeliveryLoadingFailedPage(),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
if (state is TourEmpty) {
|
if (state is TourEmpty) {
|
||||||
return Scaffold(
|
return Scaffold(
|
||||||
|
|||||||
@ -11,6 +11,7 @@ import 'package:hl_lieferservice/feature/delivery/bloc/tour_event.dart';
|
|||||||
import 'package:hl_lieferservice/feature/delivery/bloc/tour_state.dart';
|
import 'package:hl_lieferservice/feature/delivery/bloc/tour_state.dart';
|
||||||
import 'package:hl_lieferservice/feature/delivery/model/delivery_phase.dart';
|
import 'package:hl_lieferservice/feature/delivery/model/delivery_phase.dart';
|
||||||
import 'package:hl_lieferservice/feature/delivery/overview/widget/sortable_delivery_list.dart';
|
import 'package:hl_lieferservice/feature/delivery/overview/widget/sortable_delivery_list.dart';
|
||||||
|
import 'package:hl_lieferservice/feature/delivery/overview/presentation/delivery_fail_page.dart';
|
||||||
import 'package:hl_lieferservice/widget/home/presentation/home_drawer.dart';
|
import 'package:hl_lieferservice/widget/home/presentation/home_drawer.dart';
|
||||||
import 'package:hl_lieferservice/widget/phase_stepper/phase_stepper.dart';
|
import 'package:hl_lieferservice/widget/phase_stepper/phase_stepper.dart';
|
||||||
|
|
||||||
@ -251,6 +252,25 @@ class _DeliverySortPageState extends State<DeliverySortPage> {
|
|||||||
body: _emptyState(),
|
body: _emptyState(),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
if (state is TourLoadFailed) {
|
||||||
|
// Laden gescheitert: Fehlerseite mit „Erneut versuchen" im selben
|
||||||
|
// Rahmen (Header + Drawer). Vorher fiel dieser Zustand in den
|
||||||
|
// Lade-Zweig darunter → Endlos-Spinner ohne Ausweg.
|
||||||
|
return Scaffold(
|
||||||
|
drawer: const HomeAppDrawer(),
|
||||||
|
appBar: PreferredSize(
|
||||||
|
preferredSize: const Size.fromHeight(140),
|
||||||
|
child: PhaseStepper(
|
||||||
|
currentPhase: DeliveryPhase.sortieren,
|
||||||
|
carId: widget.selectedCarId,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
body: const SafeArea(
|
||||||
|
top: false,
|
||||||
|
child: DeliveryLoadingFailedPage(),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
if (state is! TourLoaded) {
|
if (state is! TourLoaded) {
|
||||||
// Lade-Zwischenzustand (auch beim 'Neu laden') mit derselben
|
// Lade-Zwischenzustand (auch beim 'Neu laden') mit derselben
|
||||||
// PhaseStepper-AppBar — sonst flackert die Leiste kurz auf die
|
// PhaseStepper-AppBar — sonst flackert die Leiste kurz auf die
|
||||||
|
|||||||
@ -64,9 +64,6 @@ class LoadingOverviewPage extends StatelessWidget {
|
|||||||
|
|
||||||
return BlocBuilder<TourBloc, TourState>(
|
return BlocBuilder<TourBloc, TourState>(
|
||||||
builder: (context, tourState) {
|
builder: (context, tourState) {
|
||||||
if (tourState is TourLoadFailed) {
|
|
||||||
return const DeliveryLoadingFailedPage();
|
|
||||||
}
|
|
||||||
// Auch ohne/vor geladener Tour den Phasen-Header zeigen — sonst
|
// Auch ohne/vor geladener Tour den Phasen-Header zeigen — sonst
|
||||||
// verschwinden Kopf-Kalender, Menü und Reload hinter einer nackten
|
// verschwinden Kopf-Kalender, Menü und Reload hinter einer nackten
|
||||||
// 'Beladung'-AppBar und der Fahrer kommt an einem leeren Tag nicht
|
// 'Beladung'-AppBar und der Fahrer kommt an einem leeren Tag nicht
|
||||||
@ -78,6 +75,18 @@ class LoadingOverviewPage extends StatelessWidget {
|
|||||||
carId: carId,
|
carId: carId,
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
if (tourState is TourLoadFailed) {
|
||||||
|
// Fehlerseite (mit „Erneut versuchen") im selben Rahmen wie die
|
||||||
|
// übrigen Zustände — vorher ohne Scaffold/Header/Drawer.
|
||||||
|
return Scaffold(
|
||||||
|
drawer: const HomeAppDrawer(),
|
||||||
|
appBar: stepperHeader,
|
||||||
|
body: const SafeArea(
|
||||||
|
top: false,
|
||||||
|
child: DeliveryLoadingFailedPage(),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
if (tourState is TourEmpty) {
|
if (tourState is TourEmpty) {
|
||||||
return Scaffold(
|
return Scaffold(
|
||||||
drawer: const HomeAppDrawer(),
|
drawer: const HomeAppDrawer(),
|
||||||
|
|||||||
@ -64,6 +64,14 @@ class _AttachmentImageState extends State<AttachmentImage> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Stößt den Download nach einem Fehler erneut an (Tipp auf die
|
||||||
|
/// Fehleranzeige). Ein fehlgeschlagener Bild-Load ist kein Endzustand.
|
||||||
|
void _retry() {
|
||||||
|
setState(() {
|
||||||
|
_future = _load();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
static const _ext = 'jpeg';
|
static const _ext = 'jpeg';
|
||||||
|
|
||||||
Future<Uint8List> _load() async {
|
Future<Uint8List> _load() async {
|
||||||
@ -133,12 +141,42 @@ class _AttachmentImageState extends State<AttachmentImage> {
|
|||||||
if (snapshot.hasError ||
|
if (snapshot.hasError ||
|
||||||
snapshot.data == null ||
|
snapshot.data == null ||
|
||||||
snapshot.data!.isEmpty) {
|
snapshot.data!.isEmpty) {
|
||||||
|
// Laden fehlgeschlagen (Netz/VPN/Server): Tippen lädt erneut.
|
||||||
|
// Bewusst GestureDetector statt InkWell — das Widget wird auch
|
||||||
|
// ohne Material-Vorfahren (Vollbild-Ansicht) verwendet.
|
||||||
return Center(
|
return Center(
|
||||||
child: Padding(
|
child: GestureDetector(
|
||||||
padding: const EdgeInsets.all(16),
|
behavior: HitTestBehavior.opaque,
|
||||||
child: Icon(
|
onTap: _retry,
|
||||||
Icons.broken_image_outlined,
|
child: Padding(
|
||||||
color: theme.colorScheme.onSurfaceVariant,
|
padding: const EdgeInsets.all(12),
|
||||||
|
child: Column(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
children: [
|
||||||
|
Icon(
|
||||||
|
Icons.broken_image_outlined,
|
||||||
|
color: theme.colorScheme.onSurfaceVariant,
|
||||||
|
),
|
||||||
|
const SizedBox(height: 4),
|
||||||
|
Row(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
children: [
|
||||||
|
Icon(
|
||||||
|
Icons.refresh,
|
||||||
|
size: 14,
|
||||||
|
color: theme.colorScheme.primary,
|
||||||
|
),
|
||||||
|
const SizedBox(width: 4),
|
||||||
|
Text(
|
||||||
|
'Erneut laden',
|
||||||
|
style: theme.textTheme.labelSmall?.copyWith(
|
||||||
|
color: theme.colorScheme.primary,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|||||||
@ -5,6 +5,7 @@ import 'package:hl_lieferservice/feature/car_selection/bloc/state.dart';
|
|||||||
import 'package:hl_lieferservice/feature/cars/bloc/cars_bloc.dart';
|
import 'package:hl_lieferservice/feature/cars/bloc/cars_bloc.dart';
|
||||||
import 'package:hl_lieferservice/feature/cars/bloc/cars_event.dart';
|
import 'package:hl_lieferservice/feature/cars/bloc/cars_event.dart';
|
||||||
import 'package:hl_lieferservice/feature/cars/bloc/cars_state.dart';
|
import 'package:hl_lieferservice/feature/cars/bloc/cars_state.dart';
|
||||||
|
import 'package:hl_lieferservice/feature/cars/presentation/car_fail_page.dart';
|
||||||
import 'package:hl_lieferservice/feature/delivery/bloc/phase_bloc.dart';
|
import 'package:hl_lieferservice/feature/delivery/bloc/phase_bloc.dart';
|
||||||
import 'package:hl_lieferservice/feature/delivery/bloc/phase_event.dart';
|
import 'package:hl_lieferservice/feature/delivery/bloc/phase_event.dart';
|
||||||
import 'package:hl_lieferservice/feature/delivery/bloc/phase_state.dart';
|
import 'package:hl_lieferservice/feature/delivery/bloc/phase_state.dart';
|
||||||
@ -12,6 +13,8 @@ import 'package:hl_lieferservice/feature/delivery/bloc/tour_bloc.dart';
|
|||||||
import 'package:hl_lieferservice/feature/delivery/bloc/tour_date_cubit.dart';
|
import 'package:hl_lieferservice/feature/delivery/bloc/tour_date_cubit.dart';
|
||||||
import 'package:hl_lieferservice/feature/delivery/bloc/tour_event.dart';
|
import 'package:hl_lieferservice/feature/delivery/bloc/tour_event.dart';
|
||||||
import 'package:hl_lieferservice/feature/delivery/bloc/tour_state.dart';
|
import 'package:hl_lieferservice/feature/delivery/bloc/tour_state.dart';
|
||||||
|
import 'package:hl_lieferservice/feature/delivery/overview/presentation/delivery_fail_page.dart';
|
||||||
|
import 'package:hl_lieferservice/widget/home/presentation/home_drawer.dart';
|
||||||
import 'package:hl_lieferservice/feature/delivery/model/delivery_phase.dart';
|
import 'package:hl_lieferservice/feature/delivery/model/delivery_phase.dart';
|
||||||
import 'package:hl_lieferservice/feature/delivery/overview/presentation/delivery_overview_page.dart';
|
import 'package:hl_lieferservice/feature/delivery/overview/presentation/delivery_overview_page.dart';
|
||||||
import 'package:hl_lieferservice/feature/delivery/overview/presentation/delivery_selection_page.dart';
|
import 'package:hl_lieferservice/feature/delivery/overview/presentation/delivery_selection_page.dart';
|
||||||
@ -178,6 +181,29 @@ class _HomeState extends State<Home> {
|
|||||||
// Spinner zeigen — das dauert in der Praxis maximal
|
// Spinner zeigen — das dauert in der Praxis maximal
|
||||||
// ein paar Frames.
|
// ein paar Frames.
|
||||||
if (phase == null) {
|
if (phase == null) {
|
||||||
|
// Start-Sackgasse vermeiden: die Phase wird erst geladen,
|
||||||
|
// wenn Tour UND Fahrzeuge da sind. Scheiterte einer der
|
||||||
|
// beiden Requests, drehte hier bisher endlos der Spinner.
|
||||||
|
// Jetzt: Fehlerseite mit „Erneut versuchen" (+ Drawer für
|
||||||
|
// Einstellungen/Logout).
|
||||||
|
if (tourState is TourLoadFailed) {
|
||||||
|
return Scaffold(
|
||||||
|
drawer: const HomeAppDrawer(),
|
||||||
|
appBar: AppBar(),
|
||||||
|
body: const SafeArea(
|
||||||
|
child: DeliveryLoadingFailedPage(),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
// `watch`: dieser Builder soll auch auf CarsBloc-Wechsel
|
||||||
|
// reagieren (Failed ↔ Loading ↔ Loaded beim Retry).
|
||||||
|
if (context.watch<CarsBloc>().state is CarsLoadingFailed) {
|
||||||
|
return Scaffold(
|
||||||
|
drawer: const HomeAppDrawer(),
|
||||||
|
appBar: AppBar(),
|
||||||
|
body: const SafeArea(child: CarsLoadingFailedPage()),
|
||||||
|
);
|
||||||
|
}
|
||||||
return const Scaffold(
|
return const Scaffold(
|
||||||
body: Center(child: CircularProgressIndicator()),
|
body: Center(child: CircularProgressIndicator()),
|
||||||
);
|
);
|
||||||
|
|||||||
@ -484,7 +484,31 @@ class _ReloadButton extends StatelessWidget {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return BlocBuilder<TourBloc, TourState>(
|
return BlocConsumer<TourBloc, TourState>(
|
||||||
|
// Fehlgeschlagener Hintergrund-Reload → Snackbar MIT Retry-Aktion.
|
||||||
|
// Zentral im gemeinsamen Header, damit es in ALLEN Phasen gilt (vorher
|
||||||
|
// nur auf der Ausliefern-Seite und ohne Retry; auf Sortieren/Beladen
|
||||||
|
// blieb der Fehler stumm). Nur bei neu gesetztem/geändertem Fehler
|
||||||
|
// feuern — nicht bei jedem Folge-Emit, solange der Fehler noch steht.
|
||||||
|
listenWhen: (prev, curr) =>
|
||||||
|
curr is TourLoaded &&
|
||||||
|
curr.refreshError != null &&
|
||||||
|
(prev is! TourLoaded || prev.refreshError != curr.refreshError),
|
||||||
|
listener: (context, state) {
|
||||||
|
if (state is! TourLoaded || state.refreshError == null) return;
|
||||||
|
final bloc = context.read<TourBloc>();
|
||||||
|
ScaffoldMessenger.of(context)
|
||||||
|
..hideCurrentSnackBar()
|
||||||
|
..showSnackBar(
|
||||||
|
SnackBar(
|
||||||
|
content: Text(state.refreshError!),
|
||||||
|
action: SnackBarAction(
|
||||||
|
label: 'Erneut versuchen',
|
||||||
|
onPressed: () => bloc.add(const RefreshTour()),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
// Nur neu rendern, wenn sich der Refresh-Status ändert — sonst
|
// Nur neu rendern, wenn sich der Refresh-Status ändert — sonst
|
||||||
// läuft der Builder bei jedem Scan-Tick mit.
|
// läuft der Builder bei jedem Scan-Tick mit.
|
||||||
buildWhen: (prev, curr) {
|
buildWhen: (prev, curr) {
|
||||||
|
|||||||
Reference in New Issue
Block a user