refactored data providers with centralized cache resolution, unified UI using custom dialogs and bottom sheets, and enhanced network error handling for Dio and TLS errors

2026-05-08 20:01:45 +02:00
parent c62a14645a
commit 9e139b5704
37 changed files with 595 additions and 753 deletions
@@ -7,6 +7,7 @@ import 'package:package_info_plus/package_info_plus.dart';
 import '../../../../state/app/modules/settings/bloc/settings_cubit.dart';
 import '../../../../widget/centered_leading.dart';
 import '../../../../widget/confirm_dialog.dart';
+import '../../../../widget/details_bottom_sheet.dart';
 import '../data/default_settings.dart';
 import '../widgets/privacy_info.dart';
 import 'dev_tools_section.dart';
@@ -69,45 +70,43 @@ class AboutSection extends StatelessWidget {
    );
  }

-  void _showPrivacyDialog(BuildContext context) => showDialog(
-        context: context,
-        builder: (context) => SimpleDialog(
-          children: [
-            ListTile(
-              leading: const CenteredLeading(Icon(Icons.school_outlined)),
-              title: const Text('Infos zum Marianum Fulda'),
-              subtitle: const Text('Für Talk-Chats und Dateien'),
-              trailing: const Icon(Icons.arrow_right),
-              onTap: () => PrivacyInfo(
-                providerText: 'Marianum',
-                imprintUrl: 'https://www.marianum-fulda.de/impressum',
-                privacyUrl: 'https://www.marianum-fulda.de/datenschutz',
-              ).showPopup(context),
-            ),
-            ListTile(
-              leading: const CenteredLeading(Icon(Icons.date_range_outlined)),
-              title: const Text('Infos zu Web-/ Untis'),
-              subtitle: const Text('Für den Stundenplan'),
-              trailing: const Icon(Icons.arrow_right),
-              onTap: () => PrivacyInfo(
-                providerText: 'Untis',
-                imprintUrl: 'https://www.untis.at/impressum',
-                privacyUrl: 'https://www.untis.at/datenschutz-wu-apps',
-              ).showPopup(context),
-            ),
-            ListTile(
-              leading: const CenteredLeading(Icon(Icons.send_time_extension_outlined)),
-              title: const Text('Infos zu mhsl'),
-              subtitle: const Text('Für Countdowns, Marianum Message und mehr'),
-              trailing: const Icon(Icons.arrow_right),
-              onTap: () => PrivacyInfo(
-                providerText: 'mhsl',
-                imprintUrl: 'https://mhsl.eu/id.html',
-                privacyUrl: 'https://mhsl.eu/datenschutz.html',
-              ).showPopup(context),
-            ),
-          ],
-        ),
+  void _showPrivacyDialog(BuildContext context) => showDetailsBottomSheet(
+        context,
+        children: (sheetCtx) => [
+          ListTile(
+            leading: const CenteredLeading(Icon(Icons.school_outlined)),
+            title: const Text('Infos zum Marianum Fulda'),
+            subtitle: const Text('Für Talk-Chats und Dateien'),
+            trailing: const Icon(Icons.arrow_right),
+            onTap: () => PrivacyInfo(
+              providerText: 'Marianum',
+              imprintUrl: 'https://www.marianum-fulda.de/impressum',
+              privacyUrl: 'https://www.marianum-fulda.de/datenschutz',
+            ).showPopup(sheetCtx),
+          ),
+          ListTile(
+            leading: const CenteredLeading(Icon(Icons.date_range_outlined)),
+            title: const Text('Infos zu Web-/ Untis'),
+            subtitle: const Text('Für den Stundenplan'),
+            trailing: const Icon(Icons.arrow_right),
+            onTap: () => PrivacyInfo(
+              providerText: 'Untis',
+              imprintUrl: 'https://www.untis.at/impressum',
+              privacyUrl: 'https://www.untis.at/datenschutz-wu-apps',
+            ).showPopup(sheetCtx),
+          ),
+          ListTile(
+            leading: const CenteredLeading(Icon(Icons.send_time_extension_outlined)),
+            title: const Text('Infos zu mhsl'),
+            subtitle: const Text('Für Countdowns, Marianum Message und mehr'),
+            trailing: const Icon(Icons.arrow_right),
+            onTap: () => PrivacyInfo(
+              providerText: 'mhsl',
+              imprintUrl: 'https://mhsl.eu/id.html',
+              privacyUrl: 'https://mhsl.eu/datenschutz.html',
+            ).showPopup(sheetCtx),
+          ),
+        ],
      );

  void _toggleDeveloperMode(BuildContext context, SettingsCubit settings, bool? state) {
@@ -11,6 +11,7 @@ import '../../../../widget/centered_leading.dart';
 import '../../../../widget/confirm_dialog.dart';
 import '../../../../widget/debug/cache_view.dart';
 import '../../../../widget/debug/json_viewer.dart';
+import '../../../../widget/details_bottom_sheet.dart';

 class DevToolsSection extends StatefulWidget {
  final SettingsCubit settings;
@@ -29,42 +30,45 @@ class _DevToolsSectionState extends State<DevToolsSection> {
          title: const Text('Performance overlays'),
          trailing: const Icon(Icons.arrow_right),
          onTap: () {
-            showDialog(
-              context: context,
-              builder: (dialogCtx) => BlocBuilder<SettingsCubit, model.Settings>(
-                bloc: widget.settings,
-                builder: (_, _) {
-                  final dev = widget.settings.val().devToolsSettings;
-                  return SimpleDialog(
-                    children: [
-                      ListTile(
-                        leading: const Icon(Icons.auto_graph_outlined),
-                        title: const Text('Performance graph'),
-                        trailing: Checkbox(
-                          value: dev.showPerformanceOverlay,
-                          onChanged: (e) => widget.settings.val(write: true).devToolsSettings.showPerformanceOverlay = e!,
+            showDetailsBottomSheet(
+              context,
+              children: (sheetCtx) => [
+                BlocBuilder<SettingsCubit, model.Settings>(
+                  bloc: widget.settings,
+                  builder: (_, _) {
+                    final dev = widget.settings.val().devToolsSettings;
+                    return Column(
+                      mainAxisSize: MainAxisSize.min,
+                      children: [
+                        ListTile(
+                          leading: const Icon(Icons.auto_graph_outlined),
+                          title: const Text('Performance graph'),
+                          trailing: Checkbox(
+                            value: dev.showPerformanceOverlay,
+                            onChanged: (e) => widget.settings.val(write: true).devToolsSettings.showPerformanceOverlay = e!,
+                          ),
                        ),
-                      ),
-                      ListTile(
-                        leading: const Icon(Icons.screen_search_desktop_outlined),
-                        title: const Text('Indicate offscreen layers'),
-                        trailing: Checkbox(
-                          value: dev.checkerboardOffscreenLayers,
-                          onChanged: (e) => widget.settings.val(write: true).devToolsSettings.checkerboardOffscreenLayers = e!,
+                        ListTile(
+                          leading: const Icon(Icons.screen_search_desktop_outlined),
+                          title: const Text('Indicate offscreen layers'),
+                          trailing: Checkbox(
+                            value: dev.checkerboardOffscreenLayers,
+                            onChanged: (e) => widget.settings.val(write: true).devToolsSettings.checkerboardOffscreenLayers = e!,
+                          ),
                        ),
-                      ),
-                      ListTile(
-                        leading: const Icon(Icons.imagesearch_roller_outlined),
-                        title: const Text('Indicate raster cache images'),
-                        trailing: Checkbox(
-                          value: dev.checkerboardRasterCacheImages,
-                          onChanged: (e) => widget.settings.val(write: true).devToolsSettings.checkerboardRasterCacheImages = e!,
+                        ListTile(
+                          leading: const Icon(Icons.imagesearch_roller_outlined),
+                          title: const Text('Indicate raster cache images'),
+                          trailing: Checkbox(
+                            value: dev.checkerboardRasterCacheImages,
+                            onChanged: (e) => widget.settings.val(write: true).devToolsSettings.checkerboardRasterCacheImages = e!,
+                          ),
                        ),
-                      ),
-                    ],
-                  );
-                },
-              ),
+                      ],
+                    );
+                  },
+                ),
+              ],
            );
          },
        ),
@@ -122,9 +126,6 @@ class _DevToolsSectionState extends State<DevToolsSection> {
          leading: const CenteredLeading(Icon(Icons.data_object)),
          title: const Text('BLOC-storage state cache'),
          subtitle: const Text('Lange tippen um zu löschen'),
-          onTap: () {
-            // Navigator.push(context, MaterialPageRoute(builder: (context) => const CacheView()));
-          },
          onLongPress: () {
            ConfirmDialog(
              title: 'BLOC-Cache löschen',
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';

 import '../../../../widget/centered_leading.dart';
 import '../../../../widget/confirm_dialog.dart';
+import '../../../../widget/details_bottom_sheet.dart';

 class PrivacyInfo {
  String providerText;
@@ -11,22 +12,29 @@ class PrivacyInfo {
  PrivacyInfo({required this.providerText, required this.imprintUrl, required this.privacyUrl});

  void showPopup(BuildContext context) {
-    showDialog(context: context, builder: (context) => SimpleDialog(
-        title: Text('Betreiberinformation | $providerText'),
-        children: [
-          ListTile(
-            leading: const CenteredLeading(Icon(Icons.person_pin_outlined)),
-            title: const Text('Impressum'),
-            subtitle: Text(imprintUrl),
-            onTap: () => ConfirmDialog.openBrowser(context, imprintUrl),
-          ),
-          ListTile(
-            leading: const CenteredLeading(Icon(Icons.privacy_tip_outlined)),
-            title: const Text('Datenschutzerklärung'),
-            subtitle: Text(privacyUrl),
-            onTap: () => ConfirmDialog.openBrowser(context, privacyUrl),
-          ),
-        ],
-      ));
+    showDetailsBottomSheet(
+      context,
+      header: Padding(
+        padding: const EdgeInsets.fromLTRB(16, 4, 16, 12),
+        child: Text(
+          'Betreiberinformation | $providerText',
+          style: Theme.of(context).textTheme.titleLarge,
+        ),
+      ),
+      children: (sheetCtx) => [
+        ListTile(
+          leading: const CenteredLeading(Icon(Icons.person_pin_outlined)),
+          title: const Text('Impressum'),
+          subtitle: Text(imprintUrl),
+          onTap: () => ConfirmDialog.openBrowser(sheetCtx, imprintUrl),
+        ),
+        ListTile(
+          leading: const CenteredLeading(Icon(Icons.privacy_tip_outlined)),
+          title: const Text('Datenschutzerklärung'),
+          subtitle: Text(privacyUrl),
+          onTap: () => ConfirmDialog.openBrowser(sheetCtx, privacyUrl),
+        ),
+      ],
+    );
  }
 }