diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index 51aa77d..bf3066c 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index 4d135b2..bb99b14 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 0422660..d556134 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 5d96b69..ead4172 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 523e761..755e8fa 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/assets/images/pickup_marker.png b/assets/images/pickup_marker.png new file mode 100644 index 0000000..a8b0258 Binary files /dev/null and b/assets/images/pickup_marker.png differ diff --git a/assets/images/watertanker.svg b/assets/images/watertanker.svg index f2db040..64bdb85 100644 --- a/assets/images/watertanker.svg +++ b/assets/images/watertanker.svg @@ -1,4 +1,4 @@ - + diff --git a/images/appicon.png b/images/appicon.png deleted file mode 100644 index 2135ccb..0000000 Binary files a/images/appicon.png and /dev/null differ diff --git a/images/appiconn.png b/images/appiconn.png index 9166320..bc865cd 100644 Binary files a/images/appiconn.png and b/images/appiconn.png differ diff --git a/images/logo.png b/images/logo.png index 5aeda03..a986cad 100644 Binary files a/images/logo.png and b/images/logo.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png index 0f9ddbd..eeec2df 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png index 0c4ebe1..1b999f8 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png index 178e4e9..9f478c7 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png index 12474de..32f6714 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png index 5af2096..d7b00b5 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png index c76cd7d..7805055 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png index 7941ef2..22a0652 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png index 178e4e9..9f478c7 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png index c97e860..f2ea83d 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png index 7406378..f0c2d1f 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png index dbbc741..11be394 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png index 8fa6185..cd2afd2 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png index 759c1ae..63964a7 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png index 9d2268a..7da2130 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png index 7406378..f0c2d1f 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png index afe7374..c5a3a30 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png index cc1a59a..0ac287d 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png index 7245c37..bcc0b0f 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png index fc106d6..8ece260 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png index 6f4e84b..3189776 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png index 91106d0..1751457 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ diff --git a/lib/adddeliveryboy.dart b/lib/adddeliveryboy.dart index 8d531c4..df12c0a 100644 --- a/lib/adddeliveryboy.dart +++ b/lib/adddeliveryboy.dart @@ -40,6 +40,8 @@ class _deliverboyState extends State { String state = ''; String zip = ''; String status = ''; + double lat=0; + double lng=0; PickResult? selectedPlace; @@ -222,6 +224,8 @@ class _deliverboyState extends State { onPlacePicked: (PickResult result) { setState(() { selectedPlace = result; + lat=selectedPlace!.geometry!.location.lat; + lng=selectedPlace!.geometry!.location.lng; if(selectedPlace!.types!.length==1){ deliveryAddressCapturingController.text = selectedPlace!.formattedAddress!; @@ -306,7 +310,7 @@ class _deliverboyState extends State { enabledBorder: OutlineInputBorder( borderSide: BorderSide(color: greyColor), ), - labelText: 'Pic Your office Address', + labelText: 'select address from MAP', labelStyle: TextStyle( color: greyColor, //<-- SEE HERE ), @@ -348,8 +352,9 @@ class _deliverboyState extends State { payload["city"] = city; payload["state"] = state; payload["zip"] = zip; + payload["latitude"] = lat; + payload["longitude"] = lng; payload["status"] = status; - bool deliveryboyStatus = await AppSettings.addDeliverboy(payload); try { diff --git a/lib/booking_requests.dart b/lib/booking_requests.dart index 54a9103..8296c87 100644 --- a/lib/booking_requests.dart +++ b/lib/booking_requests.dart @@ -2,7 +2,8 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:watermanagement/settings.dart'; - +import 'package:intl/intl.dart'; +import 'package:flutter_cupertino_datetime_picker/flutter_cupertino_datetime_picker.dart'; import 'models/booking_requests_model.dart'; import 'models/getdeliveryboy_model.dart'; @@ -19,7 +20,8 @@ class _BookingRequetsState extends State { bool isSereverIssuePending = false; bool isDataLoading = false; var dropdownAllDeliveryBoys; - + var selIOS; + TextEditingController dateController = TextEditingController(); Future getBookingRequestsData() async { isDataLoading = true; @@ -137,6 +139,9 @@ class _BookingRequetsState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ + SizedBox( + height: 12, + ), Text( BookingRequestsList[index] .tanker_name @@ -295,6 +300,42 @@ class _BookingRequetsState extends State { }, ), ), + + SizedBox( + height: 05, + ), + Container( + padding: const EdgeInsets.all(10), + child: TextFormField( + cursorColor: greyColor, + enabled: false, + controller: dateController, + textCapitalization: TextCapitalization.characters, + decoration: const InputDecoration( + prefixIcon: Icon( + Icons.date_range, + color: greyColor, + ), + border: OutlineInputBorder( + borderSide: BorderSide(color: greyColor)), + focusedBorder: OutlineInputBorder( + borderSide: BorderSide(color: greyColor), + ), + enabledBorder: OutlineInputBorder( + borderSide: BorderSide(color: greyColor), + ), + labelText: 'Select date & time', + labelStyle: TextStyle( + color: greyColor, //<-- SEE HERE + ), + ), + ), + ), + + SizedBox( + height: 05, + ), + ], ), ), @@ -322,6 +363,7 @@ class _BookingRequetsState extends State { .customer_address; payload["dateOfOrder"] = BookingRequestsList[index].date_of_order; + payload["expectedDateOfDelivery"] =dateController.text.toString(); payload["action"] = "accept"; payload["price"] = BookingRequestsList[index].price; @@ -346,6 +388,50 @@ class _BookingRequetsState extends State { } else {} }, ), + + + IconButton( + onPressed: () async { + DatePicker.showDatePicker( + context, + dateFormat: 'dd MMMM yyyy HH:mm', + initialDateTime: DateTime.now(), + minDateTime:DateTime.now(), + maxDateTime: DateTime.now().add(Duration(days: 15)), + onMonthChangeStartWithFirstDate: true, + pickerMode: DateTimePickerMode.datetime, + pickerTheme: DateTimePickerTheme( + // backgroundColor: Colors.white, + cancelTextStyle: labelTextStyle(), + confirmTextStyle: labelTextStyle(), + // showTitle: true, + //title: Text('Pick date and time'), + itemTextStyle: valuesTextStyle(), + ), + onConfirm: (dateTime, List index)async { + DateTime selectdate = dateTime; + setState(() { + selIOS = DateFormat('dd-MMM-yyyy - HH:mm').format(selectdate); + }); + + if(selIOS!=''){ + setState(() { + dateController.text=selIOS.toString(); + }); + } + else { + AppSettings.longFailedToast('please select date'); + } + }, + ); + }, + icon: Icon( + Icons.calendar_month, + color: primaryColor, + )) + + + ], ); }); diff --git a/lib/login.dart b/lib/login.dart index 857ab41..b6aa99a 100644 --- a/lib/login.dart +++ b/lib/login.dart @@ -76,7 +76,7 @@ class _LoginState extends State { children: [ /* Container( decoration: const BoxDecoration( - image: DecorationImage(image: AssetImage("images/backgroundimage.png"), fit: BoxFit.cover,), + image: DecorationImage(image:AssetImage("images/backgroundimage.png"), fit: BoxFit.cover,), ), ),*/ GestureDetector( @@ -95,7 +95,7 @@ class _LoginState extends State { Container( //width: double.infinity, child: Image( - image: const AssetImage('images/loginpng.png'), + image: const AssetImage('images/logo.png'), height: MediaQuery.of(context).size.height * .18, )), const SizedBox( diff --git a/lib/models/booking_requests_model.dart b/lib/models/booking_requests_model.dart index 6899d8b..4122068 100644 --- a/lib/models/booking_requests_model.dart +++ b/lib/models/booking_requests_model.dart @@ -26,7 +26,7 @@ class BookingRequestsModel { rtvm.customer_address = json['address'] ?? ''; rtvm.customer_id = json['customerId'] ?? ''; rtvm.booking_id = json['bookingid'] ?? ''; - rtvm.type_of_water = json['dateOfOrder'] ?? ''; + rtvm.type_of_water = json['typeofwater'] ?? ''; rtvm.capacity = json['capacity'] ?? ''; rtvm.price = json['price'] ?? ''; rtvm.payment_status = json['payment_status'] ?? ''; diff --git a/lib/signup.dart b/lib/signup.dart index 7e60f34..9176d94 100644 --- a/lib/signup.dart +++ b/lib/signup.dart @@ -90,12 +90,6 @@ class _SignInState extends State { super.initState(); } - - - - - - Future onWillPop() async { final shouldPop = await showDialog(context: context, builder: (context) { return AlertDialog( @@ -165,7 +159,7 @@ class _SignInState extends State { Container( //width: double.infinity, child: Image( - image: const AssetImage('images/loginpng.png'), + image: const AssetImage('images/logo.png'), height: MediaQuery.of(context).size.height * .18, )), @@ -262,36 +256,7 @@ class _SignInState extends State { const SizedBox( height: 5, ), - Container( - padding: const EdgeInsets.all(10), - child: TextFormField( - cursorColor: greyColor, - controller: userAddressDescriptionController, - keyboardType: TextInputType.emailAddress, - decoration: const InputDecoration( - prefixIcon: Icon( - Icons.plagiarism_outlined, - color: greyColor, - ), - border: OutlineInputBorder( - borderSide: BorderSide(color: greyColor)), - focusedBorder: OutlineInputBorder( - borderSide: BorderSide(color: greyColor), - ), - enabledBorder: OutlineInputBorder( - borderSide: BorderSide(color: greyColor), - ), - labelText: 'Address Description (Ex: Flat No)', - labelStyle: TextStyle( - color: greyColor, //<-- SEE HERE - ), - ), - ), - ),//address description - const SizedBox( - height: 5, - ), GestureDetector( child:Container( padding: const EdgeInsets.all(10), @@ -300,7 +265,6 @@ class _SignInState extends State { controller: userAddressCapturingController, onTap:() { - //============================================================================================= location.serviceEnabled().then((value) { if (value) { @@ -392,16 +356,6 @@ class _SignInState extends State { ); } }); - - - - - - - - - - //===================================================================================== // _getCurrentPosition(); @@ -421,7 +375,7 @@ class _SignInState extends State { enabledBorder: OutlineInputBorder( borderSide: BorderSide(color: greyColor), ), - labelText: 'Pic Your office Address', + labelText: 'select adress from MAP', labelStyle: TextStyle( color: greyColor, //<-- SEE HERE ), @@ -437,7 +391,36 @@ class _SignInState extends State { const SizedBox( height: 5, ), + Container( + padding: const EdgeInsets.all(10), + child: TextFormField( + cursorColor: greyColor, + controller: userAddressDescriptionController, + keyboardType: TextInputType.emailAddress, + decoration: const InputDecoration( + prefixIcon: Icon( + Icons.plagiarism_outlined, + color: greyColor, + ), + border: OutlineInputBorder( + borderSide: BorderSide(color: greyColor)), + focusedBorder: OutlineInputBorder( + borderSide: BorderSide(color: greyColor), + ), + enabledBorder: OutlineInputBorder( + borderSide: BorderSide(color: greyColor), + ), + labelText: 'Address Description (Ex: Flat No)', + labelStyle: TextStyle( + color: greyColor, //<-- SEE HERE + ), + ), + ), + ),//address description + const SizedBox( + height: 5, + ), Container( padding: const EdgeInsets.all(10), child: TextFormField( diff --git a/lib/updateprofile.dart b/lib/updateprofile.dart index 99e0232..f8d4794 100644 --- a/lib/updateprofile.dart +++ b/lib/updateprofile.dart @@ -23,6 +23,8 @@ class _UpdateprofileState extends State { TextEditingController nameController = TextEditingController(); TextEditingController mobileNumberController = TextEditingController(); TextEditingController emailController = TextEditingController(); + TextEditingController descriptionController = TextEditingController(); + @@ -33,6 +35,8 @@ class _UpdateprofileState extends State { nameController.text=AppSettings.suppliername; mobileNumberController.text=AppSettings.phoneNumber; emailController.text=AppSettings.email; + // descriptionController.text=AppSettings.suppliername; + super.initState(); @@ -245,7 +249,34 @@ class _UpdateprofileState extends State { SizedBox( height: 10, ), - + Container( + padding: const EdgeInsets.all(10), + child: TextFormField( + cursorColor: greyColor, + controller: descriptionController, + keyboardType: TextInputType.multiline, + maxLines: null, + decoration: const InputDecoration( + prefixIcon: Icon( + Icons.description, + color: greyColor, + ), + contentPadding: const EdgeInsets.symmetric(vertical: 60.0, horizontal: 30.0), + border: OutlineInputBorder( + borderSide: BorderSide(color: greyColor)), + focusedBorder: OutlineInputBorder( + borderSide: BorderSide(color: greyColor), + ), + enabledBorder: OutlineInputBorder( + borderSide: BorderSide(color: greyColor), + ), + labelText: 'Enter Description', + labelStyle: TextStyle( + color: greyColor, //<-- SEE HERE + ), + ), + ), + ), SizedBox( height: 10, ),