many many many changes

lib/app_drawer.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:go_router/go_router.dart';
 
 class AppDrawer extends StatelessWidget {
   const AppDrawer({
@@ -25,13 +24,6 @@ class AppDrawer extends StatelessWidget {
                 ),
                 title: const Text('Menü')),
           ),
-          ListTile(
-            trailing: const Icon(Icons.today),
-            title: const Text('Kalender'),
-            onTap: () {
-              context.goNamed('calendar');
-            },
-          ),
           ListTile(
             title: const Text('Einstellungen'),
             trailing: const Icon(Icons.settings),

lib/calendar.dart

@@ -1,20 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:go_router/go_router.dart';
-
-class CalendarWidget extends StatelessWidget {
-  const CalendarWidget({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      body: CalendarDatePicker(
-        onDateChanged: (value) {
-          context.goNamed('perDay', extra: value);
-        },
-        initialDate: DateTime.now(),
-        firstDate: DateTime.now().subtract(const Duration(days: 30)),
-        lastDate: DateTime.now(),
-      ),
-    );
-  }
-}

lib/enter_food_widget.dart

@@ -1,7 +1,4 @@
-import 'dart:developer';
-
 import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:kalodings/food_entry_bloc.dart';
 import 'package:kalodings/row_with_spacers_widget.dart';
 

lib/main.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:go_router/go_router.dart';
-import 'package:kalodings/calendar.dart';
 import 'package:kalodings/food_entry_bloc.dart';
 import 'package:kalodings/perdate_widget.dart';
 import 'package:kalodings/storage/storage.dart';
@@ -24,6 +24,14 @@ class MainApp extends StatelessWidget {
         return FoodEntryBloc(FoodEntryState.init(), storage: storage);
       },
       child: MaterialApp.router(
+        localizationsDelegates: const [
+          GlobalMaterialLocalizations.delegate,
+          GlobalWidgetsLocalizations.delegate,
+          GlobalCupertinoLocalizations.delegate,
+        ],
+        supportedLocales: const [
+          Locale('de'),
+        ],
         theme: ThemeData.dark(),
         routerConfig: router,
       ),
@@ -36,25 +44,25 @@ final router = GoRouter(routes: [
       path: '/',
       name: 'perDayToday',
       builder: (context, state) {
+        context
+            .read<FoodEntryBloc>()
+            .add(PageChangedEvent(changedToDate: DateTime.now()));
         return PerDateWidget(DateTime.now());
       }),
   GoRoute(
       path: '/day',
       name: 'perDay',
       builder: (context, state) {
-        DateTime day;
+        DateTime date;
         if (state.extra == null || state.extra is! DateTime) {
-          day = DateTime.now();
+          date = DateTime.now();
         } else {
-          day = state.extra as DateTime;
+          date = state.extra as DateTime;
         }
+        context
+            .read<FoodEntryBloc>()
+            .add(PageChangedEvent(changedToDate: date));
 
-        return PerDateWidget(day);
+        return PerDateWidget(date);
-      }),
-  GoRoute(
-      path: '/calendar',
-      name: 'calendar',
-      builder: (context, state) {
-        return const CalendarWidget();
       }),
 ]);

lib/perdate_widget.dart

@@ -7,29 +7,15 @@ import 'package:kalodings/food_entry_bloc.dart';
 import 'package:kalodings/food_entry_widget.dart';
 import 'package:kalodings/sum_widget.dart';
 
-class PerDateWidget extends StatefulWidget {
+class PerDateWidget extends StatelessWidget {
   final DateTime date;
   const PerDateWidget(this.date, {super.key});
 
-  @override
-  State<PerDateWidget> createState() => _PerDateWidgetState();
-}
-
-class _PerDateWidgetState extends State<PerDateWidget> {
-  @override
-  void initState() {
-    super.initState();
-
-    context
-        .read<FoodEntryBloc>()
-        .add(PageChangedEvent(changedToDate: widget.date));
-  }
-
   @override
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        title: Text(widget.date.toString()),
+        title: Text(date.toString()),
       ),
       drawer: const AppDrawer(),
       body: BlocBuilder<FoodEntryBloc, FoodEntryState>(
@@ -45,7 +31,7 @@ class _PerDateWidgetState extends State<PerDateWidget> {
                   onAdd: (context, entry) {
                     context
                         .read<FoodEntryBloc>()
-                        .add(FoodEntryEvent(entry: entry, date: widget.date));
+                        .add(FoodEntryEvent(entry: entry, date: date));
                   },
                 );
               }
@@ -55,8 +41,7 @@ class _PerDateWidgetState extends State<PerDateWidget> {
                 onDelete: (callbackContext) {
                   callbackContext.read<FoodEntryBloc>().add(
                         FoodDeletionEvent(
-                            entryID: state.foodEntries[index].id,
+                            entryID: state.foodEntries[index].id, date: date),
-                            date: widget.date),
                       );
                 },
               );
@@ -65,12 +50,21 @@ class _PerDateWidgetState extends State<PerDateWidget> {
         },
       ),
       floatingActionButton: FloatingActionButton(
-          onPressed: () {
+          onPressed: () async {
-            context.goNamed('calendar');
+            var router = GoRouter.of(context);
+            var datePicked = await showDatePicker(
+              locale: const Locale('de'),
+              context: context,
+              initialDate: date,
+              currentDate: DateTime.now(),
+              firstDate:
+                  DateTime.now().subtract(const Duration(days: 365 * 10)),
+              lastDate: DateTime.now(),
+            );
+
+            router.goNamed('perDay', extra: datePicked);
           },
           child: const Icon(Icons.today)),
     );
   }