petegregoryy/mileograph_flutter
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects 1 Releases 55 Wiki Activity

Add accent colour picker, fix empty user card when accepting friend request, add button to transfer allocations
All checks were successful
Release / meta (push) Successful in 8s
Details
Release / linux-build (push) Successful in 56s
Details
Release / web-build (push) Successful in 2m15s
Details
Release / android-build (push) Successful in 6m47s
Details
Release / release-master (push) Successful in 19s
Details
Release / release-dev (push) Successful in 21s
Details

Browse Source
This commit is contained in:
Pete Gregory
2026-01-06 00:21:19 +00:00
parent d5083e1cc7
commit 06bed86a49
11 changed files with 427 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
lib/ui/app_shell.dart
View File

@@ -27,8 +27,10 @@ import 'package:mileograph_flutter/components/widgets/leg_share_edit_notificatio
import 'package:mileograph_flutter/components/widgets/leg_share_notification_card.dart';
import 'package:mileograph_flutter/objects/objects.dart';
import 'package:mileograph_flutter/services/authservice.dart';
import 'package:mileograph_flutter/services/accent_color_service.dart';
import 'package:mileograph_flutter/services/data_service.dart';
import 'package:mileograph_flutter/services/navigation_guard.dart';
import 'package:mileograph_flutter/services/theme_mode_service.dart';
import 'package:provider/provider.dart';
final GlobalKey<NavigatorState> _shellNavigatorKey =
@@ -103,12 +105,6 @@ class _MyAppState extends State<MyApp> {
late final GoRouter _router;
bool _routerInitialized = false;
final ColorScheme defaultLight = ColorScheme.fromSeed(seedColor: Colors.red);
final ColorScheme defaultDark = ColorScheme.fromSeed(
seedColor: Colors.red,
brightness: Brightness.dark,
);
@override
void didChangeDependencies() {
super.didChangeDependencies();
@@ -188,10 +184,23 @@ class _MyAppState extends State<MyApp> {
'',
)
: null;
final transferFromLocoIdStr =
state.uri.queryParameters['transferFromLocoId'];
final transferFromLocoId = transferFromLocoIdStr != null
? int.tryParse(transferFromLocoIdStr)
: state.extra is Map
? int.tryParse(
(state.extra as Map)['transferFromLocoId']
?.toString() ??
'',
)
: null;
final selectionMode =
(selectionParam != null && selectionParam.isNotEmpty) ||
replacementPendingLocoId != null;
replacementPendingLocoId != null ||
transferFromLocoId != null;
final selectionSingle = replacementPendingLocoId != null ||
transferFromLocoId != null ||
selectionParam?.toLowerCase() == 'single' ||
selectionParam == '1' ||
selectionParam?.toLowerCase() == 'true';
@@ -199,6 +208,7 @@ class _MyAppState extends State<MyApp> {
selectionMode: selectionMode,
selectionSingle: selectionSingle,
replacementPendingLocoId: replacementPendingLocoId,
transferFromLocoId: transferFromLocoId,
);
},
),
@@ -325,20 +335,34 @@ class _MyAppState extends State<MyApp> {
@override
Widget build(BuildContext context) {
final accent = context.watch<AccentColorService>();
final themeModeService = context.watch<ThemeModeService>();
final seedColor =
accent.hasSavedSeed ? accent.seedColor : AccentColorService.defaultSeed;
final useSystemColors = accent.useSystem;
return DynamicColorBuilder(
builder: (ColorScheme? lightDynamic, ColorScheme? darkDynamic) {
final colorSchemeLight = useSystemColors && lightDynamic != null
? lightDynamic
: ColorScheme.fromSeed(seedColor: seedColor);
final colorSchemeDark = useSystemColors && darkDynamic != null
? darkDynamic
: ColorScheme.fromSeed(
seedColor: seedColor,
brightness: Brightness.dark,
);
return MaterialApp.router(
title: 'Mileograph',
routerConfig: _router,
theme: ThemeData(
useMaterial3: true,
colorScheme: lightDynamic ?? defaultLight,
colorScheme: colorSchemeLight,
),
darkTheme: ThemeData(
useMaterial3: true,
colorScheme: darkDynamic ?? defaultDark,
colorScheme: colorSchemeDark,
),
themeMode: ThemeMode.system,
themeMode: themeModeService.mode,
);
},
);