MarianumMobile/Client
MarianumMobile/Client
5
1
Fork 0
Code Issues 33 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

wip: fixed state not updating correctly

Browse Source
This commit is contained in:
Elias Müller 2024-05-27 22:28:42 +02:00
parent 634fe41e78
commit a33c4ddac5
3 changed files with 60 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/state/app/modules/holidays/bloc/holidays_bloc.dart
View File

@ -9,8 +9,8 @@ import 'holidays_state.dart';
class HolidaysBloc extends LoadableHydratedBloc<HolidaysEvent, HolidaysState, HolidaysRepository> { class HolidaysBloc extends LoadableHydratedBloc<HolidaysEvent, HolidaysState, HolidaysRepository> {
HolidaysBloc() { HolidaysBloc() {
on<SetPastHolidaysVisible>((event, emit) { on<SetPastHolidaysVisible>((event, emit) {
log('set pastholidays: ${event.shouldBeVisible.toString()}'); log('SetPastHolidaysVisible: ${event.shouldBeVisible.toString()}');
add(Emit((state) => state.copyWith(showPastHolidays: state.showPastHolidays))); add(Emit((state) => state.copyWith(showPastHolidays: event.shouldBeVisible)));
}); });
on<DisclaimerDismissed>((event, emit) => add( on<DisclaimerDismissed>((event, emit) => add(
@ -19,6 +19,9 @@ class HolidaysBloc extends LoadableHydratedBloc<HolidaysEvent, HolidaysState, Ho
} }
bool showPastHolidays() => innerState?.showPastHolidays ?? false; bool showPastHolidays() => innerState?.showPastHolidays ?? false;
List<Holiday>? getHolidays() => innerState?.holidays.where(
(element) => showPastHolidays() || DateTime.parse(element.end).isAfter(DateTime.now())
).toList();
@override @override
fromNothing() => const HolidaysState(showPastHolidays: false, holidays: [], showDisclaimer: true); fromNothing() => const HolidaysState(showPastHolidays: false, holidays: [], showDisclaimer: true);

20
lib/state/app/modules/holidays/view/holidays_view.dart
View File

@ -1,13 +1,11 @@
import 'dart:developer';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:jiffy/jiffy.dart'; import 'package:jiffy/jiffy.dart';
import '../../../../../view/pages/more/holidays/holidays.dart'; import '../../../../../view/pages/more/holidays/holidays.dart';
import '../../../../../widget/animatedTime.dart'; import '../../../../../widget/animatedTime.dart';
import '../../../../../widget/list_view_util.dart';
import '../../../../../widget/centeredLeading.dart'; import '../../../../../widget/centeredLeading.dart';
import '../../../../../widget/debug/debugTile.dart'; import '../../../../../widget/debug/debugTile.dart';
import '../../../infrastructure/loadableState/loadable_state.dart';
import '../../../infrastructure/loadableState/view/loadable_state_consumer.dart'; import '../../../infrastructure/loadableState/view/loadable_state_consumer.dart';
import '../../../infrastructure/utilityWidgets/bloc_module.dart'; import '../../../infrastructure/utilityWidgets/bloc_module.dart';
import '../bloc/holidays_bloc.dart'; import '../bloc/holidays_bloc.dart';
@ -18,11 +16,10 @@ class HolidaysView extends StatelessWidget {
const HolidaysView({super.key}); const HolidaysView({super.key});
@override @override
Widget build(BuildContext context) => BlocModule<HolidaysBloc, LoadableState<HolidaysState>>( Widget build(BuildContext context) => BlocModule(
create: (contet) => HolidaysBloc(), create: (context) => HolidaysBloc(),
autoRebuild: true, autoRebuild: true,
child: (context, bloc, state) { child: (context, bloc, state) {
log(state.toString());
void showDisclaimer() { void showDisclaimer() {
showDialog(context: context, builder: (context) => AlertDialog( showDialog(context: context, builder: (context) => AlertDialog(
title: const Text('Richtigkeit und Bereitstellung der Daten'), title: const Text('Richtigkeit und Bereitstellung der Daten'),
@ -66,17 +63,13 @@ class HolidaysView extends StatelessWidget {
], ],
), ),
body: LoadableStateConsumer<HolidaysBloc, HolidaysState>( body: LoadableStateConsumer<HolidaysBloc, HolidaysState>(
child: (state, loading) => ListView.builder( child: (state, loading) => ListViewUtil.fromList<Holiday>(bloc.getHolidays(), (holiday) {
itemCount: state.holidays.length,
itemBuilder: (context, index) {
var holiday = state.holidays[index];
var holidayType = holiday.name.split(' ').first.capitalize(); var holidayType = holiday.name.split(' ').first.capitalize();
String formatDate(String enDate) => Jiffy.parse(enDate).format(pattern: 'dd.MM.yyyy'); String formatDate(String enDate) => Jiffy.parse(enDate).format(pattern: 'dd.MM.yyyy');
return ListTile( return ListTile(
leading: const CenteredLeading(Icon(Icons.calendar_month)), leading: const CenteredLeading(Icon(Icons.calendar_month)),
title: Text('$holidayType ab ${formatDate(holiday.start)}'), title: Text('${state.showPastHolidays}$holidayType ab ${formatDate(holiday.start)}'),
subtitle: Text('bis ${formatDate(holiday.end)}'), subtitle: Text('bis ${formatDate(holiday.end)}'),
onTap: () => showDialog(context: context, builder: (context) => SimpleDialog( onTap: () => showDialog(context: context, builder: (context) => SimpleDialog(
title: Text('$holidayType ${holiday.year} in Hessen'), title: Text('$holidayType ${holiday.year} in Hessen'),
@ -111,8 +104,7 @@ class HolidaysView extends StatelessWidget {
)), )),
trailing: const Icon(Icons.arrow_right), trailing: const Icon(Icons.arrow_right),
); );
}, }),
),
), ),
); );
}, },

9
lib/widget/list_view_util.dart Normal file
View File

@ -0,0 +1,9 @@
import 'package:flutter/material.dart';
class ListViewUtil {
static ListView fromList<T>(List<T>? items, Widget Function(T item) map) => ListView.builder(
itemCount: items?.length ?? 0,
itemBuilder: (context, index) => items != null ? map(items[index]) : null,
);
}