8f7d870985
- Remove nested Scaffold from ScoringPage (now uses LayoutBuilder) - Use proper constraint-based height calculation instead of MediaQuery - Maintain score preservation across navigation without nested scaffolds - Fix viewport architecture to work within MainNavigationPage body - Minor keypad layout adjustment (77%/23% flex ratio) 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
138 lines
3.7 KiB
Dart
138 lines
3.7 KiB
Dart
import 'package:flutter/material.dart';
|
|
import 'scoring_page.dart';
|
|
import 'settings_page.dart';
|
|
|
|
class MainNavigationPage extends StatefulWidget {
|
|
const MainNavigationPage({super.key});
|
|
|
|
@override
|
|
State<MainNavigationPage> createState() => _MainNavigationPageState();
|
|
}
|
|
|
|
class _MainNavigationPageState extends State<MainNavigationPage> {
|
|
int _selectedIndex = 0;
|
|
|
|
// Persistent scoring state
|
|
int _arrowsPerEnd = 3;
|
|
int _endsPerSet = 12;
|
|
List<List<String>> _scores = [];
|
|
|
|
@override
|
|
void initState() {
|
|
super.initState();
|
|
_initializeScores();
|
|
}
|
|
|
|
void _initializeScores() {
|
|
_scores = List.generate(
|
|
_endsPerSet,
|
|
(index) => List.generate(_arrowsPerEnd, (index) => ''),
|
|
);
|
|
}
|
|
|
|
void _onArrowsPerEndChanged(int arrows) {
|
|
setState(() {
|
|
_arrowsPerEnd = arrows;
|
|
_endsPerSet = arrows == 3 ? 10 : 6;
|
|
// Note: The actual score preservation dialog logic will be handled by ScoringPage
|
|
// This is just to keep the navigation-level state in sync
|
|
});
|
|
}
|
|
|
|
void _onScoresUpdated(List<List<String>> newScores) {
|
|
setState(() {
|
|
_scores = newScores;
|
|
});
|
|
}
|
|
|
|
List<Widget> get _pages => [
|
|
ScoringPage(
|
|
initialArrowsPerEnd: _arrowsPerEnd,
|
|
initialEndsPerSet: _endsPerSet,
|
|
initialScores: _scores,
|
|
onArrowsPerEndChanged: _onArrowsPerEndChanged,
|
|
onScoresUpdated: _onScoresUpdated,
|
|
),
|
|
const SettingsPage(),
|
|
];
|
|
|
|
final List<String> _pageTitles = [
|
|
'Main (Scorer)',
|
|
'Settings',
|
|
];
|
|
|
|
void _onNavigationItemSelected(int index) {
|
|
setState(() {
|
|
_selectedIndex = index;
|
|
});
|
|
Navigator.pop(context); // Close drawer
|
|
}
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
return Scaffold(
|
|
appBar: AppBar(
|
|
title: Text(_pageTitles[_selectedIndex]),
|
|
backgroundColor: Theme.of(context).colorScheme.inversePrimary,
|
|
),
|
|
body: _pages[_selectedIndex],
|
|
drawer: Drawer(
|
|
child: ListView(
|
|
padding: EdgeInsets.zero,
|
|
children: [
|
|
DrawerHeader(
|
|
decoration: BoxDecoration(
|
|
color: Theme.of(context).colorScheme.inversePrimary,
|
|
),
|
|
child: const Column(
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
mainAxisAlignment: MainAxisAlignment.end,
|
|
children: [
|
|
Text(
|
|
'Archery Bookkeeper',
|
|
style: TextStyle(
|
|
color: Colors.white,
|
|
fontSize: 24,
|
|
fontWeight: FontWeight.bold,
|
|
),
|
|
),
|
|
SizedBox(height: 8),
|
|
Text(
|
|
'Alpha 0.1',
|
|
style: TextStyle(
|
|
color: Colors.white70,
|
|
fontSize: 16,
|
|
),
|
|
),
|
|
],
|
|
),
|
|
),
|
|
ListTile(
|
|
leading: const Icon(Icons.sports),
|
|
title: const Text('Main (Scorer)'),
|
|
selected: _selectedIndex == 0,
|
|
onTap: () => _onNavigationItemSelected(0),
|
|
),
|
|
ListTile(
|
|
leading: const Icon(Icons.settings),
|
|
title: const Text('Settings'),
|
|
selected: _selectedIndex == 1,
|
|
onTap: () => _onNavigationItemSelected(1),
|
|
),
|
|
const Divider(),
|
|
const Padding(
|
|
padding: EdgeInsets.all(16.0),
|
|
child: Text(
|
|
'REPLACE ALL THESE TEXTS WITH LOCALISATION MARKERS!!',
|
|
style: TextStyle(
|
|
fontSize: 12,
|
|
color: Colors.grey,
|
|
),
|
|
),
|
|
),
|
|
],
|
|
),
|
|
),
|
|
);
|
|
}
|
|
} |