Merge branch 'design_changes' of https://gitlab.com/Cloud_Solution/driver-app into merge_into_dev_9/13_final

 Conflicts:
	lib/widgets/delivery/customer_brief_card.dart
merge_into_dev_9/13_final
hussam al-habibeh 5 years ago
commit 24a9f561ad

@ -27,7 +27,8 @@ class AppGlobal {
const LINEAR_GRADIENT = LinearGradient(
colors: [
Color(0xff49C1BC),
Color(0xff17AFB8),
Color(0xff45B7AE),
Color(0xff119FA9),
],
// stops: [0.0, 1.0],
);

File diff suppressed because one or more lines are too long

@ -1,4 +1,5 @@
import 'package:driverapp/core/viewModels/orders_view_model.dart';
import 'package:driverapp/pages/delivery/information_page.dart';
import 'package:driverapp/uitl/translations_delegate_base.dart';
import 'package:driverapp/widgets/order/order_info_card.dart';
import 'package:driverapp/widgets/others/app_scaffold_widget.dart';
@ -35,7 +36,16 @@ class _OrdersListScreenState extends State<OrdersListScreen> {
itemBuilder: (BuildContext context, int index) {
return Padding(
padding: EdgeInsets.symmetric(horizontal: 12.2),
child: OrderInfoCard(order: model.orders[index]),
child: OrderInfoCard(
order: model.orders[index],
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) =>
InformationPage(model.orders[index])));
},
),
);
},
),

@ -69,8 +69,8 @@ class CustomerBriefCard extends StatelessWidget {
child: Text(
'ID: ${itemId}',
style: TextStyle(
color: Color(0xFFADACAD),
fontWeight: FontWeight.w800,
color: Color(0xff636363),
fontWeight: FontWeight.w500,
fontSize: 17.5),
),
),
@ -89,14 +89,20 @@ class CustomerBriefCard extends StatelessWidget {
),
Text(
Utils.formatName('${customerFirstName} ${customerLastName}'),
style: TextStyle(fontSize: 20, fontWeight: FontWeight.w500),
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.w500,
color: Color(0xff343333),
fontFamily: 'Metropolis',
),
),
SizedBox(
height: MediaQuery.of(context).size.width * 0.019,
),
Text(
mobileNo,
style: TextStyle(color: Color(0xFF50BDC5)),
style: TextStyle(
color: Color(0xff14A0A9), fontWeight: FontWeight.w400),
),
SizedBox(
height: MediaQuery.of(context).size.width * 0.005,

@ -72,6 +72,8 @@ dependencies:
# location
location: ^3.0.2
#gradient
gradient_app_bar: ^0.1.3

Loading…
Cancel
Save