Fix design issues

fix_issues
Elham Rababah 6 years ago
parent ae8af0ab43
commit d4c098010c

@ -76,8 +76,9 @@ class _DashboardScreenState extends State<DashboardScreen> {
child: Text( child: Text(
_authenticationViewModel.user.userName, _authenticationViewModel.user.userName,
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.w400, fontSize: 22.0,
fontSize: 25.0), color: Hexcolor("#343333"),
fontWeight: FontWeight.bold),
), ),
), ),
], ],
@ -465,12 +466,11 @@ class _DashboardScreenState extends State<DashboardScreen> {
Column( Column(
children: <Widget>[ children: <Widget>[
Text( Text(
TranslationBase.of(context).nearestDropOffs, TranslationBase.of(context).nearestDropOffs,
style: TextStyle( style: TextStyle(
fontSize: 21.0, fontSize: 18.0,
fontWeight: FontWeight.w400, color: Hexcolor("#343333"),
), fontWeight: FontWeight.bold)),
),
], ],
), ),
if (model.state == ViewState.Idle) if (model.state == ViewState.Idle)
@ -515,7 +515,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
: model.orders.length < 3 ? model.orders.length : 3, : model.orders.length < 3 ? model.orders.length : 3,
itemBuilder: (BuildContext context, int index) { itemBuilder: (BuildContext context, int index) {
return Padding( return Padding(
padding: EdgeInsets.symmetric(horizontal: 12.2), padding: EdgeInsets.symmetric(horizontal: 0.2),
child: InkWell( child: InkWell(
child: Container( child: Container(
child: RoundedContainer( child: RoundedContainer(
@ -626,7 +626,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
Padding( Padding(
padding: EdgeInsets.all(8.0), padding: EdgeInsets.all(8.0),
child: CircleContainer( child: CircleContainer(
borderWidth: 0.9, borderWidth: 1.5,
child: Text( child: Text(
model.orders[index].distanceInKilometers model.orders[index].distanceInKilometers
.toString() + .toString() +

File diff suppressed because one or more lines are too long

@ -1,6 +1,5 @@
import 'package:driverapp/core/viewModels/orders_view_model.dart'; import 'package:driverapp/core/viewModels/orders_view_model.dart';
import 'package:driverapp/pages/delivery/information_page.dart'; import 'package:driverapp/pages/delivery/information_page.dart';
import 'package:driverapp/uitl/translations_delegate_base.dart';
import 'package:driverapp/widgets/data_display/circle-container.dart'; import 'package:driverapp/widgets/data_display/circle-container.dart';
import 'package:driverapp/widgets/others/app_scaffold_widget.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';
@ -23,10 +22,14 @@ class _DeliverdOrdersPageState extends State<DeliverdOrdersPage> {
builder: (BuildContext context, OrdersViewModel model, Widget child) => builder: (BuildContext context, OrdersViewModel model, Widget child) =>
AppScaffold( AppScaffold(
isShowAppBar: true, isShowAppBar: true,
appBarTitle: TranslationBase.of(context).yourDeliveryQue, appBarTitle:
"UnDelivered Packages " /*TranslationBase.of(context).yourDeliveryQue*/,
titleColor: Colors.black, titleColor: Colors.black,
body: Column( body: Column(
children: <Widget>[ children: <Widget>[
SizedBox(
height: 20,
),
Expanded( Expanded(
child: ListView.builder( child: ListView.builder(
shrinkWrap: true, shrinkWrap: true,
@ -116,7 +119,6 @@ class _DeliverdOrdersPageState extends State<DeliverdOrdersPage> {
Padding( Padding(
padding: EdgeInsets.all(8.0), padding: EdgeInsets.all(8.0),
child: CircleContainer( child: CircleContainer(
borderWidth: 0.8,
child: Text( child: Text(
model.orders[index].distanceInKilometers model.orders[index].distanceInKilometers
.toString() + .toString() +

@ -27,6 +27,9 @@ class _OrdersListScreenState extends State<OrdersListScreen> {
titleColor: Colors.black, titleColor: Colors.black,
body: Column( body: Column(
children: <Widget>[ children: <Widget>[
SizedBox(
height: 20,
),
Expanded( Expanded(
child: ListView.builder( child: ListView.builder(
shrinkWrap: true, shrinkWrap: true,
@ -116,7 +119,6 @@ class _OrdersListScreenState extends State<OrdersListScreen> {
Padding( Padding(
padding: EdgeInsets.all(8.0), padding: EdgeInsets.all(8.0),
child: CircleContainer( child: CircleContainer(
borderWidth: 0.8,
child: Text( child: Text(
model.orders[index].distanceInKilometers model.orders[index].distanceInKilometers
.toString() + .toString() +

@ -6,7 +6,7 @@ class CircleContainer extends StatelessWidget {
{this.child, {this.child,
this.color = Colors.white, this.color = Colors.white,
this.borderColor, this.borderColor,
this.borderWidth = 2.0, this.borderWidth = 1.5,
this.onTap}); this.onTap});
final Widget child; final Widget child;

@ -76,7 +76,6 @@ class CustomerBriefCard extends StatelessWidget {
child: Padding( child: Padding(
padding: EdgeInsets.all(8.0), padding: EdgeInsets.all(8.0),
child: CircleContainer( child: CircleContainer(
borderWidth: 0.9,
child: Text( child: Text(
'0 K.m\naway', '0 K.m\naway',
style: TextStyle( style: TextStyle(

@ -33,7 +33,8 @@ class AppScaffold extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
AppGlobal.context = context; AppGlobal.context = context;
return SafeArea( return SafeArea(
bottom: false, // top: false,
// bottom: false,
child: Scaffold( child: Scaffold(
backgroundColor: backgroundColor:
appBarColor ?? Theme.of(context).scaffoldBackgroundColor, appBarColor ?? Theme.of(context).scaffoldBackgroundColor,
@ -43,8 +44,8 @@ class AppScaffold extends StatelessWidget {
backgroundColor: Theme.of(context).appBarTheme.color, backgroundColor: Theme.of(context).appBarTheme.color,
textTheme: TextTheme( textTheme: TextTheme(
headline6: TextStyle( headline6: TextStyle(
color: titleColor ?? Colors.white, color: titleColor ?? Colors.white,
fontWeight: FontWeight.bold), fontWeight: FontWeight.bold),
), ),
title: Text(appBarTitle.toUpperCase()), title: Text(appBarTitle.toUpperCase()),
leading: Builder( leading: Builder(

Loading…
Cancel
Save