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

Improve entries page and latest changes panel, units on events and timeline
All checks were successful
Release / meta (push) Successful in 9s
Details
Release / linux-build (push) Successful in 8m3s
Details
Release / android-build (push) Successful in 19m21s
Details
Release / release-master (push) Successful in 40s
Details
Release / release-dev (push) Successful in 42s
Details

Browse Source
This commit is contained in:
Pete Gregory
2025-12-23 17:41:21 +00:00
parent 29959f7580
commit 44d79e7c28
16 changed files with 1764 additions and 498 deletions
Download Patch File Download Diff File Expand all files Collapse all files

343
lib/ui/app_shell.dart
View File

@@ -1,4 +1,5 @@
import 'package:dynamic_color/dynamic_color.dart';
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:go_router/go_router.dart';
@@ -189,6 +190,14 @@ class _MyAppState extends State<MyApp> {
}
}
class _BackIntent extends Intent {
const _BackIntent();
}
class _ForwardIntent extends Intent {
const _ForwardIntent();
}
class MyHomePage extends StatefulWidget {
final Widget child;
const MyHomePage({super.key, required this.child});
@@ -206,13 +215,14 @@ class _MyHomePageState extends State<MyHomePage> {
}
await NavigationGuard.attemptNavigation(() async {
if (!mounted) return;
context.go(contentPages[index]);
_navigateToIndex(index);
});
}
int? _lastTabIndex;
final List<int> _tabHistory = [];
bool _handlingBackNavigation = false;
final List<int> _history = [];
int _historyPosition = -1;
final List<int> _forwardHistory = [];
bool _suppressRecord = false;
bool _fetched = false;
@@ -256,7 +266,7 @@ class _MyHomePageState extends State<MyHomePage> {
Widget build(BuildContext context) {
final uri = GoRouterState.of(context).uri;
final pageIndex = tabIndexForPath(uri.path);
_recordTabChange(pageIndex);
_syncHistory(pageIndex);
if (pageIndex != _addTabIndex) {
NavigationGuard.unregister();
}
@@ -269,136 +279,227 @@ class _MyHomePageState extends State<MyHomePage> {
? widget.child
: const Center(child: CircularProgressIndicator());
return PopScope(
canPop: false,
onPopInvokedWithResult: (didPop, _) async {
if (didPop) return;
final scaffold = LayoutBuilder(
builder: (context, constraints) {
final isWide = constraints.maxWidth >= 900;
final railExtended = constraints.maxWidth >= 1400;
final navRailDestinations = _navItems
.map(
(item) => NavigationRailDestination(
icon: Icon(item.icon),
label: Text(item.label),
),
)
.toList();
final navBarDestinations = _navItems
.map(
(item) => NavigationDestination(
icon: Icon(item.icon),
label: item.label,
),
)
.toList();
final shellNav = _shellNavigatorKey.currentState;
if (shellNav != null && shellNav.canPop()) {
shellNav.pop();
return;
}
if (_tabHistory.isNotEmpty) {
final previousTab = _tabHistory.removeLast();
if (!mounted) return;
_handlingBackNavigation = true;
context.go(contentPages[previousTab]);
return;
}
if (pageIndex != 0) {
if (!mounted) return;
_handlingBackNavigation = true;
context.go(contentPages[0]);
return;
}
SystemNavigator.pop();
},
child: LayoutBuilder(
builder: (context, constraints) {
final isWide = constraints.maxWidth >= 900;
final railExtended = constraints.maxWidth >= 1400;
final navRailDestinations = _navItems
.map(
(item) => NavigationRailDestination(
icon: Icon(item.icon),
label: Text(item.label),
),
)
.toList();
final navBarDestinations = _navItems
.map(
(item) => NavigationDestination(
icon: Icon(item.icon),
label: item.label,
),
)
.toList();
return Scaffold(
appBar: AppBar(
backgroundColor: Theme.of(context).colorScheme.inversePrimary,
title: Text.rich(
TextSpan(
children: const [
TextSpan(text: "Mile"),
TextSpan(text: "O", style: TextStyle(color: Colors.red)),
TextSpan(text: "graph"),
],
style: const TextStyle(
decoration: TextDecoration.none,
color: Colors.white,
fontFamily: "Tomatoes",
),
return Scaffold(
appBar: AppBar(
backgroundColor: Theme.of(context).colorScheme.inversePrimary,
title: Text.rich(
TextSpan(
children: const [
TextSpan(text: "Mile"),
TextSpan(text: "O", style: TextStyle(color: Colors.red)),
TextSpan(text: "graph"),
],
style: const TextStyle(
decoration: TextDecoration.none,
color: Colors.white,
fontFamily: "Tomatoes",
),
),
actions: [
const IconButton(
onPressed: null,
icon: Icon(Icons.account_circle),
),
IconButton(
tooltip: 'Settings',
onPressed: () => context.go('/settings'),
icon: const Icon(Icons.settings),
),
IconButton(onPressed: auth.logout, icon: const Icon(Icons.logout)),
],
),
bottomNavigationBar: isWide
? null
: NavigationBar(
selectedIndex: pageIndex,
onDestinationSelected: (int index) =>
_onItemTapped(index, pageIndex),
destinations: navBarDestinations,
),
body: isWide
? Row(
children: [
SafeArea(
child: NavigationRail(
selectedIndex: pageIndex,
extended: railExtended,
labelType: railExtended
? NavigationRailLabelType.none
: NavigationRailLabelType.selected,
onDestinationSelected: (int index) =>
_onItemTapped(index, pageIndex),
destinations: navRailDestinations,
),
actions: [
const IconButton(
onPressed: null,
icon: Icon(Icons.account_circle),
),
IconButton(
tooltip: 'Settings',
onPressed: () => context.go('/settings'),
icon: const Icon(Icons.settings),
),
IconButton(onPressed: auth.logout, icon: const Icon(Icons.logout)),
],
),
bottomNavigationBar: isWide
? null
: NavigationBar(
selectedIndex: pageIndex,
onDestinationSelected: (int index) =>
_onItemTapped(index, pageIndex),
destinations: navBarDestinations,
),
body: isWide
? Row(
children: [
SafeArea(
child: NavigationRail(
selectedIndex: pageIndex,
extended: railExtended,
labelType: railExtended
? NavigationRailLabelType.none
: NavigationRailLabelType.selected,
onDestinationSelected: (int index) =>
_onItemTapped(index, pageIndex),
destinations: navRailDestinations,
),
const VerticalDivider(width: 1),
Expanded(child: currentPage),
],
)
: currentPage,
);
),
const VerticalDivider(width: 1),
Expanded(child: currentPage),
],
)
: currentPage,
);
},
);
return Shortcuts(
shortcuts: <LogicalKeySet, Intent>{
LogicalKeySet(LogicalKeyboardKey.browserBack): const _BackIntent(),
LogicalKeySet(LogicalKeyboardKey.browserForward): const _ForwardIntent(),
},
child: Actions(
actions: {
_BackIntent: CallbackAction<_BackIntent>(
onInvoke: (_) {
_handleBackNavigation(allowExit: false, recordForward: true);
return null;
},
),
_ForwardIntent: CallbackAction<_ForwardIntent>(
onInvoke: (_) {
_handleForwardNavigation();
return null;
},
),
},
child: Focus(
autofocus: true,
child: Listener(
onPointerDown: _handlePointerButtons,
behavior: HitTestBehavior.opaque,
child: PopScope(
canPop: false,
onPopInvokedWithResult: (didPop, _) async {
if (didPop) return;
await _handleBackNavigation(allowExit: true, recordForward: false);
},
child: scaffold,
),
),
),
),
);
}
void _recordTabChange(int pageIndex) {
final last = _lastTabIndex;
if (last == null) {
_lastTabIndex = pageIndex;
return;
void _handlePointerButtons(PointerDownEvent event) {
// Support mouse back/forward buttons.
if (event.buttons == kBackMouseButton) {
_handleBackNavigation(allowExit: false, recordForward: true);
} else if (event.buttons == kForwardMouseButton) {
_handleForwardNavigation();
}
if (last == pageIndex) return;
}
if (_handlingBackNavigation) {
_handlingBackNavigation = false;
_lastTabIndex = pageIndex;
return;
int get _currentPageIndex => tabIndexForPath(GoRouterState.of(context).uri.path);
Future<bool> _handleBackNavigation({
bool allowExit = false,
bool recordForward = false,
}) async {
final pageIndex = _currentPageIndex;
final shellNav = _shellNavigatorKey.currentState;
if (shellNav != null && shellNav.canPop()) {
shellNav.pop();
return true;
}
if (_tabHistory.isEmpty || _tabHistory.last != last) {
_tabHistory.add(last);
if (_historyPosition > 0) {
if (recordForward) _pushForward(pageIndex);
_historyPosition -= 1;
_suppressRecord = true;
context.go(contentPages[_history[_historyPosition]]);
return true;
}
_lastTabIndex = pageIndex;
if (pageIndex != 0) {
if (recordForward) _pushForward(pageIndex);
_suppressRecord = true;
context.go(contentPages[0]);
return true;
}
if (allowExit) {
SystemNavigator.pop();
return true;
}
return false;
}
Future<bool> _handleForwardNavigation() async {
if (_forwardHistory.isEmpty) return false;
final nextTab = _forwardHistory.removeLast();
// Move cursor forward, keeping history in sync.
if (_historyPosition < _history.length - 1) {
_historyPosition += 1;
_history[_historyPosition] = nextTab;
if (_historyPosition < _history.length - 1) {
_history.removeRange(_historyPosition + 1, _history.length);
}
} else {
_history.add(nextTab);
_historyPosition = _history.length - 1;
}
_suppressRecord = true;
if (!mounted) return false;
context.go(contentPages[nextTab]);
return true;
}
void _pushForward(int pageIndex) {
if (_forwardHistory.isEmpty || _forwardHistory.last != pageIndex) {
_forwardHistory.add(pageIndex);
}
}
void _syncHistory(int pageIndex) {
if (_history.isEmpty) {
_history.add(pageIndex);
_historyPosition = 0;
return;
}
if (_suppressRecord) {
_suppressRecord = false;
return;
}
if (_historyPosition >= 0 &&
_historyPosition < _history.length &&
_history[_historyPosition] == pageIndex) {
return;
}
if (_historyPosition < _history.length - 1) {
_history.removeRange(_historyPosition + 1, _history.length);
}
_history.add(pageIndex);
_historyPosition = _history.length - 1;
_forwardHistory.clear();
}
void _navigateToIndex(int index) {
_suppressRecord = false;
_forwardHistory.clear();
context.go(contentPages[index]);
}
}