From 49dc00c7d8453ae629665c64d6eae04ad497ce64 Mon Sep 17 00:00:00 2001
From: Sneha <sneha@armintasolutions.com>
Date: Mon, 8 Sep 2025 12:38:34 +0530
Subject: [PATCH] fleet screen navigation

---
 lib/common/dashboard.dart  |  3 ++-
 lib/orders/all_orders.dart | 30 ++++++++++++++----------------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/lib/common/dashboard.dart b/lib/common/dashboard.dart
index 60a7118..f9b5a49 100644
--- a/lib/common/dashboard.dart
+++ b/lib/common/dashboard.dart
@@ -6,6 +6,7 @@ import 'package:flutter/services.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:supplier_new/common/settings.dart';
 import 'package:supplier_new/orders/all_orders.dart';
+import 'package:supplier_new/resources/fleet.dart';
 import 'package:supplier_new/set_rates/set_rates.dart';
 
 import '../login/login.dart';
@@ -33,7 +34,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
     HomeScreen(),
     HomeScreen(),
     HomeScreen(),
-    HomeScreen(),
+    FleetStep1Page(),
     HomeScreen(),
   ];
   // List of bottom navigation bar items
diff --git a/lib/orders/all_orders.dart b/lib/orders/all_orders.dart
index 1d974c1..649e854 100644
--- a/lib/orders/all_orders.dart
+++ b/lib/orders/all_orders.dart
@@ -181,13 +181,10 @@ class _AllOrdersState extends State<AllOrders> {
                     children: [
                       // Date heading
                       Padding(
-                        padding: const EdgeInsets.symmetric(vertical: 8.0),
+                        padding: const EdgeInsets.all(0),
                         child: Text(
                           date,
-                          style: const TextStyle(
-                            fontSize: 15,
-                            fontWeight: FontWeight.w600,
-                          ),
+                          style:fontTextStyle(14, Color(0XFF343637), FontWeight.w600),
                         ),
                       ),
 
@@ -283,7 +280,8 @@ class OrderCard extends StatelessWidget {
   Widget build(BuildContext context) {
     final statusColor = _getStatusColor();
 
-    return Container(
+    return Padding(padding: EdgeInsets.fromLTRB(0, 8, 0, 0),
+    child: Container(
       margin: const EdgeInsets.only(bottom: 12),
       decoration: BoxDecoration(
         color: Colors.white,
@@ -306,17 +304,17 @@ class OrderCard extends StatelessWidget {
               bottomLeft: Radius.circular(12),
             ),
             child: order.imageAsset != null
-            ? Image.asset(
-            order.imageAsset!,
-            height: 100,
-            width: 100,
-            fit: BoxFit.cover,
+                ? Image.asset(
+              order.imageAsset!,
+              height: 100,
+              width: 100,
+              fit: BoxFit.cover,
             )
                 : Image.network(
-            order.imageUrl!,
-            height: 100,
-            width: 100,
-            fit: BoxFit.cover,
+              order.imageUrl!,
+              height: 100,
+              width: 100,
+              fit: BoxFit.cover,
             ),
           ),
 
@@ -398,6 +396,6 @@ class OrderCard extends StatelessWidget {
           ),
         ],
       ),
-    );
+    ),);
   }
 }
\ No newline at end of file