Commit ecd8fcd1 authored by Sai Srinivas's avatar Sai Srinivas
Browse files

07-07-2025 By Sai Srinivas

Pubspec and Safe Area.
parent 67ab0f3e
import 'dart:io';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
import 'package:generp/Notifiers/PCWalletProvider.dart'; import 'package:generp/Notifiers/PCWalletProvider.dart';
...@@ -32,70 +34,72 @@ class _PcwalletState extends State<Pcwallet> { ...@@ -32,70 +34,72 @@ class _PcwalletState extends State<Pcwallet> {
final groupedData = provider.groupByDate(provider.historyList); final groupedData = provider.groupByDate(provider.historyList);
return WillPopScope( return WillPopScope(
onWillPop: () => onBackPressed(context), onWillPop: () => onBackPressed(context),
child: Scaffold( child: SafeArea(
resizeToAvoidBottomInset: true, top: false,
appBar: AppBar( bottom: Platform.isIOS?false:true,
automaticallyImplyLeading: false, child: Scaffold(
elevation: 2.0, resizeToAvoidBottomInset: true,
title: SizedBox( appBar: AppBar(
child: Row( automaticallyImplyLeading: false,
mainAxisAlignment: MainAxisAlignment.start, elevation: 2.0,
crossAxisAlignment: CrossAxisAlignment.center, title: SizedBox(
children: [ child: Row(
InkResponse( mainAxisAlignment: MainAxisAlignment.start,
onTap: () => Navigator.pop(context, true), crossAxisAlignment: CrossAxisAlignment.center,
child: SvgPicture.asset( children: [
"assets/svg/app_bar_back.svg", InkResponse(
height: 25, onTap: () => Navigator.pop(context, true),
), child: SvgPicture.asset(
), "assets/svg/app_bar_back.svg",
InkResponse( height: 25,
onTap: () => Navigator.pop(context,true),
child: Text(
"P.C. Wallet",
style: TextStyle(
fontSize: 16,
height: 1.1,
fontFamily: "JakartaSemiBold",
color: AppColors.semi_black,
), ),
), ),
), InkResponse(
Spacer(), onTap: () => Navigator.pop(context,true),
Container( child: Text(
padding: EdgeInsets.symmetric(horizontal: 10), "P.C. Wallet",
height: 40, style: TextStyle(
decoration: BoxDecoration( fontSize: 16,
color: Color(0xFFF2FAFF), height: 1.1,
borderRadius: BorderRadius.circular(16), fontFamily: "JakartaSemiBold",
), color: AppColors.semi_black,
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
SvgPicture.asset(
'assets/svg/pc_wallet.svg',
height: 30,
), ),
SizedBox(width: 5), ),
Text(
"${provider.totlDetails.balanceAmount??"0.00"}",
style: TextStyle(fontSize: 14),
),
],
), ),
), Spacer(),
], Container(
padding: EdgeInsets.symmetric(horizontal: 10),
height: 40,
decoration: BoxDecoration(
color: Color(0xFFF2FAFF),
borderRadius: BorderRadius.circular(16),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
SvgPicture.asset(
'assets/svg/pc_wallet.svg',
height: 30,
),
SizedBox(width: 5),
Text(
"${provider.totlDetails.balanceAmount??"0.00"}",
style: TextStyle(fontSize: 14),
),
],
),
),
],
),
), ),
), shape: RoundedRectangleBorder(
shape: RoundedRectangleBorder( borderRadius: BorderRadius.vertical(
borderRadius: BorderRadius.vertical( bottom: Radius.circular(30), // Adjust the radius as needed
bottom: Radius.circular(30), // Adjust the radius as needed ),
), ),
), ),
), backgroundColor: AppColors.scaffold_bg_color,
backgroundColor: AppColors.scaffold_bg_color, body: Container(
body: SafeArea(
child: Container(
child: SingleChildScrollView( child: SingleChildScrollView(
child: Column( child: Column(
children: [ children: [
...@@ -198,7 +202,7 @@ class _PcwalletState extends State<Pcwallet> { ...@@ -198,7 +202,7 @@ class _PcwalletState extends State<Pcwallet> {
itemBuilder: (context, index) { itemBuilder: (context, index) {
String date = groupedData.keys.elementAt(index); String date = groupedData.keys.elementAt(index);
List<HistoryList> items = groupedData[date]!; List<HistoryList> items = groupedData[date]!;
return Container( return Container(
padding: EdgeInsets.symmetric(vertical: 5), padding: EdgeInsets.symmetric(vertical: 5),
margin: EdgeInsets.symmetric(horizontal: 10), margin: EdgeInsets.symmetric(horizontal: 10),
...@@ -219,12 +223,12 @@ class _PcwalletState extends State<Pcwallet> { ...@@ -219,12 +223,12 @@ class _PcwalletState extends State<Pcwallet> {
...items.map((item) { ...items.map((item) {
String part1 = String part1 =
item.description!.split(' (').first; item.description!.split(' (').first;
RegExp regExp = RegExp(r'\(([^)]+)\)'); RegExp regExp = RegExp(r'\(([^)]+)\)');
String? part2 = regExp String? part2 = regExp
.firstMatch(item.description!) .firstMatch(item.description!)
?.group(1); ?.group(1);
return Container( return Container(
padding: EdgeInsets.symmetric( padding: EdgeInsets.symmetric(
horizontal: 10, horizontal: 10,
......
import 'dart:io';
import 'package:dropdown_button2/dropdown_button2.dart'; import 'package:dropdown_button2/dropdown_button2.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
...@@ -66,12 +68,14 @@ class _PaymentdetailsState extends State<Paymentdetails> { ...@@ -66,12 +68,14 @@ class _PaymentdetailsState extends State<Paymentdetails> {
widget.genId, widget.genId,
); );
}, },
child: Scaffold( child: SafeArea(
resizeToAvoidBottomInset: true, top: false,
appBar: appbar(context, "Payment Details"), bottom: Platform.isIOS?false:true,
backgroundColor: AppColors.scaffold_bg_color, child: Scaffold(
body: SafeArea( resizeToAvoidBottomInset: true,
child: SingleChildScrollView( appBar: appbar(context, "Payment Details"),
backgroundColor: AppColors.scaffold_bg_color,
body: SingleChildScrollView(
child: RefreshIndicator.adaptive( child: RefreshIndicator.adaptive(
color: AppColors.app_blue, color: AppColors.app_blue,
onRefresh: () async { onRefresh: () async {
...@@ -425,54 +429,54 @@ class _PaymentdetailsState extends State<Paymentdetails> { ...@@ -425,54 +429,54 @@ class _PaymentdetailsState extends State<Paymentdetails> {
), ),
), ),
), ),
), floatingActionButtonLocation:
floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat,
FloatingActionButtonLocation.centerFloat, floatingActionButton: InkWell(
floatingActionButton: InkWell( onTap: () {
onTap: () { print("clicked");
print("clicked"); if(provider.contactID==null){
if(provider.contactID==null){ toast(context, "Please Select Contact");
toast(context, "Please Select Contact"); return;
return; }
} if(provider.paymentModeID==null){
if(provider.paymentModeID==null){ toast(context, "Please Select Payment Type");
toast(context, "Please Select Payment Type"); return;
return; }
} if(provider.image_picked==0){
if(provider.image_picked==0){ toast(context, "Please add attachment");
toast(context, "Please add attachment"); return;
return; }
} provider.PaymentUpdateAPI(
provider.PaymentUpdateAPI( context,
context, provider.Referencecontroller.text,
provider.Referencecontroller.text, provider.Amountcontroller.text,
provider.Amountcontroller.text, );
); if (provider.CollectionId != 0) {
if (provider.CollectionId != 0) { showOTPSheetSheet(context);
showOTPSheetSheet(context); }
} },
}, child: Container(
child: Container( alignment: Alignment.center,
alignment: Alignment.center, height: 45,
height: 45, margin: EdgeInsets.only(
margin: EdgeInsets.only( left: 5.0,
left: 5.0, right: 5.0,
right: 5.0, top: 5.0,
top: 5.0, bottom: 5.0,
bottom: 5.0, ),
), decoration: BoxDecoration(
decoration: BoxDecoration( color: AppColors.app_blue, //1487C9
color: AppColors.app_blue, //1487C9 borderRadius: BorderRadius.circular(15.0),
borderRadius: BorderRadius.circular(15.0), ),
), child: Center(
child: Center( child: Text(
child: Text( "Send OTP",
"Send OTP", textAlign: TextAlign.center,
textAlign: TextAlign.center, style: TextStyle(
style: TextStyle( fontSize: 15,
fontSize: 15, fontFamily: "JakartaMedium",
fontFamily: "JakartaMedium", color: Colors.white,
color: Colors.white, ),
), ),
), ),
), ),
......
import 'dart:io';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
import 'package:generp/Notifiers/PendingComplaintsProvider.dart'; import 'package:generp/Notifiers/PendingComplaintsProvider.dart';
...@@ -36,232 +38,233 @@ class _PendingcomplaintsState extends State<Pendingcomplaints> { ...@@ -36,232 +38,233 @@ class _PendingcomplaintsState extends State<Pendingcomplaints> {
builder: (context, provider, child) { builder: (context, provider, child) {
return WillPopScope( return WillPopScope(
onWillPop: () => onBackPressed(context), onWillPop: () => onBackPressed(context),
child: Scaffold( child: SafeArea(
resizeToAvoidBottomInset: true, top: false,
backgroundColor: AppColors.scaffold_bg_color, bottom: Platform.isIOS?false:true,
appBar: appbar2( child: Scaffold(
context, resizeToAvoidBottomInset: true,
"Pending Complaints", backgroundColor: AppColors.scaffold_bg_color,
provider.resetAll, appBar: appbar2(
InkResponse( context,
onTap: () { "Pending Complaints",
Navigator.push( provider.resetAll,
context, InkResponse(
MaterialPageRoute( onTap: () {
builder: (context) => Scancomplaintdetails(), Navigator.push(
), context,
); MaterialPageRoute(
}, builder: (context) => Scancomplaintdetails(),
child: SvgPicture.asset("assets/svg/scanner.svg"), ),
);
},
child: SvgPicture.asset("assets/svg/scanner.svg"),
),
), ),
), body: provider.technician_complaint_list.isNotEmpty
body: SafeArea( ? Container(
child: child: ListView.builder(
provider.technician_complaint_list.isNotEmpty scrollDirection: Axis.vertical,
? Container( shrinkWrap: true,
child: ListView.builder( itemCount: provider.technician_complaint_list.length,
scrollDirection: Axis.vertical, padding: EdgeInsets.symmetric(
shrinkWrap: true, horizontal: 10,
itemCount: provider.technician_complaint_list.length, vertical: 10,
),
itemBuilder: (context, index) {
return Container(
padding: EdgeInsets.symmetric( padding: EdgeInsets.symmetric(
horizontal: 10, horizontal: 10,
vertical: 10, vertical: 10,
), ),
margin: EdgeInsets.symmetric(vertical: 5),
itemBuilder: (context, index) { decoration: BoxDecoration(
return Container( color: Colors.white,
padding: EdgeInsets.symmetric( borderRadius: BorderRadius.circular(20),
horizontal: 10, ),
vertical: 10, child: Column(
), crossAxisAlignment: CrossAxisAlignment.start,
margin: EdgeInsets.symmetric(vertical: 5), children: [
decoration: BoxDecoration( Row(
color: Colors.white, crossAxisAlignment:
borderRadius: BorderRadius.circular(20), CrossAxisAlignment.center,
), mainAxisAlignment: MainAxisAlignment.center,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Row( Expanded(
crossAxisAlignment: flex: 1,
CrossAxisAlignment.center, child: SvgPicture.asset(
mainAxisAlignment: MainAxisAlignment.center, "assets/svg/se_block_head.svg",
children: [ ),
Expanded( ),
flex: 1, SizedBox(width: 5),
child: SvgPicture.asset(
"assets/svg/se_block_head.svg", Expanded(
flex: 4,
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Text(
"${provider.technician_complaint_list[index].contactName}",
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontFamily: "JakartaMedium",
),
), ),
Text(
"${provider.technician_complaint_list[index].companyName}",
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: Color(0xFF818181),
fontSize: 14,
),
),
],
),
),
Spacer(),
Expanded(
flex: 1,
child: InkResponse(
onTap: () {
launch(
'tel://${provider.technician_complaint_list[index].mobileNo}',
);
},
child: SvgPicture.asset(
"assets/svg/se_call_customer.svg",
color: Color(0xFF0D9C00),
height: 20,
width: 20,
), ),
SizedBox(width: 5), ),
),
Expanded(
flex: 1,
child: InkResponse(
onTap: () {
_showOptionsSheet(
context,
provider
.technician_complaint_list[index]
.companyName,
Expanded( provider
flex: 4, .technician_complaint_list[index]
child: Column( .genId,
crossAxisAlignment: provider
CrossAxisAlignment.start, .technician_complaint_list[index]
children: [ .complaintId,
Text( );
"${provider.technician_complaint_list[index].contactName}", },
maxLines: 1, child: SvgPicture.asset(
overflow: TextOverflow.ellipsis, "assets/svg/ic_more.svg",
style: TextStyle( height: 30,
fontFamily: "JakartaMedium",
),
),
Text(
"${provider.technician_complaint_list[index].companyName}",
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: Color(0xFF818181),
fontSize: 14,
),
),
],
),
), ),
Spacer(), ),
),
],
),
Divider(
thickness: 0.5,
color: Color(0xFFD7D7D7),
),
...List.generate(4, (j) {
final textheads = [
"Complaint ID",
"Product Name",
"Engine Number",
"Address",
];
final textSubheads = [
provider
.technician_complaint_list[index]
.complaintId,
provider
.technician_complaint_list[index]
.productName,
provider
.technician_complaint_list[index]
.engineNo,
provider
.technician_complaint_list[index]
.address,
];
return Container(
padding: EdgeInsets.symmetric(
vertical: 3,
),
child: Row(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Expanded( Expanded(
flex: 1, flex: 1,
child: InkResponse( child: Text(
onTap: () { textheads[j].toString(),
launch( style: TextStyle(
'tel://${provider.technician_complaint_list[index].mobileNo}', fontFamily: "JakartaMedium",
);
},
child: SvgPicture.asset(
"assets/svg/se_call_customer.svg",
color: Color(0xFF0D9C00),
height: 20,
width: 20,
), ),
), ),
), ),
Expanded( Expanded(
flex: 1, flex: 2,
child: InkResponse( child: Text(
onTap: () { textSubheads[j].toString(),
_showOptionsSheet( style: TextStyle(
context, color: Color(0xFF818181),
provider
.technician_complaint_list[index]
.companyName,
provider
.technician_complaint_list[index]
.genId,
provider
.technician_complaint_list[index]
.complaintId,
);
},
child: SvgPicture.asset(
"assets/svg/ic_more.svg",
height: 30,
), ),
), ),
), ),
], ],
), ),
Divider( );
thickness: 0.5, }),
color: Color(0xFFD7D7D7), InkResponse(
), onTap: () {
...List.generate(4, (j) { Navigator.push(
final textheads = [ context,
"Complaint ID", MaterialPageRoute(
"Product Name", builder:
(context) => Visitdetails(
"Engine Number", complaintID:
"Address", provider
]; .technician_complaint_list[index]
final textSubheads = [ .complaintId,
provider
.technician_complaint_list[index]
.complaintId,
provider
.technician_complaint_list[index]
.productName,
provider
.technician_complaint_list[index]
.engineNo,
provider
.technician_complaint_list[index]
.address,
];
return Container(
padding: EdgeInsets.symmetric(
vertical: 3,
),
child: Row(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Expanded(
flex: 1,
child: Text(
textheads[j].toString(),
style: TextStyle(
fontFamily: "JakartaMedium",
),
),
), ),
Expanded( ),
flex: 2, );
child: Text( },
textSubheads[j].toString(), child: Row(
style: TextStyle( mainAxisAlignment:
color: Color(0xFF818181), MainAxisAlignment.start,
), crossAxisAlignment:
), CrossAxisAlignment.center,
), children: [
], Text(
"View Details",
style: TextStyle(
color: AppColors.app_blue,
fontFamily: "JakartaMedium",
), ),
);
}),
InkResponse(
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder:
(context) => Visitdetails(
complaintID:
provider
.technician_complaint_list[index]
.complaintId,
),
),
);
},
child: Row(
mainAxisAlignment:
MainAxisAlignment.start,
crossAxisAlignment:
CrossAxisAlignment.center,
children: [
Text(
"View Details",
style: TextStyle(
color: AppColors.app_blue,
fontFamily: "JakartaMedium",
),
),
SizedBox(width: 5),
SvgPicture.asset(
"assets/svg/next_button.svg",
),
],
), ),
), SizedBox(width: 5),
], SvgPicture.asset(
"assets/svg/next_button.svg",
),
],
),
), ),
); ],
}, ),
), );
) },
: Emptywidget(context), ),
)
: Emptywidget(context),
), ),
), ),
); );
......
import 'dart:io';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
import 'package:generp/Utils/commonWidgets.dart'; import 'package:generp/Utils/commonWidgets.dart';
...@@ -46,242 +48,245 @@ class _TodaymontlyvisistsState extends State<Todaymontlyvisists> { ...@@ -46,242 +48,245 @@ class _TodaymontlyvisistsState extends State<Todaymontlyvisists> {
builder: (context, provider, child) { builder: (context, provider, child) {
return WillPopScope( return WillPopScope(
onWillPop: () => onBackPressed(context), onWillPop: () => onBackPressed(context),
child: Scaffold( child: SafeArea(
resizeToAvoidBottomInset: true, top: false,
backgroundColor: AppColors.scaffold_bg_color, bottom: Platform.isIOS?false:true,
appBar: appbar(context, provider.title), child: Scaffold(
body:SafeArea(child: resizeToAvoidBottomInset: true,
provider.visitsList.isNotEmpty backgroundColor: AppColors.scaffold_bg_color,
? Container( appBar: appbar(context, provider.title),
child: ListView.builder( body:provider.visitsList.isNotEmpty
scrollDirection: Axis.vertical, ? Container(
shrinkWrap: true, child: ListView.builder(
itemCount: provider.visitsList.length, scrollDirection: Axis.vertical,
padding: EdgeInsets.symmetric( shrinkWrap: true,
horizontal: 10, itemCount: provider.visitsList.length,
vertical: 10, padding: EdgeInsets.symmetric(
), horizontal: 10,
vertical: 10,
),
itemBuilder: (context, index) { itemBuilder: (context, index) {
return Container( return Container(
padding: EdgeInsets.symmetric( padding: EdgeInsets.symmetric(
horizontal: 10, horizontal: 10,
vertical: 10, vertical: 10,
), ),
margin: EdgeInsets.symmetric(vertical: 5), margin: EdgeInsets.symmetric(vertical: 5),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
borderRadius: BorderRadius.circular(20), borderRadius: BorderRadius.circular(20),
), ),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Row( Row(
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
Expanded( Expanded(
flex: 1, flex: 1,
child: Container( child: Container(
padding: EdgeInsets.symmetric( padding: EdgeInsets.symmetric(
horizontal: 10, horizontal: 10,
vertical: 10, vertical: 10,
),
decoration: BoxDecoration(
color: Color(0xFFE6F6FF),
borderRadius: BorderRadius.circular(
8,
),
),
child: SvgPicture.asset(
width: 30,
height: 30,
"assets/svg/se_block_head.svg",
),
), ),
decoration: BoxDecoration( ),
color: Color(0xFFE6F6FF), SizedBox(width: 5),
borderRadius: BorderRadius.circular(
8, Expanded(
flex: 4,
child: SizedBox(
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Text(
"${provider.visitsList[index].contactName ?? "-"}",
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontFamily: "JakartaMedium",
),
),
Text(
"${provider.visitsList[index].companyName}",
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: Color(0xFF818181),
),
),
],
), ),
), ),
child: SvgPicture.asset( ),
width: 30, Spacer(),
height: 30, Expanded(
"assets/svg/se_block_head.svg", flex: 1,
child: InkResponse(
onTap: () {
launch(
'tel://${provider.visitsList[index].mobileNo}',
);
},
child: SvgPicture.asset(
"assets/svg/se_call_customer.svg",
color: Color(0xFF0D9C00),
height: 20,
width: 20,
),
), ),
), ),
// Expanded(
// flex: 1,
// child: InkResponse(
// onTap: () {
// _showOptionsSheet(context);
// },
// child: Icon(Icons.more_vert),
// ),
// ),
],
),
Padding(
padding: const EdgeInsets.all(8.0),
child: Divider(
thickness: 0.5,
color: Color(0xFFD7D7D7),
), ),
SizedBox(width: 5), ),
...List.generate(3, (j) {
Expanded( final textheads = [
flex: 4, "ID",
child: SizedBox( "Generator Type",
child: Column( "Address",
crossAxisAlignment: ];
CrossAxisAlignment.start, final textSubheads = [
children: [ provider.visitsList[index].genId,
Text( provider.visitsList[index].productName,
"${provider.visitsList[index].contactName ?? "-"}", provider.visitsList[index].address,
maxLines: 1, ];
overflow: TextOverflow.ellipsis, return Container(
padding: EdgeInsets.symmetric(vertical: 3),
child: Row(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Expanded(
flex: 1,
child: Text(
textheads[j].toString(),
style: TextStyle( style: TextStyle(
fontFamily: "JakartaMedium", fontFamily: "JakartaMedium",
), ),
), ),
Text( ),
"${provider.visitsList[index].companyName}", Expanded(
maxLines: 1, flex: 2,
overflow: TextOverflow.ellipsis, child: Text(
textSubheads[j].toString(),
style: TextStyle( style: TextStyle(
color: Color(0xFF818181), color: Color(0xFF818181),
), ),
), ),
], ),
), ],
),
),
Spacer(),
Expanded(
flex: 1,
child: InkResponse(
onTap: () {
launch(
'tel://${provider.visitsList[index].mobileNo}',
);
},
child: SvgPicture.asset(
"assets/svg/se_call_customer.svg",
color: Color(0xFF0D9C00),
height: 20,
width: 20,
),
), ),
), );
// Expanded( }),
// flex: 1, SizedBox(
// child: InkResponse(
// onTap: () {
// _showOptionsSheet(context);
// },
// child: Icon(Icons.more_vert),
// ),
// ),
],
),
Padding(
padding: const EdgeInsets.all(8.0),
child: Divider(
thickness: 0.5,
color: Color(0xFFD7D7D7),
),
),
...List.generate(3, (j) {
final textheads = [
"ID",
"Generator Type",
"Address",
];
final textSubheads = [
provider.visitsList[index].genId,
provider.visitsList[index].productName,
provider.visitsList[index].address,
];
return Container(
padding: EdgeInsets.symmetric(vertical: 3),
child: Row( child: Row(
crossAxisAlignment: mainAxisAlignment:
CrossAxisAlignment.start, MainAxisAlignment.spaceBetween,
children: [ children: [
Expanded( InkResponse(
flex: 1, onTap: () {
child: Text( Navigator.push(
textheads[j].toString(), context,
style: TextStyle( MaterialPageRoute(
fontFamily: "JakartaMedium", builder:
), (context) => Paymentdetails(
), accountName: "Generator",
), name:
Expanded( provider
flex: 2, .visitsList[index]
child: Text( .companyName,
textSubheads[j].toString(), genId:
style: TextStyle( provider
color: Color(0xFF818181), .visitsList[index]
), .genId,
referenceID:
provider
.visitsList[index]
.complaintId,
),
),
);
},
child: SvgPicture.asset(
"assets/svg/se_payment_details.svg",
), ),
), ),
], Spacer(),
), InkResponse(
); onTap: () {
}), Navigator.push(
SizedBox( context,
child: Row( MaterialPageRoute(
mainAxisAlignment: builder:
MainAxisAlignment.spaceBetween, (context) => Visitdetails(
children: [ complaintID:
InkResponse( provider
onTap: () { .visitsList[index]
Navigator.push( .complaintId,
context, ),
MaterialPageRoute(
builder:
(context) => Paymentdetails(
accountName: "Generator",
name:
provider
.visitsList[index]
.companyName,
genId:
provider
.visitsList[index]
.genId,
referenceID:
provider
.visitsList[index]
.complaintId,
), ),
), );
); },
}, child: Row(
child: SvgPicture.asset( mainAxisAlignment:
"assets/svg/se_payment_details.svg", MainAxisAlignment.start,
), crossAxisAlignment:
), CrossAxisAlignment.center,
Spacer(), children: [
InkResponse( Text(
onTap: () { "View Details",
Navigator.push( style: TextStyle(
context, fontFamily: "JakartaMedium",
MaterialPageRoute( color: AppColors.app_blue,
builder: ),
(context) => Visitdetails(
complaintID:
provider
.visitsList[index]
.complaintId,
), ),
), SizedBox(width: 5),
); SvgPicture.asset(
}, "assets/svg/next_button.svg",
child: Row(
mainAxisAlignment:
MainAxisAlignment.start,
crossAxisAlignment:
CrossAxisAlignment.center,
children: [
Text(
"View Details",
style: TextStyle(
fontFamily: "JakartaMedium",
color: AppColors.app_blue,
), ),
), ],
SizedBox(width: 5), ),
SvgPicture.asset(
"assets/svg/next_button.svg",
),
],
), ),
), ],
], ),
), ),
), ],
], ),
), );
); },
}, ),
), )
) : Emptywidget(context)
: Emptywidget(context),) ),
), ),
); );
}, },
......
import 'dart:io';
import 'package:dropdown_button2/dropdown_button2.dart'; import 'package:dropdown_button2/dropdown_button2.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
...@@ -41,17 +43,19 @@ class _UpdatecomplaintsState extends State<Updatecomplaints> { ...@@ -41,17 +43,19 @@ class _UpdatecomplaintsState extends State<Updatecomplaints> {
provider.resetAll(); provider.resetAll();
return onBackPressed(context); return onBackPressed(context);
}, },
child: Scaffold( child: SafeArea(
resizeToAvoidBottomInset: true, top: false,
appBar: appbar2( bottom: Platform.isIOS?false:true,
context, child: Scaffold(
"Update Complaint", resizeToAvoidBottomInset: true,
provider.resetAll, appBar: appbar2(
SizedBox(width: 0), context,
), "Update Complaint",
backgroundColor: AppColors.scaffold_bg_color, provider.resetAll,
body: SafeArea( SizedBox(width: 0),
child: Container( ),
backgroundColor: AppColors.scaffold_bg_color,
body: Container(
padding: EdgeInsets.symmetric(horizontal: 10, vertical: 10), padding: EdgeInsets.symmetric(horizontal: 10, vertical: 10),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
...@@ -389,54 +393,54 @@ class _UpdatecomplaintsState extends State<Updatecomplaints> { ...@@ -389,54 +393,54 @@ class _UpdatecomplaintsState extends State<Updatecomplaints> {
), ),
), ),
), ),
), floatingActionButtonLocation:
floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat,
FloatingActionButtonLocation.centerFloat, floatingActionButton: InkResponse(
floatingActionButton: InkResponse( onTap:
onTap: provider.submitLoading
provider.submitLoading ? null
? null : () {
: () { provider.submitLoading = true;
provider.submitLoading = true; provider.UpdateComplaintAPIFunction(
provider.UpdateComplaintAPIFunction( context,
context, widget.ComplaintID,
widget.ComplaintID, provider.feedbackController.text,
provider.feedbackController.text, provider.fsrNumberController.text,
provider.fsrNumberController.text, provider.runningHoursController.text,
provider.runningHoursController.text, provider.statusID,
provider.statusID, );
); },
}, child: Container(
child: Container( alignment: Alignment.center,
alignment: Alignment.center, height: 45,
height: 45, margin: EdgeInsets.only(
margin: EdgeInsets.only( left: 5.0,
left: 5.0, right: 5.0,
right: 5.0, top: 5.0,
top: 5.0, bottom: 5.0,
bottom: 5.0, ),
), decoration: BoxDecoration(
decoration: BoxDecoration( color: AppColors.app_blue, //1487C9
color: AppColors.app_blue, //1487C9 borderRadius: BorderRadius.circular(15.0),
borderRadius: BorderRadius.circular(15.0), ),
), child: Center(
child: Center( child:
child: provider.submitLoading
provider.submitLoading ? CircularProgressIndicator.adaptive(
? CircularProgressIndicator.adaptive( valueColor: AlwaysStoppedAnimation<Color>(
valueColor: AlwaysStoppedAnimation<Color>( AppColors.white,
AppColors.white, ),
), )
) : Text(
: Text( "Submit",
"Submit", textAlign: TextAlign.center,
textAlign: TextAlign.center, style: TextStyle(
style: TextStyle( fontSize: 15,
fontSize: 15, fontFamily: "JakartaMedium",
fontFamily: "JakartaMedium", color: Colors.white,
color: Colors.white, ),
), ),
), ),
), ),
), ),
), ),
......
import 'dart:io';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
import 'package:generp/Notifiers/VisitDetailsProvider.dart'; import 'package:generp/Notifiers/VisitDetailsProvider.dart';
...@@ -39,12 +41,14 @@ class _VisitdetailsState extends State<Visitdetails> { ...@@ -39,12 +41,14 @@ class _VisitdetailsState extends State<Visitdetails> {
var complaintDetails = provider.complaintDetailsNew; var complaintDetails = provider.complaintDetailsNew;
return WillPopScope( return WillPopScope(
onWillPop: () => onBackPressed(context), onWillPop: () => onBackPressed(context),
child: Scaffold( child: SafeArea(
resizeToAvoidBottomInset: true, top: false,
appBar: appbar(context, "Visit Details"), bottom: Platform.isIOS?false:true,
backgroundColor: AppColors.scaffold_bg_color, child: Scaffold(
body: SafeArea( resizeToAvoidBottomInset: true,
child: SizedBox( appBar: appbar(context, "Visit Details"),
backgroundColor: AppColors.scaffold_bg_color,
body: SizedBox(
child: SingleChildScrollView( child: SingleChildScrollView(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
...@@ -313,44 +317,44 @@ class _VisitdetailsState extends State<Visitdetails> { ...@@ -313,44 +317,44 @@ class _VisitdetailsState extends State<Visitdetails> {
), ),
), ),
), ),
), floatingActionButton: Align(
floatingActionButton: Align( alignment: Alignment.bottomCenter,
alignment: Alignment.bottomCenter, child: InkWell(
child: InkWell( onTap: () {
onTap: () { Navigator.push(
Navigator.push( context,
context, MaterialPageRoute(
MaterialPageRoute( builder:
builder: (context) =>
(context) => Followupdetails(complaintID: widget.complaintID),
Followupdetails(complaintID: widget.complaintID), ),
);
},
child: Container(
alignment: Alignment.bottomCenter,
height: 45,
width: MediaQuery.of(context).size.width,
margin: EdgeInsets.symmetric(horizontal: 10),
decoration: BoxDecoration(
color: AppColors.app_blue,
borderRadius: BorderRadius.circular(14.0),
), ),
); child: Center(
}, child: Text(
child: Container( "Followup Details",
alignment: Alignment.bottomCenter, textAlign: TextAlign.center,
height: 45, style: TextStyle(
width: MediaQuery.of(context).size.width, color: Colors.white,
margin: EdgeInsets.symmetric(horizontal: 10), fontFamily: "JakartaMedium",
decoration: BoxDecoration( ),
color: AppColors.app_blue,
borderRadius: BorderRadius.circular(14.0),
),
child: Center(
child: Text(
"Followup Details",
textAlign: TextAlign.center,
style: TextStyle(
color: Colors.white,
fontFamily: "JakartaMedium",
), ),
), ),
), ),
), ),
), ),
floatingActionButtonLocation:
FloatingActionButtonLocation.centerFloat,
), ),
floatingActionButtonLocation:
FloatingActionButtonLocation.centerFloat,
), ),
); );
}, },
......
import 'dart:io';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:generp/screens/notifierExports.dart'; import 'package:generp/screens/notifierExports.dart';
import 'package:generp/Utils/commonWidgets.dart'; import 'package:generp/Utils/commonWidgets.dart';
...@@ -37,30 +39,32 @@ class _ScancomplaintdetailsState extends State<Scancomplaintdetails> { ...@@ -37,30 +39,32 @@ class _ScancomplaintdetailsState extends State<Scancomplaintdetails> {
builder: (context, provider, child) { builder: (context, provider, child) {
return WillPopScope( return WillPopScope(
onWillPop: () => onBackPressed(context), onWillPop: () => onBackPressed(context),
child: Scaffold( child: SafeArea(
resizeToAvoidBottomInset: true, top: false,
backgroundColor: AppColors.scaffold_bg_color, bottom: Platform.isIOS?false:true,
appBar: appbar(context, "Pending Complaints"), child: Scaffold(
body: SafeArea( resizeToAvoidBottomInset: true,
child: Container( backgroundColor: AppColors.scaffold_bg_color,
appBar: appbar(context, "Pending Complaints"),
body: Container(
decoration: BoxDecoration(color: Colors.black), decoration: BoxDecoration(color: Colors.black),
child: Column( child: Column(
children: [ children: [
Spacer(), Spacer(),
Container( Container(
height: 250, height: 250,
child: QRView( child: QRView(
key: provider.scannerKey, key: provider.scannerKey,
onQRViewCreated: (p0) { onQRViewCreated: (p0) {
provider.onQRViewCreated(p0, "pendingComplaints", context); provider.onQRViewCreated(p0, "pendingComplaints", context);
}, },
formatsAllowed: [BarcodeFormat.qrcode], formatsAllowed: [BarcodeFormat.qrcode],
cameraFacing: CameraFacing.back, cameraFacing: CameraFacing.back,
overlay: QrScannerOverlayShape( overlay: QrScannerOverlayShape(
borderColor: AppColors.app_blue, borderColor: AppColors.app_blue,
borderRadius: 20, borderRadius: 20,
borderLength: 60, borderLength: 60,
......
import 'dart:io';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
import 'package:generp/Notifiers/ServiceEngineerDashboardProvider.dart'; import 'package:generp/Notifiers/ServiceEngineerDashboardProvider.dart';
...@@ -32,70 +34,72 @@ class _ServiceengineerdashboardState extends State<Serviceengineerdashboard> { ...@@ -32,70 +34,72 @@ class _ServiceengineerdashboardState extends State<Serviceengineerdashboard> {
builder: (context, provider, child) { builder: (context, provider, child) {
return WillPopScope( return WillPopScope(
onWillPop: () => onBackPressed(context), onWillPop: () => onBackPressed(context),
child: Scaffold( child: SafeArea(
resizeToAvoidBottomInset: true, top: false,
backgroundColor: AppColors.scaffold_bg_color, bottom: Platform.isIOS?false:true,
appBar: AppBar( child: Scaffold(
automaticallyImplyLeading: false, resizeToAvoidBottomInset: true,
elevation: 2.0, backgroundColor: AppColors.scaffold_bg_color,
title: SizedBox( appBar: AppBar(
child: Row( automaticallyImplyLeading: false,
mainAxisAlignment: MainAxisAlignment.start, elevation: 2.0,
crossAxisAlignment: CrossAxisAlignment.center, title: SizedBox(
children: [ child: Row(
InkResponse( mainAxisAlignment: MainAxisAlignment.start,
onTap: () => Navigator.pop(context, true), crossAxisAlignment: CrossAxisAlignment.center,
child: SvgPicture.asset( children: [
"assets/svg/app_bar_back.svg", InkResponse(
height: 25, onTap: () => Navigator.pop(context, true),
), child: SvgPicture.asset(
), "assets/svg/app_bar_back.svg",
InkResponse( height: 25,
onTap: () => Navigator.pop(context,true),
child: Text(
"Service Engineer",
style: TextStyle(
fontSize: 16,
height: 1.1,
fontFamily: "JakartaSemiBold",
color: AppColors.semi_black,
), ),
), ),
), InkResponse(
Spacer(), onTap: () => Navigator.pop(context,true),
Container( child: Text(
height: 25, "Service Engineer",
width: 45, style: TextStyle(
decoration: BoxDecoration( fontSize: 16,
color: Color(0xFFFFF6E2), height: 1.1,
borderRadius: BorderRadius.circular(20), fontFamily: "JakartaSemiBold",
), color: AppColors.semi_black,
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
SvgPicture.asset(
'assets/svg/engineer_rating.svg',
height: 15,
),
SizedBox(width: 5),
Text(
provider.avgRating.toString(),
style: TextStyle(fontSize: 14),
), ),
], ),
), ),
), Spacer(),
], Container(
height: 25,
width: 45,
decoration: BoxDecoration(
color: Color(0xFFFFF6E2),
borderRadius: BorderRadius.circular(20),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
SvgPicture.asset(
'assets/svg/engineer_rating.svg',
height: 15,
),
SizedBox(width: 5),
Text(
provider.avgRating.toString(),
style: TextStyle(fontSize: 14),
),
],
),
),
],
),
), ),
), shape: RoundedRectangleBorder(
shape: RoundedRectangleBorder( borderRadius: BorderRadius.vertical(
borderRadius: BorderRadius.vertical( bottom: Radius.circular(30), // Adjust the radius as needed
bottom: Radius.circular(30), // Adjust the radius as needed ),
), ),
), ),
), body: Container(
body: SafeArea(
child: Container(
child: SingleChildScrollView( child: SingleChildScrollView(
child: Column( child: Column(
children: [ children: [
...@@ -175,7 +179,7 @@ class _ServiceengineerdashboardState extends State<Serviceengineerdashboard> { ...@@ -175,7 +179,7 @@ class _ServiceengineerdashboardState extends State<Serviceengineerdashboard> {
color: Colors.white, color: Colors.white,
borderRadius: BorderRadius.circular(16), borderRadius: BorderRadius.circular(16),
), ),
child: GridView.builder( child: GridView.builder(
padding: EdgeInsets.symmetric( padding: EdgeInsets.symmetric(
vertical: 15, vertical: 15,
...@@ -232,7 +236,7 @@ class _ServiceengineerdashboardState extends State<Serviceengineerdashboard> { ...@@ -232,7 +236,7 @@ class _ServiceengineerdashboardState extends State<Serviceengineerdashboard> {
route = Todaymontlyvisists(visitType: "Today"); route = Todaymontlyvisists(visitType: "Today");
break; break;
} }
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute(builder: (context) => route), MaterialPageRoute(builder: (context) => route),
...@@ -253,7 +257,7 @@ class _ServiceengineerdashboardState extends State<Serviceengineerdashboard> { ...@@ -253,7 +257,7 @@ class _ServiceengineerdashboardState extends State<Serviceengineerdashboard> {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
Row( Row(
children: [ children: [
if([0,1].contains(index))...[ if([0,1].contains(index))...[
Text("₹",style: TextStyle( Text("₹",style: TextStyle(
...@@ -294,7 +298,7 @@ class _ServiceengineerdashboardState extends State<Serviceengineerdashboard> { ...@@ -294,7 +298,7 @@ class _ServiceengineerdashboardState extends State<Serviceengineerdashboard> {
color: Colors.white, color: Colors.white,
borderRadius: BorderRadius.circular(20), borderRadius: BorderRadius.circular(20),
), ),
child: Row( child: Row(
children: [ children: [
Expanded( Expanded(
......
...@@ -139,10 +139,12 @@ class _SplashState extends State<Splash> { ...@@ -139,10 +139,12 @@ class _SplashState extends State<Splash> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return SafeArea(
resizeToAvoidBottomInset: true, top: false,
body: SafeArea( bottom: Platform.isIOS?false:true,
child: Consumer<SplashVersionNotifier>( child: Scaffold(
resizeToAvoidBottomInset: true,
body: Consumer<SplashVersionNotifier>(
builder: (context, value, child) { builder: (context, value, child) {
return Container( return Container(
alignment: Alignment.center, alignment: Alignment.center,
......
...@@ -1730,6 +1730,7 @@ print("send otp:${data}"); ...@@ -1730,6 +1730,7 @@ print("send otp:${data}");
'approved_amount': approved_amount, 'approved_amount': approved_amount,
'proposed_payment_account_id': proposed_payment_account_id, 'proposed_payment_account_id': proposed_payment_account_id,
}; };
// print(data);
final res = await post(data, approveRejectPaymentRequestSubmitUrl, {}); final res = await post(data, approveRejectPaymentRequestSubmitUrl, {});
if (res != null) { if (res != null) {
print(data); print(data);
......
...@@ -37,10 +37,10 @@ packages: ...@@ -37,10 +37,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: async name: async
sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb" sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.13.0" version: "2.12.0"
auto_size_text: auto_size_text:
dependency: "direct main" dependency: "direct main"
description: description:
...@@ -293,10 +293,10 @@ packages: ...@@ -293,10 +293,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: fake_async name: fake_async
sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.3.3" version: "1.3.2"
ffi: ffi:
dependency: transitive dependency: transitive
description: description:
...@@ -940,26 +940,26 @@ packages: ...@@ -940,26 +940,26 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: leak_tracker name: leak_tracker
sha256: "8dcda04c3fc16c14f48a7bb586d4be1f0d1572731b6d81d51772ef47c02081e0" sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "11.0.1" version: "10.0.8"
leak_tracker_flutter_testing: leak_tracker_flutter_testing:
dependency: transitive dependency: transitive
description: description:
name: leak_tracker_flutter_testing name: leak_tracker_flutter_testing
sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1" sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.0.10" version: "3.0.9"
leak_tracker_testing: leak_tracker_testing:
dependency: transitive dependency: transitive
description: description:
name: leak_tracker_testing name: leak_tracker_testing
sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1" sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.0.2" version: "3.0.1"
lints: lints:
dependency: transitive dependency: transitive
description: description:
...@@ -1665,10 +1665,10 @@ packages: ...@@ -1665,10 +1665,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: vm_service name: vm_service
sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02 sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "15.0.0" version: "14.3.1"
web: web:
dependency: transitive dependency: transitive
description: description:
......
...@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev ...@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
# In Windows, build-name is used as the major, minor, and patch parts # In Windows, build-name is used as the major, minor, and patch parts
# of the product and file versions while build-number is used as the build suffix. # of the product and file versions while build-number is used as the build suffix.
version: 1.0.91+95 version: 1.0.92+96
environment: environment:
sdk: ^3.7.2 sdk: ^3.7.2
...@@ -124,18 +124,6 @@ flutter: ...@@ -124,18 +124,6 @@ flutter:
# "family" key with the font family name, and a "fonts" key with a # "family" key with the font family name, and a "fonts" key with a
# list giving the asset and other descriptors for the font. For # list giving the asset and other descriptors for the font. For
# example: # example:
# fonts:
# - family: Schyler
# fonts:
# - asset: fonts/Schyler-Regular.ttf
# - asset: fonts/Schyler-Italic.ttf
# style: italic
# - family: Trajan Pro
# fonts:
# - asset: fonts/TrajanPro.ttf
# - asset: fonts/TrajanPro_Bold.ttf
# weight: 700
#
fonts: fonts:
- family: Nexa - family: Nexa
fonts: fonts:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment