claude refactor

lib/main.dart

@@ -1,33 +1,34 @@
 import 'dart:async';
 import 'dart:developer';
 import 'dart:io';
+import 'dart:ui';
 
 import 'package:firebase_core/firebase_core.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:hydrated_bloc/hydrated_bloc.dart';
 import 'package:jiffy/jiffy.dart';
 import 'package:loader_overlay/loader_overlay.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:persistent_bottom_nav_bar_v2/persistent_bottom_nav_bar_v2.dart';
-import 'package:provider/provider.dart';
 
 import 'api/mhsl/breaker/getBreakers/getBreakersResponse.dart';
 import 'app.dart';
 import 'firebase_options.dart';
 import 'model/accountData.dart';
-import 'model/accountModel.dart';
-import 'model/breakers/Breaker.dart';
-import 'model/breakers/BreakerProps.dart';
-import 'model/chatList/chatListProps.dart';
-import 'model/chatList/chatProps.dart';
-import 'model/files/filesProps.dart';
-import 'model/holidays/holidaysProps.dart';
-import 'model/timetable/timetableProps.dart';
-import 'storage/base/settingsProvider.dart';
+import 'widget/breaker/breaker.dart';
+import 'state/app/modules/account/bloc/account_bloc.dart';
+import 'state/app/modules/account/bloc/account_state.dart';
+import 'state/app/modules/breaker/bloc/breaker_bloc.dart';
+import 'state/app/modules/chat/bloc/chat_bloc.dart';
+import 'state/app/modules/chatList/bloc/chat_list_bloc.dart';
+import 'state/app/modules/settings/bloc/settings_cubit.dart';
+import 'state/app/modules/timetable/bloc/timetable_bloc.dart';
+import 'storage/base/settings.dart';
 import 'theming/darkAppTheme.dart';
 import 'theming/lightAppTheme.dart';
 import 'view/login/login.dart';
@@ -37,133 +38,123 @@ Future<void> main() async {
   log('MarianumMobile started');
   WidgetsFlutterBinding.ensureInitialized();
 
-  addCertificateAsTrusted(ByteData certificate) => SecurityContext.defaultContext.setTrustedCertificatesBytes(certificate.buffer.asUint8List());
+  void addCertificateAsTrusted(ByteData certificate) =>
+      SecurityContext.defaultContext.setTrustedCertificatesBytes(certificate.buffer.asUint8List());
 
-  var initialisationTasks = [
+  final initialisationTasks = [
     Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform)
-      .then((value) async => log("Firebase token: ${await FirebaseMessaging.instance.getToken() ?? "Error: no Firebase token!"}"))
-      .onError((error, stackTrace) => log('Error initializing Firebase: $error')),
-
+        .then((_) async => log('Firebase token: ${await FirebaseMessaging.instance.getToken() ?? "Error: no Firebase token!"}'))
+        .onError((error, _) => log('Error initializing Firebase: $error')),
     PlatformAssetBundle().load('assets/ca/lets-encrypt-r3.pem').then(addCertificateAsTrusted),
     PlatformAssetBundle().load('assets/ca/lets-encrypt-r10.pem').then(addCertificateAsTrusted),
     PlatformAssetBundle().load('assets/ca/lets-encrypt-r13.pem').then(addCertificateAsTrusted),
-
     Future(() async {
-      await HydratedStorage.build(
-          storageDirectory: HydratedStorageDirectory((await getTemporaryDirectory()).path)
-      ).then((storage) => HydratedBloc.storage = storage);
-    })
+      final storage = await HydratedStorage.build(
+        storageDirectory: HydratedStorageDirectory((await getTemporaryDirectory()).path),
+      );
+      HydratedBloc.storage = storage;
+    }),
   ];
 
   log('starting app initialisation...');
   await Future.wait(initialisationTasks);
   log('app initialisation done!');
 
-  if(kReleaseMode) {
+  if (kReleaseMode) {
     ErrorWidget.builder = (error) => PlaceholderView(
-      icon: Icons.phonelink_erase_rounded,
-      text: error.toStringShort(),
-    );
+          icon: Icons.phonelink_erase_rounded,
+          text: error.toStringShort(),
+        );
   }
 
+  // Capture uncaught Flutter and platform errors so they show up in logs
+  // instead of being silently swallowed.
+  FlutterError.onError = (details) {
+    log('Uncaught Flutter error: ${details.exception}', stackTrace: details.stack);
+    FlutterError.presentError(details);
+  };
+  PlatformDispatcher.instance.onError = (error, stack) {
+    log('Uncaught platform error: $error', stackTrace: stack);
+    return true;
+  };
+
   log('running app...');
   runApp(
-      MultiProvider(
-        providers: [
-          ChangeNotifierProvider(create: (context) => BreakerProps()),
-
-          ChangeNotifierProvider(create: (context) => SettingsProvider()),
-          ChangeNotifierProvider(create: (context) => AccountModel()),
-
-          ChangeNotifierProvider(create: (context) => TimetableProps()),
-          ChangeNotifierProvider(create: (context) => ChatListProps()),
-          ChangeNotifierProvider(create: (context) => ChatProps()),
-          ChangeNotifierProvider(create: (context) => FilesProps()),
-
-          ChangeNotifierProvider(create: (context) => HolidaysProps()),
-        ],
-        child: const Main(),
-      )
+    MultiBlocProvider(
+      providers: [
+        BlocProvider<SettingsCubit>(create: (_) => SettingsCubit()),
+        BlocProvider<AccountBloc>(create: (_) => AccountBloc()),
+        BlocProvider<BreakerBloc>(create: (_) => BreakerBloc()),
+        BlocProvider<ChatListBloc>(create: (_) => ChatListBloc()),
+        BlocProvider<ChatBloc>(create: (_) => ChatBloc()),
+        BlocProvider<TimetableBloc>(create: (_) => TimetableBloc()),
+      ],
+      child: const Main(),
+    ),
   );
 }
 
 class Main extends StatefulWidget {
   const Main({super.key});
-  static PersistentTabController bottomNavigator = PersistentTabController(initialIndex: 0);
 
+  static PersistentTabController bottomNavigator = PersistentTabController(initialIndex: 0);
 
   @override
   State<Main> createState() => _MainState();
 }
 
 class _MainState extends State<Main> {
-  late Timer refetchProps;
-
   @override
   void initState() {
+    super.initState();
     Jiffy.setLocale('de');
 
     AccountData().waitForPopulation().then((value) {
-      Provider.of<AccountModel>(context, listen: false)
-          .setState(value ? AccountModelState.loggedIn : AccountModelState.loggedOut);
+      if (!mounted) return;
+      context.read<AccountBloc>().setStatus(value ? AccountStatus.loggedIn : AccountStatus.loggedOut);
     });
-
-    refetchProps = Timer.periodic(const Duration(seconds: 60), (timer) {
-      Provider.of<BreakerProps>(context, listen: false).run();
-    });
-
-    super.initState();
   }
 
   @override
   Widget build(BuildContext context) => Directionality(
-      textDirection: TextDirection.ltr,
-      child: Consumer<SettingsProvider>(
-        builder: (context, settings, child) {
-          var devToolsSettings = settings.val().devToolsSettings;
-          return MaterialApp(
-            showPerformanceOverlay: devToolsSettings.showPerformanceOverlay,
-            checkerboardOffscreenLayers: devToolsSettings.checkerboardOffscreenLayers,
-            checkerboardRasterCacheImages: devToolsSettings.checkerboardRasterCacheImages,
-
-            debugShowCheckedModeBanner: false,
-            localizationsDelegates: const [
-              ...GlobalMaterialLocalizations.delegates,
-              GlobalWidgetsLocalizations.delegate,
-            ],
-            supportedLocales: const [
-              Locale('de'),
-              Locale('en'),
-            ],
-            locale: const Locale('de'),
-
-            title: 'Marianum Fulda',
-            
-            themeMode: settings.val().appTheme,
-            theme: LightAppTheme.theme,
-            darkTheme: DarkAppTheme.theme,
-            home: LoaderOverlay(
-              child: Breaker(
+        textDirection: TextDirection.ltr,
+        child: BlocBuilder<SettingsCubit, Settings>(
+          builder: (context, settings) {
+            final devToolsSettings = settings.devToolsSettings;
+            return MaterialApp(
+              showPerformanceOverlay: devToolsSettings.showPerformanceOverlay,
+              checkerboardOffscreenLayers: devToolsSettings.checkerboardOffscreenLayers,
+              checkerboardRasterCacheImages: devToolsSettings.checkerboardRasterCacheImages,
+              debugShowCheckedModeBanner: false,
+              localizationsDelegates: const [
+                ...GlobalMaterialLocalizations.delegates,
+                GlobalWidgetsLocalizations.delegate,
+              ],
+              supportedLocales: const [Locale('de'), Locale('en')],
+              locale: const Locale('de'),
+              title: 'Marianum Fulda',
+              themeMode: settings.appTheme,
+              theme: LightAppTheme.theme,
+              darkTheme: DarkAppTheme.theme,
+              home: LoaderOverlay(
+                child: Breaker(
                   breaker: BreakerArea.global,
-                  child: Consumer<AccountModel>(
-                    builder: (context, accountModel, child) {
-                      switch(accountModel.state) {
-                        case AccountModelState.loggedIn: return const App();
-                        case AccountModelState.loggedOut: return const Login();
-                        case AccountModelState.undefined: return const PlaceholderView(icon: Icons.timer, text: 'Daten werden geladen');
+                  child: BlocBuilder<AccountBloc, AccountState>(
+                    builder: (context, accountState) {
+                      switch (accountState.status) {
+                        case AccountStatus.loggedIn:
+                          return const App();
+                        case AccountStatus.loggedOut:
+                          return const Login();
+                        case AccountStatus.undefined:
+                          return const PlaceholderView(icon: Icons.timer, text: 'Daten werden geladen');
                       }
                     },
-                  )
+                  ),
+                ),
               ),
-            ),
-          );
-        },
-      ),
-    );
-
-  @override
-  void dispose() {
-    refetchProps.cancel();
-    super.dispose();
-  }
+            );
+          },
+        ),
+      );
 }