Haroon6138
/
driver-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dashboard design updates

Browse Source
logut
hussam al-habibeh 4 years ago
parent a87efbe7dd
commit 15ae571383
26 changed files with 179 additions and 150 deletions
Show Stats Download Patch File Download Diff File

BIN
assets/fonts/Metropolis/Metropolis-Black.otf
View File

Binary file not shown.

BIN
assets/fonts/Metropolis/Metropolis-BlackItalic.otf
View File

Binary file not shown.

BIN
assets/fonts/Metropolis/Metropolis-Bold.otf
View File

Binary file not shown.

BIN
assets/fonts/Metropolis/Metropolis-BoldItalic.otf
View File

Binary file not shown.

BIN
assets/fonts/Metropolis/Metropolis-ExtraBold.otf
View File

Binary file not shown.

BIN
assets/fonts/Metropolis/Metropolis-ExtraBoldItalic.otf
View File

Binary file not shown.

BIN
assets/fonts/Metropolis/Metropolis-ExtraLight.otf
View File

Binary file not shown.

BIN
assets/fonts/Metropolis/Metropolis-ExtraLightItalic.otf
View File

Binary file not shown.

BIN
assets/fonts/Metropolis/Metropolis-Light.otf
View File

Binary file not shown.

BIN
assets/fonts/Metropolis/Metropolis-LightItalic.otf
View File

Binary file not shown.

BIN
assets/fonts/Metropolis/Metropolis-Medium.otf
View File

Binary file not shown.

BIN
assets/fonts/Metropolis/Metropolis-MediumItalic.otf
View File

Binary file not shown.

BIN
assets/fonts/Metropolis/Metropolis-Regular.otf
View File

Binary file not shown.

BIN
assets/fonts/Metropolis/Metropolis-RegularItalic.otf
View File

Binary file not shown.

BIN
assets/fonts/Metropolis/Metropolis-SemiBold.otf
View File

Binary file not shown.

BIN
assets/fonts/Metropolis/Metropolis-SemiBoldItalic.otf
View File

Binary file not shown.

BIN
assets/fonts/Metropolis/Metropolis-Thin.otf
View File

Binary file not shown.

BIN
assets/fonts/Metropolis/Metropolis-ThinItalic.otf
View File

Binary file not shown.

BIN
assets/images/closed_box.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
assets/images/open_box.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.9 KiB

BIN
assets/images/opend_box.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
assets/images/qr_code.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.9 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

8
lib/main.dart
Unescape Escape View File

@ -8,8 +8,6 @@ import 'config/size_config.dart';
import 'core/viewModels/project_view_model.dart'; import 'core/viewModels/project_view_model.dart';
import 'locator.dart'; import 'locator.dart';
void main() { void main() {
setupLocator(); setupLocator();
runApp(MyApp()); runApp(MyApp());
@ -44,6 +42,7 @@ class MyApp extends StatelessWidget {
const Locale('en', ''), // English const Locale('en', ''), // English
], ],
theme: ThemeData( theme: ThemeData(
fontFamily: 'Metropolis',
primarySwatch: Colors.blue, primarySwatch: Colors.blue,
visualDensity: VisualDensity.adaptivePlatformDensity, visualDensity: VisualDensity.adaptivePlatformDensity,
brightness: Brightness.light, brightness: Brightness.light,
@ -53,12 +52,11 @@ class MyApp extends StatelessWidget {
TargetPlatform.iOS: CupertinoPageTransitionsBuilder(), TargetPlatform.iOS: CupertinoPageTransitionsBuilder(),
}, },
), ),
scaffoldBackgroundColor:Color.fromRGBO(239, 245, 245, 1) , scaffoldBackgroundColor: Color.fromRGBO(239, 245, 245, 1),
hintColor: Colors.grey[400], hintColor: Colors.grey[400],
disabledColor: Colors.grey[300], disabledColor: Colors.grey[300],
bottomSheetTheme: BottomSheetThemeData( bottomSheetTheme: BottomSheetThemeData(
backgroundColor: Color.fromRGBO(239, 245, 245, 1) backgroundColor: Color.fromRGBO(239, 245, 245, 1)),
),
errorColor: Color.fromRGBO(235, 80, 60, 1.0), errorColor: Color.fromRGBO(235, 80, 60, 1.0),
textSelectionColor: Color.fromRGBO(80, 100, 253, 0.5), textSelectionColor: Color.fromRGBO(80, 100, 253, 0.5),
textSelectionHandleColor: Color.fromRGBO(80, 100, 253, 1.0), textSelectionHandleColor: Color.fromRGBO(80, 100, 253, 1.0),

