Skip to content

GitLab

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

23-06-2025 By Sai Srinivas 

bottom sheet bottom insets.
parent 233faa10
Hide whitespace changes
Inline Side-by-side
lib/screens/AttendanceScreen.dart
View file @ fd66d000
...@@ -744,6 +744,7 @@ class _AttendanceScreenState extends State<AttendanceScreen> { ...@@ -744,6 +744,7 @@ class _AttendanceScreenState extends State<AttendanceScreen> {
right: 15, right: 15,
top: 15, top: 15,
), ),
padding: EdgeInsets.only( bottom: MediaQuery.of(context).viewInsets.bottom,),
child: SingleChildScrollView( child: SingleChildScrollView(
child: Column( child: Column(
...@@ -846,6 +847,7 @@ class _AttendanceScreenState extends State<AttendanceScreen> { ...@@ -846,6 +847,7 @@ class _AttendanceScreenState extends State<AttendanceScreen> {
right: 15, right: 15,
top: 15, top: 15,
), ),
padding: EdgeInsets.only( bottom: MediaQuery.of(context).viewInsets.bottom,),
child: SingleChildScrollView( child: SingleChildScrollView(
child: Column( child: Column(
......
lib/screens/HomeScreen.dart
View file @ fd66d000
...@@ -555,7 +555,7 @@ class _MyHomePageState extends State<MyHomePage> { ...@@ -555,7 +555,7 @@ class _MyHomePageState extends State<MyHomePage> {
right: 15, right: 15,
top: 30, top: 30,
), ),
padding: EdgeInsets.only( bottom: MediaQuery.of(context).viewInsets.bottom,),
child: Consumer3< child: Consumer3<
HomescreenNotifier, HomescreenNotifier,
ProfileNotifer, ProfileNotifer,
...@@ -806,7 +806,7 @@ class _MyHomePageState extends State<MyHomePage> { ...@@ -806,7 +806,7 @@ class _MyHomePageState extends State<MyHomePage> {
right: 15, right: 15,
top: 30, top: 30,
), ),
padding: EdgeInsets.only( bottom: MediaQuery.of(context).viewInsets.bottom,),
child: Consumer3< child: Consumer3<
HomescreenNotifier, HomescreenNotifier,
ProfileNotifer, ProfileNotifer,
......
lib/screens/crm/LeadDetailsByMode.dart
View file @ fd66d000
...@@ -235,7 +235,7 @@ class _LeadDetailsByModeState extends State<LeadDetailsByMode> { ...@@ -235,7 +235,7 @@ class _LeadDetailsByModeState extends State<LeadDetailsByMode> {
left: 15, left: 15,
right: 15, right: 15,
top: 10, top: 10,
), ),padding: EdgeInsets.only( bottom: MediaQuery.of(context).viewInsets.bottom,),
child: SingleChildScrollView( child: SingleChildScrollView(
child: Column( child: Column(
......
lib/screens/crm/LeadListByMode.dart
View file @ fd66d000
...@@ -319,7 +319,7 @@ class _LeadlistbymodeState extends State<Leadlistbymode> { ...@@ -319,7 +319,7 @@ class _LeadlistbymodeState extends State<Leadlistbymode> {
right: 15, right: 15,
top: 10, top: 10,
), ),
padding: EdgeInsets.only( bottom: MediaQuery.of(context).viewInsets.bottom,),
child: SingleChildScrollView( child: SingleChildScrollView(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
......
lib/screens/crm/NearbyOpenLeads.dart
View file @ fd66d000
...@@ -122,7 +122,7 @@ class _NearbyOpenLeadsState extends State<NearbyOpenLeads> { ...@@ -122,7 +122,7 @@ class _NearbyOpenLeadsState extends State<NearbyOpenLeads> {
left: 15, left: 15,
right: 15, right: 15,
top: 15, top: 15,
), ),padding: EdgeInsets.only( bottom: MediaQuery.of(context).viewInsets.bottom,),
child: SingleChildScrollView( child: SingleChildScrollView(
child: Column( child: Column(
......
lib/screens/crm/ProspectListByMode.dart
View file @ fd66d000
...@@ -95,161 +95,165 @@ class _ProspectListByModeState extends State<ProspectListByMode> { ...@@ -95,161 +95,165 @@ class _ProspectListByModeState extends State<ProspectListByMode> {
), ),
); );
} }
return Container(
padding: EdgeInsets.symmetric( // if(crmLists[index].aid=="1726"){
horizontal: 10, return Container(
vertical: 10, padding: EdgeInsets.symmetric(
), horizontal: 10,
margin: EdgeInsets.symmetric( vertical: 10,
horizontal: 10, ),
vertical: 10, margin: EdgeInsets.symmetric(
), horizontal: 10,
decoration: BoxDecoration( vertical: 10,
color: Colors.white, ),
borderRadius: BorderRadius.circular(16), decoration: BoxDecoration(
), color: Colors.white,
child: Column( borderRadius: BorderRadius.circular(16),
children: [ ),
Row( child: Column(
children: [ children: [
Expanded( Row(
flex: 1, children: [
child: Container( Expanded(
height: 50, flex: 1,
width: 35, child: Container(
padding: EdgeInsets.all(8.0), height: 50,
decoration: BoxDecoration( width: 35,
color: Color(0xFFE6F6FF), padding: EdgeInsets.all(8.0),
borderRadius: decoration: BoxDecoration(
BorderRadius.circular(8), color: Color(0xFFE6F6FF),
borderRadius:
BorderRadius.circular(8),
),
child: SvgPicture.asset(
"assets/svg/se_block_head.svg",
),
), ),
child: SvgPicture.asset( ),
"assets/svg/se_block_head.svg", SizedBox(width: 10),
Expanded(
flex: 4,
child: SizedBox(
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Text(
crmLists[index].aname!,
style: TextStyle(
fontFamily: "JakartaMedium",
fontSize: 14,
color: AppColors.semi_black,
),
),
],
),
), ),
), ),
),
SizedBox(width: 10), ],
Expanded( ),
flex: 4, Divider(
child: SizedBox( thickness: 0.5,
child: Column( color: Color(0xFFD7D7D7),
crossAxisAlignment: ),
CrossAxisAlignment.start, ...List.generate(6, (j) {
children: [ final headings = [
Text( "Account Manager",
crmLists[index].aname!, "Contact Person",
"Mobile Number",
"Address",
"Account Age",
"GST Number",
];
final subHeadings = [
crmLists[index].accman,
crmLists[index].cname,
crmLists[index].mob1,
crmLists[index].address,
"${crmLists[index].age} days old",
crmLists[index].gstNumber,
];
return Container(
padding: EdgeInsets.symmetric(
vertical: 5,
),
child: Row(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Expanded(
child: Text(
headings[j],
style: TextStyle( style: TextStyle(
fontFamily: "JakartaMedium", fontFamily: "JakartaMedium",
fontSize: 14, fontSize: 14,
color: AppColors.semi_black, color: AppColors.semi_black,
), ),
), ),
], ),
Expanded(
child: Text(
subHeadings[j]!,
style: TextStyle(
fontSize: 14,
color: Color(0xFF818181),
),
),
),
],
),
);
}),
InkResponse(
onTap: () async {
Navigator.push(
context,
MaterialPageRoute(
builder:
(context) =>
ProspectDetailsByMode(
pageTitleName:
widget
.pageTitleName,
mode: widget.mode,
leadId:provider.accountList[index].aid,
),
), ),
);
},
child: Container(
padding: EdgeInsets.symmetric(
vertical: 5,
), ),
), child: Row(
crossAxisAlignment:
], CrossAxisAlignment.center,
), mainAxisAlignment:
Divider( MainAxisAlignment.start,
thickness: 0.5, children: [
color: Color(0xFFD7D7D7), Text(
), "View Details",
...List.generate(6, (j) {
final headings = [
"Account Manager",
"Contact Person",
"Mobile Number",
"Address",
"Account Age",
"GST Number",
];
final subHeadings = [
crmLists[index].accman,
crmLists[index].cname,
crmLists[index].mob1,
crmLists[index].address,
"${crmLists[index].age} days old",
crmLists[index].gstNumber,
];
return Container(
padding: EdgeInsets.symmetric(
vertical: 5,
),
child: Row(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Expanded(
child: Text(
headings[j],
style: TextStyle( style: TextStyle(
fontFamily: "JakartaMedium", fontFamily: "JakartaMedium",
fontSize: 14, fontSize: 14,
color: AppColors.semi_black, color: AppColors.app_blue,
), ),
), ),
), SizedBox(width: 5),
Expanded( SvgPicture.asset(
child: Text( "assets/svg/next_button.svg",
subHeadings[j]!,
style: TextStyle(
fontSize: 14,
color: Color(0xFF818181),
),
), ),
), ],
],
),
);
}),
InkResponse(
onTap: () async {
Navigator.push(
context,
MaterialPageRoute(
builder:
(context) =>
ProspectDetailsByMode(
pageTitleName:
widget
.pageTitleName,
mode: widget.mode,
leadId:provider.accountList[index].aid,
),
), ),
);
},
child: Container(
padding: EdgeInsets.symmetric(
vertical: 5,
),
child: Row(
crossAxisAlignment:
CrossAxisAlignment.center,
mainAxisAlignment:
MainAxisAlignment.start,
children: [
Text(
"View Details",
style: TextStyle(
fontFamily: "JakartaMedium",
fontSize: 14,
color: AppColors.app_blue,
),
),
SizedBox(width: 5),
SvgPicture.asset(
"assets/svg/next_button.svg",
),
],
), ),
), ),
), ],
], ),
), );
);
}, },
), ),
), ),
...@@ -284,6 +288,7 @@ class _ProspectListByModeState extends State<ProspectListByMode> { ...@@ -284,6 +288,7 @@ class _ProspectListByModeState extends State<ProspectListByMode> {
right: 15, right: 15,
top: 10, top: 10,
), ),
padding: EdgeInsets.only(bottom:MediaQuery.of(context).viewInsets.bottom,),
child: SingleChildScrollView( child: SingleChildScrollView(
child: Column( child: Column(
......
lib/screens/crm/crmDashboard.dart
View file @ fd66d000
...@@ -197,7 +197,7 @@ class _CrmdashboardScreenState extends State<CrmdashboardScreen> { ...@@ -197,7 +197,7 @@ class _CrmdashboardScreenState extends State<CrmdashboardScreen> {
right: 15, right: 15,
top: 10, top: 10,
), ),
padding: EdgeInsets.only( bottom: MediaQuery.of(context).viewInsets.bottom,),
child: SingleChildScrollView( child: SingleChildScrollView(
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
......
lib/screens/finance/AllPaymentRequesitionListsByModes.dart
View file @ fd66d000
...@@ -402,7 +402,7 @@ class _AllpaymentrequesitionlistsbymodesState ...@@ -402,7 +402,7 @@ class _AllpaymentrequesitionlistsbymodesState
right: 15, right: 15,
top: 10, top: 10,
), ),
padding: EdgeInsets.only( bottom: MediaQuery.of(context).viewInsets.bottom,),
child: SingleChildScrollView( child: SingleChildScrollView(
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
......
lib/screens/finance/financeDashboard.dart
View file @ fd66d000
...@@ -189,7 +189,7 @@ class _FinancedashboardState extends State<Financedashboard> { ...@@ -189,7 +189,7 @@ class _FinancedashboardState extends State<Financedashboard> {
right: 15, right: 15,
top: 10, top: 10,
), ),
padding: EdgeInsets.only( bottom: MediaQuery.of(context).viewInsets.bottom,),
child: SingleChildScrollView( child: SingleChildScrollView(
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
......
lib/screens/finance/paymentListPaymentRequisition.dart
View file @ fd66d000
...@@ -356,7 +356,7 @@ late Commondaterangefilter cf; ...@@ -356,7 +356,7 @@ late Commondaterangefilter cf;
left: 15, left: 15,
right: 15, right: 15,
top: 10, top: 10,
), ),padding: EdgeInsets.only( bottom: MediaQuery.of(context).viewInsets.bottom,),
child: SingleChildScrollView( child: SingleChildScrollView(
child: Column( child: Column(
......
lib/screens/finance/paymentreceiptList.dart
View file @ fd66d000
...@@ -326,7 +326,7 @@ class _PaymentreceiptlistState extends State<Paymentreceiptlist> { ...@@ -326,7 +326,7 @@ class _PaymentreceiptlistState extends State<Paymentreceiptlist> {
right: 15, right: 15,
top: 10, top: 10,
), ),
padding: EdgeInsets.only( bottom: MediaQuery.of(context).viewInsets.bottom,),
child: SingleChildScrollView( child: SingleChildScrollView(
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
......
lib/screens/order/orderDetailsFeedbackHistory.dart
View file @ fd66d000
...@@ -173,7 +173,7 @@ class _OrderdetailsfeedbackhistoryState extends State<Orderdetailsfeedbackhistor ...@@ -173,7 +173,7 @@ class _OrderdetailsfeedbackhistoryState extends State<Orderdetailsfeedbackhistor
right: 15, right: 15,
top: 10, top: 10,
), ),
padding: EdgeInsets.only( bottom: MediaQuery.of(context).viewInsets.bottom,),
child: SingleChildScrollView( child: SingleChildScrollView(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
......
lib/screens/order/ordersDetailsByModes.dart
View file @ fd66d000
...@@ -359,7 +359,7 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> { ...@@ -359,7 +359,7 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> {
right: 15, right: 15,
top: 10, top: 10,
), ),
padding: EdgeInsets.only( bottom: MediaQuery.of(context).viewInsets.bottom,),
child: SingleChildScrollView( child: SingleChildScrollView(
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
...@@ -467,7 +467,7 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> { ...@@ -467,7 +467,7 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> {
right: 15, right: 15,
top: 10, top: 10,
), ),
padding: EdgeInsets.only( bottom: MediaQuery.of(context).viewInsets.bottom,),
child: SingleChildScrollView( child: SingleChildScrollView(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
...@@ -708,7 +708,7 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> { ...@@ -708,7 +708,7 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> {
right: 15, right: 15,
top: 10, top: 10,
), ),
padding: EdgeInsets.only( bottom: MediaQuery.of(context).viewInsets.bottom,),
child: SingleChildScrollView( child: SingleChildScrollView(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
......
lib/screens/order/ordersListByModes.dart
View file @ fd66d000
...@@ -322,7 +322,7 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> { ...@@ -322,7 +322,7 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> {
right: 15, right: 15,
top: 10, top: 10,
), ),
padding: EdgeInsets.only( bottom: MediaQuery.of(context).viewInsets.bottom,),
child: SingleChildScrollView( child: SingleChildScrollView(
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
......
lib/screens/order/paymentDetailsByMode.dart
View file @ fd66d000
...@@ -506,7 +506,7 @@ class _PaymentdetailsbymodeState extends State<Paymentdetailsbymode> { ...@@ -506,7 +506,7 @@ class _PaymentdetailsbymodeState extends State<Paymentdetailsbymode> {
right: 15, right: 15,
top: 10, top: 10,
), ),
padding: EdgeInsets.only( bottom: MediaQuery.of(context).viewInsets.bottom,),
child: SingleChildScrollView( child: SingleChildScrollView(
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
...@@ -658,7 +658,7 @@ class _PaymentdetailsbymodeState extends State<Paymentdetailsbymode> { ...@@ -658,7 +658,7 @@ class _PaymentdetailsbymodeState extends State<Paymentdetailsbymode> {
right: 15, right: 15,
top: 10, top: 10,
), ),
padding: EdgeInsets.only( bottom: MediaQuery.of(context).viewInsets.bottom,),
child: SingleChildScrollView( child: SingleChildScrollView(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
...@@ -801,7 +801,7 @@ class _PaymentdetailsbymodeState extends State<Paymentdetailsbymode> { ...@@ -801,7 +801,7 @@ class _PaymentdetailsbymodeState extends State<Paymentdetailsbymode> {
right: 15, right: 15,
top: 10, top: 10,
), ),
padding: EdgeInsets.only( bottom: MediaQuery.of(context).viewInsets.bottom,),
child: SingleChildScrollView( child: SingleChildScrollView(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
...@@ -877,7 +877,7 @@ class _PaymentdetailsbymodeState extends State<Paymentdetailsbymode> { ...@@ -877,7 +877,7 @@ class _PaymentdetailsbymodeState extends State<Paymentdetailsbymode> {
right: 15, right: 15,
top: 30, top: 30,
), ),
padding: EdgeInsets.only( bottom: MediaQuery.of(context).viewInsets.bottom,),
child: Consumer<Paymentsprovider>( child: Consumer<Paymentsprovider>(
builder: (context, provider, child) { builder: (context, provider, child) {
return SingleChildScrollView( return SingleChildScrollView(
......
lib/screens/order/paymentListsByMode.dart
View file @ fd66d000
...@@ -315,7 +315,7 @@ class _PaymentlistsbymodeState extends State<Paymentlistsbymode> { ...@@ -315,7 +315,7 @@ class _PaymentlistsbymodeState extends State<Paymentlistsbymode> {
right: 15, right: 15,
top: 10, top: 10,
), ),
padding: EdgeInsets.only( bottom: MediaQuery.of(context).viewInsets.bottom,),
child: SingleChildScrollView( child: SingleChildScrollView(
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
......
lib/screens/order/tpcAgentIssueListDetails.dart
View file @ fd66d000
...@@ -291,7 +291,7 @@ class _TpcagentissuelistdetailsState extends State<Tpcagentissuelistdetails> { ...@@ -291,7 +291,7 @@ class _TpcagentissuelistdetailsState extends State<Tpcagentissuelistdetails> {
right: 15, right: 15,
top: 10, top: 10,
), ),
padding: EdgeInsets.only( bottom: MediaQuery.of(context).viewInsets.bottom,),
child: SingleChildScrollView( child: SingleChildScrollView(
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
...@@ -401,7 +401,7 @@ class _TpcagentissuelistdetailsState extends State<Tpcagentissuelistdetails> { ...@@ -401,7 +401,7 @@ class _TpcagentissuelistdetailsState extends State<Tpcagentissuelistdetails> {
right: 15, right: 15,
top: 10, top: 10,
), ),
padding: EdgeInsets.only( bottom: MediaQuery.of(context).viewInsets.bottom,),
child: SingleChildScrollView( child: SingleChildScrollView(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
......
lib/screens/serviceEngineer/NearbyGenerators.dart
View file @ fd66d000
...@@ -293,7 +293,7 @@ class _NearbygeneratorsState extends State<Nearbygenerators> { ...@@ -293,7 +293,7 @@ class _NearbygeneratorsState extends State<Nearbygenerators> {
right: 15, right: 15,
top: 15, top: 15,
), ),
padding: EdgeInsets.only( bottom: MediaQuery.of(context).viewInsets.bottom,),
child: SingleChildScrollView( child: SingleChildScrollView(
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
......
lib/screens/serviceEngineer/PendingComplaints.dart
View file @ fd66d000
...@@ -296,7 +296,7 @@ class _PendingcomplaintsState extends State<Pendingcomplaints> { ...@@ -296,7 +296,7 @@ class _PendingcomplaintsState extends State<Pendingcomplaints> {
right: 15, right: 15,
top: 10, top: 10,
), ),
padding: EdgeInsets.only( bottom: MediaQuery.of(context).viewInsets.bottom,),
child: SingleChildScrollView( child: SingleChildScrollView(
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
......
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