changes in order track file

lib/screens/order_screen.dart

@@ -32,64 +32,24 @@ class _OrdersScreenState extends State<OrdersScreen> {
     }
 
     final screenWidth = MediaQuery.of(context).size.width;
-    final scale = (screenWidth / 420).clamp(0.85, 1.15);
+    final scale = (screenWidth / 420).clamp(0.85, 1.1);
 
     final filteredOrders = provider.orders.where((o) {
       final q = searchQuery.toLowerCase();
       return o["order_id"].toString().toLowerCase().contains(q) ||
           o["status"].toString().toLowerCase().contains(q) ||
-          o["description"].toString().toLowerCase().contains(q) ||
-          o["amount"].toString().toLowerCase().contains(q);
+          o["description"].toString().toLowerCase().contains(q);
     }).toList();
 
     return Column(
       children: [
-        // SEARCH BAR
-        Container(
-          margin: EdgeInsets.fromLTRB(16 * scale, 16 * scale, 16 * scale, 10 * scale),
-          padding: EdgeInsets.symmetric(horizontal: 14 * scale),
-          decoration: BoxDecoration(
-            color: Colors.white,
-            borderRadius: BorderRadius.circular(16 * scale),
-            boxShadow: [
-              BoxShadow(
-                color: Colors.black12.withOpacity(0.12),
-                blurRadius: 10 * scale,
-                spreadRadius: 1 * scale,
-                offset: Offset(0, 4 * scale),
-              ),
-            ],
-          ),
-          child: Row(
-            children: [
-              Icon(Icons.search, size: 22 * scale, color: Colors.grey.shade700),
-              SizedBox(width: 10 * scale),
-              Expanded(
-                child: TextField(
-                  onChanged: (value) => setState(() => searchQuery = value),
-                  style: TextStyle(fontSize: 15 * scale),
-                  decoration: InputDecoration(
-                    hintText: "Search orders...",
-                    hintStyle: TextStyle(
-                      fontSize: 14 * scale,
-                      color: Colors.grey.shade600,
-                    ),
-                    border: InputBorder.none,
-                  ),
-                ),
-              ),
-            ],
-          ),
-        ),
-
-        // ORDER LIST
+        _searchBar(scale),
         Expanded(
           child: ListView.builder(
-            padding: EdgeInsets.all(16 * scale),
+            padding: EdgeInsets.all(14 * scale),
             itemCount: filteredOrders.length,
             itemBuilder: (context, i) {
-              final order = filteredOrders[i];
-              return _orderCard(order, scale);
+              return _orderCard(filteredOrders[i], scale);
             },
           ),
         ),
@@ -97,106 +57,175 @@ class _OrdersScreenState extends State<OrdersScreen> {
     );
   }
 
+  Widget _searchBar(double scale) {
+    return Container(
+      margin: EdgeInsets.fromLTRB(14 * scale, 14 * scale, 14 * scale, 8 * scale),
+      padding: EdgeInsets.symmetric(horizontal: 12 * scale),
+      decoration: BoxDecoration(
+        color: Colors.white,
+        borderRadius: BorderRadius.circular(14 * scale),
+        boxShadow: [
+          BoxShadow(
+            color: Colors.black12.withOpacity(0.1),
+            blurRadius: 8 * scale,
+            offset: const Offset(0, 3),
+          ),
+        ],
+      ),
+      child: Row(
+        children: [
+          Icon(Icons.search, size: 20 * scale, color: Colors.grey.shade700),
+          SizedBox(width: 8 * scale),
+          Expanded(
+            child: TextField(
+              onChanged: (v) => setState(() => searchQuery = v),
+              decoration: const InputDecoration(
+                hintText: "Search orders...",
+                border: InputBorder.none,
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
   Widget _orderCard(Map<String, dynamic> o, double scale) {
     final progress = getProgress(o['status']);
-    final badgeColor = getStatusColor(o['status']);
+    final percent = (progress * 100).toInt();
 
     return Card(
-      elevation: 3 * scale,
+      elevation: 2,
+      margin: EdgeInsets.only(bottom: 12 * scale),
       color: Colors.white,
-      margin: EdgeInsets.only(bottom: 16 * scale),
       shape: RoundedRectangleBorder(
-        borderRadius: BorderRadius.circular(16 * scale),
+        borderRadius: BorderRadius.circular(14),
       ),
       child: Padding(
-        padding: EdgeInsets.all(16 * scale),
+        padding: EdgeInsets.all(12 * scale), // 👈 tighter padding
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
+            // HEADER
             Row(
               mainAxisAlignment: MainAxisAlignment.spaceBetween,
               children: [
                 Text(
                   "Order #${o['order_id']}",
                   style: TextStyle(
-                    fontSize: 18 * scale,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                Container(
-                  padding: EdgeInsets.symmetric(
-                    horizontal: 12 * scale,
-                    vertical: 6 * scale,
-                  ),
-                  decoration: BoxDecoration(
-                    color: badgeColor.withOpacity(0.15),
-                    borderRadius: BorderRadius.circular(12 * scale),
-                  ),
-                  child: Text(
-                    o['status'],
-                    style: TextStyle(
-                      color: badgeColor,
-                      fontWeight: FontWeight.bold,
-                      fontSize: 13 * scale,
-                    ),
+                    fontSize: 15 * scale, // 👈 slightly smaller
+                    fontWeight: FontWeight.w600,
                   ),
                 ),
+                getStatusBadge(o['status'], scale),
               ],
             ),
 
-            SizedBox(height: 10 * scale),
-            Text(o['description'], style: TextStyle(fontSize: 14 * scale)),
-            SizedBox(height: 5 * scale),
+            SizedBox(height: 6 * scale),
+            Text(
+              o['description'],
+              style: TextStyle(fontSize: 13 * scale),
+            ),
 
+            SizedBox(height: 4 * scale),
             Text(
               "₹${o['amount']}",
               style: TextStyle(
-                fontSize: 16 * scale,
+                fontSize: 15 * scale,
                 fontWeight: FontWeight.w600,
               ),
             ),
 
-            SizedBox(height: 18 * scale),
-            _AnimatedProgressBar(progress: progress, scale: scale),
-            SizedBox(height: 18 * scale),
+            SizedBox(height: 12 * scale),
 
+            // PROGRESS HEADER
+            Align(
+              alignment: Alignment.centerRight,
+              child: Text(
+                "$percent%",
+                style: TextStyle(
+                  fontWeight: FontWeight.w600,
+                  fontSize: 11 * scale,
+                  color: Colors.grey.shade700,
+                ),
+              ),
+            ),
+
+            _AnimatedProgressBar(progress: progress, scale: scale),
+
+            SizedBox(height: 6 * scale),
+
+            // PROGRESS LABELS
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: const [
+                Text("Shipment Ready",
+                    style: TextStyle(fontSize: 10, color: Colors.grey)),
+                Text("Import Custom",
+                    style: TextStyle(fontSize: 10, color: Colors.grey)),
+                Text("Delivered",
+                    style: TextStyle(fontSize: 10, color: Colors.grey)),
+              ],
+            ),
+
+            SizedBox(height: 12 * scale),
+
+            // ACTIONS
             Row(
               mainAxisAlignment: MainAxisAlignment.spaceBetween,
               children: [
-                _btn(Icons.visibility, "View", Colors.green.shade800,
-                    Colors.green.shade50, () => _openOrderDetails(o['order_id']), scale),
-
-                _btn(Icons.receipt_long, "Invoice", Colors.orange.shade800,
-                    Colors.orange.shade50, () => _openInvoice(o['order_id']), scale),
-
-                _btn(Icons.local_shipping, "Track", Colors.blue.shade800,
-                    Colors.blue.shade50, () => _openTrack(o['order_id']), scale),
+                _btn(Icons.visibility, "View",
+                    Colors.green.shade700, Colors.green.shade50,
+                        () => _openOrderDetails(o['order_id']), scale),
+                _btn(Icons.receipt_long, "Invoice",
+                    Colors.orange.shade700, Colors.orange.shade50,
+                        () => _openInvoice(o['order_id']), scale),
+                _btn(Icons.local_shipping, "Track",
+                    Colors.blue.shade700, Colors.blue.shade50,
+                        () => _openTrack(o['order_id']), scale),
               ],
-            )
+            ),
           ],
         ),
       ),
     );
   }
 
-  Widget _btn(IconData icon, String text, Color fg, Color bg,
-      VoidCallback onTap, double scale) {
+  Widget _btn(
+      IconData icon,
+      String text,
+      Color fg,
+      Color bg,
+      VoidCallback onTap,
+      double scale,
+      ) {
     return InkWell(
-      borderRadius: BorderRadius.circular(12 * scale),
       onTap: onTap,
+      borderRadius: BorderRadius.circular(10),
       child: Container(
-        padding: EdgeInsets.symmetric(horizontal: 20 * scale, vertical: 12 * scale),
-        decoration: BoxDecoration(color: bg, borderRadius: BorderRadius.circular(12 * scale)),
+        constraints: BoxConstraints(
+          minWidth: 115 * scale,   // 👈 makes button wider
+          minHeight: 36 * scale,  // 👈 makes button taller
+        ),
+        padding: EdgeInsets.symmetric(
+          horizontal: 16 * scale, // slightly more horizontal space
+          vertical: 8 * scale,
+        ),
+        decoration: BoxDecoration(
+          color: bg,
+          borderRadius: BorderRadius.circular(10),
+        ),
         child: Row(
+          mainAxisAlignment: MainAxisAlignment.center, // 👈 centers content
           children: [
-            Icon(icon, size: 18 * scale, color: fg),
-            SizedBox(width: 8 * scale),
+            Icon(icon, size: 16 * scale, color: fg),
+            SizedBox(width: 6 * scale),
             Text(
               text,
               style: TextStyle(
                 color: fg,
                 fontWeight: FontWeight.w600,
-                fontSize: 14 * scale,
+                fontSize: 12 * scale,
               ),
             ),
           ],
@@ -205,20 +234,44 @@ class _OrdersScreenState extends State<OrdersScreen> {
     );
   }
 
-  void _openOrderDetails(String id) {
-    Navigator.push(context,
-        MaterialPageRoute(builder: (_) => OrderDetailScreen(orderId: id)));
+
+  // ================= STATUS BADGE =================
+
+  Widget getStatusBadge(String? status, double scale) {
+    final config = statusConfig(status);
+    final isDomestic = (status ?? '').toLowerCase().contains("domestic");
+
+    return Container(
+      padding: EdgeInsets.symmetric(horizontal: 10, vertical: 6),
+      decoration: BoxDecoration(
+        color: config.bg,
+        borderRadius: BorderRadius.circular(12),
+      ),
+      child: Text(
+        isDomestic ? "Domestic\nDistribution" : (status ?? "Unknown"),
+        textAlign: TextAlign.center,
+        maxLines: isDomestic ? 2 : 1,
+        style: TextStyle(
+          color: config.fg,
+          fontWeight: FontWeight.w600,
+          fontSize: 11,
+          height: 1.2,
+        ),
+      ),
+    );
   }
 
-  void _openInvoice(String id) {
-    Navigator.push(context,
-        MaterialPageRoute(builder: (_) => OrderInvoiceScreen(orderId: id)));
-  }
+  void _openOrderDetails(String id) =>
+      Navigator.push(context,
+          MaterialPageRoute(builder: (_) => OrderDetailScreen(orderId: id)));
 
-  void _openTrack(String id) {
-    Navigator.push(context,
-        MaterialPageRoute(builder: (_) => OrderTrackScreen(orderId: id)));
-  }
+  void _openInvoice(String id) =>
+      Navigator.push(context,
+          MaterialPageRoute(builder: (_) => OrderInvoiceScreen(orderId: id)));
+
+  void _openTrack(String id) =>
+      Navigator.push(context,
+          MaterialPageRoute(builder: (_) => OrderTrackScreen(orderId: id)));
 }
 
 // ================= PROGRESS BAR =================
@@ -231,28 +284,24 @@ class _AnimatedProgressBar extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return LayoutBuilder(builder: (context, constraints) {
+    return LayoutBuilder(builder: (context, c) {
       return Stack(
         children: [
           Container(
-            height: 10 * scale,
+            height: 8, // 👈 thinner bar
             decoration: BoxDecoration(
               color: Colors.grey.shade300,
-              borderRadius: BorderRadius.circular(20 * scale),
+              borderRadius: BorderRadius.circular(20),
             ),
           ),
           AnimatedContainer(
-            duration: const Duration(milliseconds: 650),
-            curve: Curves.easeInOut,
-            height: 10 * scale,
-            width: constraints.maxWidth * progress,
+            duration: const Duration(milliseconds: 600),
+            height: 8,
+            width: c.maxWidth * progress,
             decoration: BoxDecoration(
-              borderRadius: BorderRadius.circular(20 * scale),
+              borderRadius: BorderRadius.circular(20),
               gradient: const LinearGradient(
-                colors: [
-                  Color(0xFF4F8CFF),
-                  Color(0xFF8A4DFF),
-                ],
+                colors: [Color(0xFF4F8CFF), Color(0xFF8A4DFF)],
               ),
             ),
           ),
@@ -262,36 +311,58 @@ class _AnimatedProgressBar extends StatelessWidget {
   }
 }
 
-// ================= FIXED STATUS LOGIC =================
+// ================= STATUS LOGIC =================
 
 double getProgress(String? status) {
-  final s = (status ?? '')
-      .toLowerCase()
-      .replaceAll('_', ' ')
-      .replaceAll('-', ' ')
-      .trim();
-
-  if (s == "pending") return 0.25;
-  if (s == "loading") return 0.40;
-  if (s.contains("transit")) return 0.65;
-  if (s == "dispatched") return 0.85;
-  if (s == "delivered") return 1.0;
-
+  final s = (status ?? '').toLowerCase();
+  if (s.contains("shipment ready")) return 0.05;
+  if (s.contains("export")) return 0.10;
+  if (s.contains("international")) return 0.20;
+  if (s.contains("arrived")) return 0.30;
+  if (s.contains("import")) return 0.40;
+  if (s.contains("warehouse")) return 0.50;
+  if (s.contains("domestic")) return 0.60;
+  if (s.contains("out for")) return 0.90;
+  if (s.contains("delivered")) return 1.0;
   return 0.05;
 }
 
-Color getStatusColor(String? status) {
-  final s = (status ?? '')
-      .toLowerCase()
-      .replaceAll('_', ' ')
-      .replaceAll('-', ' ')
-      .trim();
+_StatusConfig statusConfig(String? status) {
+  final s = (status ?? '').toLowerCase();
 
-  if (s == "pending") return Colors.orange;
-  if (s == "loading") return Colors.amber.shade800;
-  if (s.contains("transit")) return Colors.red;
-  if (s == "dispatched") return Colors.blue.shade700;
-  if (s == "delivered") return Colors.green.shade700;
+  if (s.contains("shipment ready")) {
+    return _StatusConfig(Colors.blue.shade800, Colors.blue.shade50);
+  }
+  if (s.contains("export")) {
+    return _StatusConfig(Colors.purple.shade800, Colors.purple.shade50);
+  }
+  if (s.contains("international")) {
+    return _StatusConfig(Colors.red.shade800, Colors.red.shade50);
+  }
+  if (s.contains("arrived")) {
+    return _StatusConfig(Colors.orange.shade800, Colors.orange.shade50);
+  }
+  if (s.contains("import")) {
+    return _StatusConfig(Colors.teal.shade800, Colors.teal.shade50);
+  }
+  if (s.contains("warehouse")) {
+    return _StatusConfig(Colors.brown.shade800, Colors.brown.shade50);
+  }
+  if (s.contains("domestic")) {
+    return _StatusConfig(Colors.indigo.shade800, Colors.indigo.shade50);
+  }
+  if (s.contains("out for")) {
+    return _StatusConfig(Colors.pink.shade800, Colors.pink.shade50);
+  }
+  if (s.contains("delivered")) {
+    return _StatusConfig(Colors.green.shade800, Colors.green.shade50);
+  }
 
-  return Colors.black54;
+  return _StatusConfig(Colors.grey.shade800, Colors.grey.shade300);
+}
+
+class _StatusConfig {
+  final Color fg;
+  final Color bg;
+  _StatusConfig(this.fg, this.bg);
 }