add draft changes
All checks were successful
All checks were successful
This commit is contained in:
@@ -11,6 +11,7 @@ import 'package:mileograph_flutter/components/pages/legs.dart';
|
||||
import 'package:mileograph_flutter/services/apiService.dart';
|
||||
import 'package:mileograph_flutter/services/authservice.dart';
|
||||
import 'package:mileograph_flutter/services/dataService.dart';
|
||||
import 'package:mileograph_flutter/services/navigation_guard.dart';
|
||||
|
||||
import 'components/login/login.dart';
|
||||
import 'components/pages/dashboard.dart';
|
||||
@@ -100,6 +101,14 @@ class MyApp extends StatelessWidget {
|
||||
),
|
||||
GoRoute(path: '/trips', builder: (_, __) => TripsPage()),
|
||||
GoRoute(path: '/add', builder: (_, __) => NewEntryPage()),
|
||||
GoRoute(
|
||||
path: '/legs/edit/:id',
|
||||
builder: (_, state) {
|
||||
final idParam = state.pathParameters['id'];
|
||||
final legId = idParam == null ? null : int.tryParse(idParam);
|
||||
return NewEntryPage(editLegId: legId);
|
||||
},
|
||||
),
|
||||
],
|
||||
),
|
||||
GoRoute(path: '/login', builder: (_, __) => const LoginScreen()),
|
||||
@@ -180,12 +189,14 @@ class _MyHomePageState extends State<MyHomePage> {
|
||||
return newIndex;
|
||||
}
|
||||
|
||||
void _onItemTapped(int index, int currentIndex) {
|
||||
Future<void> _onItemTapped(int index, int currentIndex) async {
|
||||
if (index < 0 || index >= contentPages.length || index == currentIndex) {
|
||||
return;
|
||||
}
|
||||
context.push(contentPages[index]);
|
||||
_getIndexFromLocation(contentPages[index]);
|
||||
await NavigationGuard.attemptNavigation(() async {
|
||||
if (!mounted) return;
|
||||
context.go(contentPages[index]);
|
||||
});
|
||||
}
|
||||
|
||||
bool loggedIn = false;
|
||||
|
||||
Reference in New Issue
Block a user