fix issues after merge

logut
Elham Rababah 6 years ago
parent 8a839a5424
commit 7029cc2dd6

@ -1,20 +1,16 @@
import 'package:barcode_scan/platform_wrapper.dart'; import 'package:barcode_scan/platform_wrapper.dart';
import 'package:driverapp/config/size_config.dart';
import 'package:driverapp/core/enum/viewstate.dart'; import 'package:driverapp/core/enum/viewstate.dart';
import 'package:driverapp/core/viewModels/orders_view_model.dart'; import 'package:driverapp/core/viewModels/orders_view_model.dart';
import 'package:driverapp/uitl/app_toast.dart';
import 'package:driverapp/uitl/utils.dart';
import 'package:driverapp/pages/delivery/information_page.dart'; import 'package:driverapp/pages/delivery/information_page.dart';
import 'package:driverapp/pages/orders/pending_orders_page.dart'; import 'package:driverapp/pages/orders/pending_orders_page.dart';
import 'package:driverapp/uitl/app_toast.dart';
import 'package:driverapp/uitl/utils.dart';
import 'package:driverapp/widgets/others/app_scaffold_widget.dart';
import 'package:driverapp/widgets/others/rounded_container.dart'; import 'package:driverapp/widgets/others/rounded_container.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../base/base_view.dart'; import '../base/base_view.dart';
import 'package:flutter/cupertino.dart';
import 'package:driverapp/app-icons/driver_app_icons.dart';
import 'package:driverapp/widgets/others/rounded_container.dart';
import 'package:driverapp/pages/orders/pending_orders_page.dart';
import 'package:driverapp/widgets/others/app_scaffold_widget.dart';
class DashboardScreen extends StatefulWidget { class DashboardScreen extends StatefulWidget {
@override @override
@ -402,10 +398,9 @@ class _DashboardScreenState extends State<DashboardScreen> {
Expanded( Expanded(
child: Text( child: Text(
'Olaya ST, Behind kfc next to king ,Olaya ST ', 'Olaya ST, Behind kfc next to king ,Olaya ST ',
style: TextStyle( style: TextStyle(color: Colors.black45),
color: Colors.black45), ),
), ),
)
], ],
), ),
), ),
@ -422,15 +417,13 @@ class _DashboardScreenState extends State<DashboardScreen> {
backgroundColor: Colors.white, backgroundColor: Colors.white,
maxRadius: 25.1, maxRadius: 25.1,
child: Padding( child: Padding(
padding: padding: const EdgeInsets.all(8.0),
const EdgeInsets.all(8.0),
child: Text( child: Text(
'3 K.m \n away', '3 K.m \n away',
style: TextStyle( style: TextStyle(
color: Color(0xff30B7B9), color: Color(0xff30B7B9),
fontSize: 12.5, fontSize: 12.5,
fontWeight: fontWeight: FontWeight.w600),
FontWeight.w600),
), ),
), ),
), ),
@ -442,13 +435,17 @@ class _DashboardScreenState extends State<DashboardScreen> {
], ],
), ),
), ),
onTap: () => Navigator.push( onTap: () {
Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => OrdersListScreen()), builder: (context) =>
)), InformationPage(model.orders[index])));
},
),
); );
}), },
),
) )
], ],
), ),

Loading…
Cancel
Save