diff --git a/assets/images/booking_request.svg b/assets/images/booking_request.svg
new file mode 100644
index 0000000..97c533f
--- /dev/null
+++ b/assets/images/booking_request.svg
@@ -0,0 +1,5 @@
+
diff --git a/assets/images/customers.svg b/assets/images/customers.svg
new file mode 100644
index 0000000..b2bbe34
--- /dev/null
+++ b/assets/images/customers.svg
@@ -0,0 +1,5 @@
+
diff --git a/assets/images/deliveryboyview.svg b/assets/images/deliveryboyview.svg
new file mode 100644
index 0000000..0dc8d96
--- /dev/null
+++ b/assets/images/deliveryboyview.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/images/tankersview.svg b/assets/images/tankersview.svg
new file mode 100644
index 0000000..96567d7
--- /dev/null
+++ b/assets/images/tankersview.svg
@@ -0,0 +1,12 @@
+
diff --git a/lib/conect_request_customers.dart b/lib/conect_request_customers.dart
index be4afe9..db4895d 100644
--- a/lib/conect_request_customers.dart
+++ b/lib/conect_request_customers.dart
@@ -99,14 +99,6 @@ class _ConectedPendingCustomersState extends State wit
});
}
}
-
-
-
-
-
-
-
-
@override
void initState() {
// TODO: implement initState
@@ -115,10 +107,6 @@ class _ConectedPendingCustomersState extends State wit
getPendingSuppliersData();
super.initState();
}
-
-
-
-
Widget connectedCustomers(){
if(connectedCustomersList.length!=0){
diff --git a/lib/dashboard.dart b/lib/dashboard.dart
index afb4279..dcd1e94 100644
--- a/lib/dashboard.dart
+++ b/lib/dashboard.dart
@@ -123,6 +123,7 @@ class _DashboardState extends State {
);
},
child: Container(
+ height: 100,
padding: EdgeInsets.all(05),
margin: EdgeInsets.only(left:15, top:10, right: 0, bottom:0),
//height: MediaQuery.of(context).size.height * .05,
@@ -132,17 +133,20 @@ class _DashboardState extends State {
borderRadius: BorderRadius.circular(12),
),
// Change button text when light changes state.
-
- child: Column(
- children: [
- Container(
- padding: EdgeInsets.fromLTRB(35, 10,0,0),
- child: new SvgPicture.asset("assets/images/tanklevels.svg")
- ),
- Text('Takers View',style: dashboardTextStyle(),),
-
- ],
- ),
+ child: Center(
+ child: Column(
+ children: [
+ Container(
+ //height: 50,
+ padding: EdgeInsets.fromLTRB(0, 15,0,0),
+ child: new SvgPicture.asset("assets/images/tankersview.svg")
+ ),
+ SizedBox(height: 5,),
+ Text('Takers View',style: dashboardTextStyle(),),
+
+ ],
+ ),
+ )
),
)),
@@ -160,28 +164,30 @@ class _DashboardState extends State {
);
},
child: Container(
- padding: EdgeInsets.all(05),
- margin: EdgeInsets.only(left:0, top:10, right: 15, bottom:0),
- // height: MediaQuery.of(context).size.height * .16,
- // width: MediaQuery.of(context).size.width * .40,
- //color: Colors.white,
- //margin: const EdgeInsets.all(15.0),
- decoration: BoxDecoration(
- color: Colors.white,
- borderRadius: BorderRadius.circular(12),
- ),
- // Change button text when light changes state.
- child: Column(
- children: [
- Container(
-
- padding: EdgeInsets.fromLTRB(0, 10,0,0),
- child: new SvgPicture.asset("assets/images/watertanker.svg")
+ height: 100,
+ padding: EdgeInsets.all(05),
+ margin: EdgeInsets.only(left:15, top:10, right: 0, bottom:0),
+ //height: MediaQuery.of(context).size.height * .05,
+ //width: MediaQuery.of(context).size.width * .45,
+ decoration: BoxDecoration(
+ color: Colors.white,
+ borderRadius: BorderRadius.circular(12),
+ ),
+ // Change button text when light changes state.
+ child: Center(
+ child: Column(
+ children: [
+ Container(
+ //height: 50,
+ padding: EdgeInsets.fromLTRB(0, 15,0,0),
+ child: new SvgPicture.asset("assets/images/deliveryboyview.svg")
+ ),
+ SizedBox(height: 5,),
+ Text('Deliveryboys View',style: dashboardTextStyle(),),
+
+ ],
),
- Text('Deliveryboys View',style: dashboardTextStyle(),)
-
- ],
- ),
+ )
),
),
)
@@ -199,26 +205,30 @@ class _DashboardState extends State {
);
},
child: Container(
- padding: EdgeInsets.all(05),
- margin: EdgeInsets.only(left:15, top:10, right: 0, bottom:0),
- //height: MediaQuery.of(context).size.height * .05,
- //width: MediaQuery.of(context).size.width * .45,
- decoration: BoxDecoration(
- color: Colors.white,
- borderRadius: BorderRadius.circular(12),
- ),
- // Change button text when light changes state.
-
- child: Column(
- children: [
- Container(
- padding: EdgeInsets.fromLTRB(35, 10,0,0),
- child: new SvgPicture.asset("assets/images/resources.svg")
+ height: 100,
+ padding: EdgeInsets.all(05),
+ margin: EdgeInsets.only(left:15, top:10, right: 0, bottom:0),
+ //height: MediaQuery.of(context).size.height * .05,
+ //width: MediaQuery.of(context).size.width * .45,
+ decoration: BoxDecoration(
+ color: Colors.white,
+ borderRadius: BorderRadius.circular(12),
+ ),
+ // Change button text when light changes state.
+ child: Center(
+ child: Column(
+ children: [
+ Container(
+ //height: 50,
+ padding: EdgeInsets.fromLTRB(0, 15,0,0),
+ child: new SvgPicture.asset("assets/images/customers.svg")
+ ),
+ SizedBox(height: 5,),
+ Text('Customers',style: dashboardTextStyle(),),
+
+ ],
),
- Text('Customers',style: dashboardTextStyle(),),
-
- ],
- ),
+ )
),
)),
@@ -236,28 +246,30 @@ class _DashboardState extends State {
);
},
child: Container(
- padding: EdgeInsets.all(05),
- margin: EdgeInsets.only(left:0, top:10, right: 15, bottom:0),
- // height: MediaQuery.of(context).size.height * .16,
- // width: MediaQuery.of(context).size.width * .40,
- //color: Colors.white,
- //margin: const EdgeInsets.all(15.0),
- decoration: BoxDecoration(
- color: Colors.white,
- borderRadius: BorderRadius.circular(12),
- ),
- // Change button text when light changes state.
- child: Column(
- children: [
- Container(
-
- padding: EdgeInsets.fromLTRB(0, 10,0,0),
- child: new SvgPicture.asset("assets/images/consumption.svg")
+ height: 100,
+ padding: EdgeInsets.all(05),
+ margin: EdgeInsets.only(left:15, top:10, right: 0, bottom:0),
+ //height: MediaQuery.of(context).size.height * .05,
+ //width: MediaQuery.of(context).size.width * .45,
+ decoration: BoxDecoration(
+ color: Colors.white,
+ borderRadius: BorderRadius.circular(12),
+ ),
+ // Change button text when light changes state.
+ child: Center(
+ child: Column(
+ children: [
+ Container(
+ //height: 50,
+ padding: EdgeInsets.fromLTRB(0, 15,0,0),
+ child: new SvgPicture.asset("assets/images/booking_request.svg")
+ ),
+ SizedBox(height: 5,),
+ Text('Booking Requests',style: dashboardTextStyle(),),
+
+ ],
),
- Text('Booking Requests',style: dashboardTextStyle(),)
-
- ],
- ),
+ )
),
),
)
diff --git a/lib/getdeliveryboydata.dart b/lib/getdeliveryboydata.dart
index 27855c1..189daac 100644
--- a/lib/getdeliveryboydata.dart
+++ b/lib/getdeliveryboydata.dart
@@ -160,22 +160,16 @@ class _GetDeliveryboyDataState extends State {
TextButton(
child: Text('Update',style:textButtonStyle()),
onPressed: () async{
-
-
if(deliveryboyNameController.text!=''&&deliveryboyPhoneController.text!=''&&deliveryboyAlterPhoneController.text!=''){
-
-
var payload = new Map();
payload["name"] = deliveryboyNameController.text.toString();
payload["phone"] = deliveryboyPhoneController.text.toString();
payload["alternativeContactNumber"] = deliveryboyAlterPhoneController.text.toString();
bool updateDeliveryboyStatus = await AppSettings.updateDeliveryboy(object.deliveryboy_phone,payload);
-
if(updateDeliveryboyStatus){
readJson();
AppSettings.longSuccessToast('Deliveryboy updated successfully');
Navigator.of(context).pop(true);
-
}
else{
AppSettings.longFailedToast('Deliveryboy update failed');
@@ -184,10 +178,6 @@ class _GetDeliveryboyDataState extends State {
else{
AppSettings.longFailedToast('Fill the details');
}
-
-
-
-
},
),
],
@@ -249,11 +239,7 @@ class _GetDeliveryboyDataState extends State {
),
],
),
-
-
),
-
-
Expanded(child:IconButton(
icon: const Icon(Icons.edit,color: primaryColor,),
onPressed: () {