fleet screen navigation

master
Sneha 6 days ago
parent f461be2c2f
commit 49dc00c7d8

@ -6,6 +6,7 @@ import 'package:flutter/services.dart';
import 'package:image_picker/image_picker.dart'; import 'package:image_picker/image_picker.dart';
import 'package:supplier_new/common/settings.dart'; import 'package:supplier_new/common/settings.dart';
import 'package:supplier_new/orders/all_orders.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 'package:supplier_new/set_rates/set_rates.dart';
import '../login/login.dart'; import '../login/login.dart';
@ -33,7 +34,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
HomeScreen(), HomeScreen(),
HomeScreen(), HomeScreen(),
HomeScreen(), HomeScreen(),
HomeScreen(), FleetStep1Page(),
HomeScreen(), HomeScreen(),
]; ];
// List of bottom navigation bar items // List of bottom navigation bar items

@ -181,13 +181,10 @@ class _AllOrdersState extends State<AllOrders> {
children: [ children: [
// Date heading // Date heading
Padding( Padding(
padding: const EdgeInsets.symmetric(vertical: 8.0), padding: const EdgeInsets.all(0),
child: Text( child: Text(
date, date,
style: const TextStyle( style:fontTextStyle(14, Color(0XFF343637), FontWeight.w600),
fontSize: 15,
fontWeight: FontWeight.w600,
),
), ),
), ),
@ -283,7 +280,8 @@ class OrderCard extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
final statusColor = _getStatusColor(); final statusColor = _getStatusColor();
return Container( return Padding(padding: EdgeInsets.fromLTRB(0, 8, 0, 0),
child: Container(
margin: const EdgeInsets.only(bottom: 12), margin: const EdgeInsets.only(bottom: 12),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
@ -306,17 +304,17 @@ class OrderCard extends StatelessWidget {
bottomLeft: Radius.circular(12), bottomLeft: Radius.circular(12),
), ),
child: order.imageAsset != null child: order.imageAsset != null
? Image.asset( ? Image.asset(
order.imageAsset!, order.imageAsset!,
height: 100, height: 100,
width: 100, width: 100,
fit: BoxFit.cover, fit: BoxFit.cover,
) )
: Image.network( : Image.network(
order.imageUrl!, order.imageUrl!,
height: 100, height: 100,
width: 100, width: 100,
fit: BoxFit.cover, fit: BoxFit.cover,
), ),
), ),
@ -398,6 +396,6 @@ class OrderCard extends StatelessWidget {
), ),
], ],
), ),
); ),);
} }
} }
Loading…
Cancel
Save