Skip to content

GitLab

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

07-07-2025 By Sai Srinivas 

Pubspec and Safe Area.
parent 67ab0f3e
Show whitespace changes
Inline Side-by-side
lib/screens/order/addTpcAgent.dart
View file @ ecd8fcd1
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_svg/svg.dart';
......@@ -33,6 +35,9 @@ class _AddtpcagentScreenState extends State<AddtpcagentScreen> {
return Consumer<Tpcagentsprovider>(
builder: (context, provider, child) {
return WillPopScope(
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
appBar: appbar2(
......@@ -278,6 +283,7 @@ class _AddtpcagentScreenState extends State<AddtpcagentScreen> {
),
),
),
),
onWillPop: () {
return onBackPressed(context);
......
lib/screens/order/editAdjustedOrderList.dart
View file @ ecd8fcd1
import 'dart:io';
import 'package:dropdown_button2/dropdown_button2.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
......@@ -85,6 +87,9 @@ class _EditadjustedorderlistState extends State<Editadjustedorderlist> {
return Consumer<Editpaymentprovider>(
builder: (context, editProvider, child) {
return WillPopScope(
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
backgroundColor: AppColors.scaffold_bg_color,
......@@ -571,6 +576,7 @@ class _EditadjustedorderlistState extends State<Editadjustedorderlist> {
),
),
),
),
onWillPop: () async {
editProvider.resetForm();
return _onBackPressed(context);
......
lib/screens/order/editOrderAccountDetails.dart
View file @ ecd8fcd1
import 'dart:io';
import 'package:dropdown_button2/dropdown_button2.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
......@@ -55,6 +57,9 @@ class _EditorderaccountdetailsState extends State<Editorderaccountdetails> {
return Consumer<Editorderprovider>(
builder: (context, provider, child) {
return WillPopScope(
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
backgroundColor: AppColors.white,
......@@ -531,6 +536,7 @@ class _EditorderaccountdetailsState extends State<Editorderaccountdetails> {
),
),
),
),
onWillPop: () async {
provider.resetForm();
return _onBackPressed(context);
......
lib/screens/order/editPaymentDetailsByMode.dart
View file @ ecd8fcd1
import 'dart:async';
import 'dart:io';
import 'package:dropdown_button2/dropdown_button2.dart';
import 'package:flutter/material.dart';
......@@ -85,6 +86,9 @@ class _EditpaymentdetailsbymodeState extends State<Editpaymentdetailsbymode> {
return Consumer2<Addpaymentprovider, Editpaymentprovider>(
builder: (context, provider, editProvider, child) {
return WillPopScope(
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
backgroundColor: AppColors.white,
......@@ -338,6 +342,7 @@ class _EditpaymentdetailsbymodeState extends State<Editpaymentdetailsbymode> {
),
),
),
),
onWillPop: () async {
provider.resetForm();
return _onBackPressed(context);
......
lib/screens/order/orderDetailsFeedbackHistory.dart
View file @ ecd8fcd1
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'package:provider/provider.dart';
......@@ -35,6 +37,9 @@ class _OrderdetailsfeedbackhistoryState extends State<Orderdetailsfeedbackhistor
return WillPopScope(
onWillPop: () => onBackPressed(context),
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
appBar: appbar(context, "Feedback History"),
......@@ -146,6 +151,7 @@ class _OrderdetailsfeedbackhistoryState extends State<Orderdetailsfeedbackhistor
floatingActionButtonLocation:
FloatingActionButtonLocation.centerFloat,
),
),
);
},
);
......
lib/screens/order/orderDetailsPaymentHistory.dart
View file @ ecd8fcd1
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'package:generp/Notifiers/ordersProvider/pagesDashboardProvider.dart';
......@@ -35,6 +37,9 @@ class _OrderdetailspaymenthistoryState extends State<Orderdetailspaymenthistory>
final paymentHistory = provider.paymentHistory;
return WillPopScope(
onWillPop: () => onBackPressed(context),
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
appBar: appbar(context, "Payment History"),
......@@ -123,6 +128,7 @@ class _OrderdetailspaymenthistoryState extends State<Orderdetailspaymenthistory>
):Emptywidget(context),
),
),
);
},
);
......
lib/screens/order/orderDetailsProductsHistory.dart
View file @ ecd8fcd1
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
......@@ -33,6 +35,9 @@ class _OrderdetailsproductshistoryState extends State<Orderdetailsproductshistor
final productsHistory = provider.productsHistory;
return WillPopScope(
onWillPop: () => onBackPressed(context),
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
appBar: appbar(context, "Products"),
......@@ -121,6 +126,7 @@ class _OrderdetailsproductshistoryState extends State<Orderdetailsproductshistor
):Emptywidget(context),
),
),
);
},
);
......
lib/screens/order/orderModuleDashboard.dart
View file @ ecd8fcd1
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
......@@ -33,6 +35,9 @@ class _OrdermoduledashboardState extends State<Ordermoduledashboard> {
final pages = provider.ordersAccessiblePagesList;
return WillPopScope(
onWillPop: () => onBackPressed(context),
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
backgroundColor: AppColors.scaffold_bg_color,
......@@ -257,6 +262,7 @@ class _OrdermoduledashboardState extends State<Ordermoduledashboard> {
),
),
),
),
);
},
);
......
lib/screens/order/ordersDetailsByModes.dart
View file @ ecd8fcd1
import 'dart:io';
import 'package:dropdown_button2/dropdown_button2.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
......@@ -185,6 +187,9 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> {
subHeadings = [...subHeadings1,...subHeadings2];
}
return WillPopScope(
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
appBar: appbar2(
......@@ -528,6 +533,7 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> {
),
),
),
),
onWillPop: () {
return onBackPressed(context);
......
lib/screens/order/ordersListByModes.dart
View file @ ecd8fcd1
import 'dart:io';
import 'package:dropdown_button2/dropdown_button2.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
......@@ -52,6 +54,9 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> {
provider.resetAll();
return onBackPressed(context);
},
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
appBar: appbar2(
......@@ -105,7 +110,7 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> {
),
);
}
if(ordersList[index].orderNumber=="GP20252605448")
if(ordersList[index].orderNumber=="GP20252605448")
return Container(
padding: EdgeInsets.symmetric(
horizontal: 10,
......@@ -313,6 +318,7 @@ if(ordersList[index].orderNumber=="GP20252605448")
)
: Emptywidget(context),
),
),
);
},
);
......
lib/screens/order/paymentDetailsByMode.dart
View file @ ecd8fcd1
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'package:generp/Notifiers/ordersProvider/paymentsProvider.dart';
......@@ -48,6 +50,9 @@ class _PaymentdetailsbymodeState extends State<Paymentdetailsbymode> {
var paymentDetails = provider.paymentDetails;
var adjustList = provider.paidLists;
return WillPopScope(
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
appBar: appbar2(
......@@ -473,6 +478,7 @@ class _PaymentdetailsbymodeState extends State<Paymentdetailsbymode> {
),
),
),
),
onWillPop: () {
return onBackPressed(context);
......
lib/screens/order/paymentListsByMode.dart
View file @ ecd8fcd1
import 'dart:io';
import 'package:dropdown_button2/dropdown_button2.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
......@@ -48,6 +50,9 @@ class _PaymentlistsbymodeState extends State<Paymentlistsbymode> {
provider.resetAll();
return onBackPressed(context);
},
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
appBar: appbar2(
......@@ -288,6 +293,7 @@ class _PaymentlistsbymodeState extends State<Paymentlistsbymode> {
),
) : Emptywidget(context),
),
),
);
},
);
......
lib/screens/order/tpcAgentDetailsByMode.dart
View file @ ecd8fcd1
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'package:generp/Notifiers/ordersProvider/tpcAgentsProvider.dart';
......@@ -41,6 +43,9 @@ class _TpcagentdetailsbymodeState extends State<Tpcagentdetailsbymode> {
var tpcAgentDetails = provider.TPCAgentsDetails;
var tpcReqAmt = provider.TPCRequestedAmounts;
return WillPopScope(
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
appBar: appbar2(context, widget.pageTitleName, provider.resetAll,
......@@ -291,6 +296,7 @@ class _TpcagentdetailsbymodeState extends State<Tpcagentdetailsbymode> {
),
),
),
onWillPop: () {
return onBackPressed(context);
......
lib/screens/order/tpcAgentIssueList.dart
View file @ ecd8fcd1
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'package:generp/screens/order/tpcAgentIssueListDetails.dart';
......@@ -43,6 +45,9 @@ class _TpcagentissuelistState extends State<Tpcagentissuelist> {
provider.resetAll();
return onBackPressed(context);
},
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
appBar: appbar2(
......@@ -261,6 +266,7 @@ class _TpcagentissuelistState extends State<Tpcagentissuelist> {
),
) : Emptywidget(context),
),
),
);
},
);
......
lib/screens/order/tpcAgentIssueListDetails.dart
View file @ ecd8fcd1
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'package:generp/screens/screensExports.dart';
......@@ -172,6 +174,9 @@ class _TpcagentissuelistdetailsState extends State<Tpcagentissuelistdetails> {
subHeadings = [...subHeadings1,...subHeadings2];
}
return WillPopScope(
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
appBar: appbar2(context, widget.pageTitleName, provider.resetAll,
......@@ -415,6 +420,7 @@ class _TpcagentissuelistdetailsState extends State<Tpcagentissuelistdetails> {
),
),
),
onWillPop: () {
return onBackPressed(context);
......
lib/screens/order/tpcAgentListByMode.dart
View file @ ecd8fcd1
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'package:generp/Notifiers/ordersProvider/tpcAgentsProvider.dart';
......@@ -45,6 +47,9 @@ class _TpcagentlistbymodeState extends State<Tpcagentlistbymode> {
provider.resetAll();
return onBackPressed(context);
},
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
appBar: appbar2(
......@@ -289,6 +294,7 @@ class _TpcagentlistbymodeState extends State<Tpcagentlistbymode> {
),
) : Emptywidget(context),
),
),
);
},
);
......
lib/screens/serviceEngineer/AccountSuggestions.dart
View file @ ecd8fcd1
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'package:generp/Notifiers/PaymentCollectionProvider.dart';
......@@ -23,12 +25,14 @@ class _AccountsuggestionsState extends State<Accountsuggestions> {
builder: (context, provider, child) {
return WillPopScope(
onWillPop: () => onBackPressed(context),
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
appBar: appbar(context, "Accounts"),
backgroundColor: AppColors.scaffold_bg_color,
body: SafeArea(
child: Container(
body: Container(
decoration: BoxDecoration(color: Colors.white),
child: Column(
children: [
......
lib/screens/serviceEngineer/Followupdetails.dart
View file @ ecd8fcd1
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:generp/screens/finance/FileViewer.dart';
import 'package:provider/provider.dart';
......@@ -36,12 +38,14 @@ class _FollowupdetailsState extends State<Followupdetails> {
var followups = provider.followUpList;
return WillPopScope(
onWillPop: () => onBackPressed(context),
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
appBar: appbar(context, "Follow Up Details"),
backgroundColor: AppColors.scaffold_bg_color,
body: SafeArea(
child: Container(
body: Container(
child: ListView.builder(
itemCount: provider.followUpList.length,
itemBuilder: (context, index) {
......
lib/screens/serviceEngineer/MonthlyCollection.dart
View file @ ecd8fcd1
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'package:generp/Notifiers/PaymentCollectionProvider.dart';
......@@ -52,11 +54,14 @@ class _MonthlycollectionState extends State<Monthlycollection> {
);
return WillPopScope(
onWillPop: () => onBackPressed(context),
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
backgroundColor: AppColors.scaffold_bg_color,
appBar: appbar2(context, "Payment Collection",provider.resetAll, sendWidget),
body: SafeArea(child: provider.paymenCollectionList.isNotEmpty?Container(
body: provider.paymenCollectionList.isNotEmpty?Container(
child: ListView.builder(
scrollDirection: Axis.vertical,
shrinkWrap: true,
......@@ -232,7 +237,8 @@ class _MonthlycollectionState extends State<Monthlycollection> {
);
},
),
):Emptywidget(context),)
):Emptywidget(context)
),
),
);
},
......
lib/screens/serviceEngineer/NearbyGenerators.dart
View file @ ecd8fcd1
import 'dart:io';
import 'package:dropdown_button2/dropdown_button2.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/gestures.dart';
......@@ -214,12 +216,14 @@ class _NearbygeneratorsState extends State<Nearbygenerators> {
return WillPopScope(
onWillPop: () => onBackPressed(context),
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
appBar: appbar2(context, "Nearby Generators",provider.resetAll,sendWidget),
backgroundColor: AppColors.scaffold_bg_color,
body: SafeArea(
child: Container(
body: Container(
child: SingleChildScrollView(
child:Column(
children: [
......@@ -234,6 +238,9 @@ class _NearbygeneratorsState extends State<Nearbygenerators> {
height: MediaQuery.of(context).size.height,
child: Stack(children: [
GoogleMap(
scrollGesturesEnabled: true,
rotateGesturesEnabled: true,
myLocationEnabled: true,
zoomGesturesEnabled: true,
zoomControlsEnabled: true,
......@@ -371,6 +378,7 @@ class _NearbygeneratorsState extends State<Nearbygenerators> {
],
),
),
SizedBox(height: 10,),
Row(
children: [
Text(
......@@ -391,8 +399,9 @@ class _NearbygeneratorsState extends State<Nearbygenerators> {
],
),
InteractiveSlider(
padding: EdgeInsets.symmetric(horizontal: 4,vertical: 0),
min: 1.0,
max: 100.0,
max: 50.0,
enabled: true,
// backgroundColor: AppColors.app_blue,
......@@ -400,9 +409,9 @@ class _NearbygeneratorsState extends State<Nearbygenerators> {
segmentDividerColor:Color(0xFFF6F6F8),
onChanged: (value) {
provider.currentValue = value;
provider.debounce(() {
provider.LoadNearbyGeneratorsAPI(context);
}, Duration(milliseconds: 200));
// provider.debounce(() {
// provider.LoadNearbyGeneratorsAPI(context);
// }, Duration(milliseconds: 200));
},
),
// Slider(
......@@ -425,7 +434,7 @@ class _NearbygeneratorsState extends State<Nearbygenerators> {
child: InkWell(
onTap: () {
provider.debounce(() {
provider.LoadNearbyGeneratorsAPI(context);
provider.LoadNearbyGeneratorsAPI(context,provider.currentValue);
Navigator.pop(context);
}, Duration(milliseconds: 500));
},
......
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