246
lib/pages/dashboard/dashboard_screen.dart
Unescape Escape View File

@ -42,8 +42,11 @@ class _DashboardScreenState extends State<DashboardScreen> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Text( Text(
'Have a great day ,', 'Have a great day,',
style: TextStyle(fontSize: 12.5), style: TextStyle(
fontSize: 14.5,
color: Color(0xff636363),
fontWeight: FontWeight.w300),
), ),
Padding( Padding(
padding: EdgeInsets.only(top: 4.5), padding: EdgeInsets.only(top: 4.5),
@ -91,7 +94,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
Padding( Padding(
padding: EdgeInsets.symmetric(horizontal: 10.0), padding: EdgeInsets.symmetric(horizontal: 10.0),
child: Container( child: Container(
height: MediaQuery.of(context).size.height * 0.15, height: MediaQuery.of(context).size.height * 0.16,
width: MediaQuery.of(context).size.width * 0.44, width: MediaQuery.of(context).size.width * 0.44,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(15.0), borderRadius: BorderRadius.circular(15.0),
@ -101,57 +104,60 @@ class _DashboardScreenState extends State<DashboardScreen> {
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[ children: <Widget>[
Padding( Expanded(
padding: EdgeInsets.all(10.0), child: Padding(
child: Column( padding: EdgeInsets.all(2.0),
mainAxisAlignment: child: Column(
MainAxisAlignment.spaceBetween, mainAxisAlignment:
children: <Widget>[ MainAxisAlignment.spaceEvenly,
Text( children: <Widget>[
'You Have', Text(
style: TextStyle( 'You Have',
color: Colors.white, fontSize: 10.0),
),
Text(
'5',
style: TextStyle(
color: Colors.white, fontSize: 25.0),
),
Expanded(
child: Text(
'Undelivered \n Packages',
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.white,
fontSize: 10.0), fontSize: 10.0),
), ),
) Text(
], '5',
style: TextStyle(
color: Colors.white,
fontSize: 25.0),
),
Text(
'Undeliverd\nPackages',
style: TextStyle(
color: Colors.white, fontSize: 9.5),
)
],
),
), ),
), ),
Expanded( Padding(
child: Padding( padding: EdgeInsets.only(right: 9.5),
padding: EdgeInsets.all(4.0), child: Container(
width: 110,
height: 110,
decoration: BoxDecoration(
color: Colors.white10,
shape: BoxShape.circle),
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[ children: <Widget>[
Padding( Image.asset(
padding: EdgeInsets.only(right: 9.5), 'assets/images/closed_box.png',
child: Image.asset( height:
'assets/images/closed_box.png', MediaQuery.of(context).size.height *
height: MediaQuery.of(context) 0.10,
.size width:
.height * MediaQuery.of(context).size.width *
0.09,
width: MediaQuery.of(context)
.size
.width *
0.20, 0.20,
//fit: BoxFit.cover, scale: 0.9,
)), fit: BoxFit.cover,
),
], ],
), ),
), ),
) ),
], ],
), ),
), ),
@ -159,72 +165,83 @@ class _DashboardScreenState extends State<DashboardScreen> {
], ],
), ),
), ),
Column( Expanded(
children: <Widget>[ child: Column(
Padding( children: <Widget>[
padding: EdgeInsets.symmetric(horizontal: 10.0), Padding(
child: Container( padding: EdgeInsets.symmetric(horizontal: 10.0),
height: MediaQuery.of(context).size.height * 0.15, child: Container(
width: MediaQuery.of(context).size.width * 0.44, height: MediaQuery.of(context).size.height * 0.16,
decoration: BoxDecoration( width: MediaQuery.of(context).size.width * 0.45,
borderRadius: BorderRadius.circular(15.0), decoration: BoxDecoration(
gradient: LinearGradient( borderRadius: BorderRadius.circular(15.0),
colors: [Color(0xff17AFB8), Color(0xff49C1BC)]), gradient: LinearGradient(
), colors: [Color(0xff17AFB8), Color(0xff49C1BC)]),
child: Row( ),
mainAxisAlignment: MainAxisAlignment.spaceBetween, child: Row(
children: <Widget>[ mainAxisAlignment: MainAxisAlignment.spaceBetween,
Expanded( children: <Widget>[
child: Padding( Expanded(
padding: EdgeInsets.all(12.0), child: Padding(
child: Column( padding: EdgeInsets.all(2.0),
mainAxisAlignment: child: Column(
MainAxisAlignment.spaceEvenly, mainAxisAlignment:
children: <Widget>[ MainAxisAlignment.spaceEvenly,
Text( children: <Widget>[
'You Have', Text(
style: TextStyle( 'You Have',
color: Colors.white, fontSize: 10.0),
),
Text(
'25',
style: TextStyle(
color: Colors.white, fontSize: 25.0),
),
Expanded(
child: Text(
'unWanted\n Packge',
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.white,
fontSize: 10.0), fontSize: 10.0),
), ),
) Text(
], '25',
style: TextStyle(
color: Colors.white,
fontSize: 25.0),
),
Text(
'Succesful\nDeliveries',
style: TextStyle(
color: Colors.white,
fontSize: 10.0),
)
],
),
), ),
), ),
), Padding(
Padding( padding: EdgeInsets.only(right: 9.5),
padding: EdgeInsets.only(right: 9.5), child: Container(
child: Column( width: 110,
mainAxisAlignment: MainAxisAlignment.center, height: 110,
children: <Widget>[ decoration: BoxDecoration(
Image.asset( color: Colors.white10,
'assets/images/open_box.png', shape: BoxShape.circle),
height: MediaQuery.of(context).size.height * child: Column(
0.10, mainAxisAlignment: MainAxisAlignment.center,
width: MediaQuery.of(context).size.width * children: <Widget>[
0.20, Image.asset(
scale: 0.9, 'assets/images/opend_box.png',
fit: BoxFit.cover, height:
MediaQuery.of(context).size.height *
0.10,
width:
MediaQuery.of(context).size.width *
0.20,
scale: 0.9,
fit: BoxFit.cover,
),
],
), ),
], ),
), ),
), ],
], ),
), ),
), )
) ],
], ),
), ),
], ],
), ),
@ -235,7 +252,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
Expanded( Expanded(
child: InkWell( child: InkWell(
child: Container( child: Container(
height: MediaQuery.of(context).size.height * 0.16, height: MediaQuery.of(context).size.height * 0.18,
width: MediaQuery.of(context).size.width * 0.50, width: MediaQuery.of(context).size.width * 0.50,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(15.0), borderRadius: BorderRadius.circular(15.0),
@ -252,10 +269,10 @@ class _DashboardScreenState extends State<DashboardScreen> {
Image.asset( Image.asset(
'assets/images/qr_code.png', 'assets/images/qr_code.png',
width: width:
MediaQuery.of(context).size.width * 0.25, MediaQuery.of(context).size.width * 0.26,
height: height:
MediaQuery.of(context).size.height * 0.14, MediaQuery.of(context).size.height * 0.14,
fit: BoxFit.cover, fit: BoxFit.contain,
) )
], ],
), ),
@ -270,7 +287,9 @@ class _DashboardScreenState extends State<DashboardScreen> {
child: Text( child: Text(
'SCAN', 'SCAN',
style: TextStyle( style: TextStyle(
fontSize: 35.0, color: Colors.white), fontSize: 35.0,
color: Colors.white,
fontWeight: FontWeight.w400),
), ),
), ),
Padding( Padding(
@ -296,7 +315,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
), ),
), ),
Padding( Padding(
padding: EdgeInsets.symmetric(horizontal: 12.0, vertical: 1.0), padding: EdgeInsets.symmetric(horizontal: 20.0, vertical: 1.0),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[ children: <Widget>[
@ -319,11 +338,13 @@ class _DashboardScreenState extends State<DashboardScreen> {
children: <Widget>[ children: <Widget>[
Text( Text(
'See All', 'See All',
style: TextStyle(fontSize: 14.5), style: TextStyle(
fontSize: 14.5, color: Color(0xff42B6AD)),
), ),
Icon( Icon(
Icons.arrow_forward_ios, Icons.arrow_forward_ios,
size: 15.0, size: 15.0,
color: Color(0xff42B6AD),
), ),
], ],
), ),
@ -348,7 +369,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
padding: EdgeInsets.symmetric(horizontal: 12.2), padding: EdgeInsets.symmetric(horizontal: 12.2),
child: InkWell( child: InkWell(
child: RoundedContainer( child: RoundedContainer(
height: MediaQuery.of(context).size.height * 0.108, height: MediaQuery.of(context).size.height * 0.109,
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[ children: <Widget>[
@ -358,14 +379,15 @@ class _DashboardScreenState extends State<DashboardScreen> {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[ children: <Widget>[
Padding( Padding(
padding: EdgeInsets.only(left: 22.0), padding: EdgeInsets.only(
left: 10.0, bottom: 5.0),
child: Image.asset( child: Image.asset(
'assets/images/location.png', 'assets/images/location.png',
height: height:
MediaQuery.of(context).size.height * MediaQuery.of(context).size.height *
0.10, 0.06,
width: MediaQuery.of(context).size.width * width: MediaQuery.of(context).size.width *
0.09, 0.05,
), ),
) )
], ],
@ -396,7 +418,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
), ),
Expanded( Expanded(
child: Text( child: Text(
'Olaya ST, Behind kfc next to king ,', 'Olaya ST, Behind kfc next to king , ',
style: TextStyle(color: Colors.black45), style: TextStyle(color: Colors.black45),
), ),
), ),
@ -421,8 +443,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
'3 K.m \n away', '3 K.m \n away',
style: TextStyle( style: TextStyle(
color: Color(0xff30B7B9), color: Color(0xff30B7B9),
fontSize: 12.5, fontSize: 10.5,
fontWeight: FontWeight.w600), fontWeight: FontWeight.w400),
), ),
), ),
), ),
@ -445,7 +467,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
); );
}, },
), ),
) ),
], ],
), ),
), ),

