changed button name

lib/screens/comparison_page.dart

@@ -279,7 +279,7 @@ class ComparisonPageState extends State<ComparisonPage> {
             // Proceed Button
             ElevatedButton(
               onPressed: _navigateToFinalClearance,
-              child: const Text('Proceed to Clearance Display'),
+              child: const Text('Proceed to Readback page'),
             ),
           ],
         ),

lib/screens/expectation_input_page.dart

@@ -35,8 +35,8 @@ class ExpectationInputPageState extends State<ExpectationInputPage> {
   final FocusNode _clearanceLimitFocusNode = FocusNode();
   final FocusNode _routeFocusNode = FocusNode();
   final FocusNode _altitudeFocusNode = FocusNode();
-  final FocusNode _squawkFocusNode = FocusNode();
   final FocusNode _frequencyFocusNode = FocusNode();
+  final FocusNode _squawkFocusNode = FocusNode();
 
   @override
   void dispose() {
@@ -48,8 +48,8 @@ class ExpectationInputPageState extends State<ExpectationInputPage> {
     _clearanceLimitFocusNode.dispose();
     _routeFocusNode.dispose();
     _altitudeFocusNode.dispose();
-    _squawkFocusNode.dispose();
     _frequencyFocusNode.dispose();
+    _squawkFocusNode.dispose();
     super.dispose();
   }
 
@@ -265,7 +265,7 @@ class ExpectationInputPageState extends State<ExpectationInputPage> {
                               label: 'Altitude',
                               controller: _expectedAltitudeController,
                               currentFocus: _altitudeFocusNode,
-                              nextFocus: _squawkFocusNode,
+                              nextFocus: _frequencyFocusNode, // Updated next focus
                               keyboardType: TextInputType.text, // Standard keyboard
                               inputFormatters: null, // No restrictions
                               enableAutocorrect: false, // Disable autocorrect
@@ -274,16 +274,13 @@ class ExpectationInputPageState extends State<ExpectationInputPage> {
                                   false, // iOS-specific
                             ),
                             buildTextField(
-                              label: 'Transponder (Squawk)',
+                              label: 'Departure Frequency', // Changed label
-                              controller: _expectedSquawkController,
+                              controller: _expectedFrequencyController,
-                              currentFocus: _squawkFocusNode,
+                              currentFocus: _frequencyFocusNode,
-                              nextFocus: _frequencyFocusNode,
+                              nextFocus: _squawkFocusNode, // Next focus to Squawk
                               keyboardType: TextInputType.text, // Standard keyboard
                               inputFormatters: [
-                                // Allow only digits 0-7 and limit to 4 characters
+                                FrequencyInputFormatter(), // Handles decimal inputs
-                                FilteringTextInputFormatter.allow(
-                                    RegExp(r'[0-7]')),
-                                LengthLimitingTextInputFormatter(4),
                               ],
                               enableAutocorrect: false, // Disable autocorrect
                               enableSuggestions: false, // Disable suggestions
@@ -291,13 +288,16 @@ class ExpectationInputPageState extends State<ExpectationInputPage> {
                                   false, // iOS-specific
                             ),
                             buildTextField(
-                              label: 'Departure Frequency',
+                              label: 'Transponder (Squawk)', // Now last field
-                              controller: _expectedFrequencyController,
+                              controller: _expectedSquawkController,
-                              currentFocus: _frequencyFocusNode,
+                              currentFocus: _squawkFocusNode,
-                              isLastField: true,
+                              isLastField: true, // Mark as last field
                               keyboardType: TextInputType.text, // Standard keyboard
                               inputFormatters: [
-                                FrequencyInputFormatter(), // Handles decimal inputs
+                                // Allow only digits 0-7 and limit to 4 characters
+                                FilteringTextInputFormatter.allow(
+                                    RegExp(r'[0-7]')),
+                                LengthLimitingTextInputFormatter(4),
                               ],
                               enableAutocorrect: false, // Disable autocorrect
                               enableSuggestions: false, // Disable suggestions

lib/screens/final_clearance_page.dart

@@ -91,8 +91,8 @@ class FinalClearanceDisplayState extends State<FinalClearanceDisplay> {
                   buildClearanceField('Clearance Limit', clearanceLimit),
                   buildClearanceField('Route', route),
                   buildClearanceField('Altitude', altitude),
-                  buildClearanceField('Transponder (Squawk)', squawk),
                   buildClearanceField('Frequency', frequency),
+                  buildClearanceField('Transponder (Squawk)', squawk),
                 ],
               ),
             ),

pubspec.lock

@@ -180,18 +180,18 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
+      sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.5"
+    version: "10.0.4"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
+      sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.5"
+    version: "3.0.3"
   leak_tracker_testing:
     dependency: transitive
     description:
@@ -220,18 +220,18 @@ packages:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
+      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
       url: "https://pub.dev"
     source: hosted
-    version: "0.11.1"
+    version: "0.8.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
+      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
       url: "https://pub.dev"
     source: hosted
-    version: "1.15.0"
+    version: "1.12.0"
   path:
     dependency: transitive
     description:
@@ -393,10 +393,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
+      sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.2"
+    version: "0.7.0"
   typed_data:
     dependency: transitive
     description:
@@ -417,10 +417,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
+      sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
       url: "https://pub.dev"
     source: hosted
-    version: "14.2.5"
+    version: "14.2.1"
   web:
     dependency: transitive
     description: