Merge remote-tracking branch 'origin/master'

assets/images/booking_request.svg

@@ -1,5 +1,5 @@
-<svg width="108" height="108" viewBox="0 0 56 53" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M55.5919 41.501L51.9098 31.5854C51.6414 31.1518 51.2405 30.8141 50.7653 30.6211C50.2902 30.4281 49.7653 30.3899 49.2667 30.512L36.4615 33.5966L30.2745 25.4471C30.1349 25.2063 29.9467 24.9965 29.7216 24.8308C29.4966 24.6652 29.2394 24.5472 28.9663 24.4843L28.9317 24.4764C28.5147 24.3665 28.0741 24.3826 27.6665 24.5226C27.2588 24.6627 26.9028 24.9203 26.6442 25.2623C26.3856 25.6044 26.2362 26.0152 26.2153 26.442C26.1944 26.8687 26.3029 27.2919 26.5268 27.6572L36.9455 44.5713L37.9453 46.4739L33.6435 45.7393C33.5074 45.7073 30.2728 44.9786 28.9791 47.5107L28.9765 47.5159C28.9418 47.5856 28.9221 47.6617 28.9188 47.7394C28.9155 47.817 28.9287 47.8945 28.9574 47.9668C28.9861 48.0392 29.0297 48.1048 29.0855 48.1594C29.1413 48.2141 29.208 48.2566 29.2813 48.2843C31.6836 49.2025 40.7232 52.4287 40.7232 52.4287C42.0804 52.9131 43.5293 53.0929 44.9653 52.9551C46.4013 52.8172 47.7884 52.3653 49.0264 51.6318L52.7518 49.4349C54.0852 48.648 55.0989 47.4243 55.6176 45.9755C56.1362 44.5267 56.1271 42.9439 55.5919 41.501Z" fill="#0D4E84"/>
-<path d="M19.8578 13.9316H21.5787C22.0351 13.9316 22.4728 14.1166 22.7955 14.4459C23.1182 14.7752 23.2995 15.2218 23.2995 15.6874V22.86C23.8738 23.0671 24.3579 23.4747 24.6662 24.0108C24.9744 24.5469 25.087 25.1769 24.9841 25.7894C24.8811 26.402 24.5692 26.9577 24.1035 27.3584C23.6378 27.759 23.0482 27.9787 22.4391 27.9787C21.8299 27.9787 21.2404 27.759 20.7747 27.3584C20.309 26.9577 19.9971 26.402 19.8941 25.7894C19.7911 25.1769 19.9037 24.5469 20.212 24.0108C20.5203 23.4747 21.0043 23.0671 21.5787 22.86V15.6874H19.8578V18.3212L15.9859 14.8095L19.8578 11.2979V13.9316ZM11.2536 17.294C10.6792 17.0869 10.1952 16.6793 9.88691 16.1432C9.57865 15.6072 9.46605 14.9772 9.56903 14.3646C9.672 13.752 9.98391 13.1963 10.4496 12.7957C10.9153 12.3951 11.5049 12.1753 12.114 12.1753C12.7231 12.1753 13.3127 12.3951 13.7784 12.7957C14.2441 13.1963 14.556 13.752 14.659 14.3646C14.7619 14.9772 14.6493 15.6072 14.3411 16.1432C14.0328 16.6793 13.5487 17.0869 12.9744 17.294V22.86C13.5487 23.0671 14.0328 23.4747 14.3411 24.0108C14.6493 24.5469 14.7619 25.1769 14.659 25.7894C14.556 26.402 14.2441 26.9577 13.7784 27.3584C13.3127 27.759 12.7231 27.9787 12.114 27.9787C11.5049 27.9787 10.9153 27.759 10.4496 27.3584C9.98391 26.9577 9.672 26.402 9.56903 25.7894C9.46605 25.1769 9.57865 24.5469 9.88691 24.0108C10.1952 23.4747 10.6792 23.0671 11.2536 22.86V17.294Z" fill="#0D4E84"/>
-<path d="M27.7978 50.0909C27.4032 49.9379 27.0447 49.7034 26.7455 49.4024C26.4463 49.1014 26.2129 48.7407 26.0604 48.3434C25.9079 47.9461 25.8396 47.5211 25.86 47.0956C25.8804 46.6701 25.9889 46.2536 26.1787 45.873C26.5526 45.1084 27.0872 44.4349 27.7455 43.8994C28.4038 43.3638 29.1699 42.9791 29.9906 42.7719C30.007 42.7678 30.0214 42.7578 30.031 42.7437C30.0406 42.7296 30.0447 42.7125 30.0425 42.6956C30.0404 42.6787 30.0321 42.6631 30.0193 42.6519C30.0065 42.6408 29.99 42.6348 29.9731 42.635H5.6451C5.05302 42.6309 4.48637 42.3921 4.06777 41.9703C3.64918 41.5484 3.41234 40.9775 3.40851 40.381V6.26219C3.41197 5.66561 3.64869 5.09445 4.06737 4.67251C4.48604 4.25058 5.05292 4.01189 5.64511 4.00818H32.4826C33.0748 4.01188 33.6417 4.25058 34.0603 4.67251C34.479 5.09444 34.7157 5.66561 34.7192 6.26219V26.2706L37.1245 29.4938L38.1271 29.2481V6.26219C38.1377 5.51406 37.9961 4.77168 37.7109 4.0808C37.4258 3.38993 37.0032 2.76521 36.4693 2.24516C35.9531 1.70731 35.3332 1.28165 34.6475 0.994409C33.9618 0.707169 33.2251 0.564437 32.4826 0.57501H5.6451C4.9026 0.564438 4.16581 0.70717 3.48016 0.99441C2.79451 1.28165 2.17452 1.70731 1.6584 2.24516C1.12443 2.76521 0.701863 3.38993 0.416736 4.0808C0.13161 4.77168 -0.0100284 5.51406 0.000551929 6.26219V44.9309C-0.0100169 45.6788 0.131634 46.421 0.416766 47.1116C0.701898 47.8022 1.12446 48.4266 1.6584 48.9463C2.1744 49.4843 2.79438 49.9101 3.48006 50.1973C4.16573 50.4846 4.90257 50.6272 5.6451 50.6164H29.1812C29.1812 50.6164 29.0426 50.5644 28.9753 50.5391C28.5042 50.3621 28.1012 50.2089 27.7978 50.0909ZM20.6523 48.365C20.286 48.7241 19.8077 48.9445 19.2985 48.9888C18.7893 49.0332 18.2805 48.8987 17.8584 48.6083C17.4364 48.3178 17.1271 47.8893 16.9829 47.3953C16.8387 46.9013 16.8686 46.3722 17.0675 45.8979C17.2663 45.4236 17.6219 45.0331 18.0739 44.7928C18.5259 44.5524 19.0466 44.477 19.5475 44.5792C20.0484 44.6815 20.4989 44.9551 20.8224 45.3537C21.1459 45.7524 21.3226 46.2515 21.3225 46.7664C21.3248 47.0648 21.2666 47.3605 21.1514 47.6354C21.0361 47.9103 20.8663 48.1586 20.6523 48.365Z" fill="#0D4E84"/>
+<svg width="120" height="120" viewBox="0 0 120 120" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M109.271 84.9767L102.696 67.2703C102.217 66.496 101.501 65.893 100.652 65.5483C99.8039 65.2037 98.8666 65.1355 97.9763 65.3535L75.1099 70.8618L64.0616 56.3091C63.8124 55.879 63.4763 55.5044 63.0744 55.2086C62.6725 54.9128 62.2134 54.7021 61.7256 54.5898L61.6638 54.5756C60.9192 54.3793 60.1324 54.4081 59.4045 54.6582C58.6765 54.9083 58.0408 55.3683 57.579 55.9791C57.1172 56.5899 56.8505 57.3235 56.8131 58.0856C56.7758 58.8477 56.9695 59.6034 57.3693 60.2556L75.9741 90.4594L77.7595 93.8569L70.0778 92.5451C69.8346 92.4879 64.0586 91.1867 61.7486 95.7083L61.7438 95.7176C61.6818 95.8421 61.6467 95.978 61.6408 96.1167C61.635 96.2553 61.6584 96.3937 61.7096 96.5229C61.7609 96.652 61.8388 96.7692 61.9384 96.8668C62.0381 96.9644 62.1572 97.0404 62.2882 97.0897C66.5779 98.7293 82.72 104.491 82.72 104.491C85.1436 105.355 87.731 105.676 90.2952 105.43C92.8595 105.184 95.3365 104.377 97.5473 103.068L104.2 99.1445C106.581 97.7393 108.391 95.554 109.317 92.9669C110.243 90.3797 110.227 87.5533 109.271 84.9767Z" fill="#4D317D"/>
+<path d="M45.4603 35.7455H48.5333C49.3483 35.7455 50.1299 36.0758 50.7062 36.6638C51.2824 37.2518 51.6062 38.0493 51.6062 38.8809V51.6891C52.6318 52.0589 53.4962 52.7868 54.0467 53.744C54.5971 54.7013 54.7982 55.8263 54.6143 56.9202C54.4304 58.0141 53.8735 59.0064 53.0418 59.7218C52.2102 60.4372 51.1575 60.8296 50.0697 60.8296C48.982 60.8296 47.9293 60.4372 47.0976 59.7218C46.266 59.0064 45.709 58.0141 45.5251 56.9202C45.3413 55.8263 45.5423 54.7013 46.0928 53.744C46.6433 52.7868 47.5077 52.0589 48.5333 51.6891V38.8809H45.4603V43.584L38.5462 37.3132L45.4603 31.0424V35.7455ZM30.0956 41.7498C29.07 41.38 28.2056 40.6521 27.6551 39.6948C27.1047 38.7376 26.9036 37.6126 27.0875 36.5187C27.2714 35.4248 27.8283 34.4325 28.66 33.7171C29.4916 33.0017 30.5443 32.6093 31.6321 32.6093C32.7198 32.6093 33.7726 33.0017 34.6042 33.7171C35.4358 34.4325 35.9928 35.4248 36.1767 36.5187C36.3605 37.6126 36.1595 38.7376 35.609 39.6948C35.0586 40.6521 34.1941 41.38 33.1685 41.7498V51.6891C34.1941 52.0589 35.0586 52.7868 35.609 53.744C36.1595 54.7013 36.3605 55.8263 36.1767 56.9202C35.9928 58.0141 35.4358 59.0064 34.6042 59.7218C33.7726 60.4372 32.7198 60.8296 31.6321 60.8296C30.5443 60.8296 29.4916 60.4372 28.66 59.7218C27.8283 59.0064 27.2714 58.0141 27.0875 56.9202C26.9036 55.8263 27.1047 54.7013 27.6551 53.744C28.2056 52.7868 29.07 52.0589 30.0956 51.6891V41.7498Z" fill="#4D317D"/>
+<path d="M59.639 100.316C58.9343 100.043 58.2942 99.6237 57.7599 99.0863C57.2255 98.5489 56.8088 97.9047 56.5364 97.1952C56.2641 96.4858 56.1422 95.7268 56.1786 94.967C56.215 94.2072 56.4088 93.4635 56.7477 92.7838C57.4153 91.4184 58.3701 90.2157 59.5455 89.2594C60.721 88.3031 62.089 87.6161 63.5546 87.2461C63.584 87.2388 63.6097 87.2209 63.6268 87.1958C63.6439 87.1707 63.6513 87.1401 63.6474 87.1098C63.6435 87.0796 63.6288 87.0519 63.6059 87.0319C63.583 87.012 63.5537 87.0012 63.5234 87.0017H20.0805C19.0233 86.9944 18.0114 86.568 17.2639 85.8147C16.5164 85.0614 16.0935 84.0418 16.0866 82.9767V22.0502C16.0928 20.9849 16.5155 19.965 17.2632 19.2115C18.0108 18.4581 19.0231 18.0318 20.0806 18.0252H68.0046C69.0621 18.0318 70.0744 18.458 70.822 19.2115C71.5696 19.9649 71.9923 20.9849 71.9985 22.0502V57.7795L76.2938 63.5352L78.0841 63.0965V22.0502C78.103 20.7143 77.8501 19.3886 77.3409 18.1549C76.8318 16.9212 76.0772 15.8056 75.1237 14.8769C74.202 13.9165 73.0949 13.1564 71.8705 12.6435C70.6462 12.1305 69.3305 11.8757 68.0046 11.8945H20.0805C18.7546 11.8757 17.439 12.1305 16.2146 12.6435C14.9902 13.1564 13.8831 13.9165 12.9614 14.8769C12.0079 15.8056 11.2533 16.9212 10.7442 18.1549C10.235 19.3886 9.98209 20.7143 10.001 22.0502V91.1015C9.98211 92.437 10.2351 93.7623 10.7442 94.9955C11.2534 96.2287 12.008 97.3438 12.9614 98.2719C13.8829 99.2326 14.99 99.9929 16.2144 100.506C17.4388 101.019 18.7546 101.273 20.0805 101.254H62.1094C62.1094 101.254 61.8618 101.161 61.7416 101.116C60.9004 100.8 60.1807 100.526 59.639 100.316ZM46.8791 97.2337C46.225 97.875 45.3709 98.2686 44.4616 98.3478C43.5522 98.4269 42.6437 98.1869 41.8901 97.6682C41.1364 97.1496 40.584 96.3843 40.3266 95.5021C40.0692 94.62 40.1225 93.6753 40.4776 92.8283C40.8327 91.9812 41.4677 91.284 42.2748 90.8548C43.082 90.4256 44.0117 90.2909 44.9063 90.4735C45.8008 90.6561 46.6051 91.1447 47.1828 91.8566C47.7605 92.5684 48.076 93.4596 48.0758 94.3791C48.0801 94.912 47.9761 95.4401 47.7703 95.931C47.5645 96.4219 47.2612 96.8652 46.8791 97.2337Z" fill="#4D317D"/>
 </svg>

lib/dashboard.dart

@@ -73,7 +73,7 @@ class _DashboardState extends State<Dashboard> {
       child: Column(
         children: <Widget>[
           Container(
-              height: MediaQuery.of(context).size.height * .330,
+              height: MediaQuery.of(context).size.height * .250,
               width: double.infinity,
               decoration: BoxDecoration(
                 borderRadius: BorderRadius.circular(0),
@@ -115,7 +115,7 @@ class _DashboardState extends State<Dashboard> {
                       child: Column(
                         children:  [
                           Container(
-                              padding: EdgeInsets.fromLTRB(20, 10,10,10),
+                              padding: EdgeInsets.fromLTRB(30, 10,10,10),
                               child: new SvgPicture.asset("assets/images/booking_request.svg")
                           ),
                           Text('Booking Data',style: dashboardTextStyle(),),
@@ -228,7 +228,7 @@ class _DashboardState extends State<Dashboard> {
           // Add a ListView to the drawer. This ensures the user can scroll
           // through the options in the drawer if there isn't enough vertical
           // space to fit everything.
-          //backgroundColor: screenBackgroundColor,
+          backgroundColor: screenBackgroundColor,
           child: ListView(
             // Important: Remove any padding from the ListView.
             padding: EdgeInsets.zero,

lib/delivrybookingdata.dart

@@ -1,15 +1,11 @@
 import 'dart:convert';
 import 'dart:io';
 import 'package:flutter/material.dart';
-import 'package:geolocator/geolocator.dart';
-import 'package:google_maps_flutter/google_maps_flutter.dart';
-import 'package:google_maps_flutter_android/google_maps_flutter_android.dart';
-import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart';
 import 'package:flutter/services.dart';
 import 'package:url_launcher/url_launcher.dart';
 import 'package:watermanagement/model/getdeliveryboy_model.dart';
 import 'package:watermanagement/settings.dart';
-
+import 'package:intl/intl.dart';
 import 'order_tracking_page.dart';
 
 
@@ -59,7 +55,9 @@ class _DelivryBookingDataState extends State<DelivryBookingData> with TickerProv
               return GetDeliveryboyDetailsModel.fromJson(model);
             }).toList();
         activeOrdersList=bookingDataList.where((product) => product.orderStatus.toString().toLowerCase()!='delivered').toList();
+        activeOrdersList=activeOrdersList.reversed.toList();
         completedOrdersList=bookingDataList.where((product) => product.orderStatus.toString().toLowerCase()=='delivered').toList();
+        completedOrdersList=completedOrdersList.reversed.toList();
         isLoading = false;
       });
 
@@ -230,9 +228,16 @@ class _DelivryBookingDataState extends State<DelivryBookingData> with TickerProv
                           if(int.parse(x)<=int.parse(obj.price)){
                             var payload = new Map<String, dynamic>();
 
+                            final DateTime now = DateTime.now();
+                            final DateFormat formatter = DateFormat('dd-MMM-yyyy - HH:mm');
+
+                            final String formatted = formatter.format(now);
+                            print(formatted);
+                            
                         payload["amount_paid"] = amountPaidController.text.toString();
                         payload["payment_mode"] = dropdownTypeOfPayment.toString().toLowerCase();
                         payload["orderStatus"] = 'delivered';
+                        payload["deliveredDate"] = formatted;
 
                             bool updateStatus = await AppSettings.deliveryboyFinishOrder(obj.bookingid,payload);
                             
@@ -418,53 +423,56 @@ class _DelivryBookingDataState extends State<DelivryBookingData> with TickerProv
                               SizedBox(
                                 width: 30,
                               ),
-                              Column(
-                                children: [
-                                  IconButton(
-                                    iconSize: 30,
-                                    icon:  Icon(
-                                      Icons.download,
-                                      color:activeOrdersList[index].tankerRunningStatus=='1'?Colors.red: Colors.green,
+                              Visibility(
+                                visible: activeOrdersList[index].stopTime==''||activeOrdersList[index].stopTime=='null',
+                                child: Column(
+                                  children: [
+                                    IconButton(
+                                      iconSize: 30,
+                                      icon:  Icon(
+                                        Icons.download,
+                                        color:activeOrdersList[index].tankerRunningStatus=='1'?Colors.red: Colors.green,
+                                      ),
+                                      onPressed: () async{
+
+                                        if(activeOrdersList[index].tankerRunningStatus!='0'){
+                                          var payload = new Map<String, dynamic>();
+                                          payload["action"] = 'stop';
+                                          payload["percentage"] = '';
+
+                                          var capacity = await AppSettings.startAndStop(activeOrdersList[index].bookingid,payload);
+
+                                          print(capacity);
+                                          //var modelTanksViewList = jsonDecode(capacity)['data'];
+                                          setState(() {
+                                            activeOrdersList[index].tankerRunningStatus='0';
+                                            activeOrdersList[index].stopTime=jsonDecode(capacity)['stop time'];
+                                          });
+                                        }
+                                        else{
+                                          var payload = new Map<String, dynamic>();
+                                          payload["action"] = 'start';
+                                          payload["percentage"] = '';
+
+                                          var capacity = await AppSettings.startAndStop(activeOrdersList[index].bookingid,payload);
+
+                                          print(capacity);
+                                          //var modelTanksViewList = jsonDecode(capacity)['data'];
+
+                                          setState(() {
+                                            activeOrdersList[index].tankerRunningStatus='1';
+                                            activeOrdersList[index].startTime=jsonDecode(capacity)['start time'];
+                                          });
+                                        }
+
+                                      },
                                     ),
-                                    onPressed: () async{
-
-                                      if(activeOrdersList[index].tankerRunningStatus!='0'){
-                                        var payload = new Map<String, dynamic>();
-                                        payload["action"] = 'stop';
-                                        payload["percentage"] = '';
-
-                                        var capacity = await AppSettings.startAndStop(activeOrdersList[index].bookingid,payload);
-
-                                        print(capacity);
-                                        //var modelTanksViewList = jsonDecode(capacity)['data'];
-                                        setState(() {
-                                          activeOrdersList[index].tankerRunningStatus='0';
-                                          activeOrdersList[index].stopTime=jsonDecode(capacity)['stop time'];
-                                        });
-                                      }
-                                      else{
-                                        var payload = new Map<String, dynamic>();
-                                        payload["action"] = 'start';
-                                        payload["percentage"] = '';
-
-                                        var capacity = await AppSettings.startAndStop(activeOrdersList[index].bookingid,payload);
-
-                                        print(capacity);
-                                        //var modelTanksViewList = jsonDecode(capacity)['data'];
-
-                                        setState(() {
-                                          activeOrdersList[index].tankerRunningStatus='1';
-                                          activeOrdersList[index].startTime=jsonDecode(capacity)['start time'];
-                                        });
-                                      }
-
-                                    },
-                                  ),
-                                  Text(
-                                    'Download Water',
-                                    style: iconBelowTextStyle(),
-                                  ),
-                                ],
+                                    Text(
+                                      'Download Water',
+                                      style: iconBelowTextStyle(),
+                                    ),
+                                  ],
+                                ),
                               ),
                               SizedBox(width: 10,),
 

lib/login.dart

@@ -105,24 +105,7 @@ class _LoginState extends State<Login> {
                                   cursorColor: greyColor,
                                   controller: mobileNumberController,
                                   keyboardType: TextInputType.number,
-                                  decoration: const InputDecoration(
-                                    prefixIcon: Icon(
-                                      Icons.phone,
-                                      color: greyColor,
-                                    ),
-                                    border: OutlineInputBorder(
-                                        borderSide: BorderSide(color: greyColor)),
-                                    focusedBorder: OutlineInputBorder(
-                                      borderSide: BorderSide(color:greyColor),
-                                    ),
-                                    enabledBorder: OutlineInputBorder(
-                                      borderSide: BorderSide(color: greyColor),
-                                    ),
-                                    labelText: 'Enter MobileNumber',
-                                    labelStyle: TextStyle(
-                                      color: greyColor, //<-- SEE HERE
-                                    ),
-                                  ),
+                                  decoration: textFormFieldDecoration(Icons.phone,'Enter MobileNumber'),
                                 ),
                               ),
                               const SizedBox(

lib/otpscreen.dart

@@ -29,6 +29,7 @@ class _OtpScreenState extends State<OtpScreen> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
+      backgroundColor: screenBackgroundColor,
       body: Column(
         mainAxisAlignment: MainAxisAlignment.center,
         children: [
@@ -141,9 +142,17 @@ class OtpInput extends StatelessWidget {
         keyboardType: TextInputType.number,
         controller: controller,
         maxLength: 1,
-        cursorColor: Theme.of(context).primaryColor,
+        cursorColor: primaryColor,
         decoration: const InputDecoration(
-            border: OutlineInputBorder(),
+            filled: true,
+            fillColor: Colors.white,
+            border: OutlineInputBorder(borderSide: BorderSide(color: primaryColor)),
+            focusedBorder: OutlineInputBorder(
+              borderSide: BorderSide(color: primaryColor),
+            ),
+            enabledBorder: OutlineInputBorder(
+              borderSide: BorderSide(color: primaryColor),
+            ),
             counterText: '',
             hintStyle: TextStyle(color: Colors.black, fontSize: 20.0)),
         onChanged: (value) {

lib/settings.dart

@@ -14,17 +14,19 @@ import 'package:geolocator/geolocator.dart';
 import 'package:watermanagement/preloader.dart';
 
 
-const Color primaryColor = Color(0XFF0D4E84);
+//const Color primaryColor = Color(0XFF0D4E84);
+const Color primaryColor = Color(0XFF4D317D);
 const Color greyColor = Color(0XFF8F8E8E);
 const Color textFieldStartColor = Colors.grey;
-const Color screenBackgroundColor = Color(0XFFEAF6FF);
+//const Color screenBackgroundColor = Color(0XFFEAF6FF);
+const Color screenBackgroundColor = Color(0XFFDCCBFA);
 const Color screenBackgroundColord = Colors.black12;
 const Color dashboardbackground = Color(0XFFF5F5F5);
 
-Color AppBarGradient_1 = Color(0XFF1258F6);
+Color AppBarGradient_1 = Color(0XFF4D317D);
 
 TextStyle PreloaderText() {
-  return TextStyle(color: Colors.blueAccent);
+  return TextStyle(color:Color(0XFF4D317D));
 }
 
 TextStyle labelTextStyle() {
@@ -69,6 +71,28 @@ TextStyle serverIssueTextStyle() {
   return TextStyle(color: Colors.red, fontSize: 15);
 }
 
+InputDecoration textFormFieldDecoration(IconData icon,var text){
+  return InputDecoration(
+    filled: true,
+    fillColor: Colors.white,
+    prefixIcon: Icon(
+      icon,
+      color: greyColor,
+    ),
+    border: OutlineInputBorder(borderSide: BorderSide(color: primaryColor)),
+    focusedBorder: OutlineInputBorder(
+      borderSide: BorderSide(color: primaryColor),
+    ),
+    enabledBorder: OutlineInputBorder(
+      borderSide: BorderSide(color: primaryColor),
+    ),
+    labelText: text,
+    labelStyle:
+    TextStyle(color: primaryColor, fontWeight: FontWeight.bold //<-- SEE HERE
+    ),
+  );
+}
+
 final GlobalKey<State> preloaderWindowKey = new GlobalKey<State>();
 Future<void> preloaderWindow(BuildContext context) async {
   try {