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

implemented a central haptic feedback system with configurable levels (off, reduced, full), added a Haptics facade providing semantic feedback methods, integrated haptic cues across navigation, settings toggles, and async action results, and updated version to 1.1.0+54

Browse Source
This commit is contained in:
Elias Müller
2026-05-30 13:54:19 +02:00
parent 01b4b44010
commit ece0669f7d
26 changed files with 308 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/view/pages/settings/data/default_settings.dart
+2
View File
@@ -6,6 +6,7 @@ import '../../../../state/app/modules/app_modules.dart';
import '../../../../storage/dev_tools_settings.dart';
import '../../../../storage/file_settings.dart';
import '../../../../storage/file_view_settings.dart';
import '../../../../storage/haptic_settings.dart';
import '../../../../storage/holidays_settings.dart';
import '../../../../storage/modules_settings.dart';
import '../../../../storage/notification_settings.dart';
@@ -65,5 +66,6 @@ class DefaultSettings {
marianumConnectEndpoint: MarianumConnectEndpoint.live,
marianumConnectCustomUrl: '',
),
hapticSettings: HapticSettings(level: HapticLevel.full),
);
}
lib/view/pages/settings/modules_settings_page.dart
+7 -3
View File
@@ -4,6 +4,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
import '../../../state/app/modules/app_modules.dart';
import '../../../state/app/modules/settings/bloc/settings_cubit.dart';
import '../../../storage/settings.dart' as model;
import '../../../utils/haptics.dart';
import '../../../widget/confirm_dialog.dart';
import 'data/default_settings.dart';
@@ -23,6 +24,7 @@ class ModuleSortBody extends StatelessWidget {
final modulesSettings = settings.val().modulesSettings;
void changeVisibility(Modules module) {
Haptics.selection();
var hidden = settings.val(write: true).modulesSettings.hiddenModules;
if (hidden.contains(module)) {
hidden.remove(module);
@@ -48,9 +50,11 @@ class ModuleSortBody extends StatelessWidget {
'Auf größeren Bildschirmen werden mehr Module direkt angezeigt',
),
value: modulesSettings.autoFillBottomBar,
onChanged: (value) =>
settings.val(write: true).modulesSettings.autoFillBottomBar =
value,
onChanged: (value) {
Haptics.selection();
settings.val(write: true).modulesSettings.autoFillBottomBar =
value;
},
),
if (!modulesSettings.autoFillBottomBar)
ListTile(
lib/view/pages/settings/sections/appearance_section.dart
+79 -23
View File
@@ -2,7 +2,9 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import '../../../../state/app/modules/settings/bloc/settings_cubit.dart';
import '../../../../storage/haptic_settings.dart';
import '../../../../theming/app_theme.dart';
import '../../../../utils/haptics.dart';
class AppearanceSection extends StatelessWidget {
const AppearanceSection({super.key});
@@ -10,29 +12,83 @@ class AppearanceSection extends StatelessWidget {
@override
Widget build(BuildContext context) {
final settings = context.watch<SettingsCubit>();
return ListTile(
leading: const Icon(Icons.dark_mode_outlined),
title: const Text('Farbgebung'),
trailing: DropdownButton<ThemeMode>(
value: settings.val().appTheme,
icon: const Icon(Icons.arrow_drop_down),
items: ThemeMode.values
.map(
(e) => DropdownMenuItem<ThemeMode>(
value: e,
enabled: e != settings.val().appTheme,
child: Row(
children: [
Icon(AppTheme.getDisplayOptions(e).icon),
const SizedBox(width: 10),
Text(AppTheme.getDisplayOptions(e).displayName),
],
),
),
)
.toList(),
onChanged: (e) => settings.val(write: true).appTheme = e!,
),
return Column(
children: [
ListTile(
leading: const Icon(Icons.dark_mode_outlined),
title: const Text('Farbgebung'),
trailing: DropdownButton<ThemeMode>(
value: settings.val().appTheme,
icon: const Icon(Icons.arrow_drop_down),
items: ThemeMode.values
.map(
(e) => DropdownMenuItem<ThemeMode>(
value: e,
enabled: e != settings.val().appTheme,
child: Row(
children: [
Icon(AppTheme.getDisplayOptions(e).icon),
const SizedBox(width: 10),
Text(AppTheme.getDisplayOptions(e).displayName),
],
),
),
)
.toList(),
onChanged: (e) => settings.val(write: true).appTheme = e!,
),
),
ListTile(
leading: const Icon(Icons.vibration_outlined),
title: const Text('Haptisches Feedback'),
trailing: DropdownButton<HapticLevel>(
value: settings.val().hapticSettings.level,
icon: const Icon(Icons.arrow_drop_down),
items: HapticLevel.values
.map(
(e) => DropdownMenuItem<HapticLevel>(
value: e,
enabled: e != settings.val().hapticSettings.level,
child: Row(
children: [
Icon(_hapticIcon(e)),
const SizedBox(width: 10),
Text(_hapticLabel(e)),
],
),
),
)
.toList(),
onChanged: (e) {
settings.val(write: true).hapticSettings.level = e!;
// Sofortiges Probe-Feedback in der neu gewählten Stufe.
Haptics.longPress();
},
),
),
],
);
}
IconData _hapticIcon(HapticLevel level) {
switch (level) {
case HapticLevel.off:
return Icons.notifications_off_outlined;
case HapticLevel.reduced:
return Icons.notifications_paused_outlined;
case HapticLevel.full:
return Icons.notifications_active_outlined;
}
}
String _hapticLabel(HapticLevel level) {
switch (level) {
case HapticLevel.off:
return 'Aus';
case HapticLevel.reduced:
return 'Reduziert';
case HapticLevel.full:
return 'Vollständig';
}
}
}
lib/view/pages/settings/sections/dev_tools_section.dart
+22 -18
View File
@@ -6,6 +6,7 @@ import 'package:hydrated_bloc/hydrated_bloc.dart';
import '../../../../routing/app_routes.dart';
import '../../../../state/app/modules/settings/bloc/settings_cubit.dart';
import '../../../../storage/settings.dart' as model;
import '../../../../utils/haptics.dart';
import '../../../../widget/centered_leading.dart';
import '../../../../widget/confirm_dialog.dart';
import '../../../../widget/debug/cache_view.dart';
@@ -45,12 +46,13 @@ class _DevToolsSectionState extends State<DevToolsSection> {
title: const Text('Performance graph'),
trailing: Checkbox(
value: dev.showPerformanceOverlay,
onChanged: (e) =>
widget.settings
.val(write: true)
.devToolsSettings
.showPerformanceOverlay =
e!,
onChanged: (e) {
Haptics.selection();
widget.settings
.val(write: true)
.devToolsSettings
.showPerformanceOverlay = e!;
},
),
),
ListTile(
@@ -60,12 +62,13 @@ class _DevToolsSectionState extends State<DevToolsSection> {
title: const Text('Indicate offscreen layers'),
trailing: Checkbox(
value: dev.checkerboardOffscreenLayers,
onChanged: (e) =>
widget.settings
.val(write: true)
.devToolsSettings
.checkerboardOffscreenLayers =
e!,
onChanged: (e) {
Haptics.selection();
widget.settings
.val(write: true)
.devToolsSettings
.checkerboardOffscreenLayers = e!;
},
),
),
ListTile(
@@ -73,12 +76,13 @@ class _DevToolsSectionState extends State<DevToolsSection> {
title: const Text('Indicate raster cache images'),
trailing: Checkbox(
value: dev.checkerboardRasterCacheImages,
onChanged: (e) =>
widget.settings
.val(write: true)
.devToolsSettings
.checkerboardRasterCacheImages =
e!,
onChanged: (e) {
Haptics.selection();
widget.settings
.val(write: true)
.devToolsSettings
.checkerboardRasterCacheImages = e!;
},
),
),
],
lib/view/pages/settings/sections/files_section.dart
+12 -8
View File
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import '../../../../state/app/modules/settings/bloc/settings_cubit.dart';
import '../../../../utils/haptics.dart';
class FilesSection extends StatelessWidget {
const FilesSection({super.key});
@@ -16,8 +17,10 @@ class FilesSection extends StatelessWidget {
title: const Text('Ordner in Dateien nach oben sortieren'),
trailing: Checkbox(
value: settings.val().fileSettings.sortFoldersToTop,
onChanged: (e) =>
settings.val(write: true).fileSettings.sortFoldersToTop = e!,
onChanged: (e) {
Haptics.selection();
settings.val(write: true).fileSettings.sortFoldersToTop = e!;
},
),
),
ListTile(
@@ -25,12 +28,13 @@ class FilesSection extends StatelessWidget {
title: const Text('Dateien immer mit Systemdialog öffnen'),
trailing: Checkbox(
value: settings.val().fileViewSettings.alwaysOpenExternally,
onChanged: (e) =>
settings
.val(write: true)
.fileViewSettings
.alwaysOpenExternally =
e!,
onChanged: (e) {
Haptics.selection();
settings
.val(write: true)
.fileViewSettings
.alwaysOpenExternally = e!;
},
),
),
],
lib/view/pages/settings/sections/talk_section.dart
+10 -4
View File
@@ -3,6 +3,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
import '../../../../notification/notify_updater.dart';
import '../../../../state/app/modules/settings/bloc/settings_cubit.dart';
import '../../../../utils/haptics.dart';
import '../../../../widget/centered_leading.dart';
import '../../../../widget/info_dialog.dart';
@@ -21,8 +22,10 @@ class TalkSection extends StatelessWidget {
title: const Text('Favoriten im Talk nach oben sortieren'),
trailing: Checkbox(
value: talkSettings.sortFavoritesToTop,
onChanged: (e) =>
settings.val(write: true).talkSettings.sortFavoritesToTop = e!,
onChanged: (e) {
Haptics.selection();
settings.val(write: true).talkSettings.sortFavoritesToTop = e!;
},
),
),
ListTile(
@@ -30,8 +33,10 @@ class TalkSection extends StatelessWidget {
title: const Text('Ungelesene Chats nach oben sortieren'),
trailing: Checkbox(
value: talkSettings.sortUnreadToTop,
onChanged: (e) =>
settings.val(write: true).talkSettings.sortUnreadToTop = e!,
onChanged: (e) {
Haptics.selection();
settings.val(write: true).talkSettings.sortUnreadToTop = e!;
},
),
),
ListTile(
@@ -43,6 +48,7 @@ class TalkSection extends StatelessWidget {
trailing: Checkbox(
value: notificationSettings.enabled,
onChanged: (e) {
Haptics.selection();
if (e!) {
NotifyUpdater.enableAfterDisclaimer(settings).asDialog(context);
} else {
lib/view/pages/settings/sections/timetable_section.dart
+8 -6
View File
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import '../../../../state/app/modules/settings/bloc/settings_cubit.dart';
import '../../../../utils/haptics.dart';
import '../../../../view/pages/timetable/data/timetable_name_mode.dart';
class TimetableSection extends StatelessWidget {
@@ -46,12 +47,13 @@ class TimetableSection extends StatelessWidget {
title: const Text('Doppelstunden zusammenhängend anzeigen'),
trailing: Checkbox(
value: timetableSettings.connectDoubleLessons,
onChanged: (e) =>
settings
.val(write: true)
.timetableSettings
.connectDoubleLessons =
e!,
onChanged: (e) {
Haptics.selection();
settings
.val(write: true)
.timetableSettings
.connectDoubleLessons = e!;
},
),
),
],