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

6
lib/main.dart
Unescape Escape View File

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

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

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

55
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 'package:flutter/cupertino.dart';
import 'package:driverapp/widgets/others/rounded_container.dart';
import 'package:driverapp/pages/delivery/information_page.dart';
class OrdersListScreen extends StatefulWidget {
@override
@ -26,28 +27,17 @@ class _OrdersListScreenState extends State<OrdersListScreen> {
),
body: Column(
children: <Widget>[
Center(
child: Text(
'Nearest',
style: TextStyle(
color: Color(0xff30B7B9),
fontSize: 18.0,
fontWeight: FontWeight.w400),
),
),
Expanded(
child: ListView.builder(
itemCount: model.orders == null ? 0 : model.orders.length,
scrollDirection: Axis.vertical,
shrinkWrap: true,
scrollDirection: Axis.vertical,
itemCount: model.orders == null ? 0 : model.orders.length,
itemBuilder: (BuildContext context, int index) {
return Padding(
padding: EdgeInsets.symmetric(horizontal: 12.2),
child: InkWell(
child: RoundedContainer(
height: MediaQuery.of(context).orientation ==
Orientation.portrait
? MediaQuery.of(context).size.height * 0.107
: MediaQuery.of(context).size.height * 0.18,
height: MediaQuery.of(context).size.height * 0.109,
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
@ -57,14 +47,17 @@ class _OrdersListScreenState extends State<OrdersListScreen> {
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
Padding(
padding: EdgeInsets.only(left: 22.0),
padding: EdgeInsets.only(
left: 10.0, bottom: 5.0),
child: Image.asset(
'assets/images/location.png',
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,
children: <Widget>[
Padding(
padding: EdgeInsets.only(top: 10.0),
padding: EdgeInsets.only(top: 5.0),
child: Text(
model.orders[index].firstName +
' ' +
@ -88,14 +81,15 @@ class _OrdersListScreenState extends State<OrdersListScreen> {
style: TextStyle(
color: Color(0xff30B7B9),
fontWeight: FontWeight.w600,
fontSize: 15.0),
fontSize: 15.0,
),
),
Expanded(
child: Text(
'Olaya ST, Behind kfc next to king ',
'Olaya ST, Behind kfc next to king ,',
style: TextStyle(color: Colors.black45),
),
)
),
],
),
),
@ -110,15 +104,15 @@ class _OrdersListScreenState extends State<OrdersListScreen> {
radius: 28.0,
child: CircleAvatar(
backgroundColor: Colors.white,
maxRadius: 25.1,
maxRadius: 24.1,
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Text(
'3 K.m \n away',
style: TextStyle(
color: Color(0xff30B7B9),
fontSize: 12.5,
fontWeight: FontWeight.w600),
fontSize: 10.5,
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
fonts:
- 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