69
lib/pages/orders/pending_orders_page.dart
Unescape Escape View File

@ -4,6 +4,7 @@ import 'package:driverapp/core/viewModels/orders_view_model.dart';
import '../base/base_view.dart'; import '../base/base_view.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:driverapp/widgets/others/rounded_container.dart'; import 'package:driverapp/widgets/others/rounded_container.dart';
import 'package:driverapp/pages/delivery/information_page.dart';
class OrdersListScreen extends StatefulWidget { class OrdersListScreen extends StatefulWidget {
@override @override
@ -26,28 +27,17 @@ class _OrdersListScreenState extends State<OrdersListScreen> {
), ),
body: Column( body: Column(
children: <Widget>[ children: <Widget>[
Center(
child: Text(
'Nearest',
style: TextStyle(
color: Color(0xff30B7B9),
fontSize: 18.0,
fontWeight: FontWeight.w400),
),
),
Expanded( Expanded(
child: ListView.builder( child: ListView.builder(
itemCount: model.orders == null ? 0 : model.orders.length, shrinkWrap: true,
scrollDirection: Axis.vertical, scrollDirection: Axis.vertical,
shrinkWrap: true, itemCount: model.orders == null ? 0 : model.orders.length,
itemBuilder: (BuildContext context, int index) { itemBuilder: (BuildContext context, int index) {
return Padding( return Padding(
padding: EdgeInsets.symmetric(horizontal: 12.2), padding: EdgeInsets.symmetric(horizontal: 12.2),
child: InkWell(
child: RoundedContainer( child: RoundedContainer(
height: MediaQuery.of(context).orientation == height: MediaQuery.of(context).size.height * 0.109,
Orientation.portrait
? MediaQuery.of(context).size.height * 0.107
: MediaQuery.of(context).size.height * 0.18,
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[ children: <Widget>[
@ -57,14 +47,17 @@ class _OrdersListScreenState extends State<OrdersListScreen> {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[ children: <Widget>[
Padding( Padding(
padding: EdgeInsets.only(left: 22.0), padding: EdgeInsets.only(
left: 10.0, bottom: 5.0),
child: Image.asset( child: Image.asset(
'assets/images/location.png', 'assets/images/location.png',
height: height:
MediaQuery.of(context).size.height * MediaQuery.of(context).size.height *
0.101, 0.06,
width: MediaQuery.of(context).size.width *
0.05,
), ),
), )
], ],
), ),
), ),
@ -75,7 +68,7 @@ class _OrdersListScreenState extends State<OrdersListScreen> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Padding( Padding(
padding: EdgeInsets.only(top: 10.0), padding: EdgeInsets.only(top: 5.0),
child: Text( child: Text(
model.orders[index].firstName + model.orders[index].firstName +
' ' + ' ' +
@ -86,16 +79,17 @@ class _OrdersListScreenState extends State<OrdersListScreen> {
Text( Text(
model.orders[index].mobileNumber, model.orders[index].mobileNumber,
style: TextStyle( style: TextStyle(
color: Color(0xff30B7B9), color: Color(0xff30B7B9),
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 15.0), fontSize: 15.0,
),
), ),
Expanded( Expanded(
child: Text( child: Text(
'Olaya ST, Behind kfc next to king ', 'Olaya ST, Behind kfc next to king ,',
style: TextStyle(color: Colors.black45), style: TextStyle(color: Colors.black45),
), ),
) ),
], ],
), ),
), ),
@ -110,15 +104,15 @@ class _OrdersListScreenState extends State<OrdersListScreen> {
radius: 28.0, radius: 28.0,
child: CircleAvatar( child: CircleAvatar(
backgroundColor: Colors.white, backgroundColor: Colors.white,
maxRadius: 25.1, maxRadius: 24.1,
child: Padding( child: Padding(
padding: const EdgeInsets.all(8.0), padding: 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: 10.5,
fontWeight: FontWeight.w600), fontWeight: FontWeight.w400),
), ),
), ),
), ),
@ -130,8 +124,17 @@ class _OrdersListScreenState extends State<OrdersListScreen> {
], ],
), ),
), ),
); onTap: () {
}), Navigator.push(
context,
MaterialPageRoute(
builder: (context) =>
InformationPage(model.orders[index])));
},
),
);
},
),
), ),
], ],
), ),

6
pubspec.yaml
Unescape Escape View File

@ -98,3 +98,9 @@ flutter:
- family: DriverApp - family: DriverApp
fonts: fonts:
- asset: lib/app-icons/fonts/DriverApp.ttf - asset: lib/app-icons/fonts/DriverApp.ttf
- family: Metropolis
fonts:
- asset: assets/fonts/Metropolis/Metropolis-Regular.otf
- asset: assets/fonts/Metropolis/Metropolis-Bold.otf
- asset: assets/fonts/Metropolis/Metropolis-Light.otf

Write Preview
Loading…
Cancel
Save