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/crm/universalSearchScreen.dart
View file @ ecd8fcd1
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'package:generp/screens/crm/ProspectDetailsByMode.dart';
......@@ -32,12 +34,14 @@ class _UniversalsearchscreenState extends State<Universalsearchscreen> {
builder: (context, provider, child) {
return WillPopScope(
onWillPop: () => onBackPressed(context),
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
backgroundColor: AppColors.scaffold_bg_color,
appBar: appbar(context, "Search"),
body: SafeArea(
child: SingleChildScrollView(
body: SingleChildScrollView(
child: Column(
children: [
if (provider.accountsList.length > 0) ...[
......
lib/screens/finance/AllPaymentRequesitionListsByModes.dart
View file @ ecd8fcd1
import 'dart:io';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
......@@ -59,6 +61,9 @@ class _AllpaymentrequesitionlistsbymodesState
onWillPop: () {
return onBackPressed(context);
},
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
appBar: appbar2(
......@@ -112,7 +117,7 @@ class _AllpaymentrequesitionlistsbymodesState
),
backgroundColor: AppColors.scaffold_bg_color,
body:
SafeArea(child: provider.isLoading
provider.isLoading
? Center(child: CircularProgressIndicator.adaptive(
valueColor: AlwaysStoppedAnimation<Color>(
AppColors.app_blue)
......@@ -373,7 +378,8 @@ class _AllpaymentrequesitionlistsbymodesState
},
),
),
):Emptywidget(context),)
):Emptywidget(context)
),
),
);
},
......
lib/screens/finance/PaymentRequestionListDetails.dart
View file @ ecd8fcd1
......@@ -112,9 +112,16 @@ class _PaymentrequestionlistdetailsState
shouldShowButtons = [
"Level 2 Approved",
"Level 2 approved",
].contains(req_det.status); // Show buttons if Level 2 is approved
].contains(req_det.status);
}else if(widget.mode == "self_apr_lvl2"){
shouldShowButtons = [
"Requested"
].contains(req_det.status);
}
return WillPopScope(
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
appBar: appbar2(
......@@ -124,8 +131,7 @@ class _PaymentrequestionlistdetailsState
SizedBox(width: 0),
),
backgroundColor: AppColors.scaffold_bg_color,
body: SafeArea(
child: Container(
body: Container(
child: SingleChildScrollView(
child: Container(
decoration: BoxDecoration(
......@@ -315,12 +321,11 @@ class _PaymentrequestionlistdetailsState
),
),
),
),
bottomNavigationBar:
(["admin", "self"].contains(widget.mode) || !shouldShowButtons)
? Container(height: 0)
: Container(
margin: EdgeInsets.symmetric(horizontal: 10),
margin: EdgeInsets.symmetric(horizontal: 10,vertical: 10),
alignment: Alignment.bottomCenter,
height: 60,
child: Container(
......@@ -363,6 +368,7 @@ class _PaymentrequestionlistdetailsState
if ([
"apr_lvl1",
"apr_lvl2",
"self_apr_lvl2"
].contains(widget.mode)) ...[
Expanded(
child: InkResponse(
......@@ -561,6 +567,7 @@ class _PaymentrequestionlistdetailsState
// ),
// ),
),
),
onWillPop: () {
provider.resetAll();
return onBackPressed(context);
......@@ -644,6 +651,7 @@ class _PaymentrequestionlistdetailsState
focusNodes[1],
TextInputAction.next
),
errorWidget(context, provider.ApprovedAmountError),
textControllerWidget(
context,
remarks,
......@@ -657,6 +665,7 @@ class _PaymentrequestionlistdetailsState
null,
TextInputAction.done
),
errorWidget(context, provider.remarksError),
TextWidget(context, "Proposed Payment Account"),
DropdownButtonHideUnderline(
child: Row(
......@@ -881,6 +890,7 @@ class _PaymentrequestionlistdetailsState
null,
focusNodes[2],null,TextInputAction.done
),
errorWidget(context, provider.remarksError),
InkWell(
onTap: () {
provider
......
lib/screens/finance/addPaymentReceiptList.dart
View file @ ecd8fcd1
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter/cupertino.dart';
......@@ -49,12 +51,14 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> {
return Consumer<Paymentreceiptsprovider>(
builder: (context, provider, child) {
return WillPopScope(
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
backgroundColor: AppColors.white,
appBar: appbar2(context, "${widget.pageTitleName}",provider.resetForm,SizedBox(width: 0,)),
body: SafeArea(
child: Container(
body: Container(
padding: EdgeInsets.symmetric(horizontal: 10),
decoration: BoxDecoration(
color: Colors.white,
......@@ -537,10 +541,9 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> {
),
),
),
),
floatingActionButtonLocation:
FloatingActionButtonLocation.centerFloat,
floatingActionButton: InkResponse(
bottomNavigationBar: InkResponse(
onTap: provider.submitClicked?null: () {
provider.submitClicked = true;
provider.addReceiptPaymentRequestionSubmitAPI(context, provider.formattedDate);
......@@ -567,6 +570,7 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> {
),
),
),
),
onWillPop: () {
provider.resetForm();
return onBackPressed(context);
......
lib/screens/finance/directPaymentRequesitionList.dart
View file @ ecd8fcd1
import 'dart:io';
import 'package:dropdown_button2/dropdown_button2.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
......@@ -56,12 +58,14 @@ class _DirectpaymentrequesitionlistState
return Consumer<Requestionlistprovider>(
builder: (context, provider, child) {
return WillPopScope(
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
backgroundColor: AppColors.white,
appBar: appbar(context, "${widget.pageTitleName}"),
body: SafeArea(
child: Container(
body: Container(
padding: EdgeInsets.symmetric(horizontal: 10),
decoration: BoxDecoration(
color: Colors.white,
......@@ -546,7 +550,6 @@ class _DirectpaymentrequesitionlistState
),
),
),
),
floatingActionButtonLocation:
FloatingActionButtonLocation.centerFloat,
bottomNavigationBar: InkResponse(
......@@ -579,6 +582,7 @@ class _DirectpaymentrequesitionlistState
),
),
),
),
onWillPop: () {
provider.resetForm();
return onBackPressed(context);
......
lib/screens/finance/financeDashboard.dart
View file @ ecd8fcd1
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'package:generp/Notifiers/financeProvider/DashboardProvider.dart';
......@@ -33,12 +35,14 @@ class _FinancedashboardState extends State<Financedashboard> {
return WillPopScope(
onWillPop: () => onBackPressed(context),
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
backgroundColor: AppColors.scaffold_bg_color,
appBar: appbar(context, "Finance"),
body: SafeArea(
child: SizedBox(
body: SizedBox(
child: SingleChildScrollView(
child: Column(
children: [
......@@ -171,7 +175,6 @@ class _FinancedashboardState extends State<Financedashboard> {
),
),
),
),
floatingActionButtonLocation:
FloatingActionButtonLocation.centerFloat,
floatingActionButton: InkResponse(
......@@ -198,6 +201,7 @@ class _FinancedashboardState extends State<Financedashboard> {
),
),
),
),
);
},
);
......
lib/screens/finance/paymentDetailsPaymentRequisition.dart
View file @ ecd8fcd1
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'package:generp/Utils/app_colors.dart';
......@@ -46,12 +48,14 @@ class _PaymentdetailspaymentrequisitionState
var payment_det = provider.paymentDetails;
return WillPopScope(
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
appBar: appbar(context, widget.pageName),
backgroundColor: AppColors.scaffold_bg_color,
body: SafeArea(
child: SizedBox(
body: SizedBox(
child: SingleChildScrollView(
child: Container(
decoration: BoxDecoration(
......@@ -201,9 +205,9 @@ class _PaymentdetailspaymentrequisitionState
),
),
),
),
),
),
onWillPop: () {
return onBackPressed(context);
},
......
lib/screens/finance/paymentListPaymentRequisition.dart
View file @ ecd8fcd1
import 'dart:io';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
......@@ -48,6 +50,9 @@ late Commondaterangefilter cf;
onWillPop: () {
return onBackPressed(context);
},
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
appBar: appbar2(
......@@ -94,7 +99,7 @@ late Commondaterangefilter cf;
),
),
backgroundColor: AppColors.scaffold_bg_color,
body: SafeArea(child: provider.isLoading
body: provider.isLoading
? Center(child: CircularProgressIndicator.adaptive(
valueColor: AlwaysStoppedAnimation<Color>(
AppColors.app_blue)
......@@ -328,7 +333,8 @@ late Commondaterangefilter cf;
},
),
),
):Emptywidget(context),)
):Emptywidget(context)
),
),
);
},
......
lib/screens/finance/paymentReceiptDetails.dart
View file @ ecd8fcd1
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'package:generp/Utils/app_colors.dart';
......@@ -45,12 +47,14 @@ class _PaymentreceiptdetailsState
var payment_det = provider.receiptDetails;
return WillPopScope(
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
appBar: appbar(context, widget.pageName),
backgroundColor: AppColors.scaffold_bg_color,
body: SafeArea(
child: Container(
body: Container(
child: SingleChildScrollView(
child: Container(
decoration: BoxDecoration(
......@@ -178,9 +182,9 @@ class _PaymentreceiptdetailsState
),
),
),
),
),
),
onWillPop: () {
return onBackPressed(context);
},
......
lib/screens/finance/paymentreceiptList.dart
View file @ ecd8fcd1
import 'dart:io';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
......@@ -43,6 +45,9 @@ class _PaymentreceiptlistState extends State<Paymentreceiptlist> {
onWillPop: () {
return onBackPressed(context);
},
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
appBar: appbar2(
......@@ -89,7 +94,7 @@ class _PaymentreceiptlistState extends State<Paymentreceiptlist> {
),
),
backgroundColor: AppColors.scaffold_bg_color,
body: SafeArea(child: provider.isLoading
body: provider.isLoading
? Center(child: CircularProgressIndicator.adaptive(
valueColor: AlwaysStoppedAnimation<Color>(
AppColors.app_blue)
......@@ -297,7 +302,8 @@ class _PaymentreceiptlistState extends State<Paymentreceiptlist> {
},
),
),
):Emptywidget(context),)
):Emptywidget(context)
),
),
);
},
......
lib/screens/finance/submitPaymentRequestionListsByMode.dart
View file @ ecd8fcd1
import 'dart:io';
import 'package:dropdown_button2/dropdown_button2.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
......@@ -122,6 +124,9 @@ class _SubmitpaymentrequestionlistsbymodeState
return WillPopScope(
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
backgroundColor: AppColors.white,
......@@ -131,8 +136,7 @@ class _SubmitpaymentrequestionlistsbymodeState
provider.resetForm,
SizedBox(width: 0),
),
body: SafeArea(
child: Container(
body: Container(
padding: EdgeInsets.symmetric(horizontal: 10),
decoration: BoxDecoration(
color: Colors.white,
......@@ -635,7 +639,7 @@ class _SubmitpaymentrequestionlistsbymodeState
TextInputAction.next,
),
errorWidget(context, provider.bankIFSCError),
],
],
if ([
"Cheque",
"RTGS",
......@@ -677,7 +681,6 @@ class _SubmitpaymentrequestionlistsbymodeState
),
),
),
),
floatingActionButtonLocation:
FloatingActionButtonLocation.centerFloat,
bottomNavigationBar: InkResponse(
......@@ -718,6 +721,7 @@ class _SubmitpaymentrequestionlistsbymodeState
),
),
),
),
onWillPop: () {
provider.resetForm();
return onBackPressed(context);
......
lib/screens/genTracker/ComplaintHistory.dart
View file @ ecd8fcd1
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
......@@ -43,12 +45,14 @@ class _ComplainthistoryState extends State<Complainthistory> {
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, "Complaint History"),
backgroundColor: AppColors.scaffold_bg_color,
body: SafeArea(
child: Container(
body: Container(
child: SingleChildScrollView(
child: Column(
children: [
......
lib/screens/genTracker/GenTrackerDashboard.dart
View file @ ecd8fcd1
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'package:generp/Utils/commonWidgets.dart';
......@@ -29,12 +31,14 @@ class _GentrackerdashboardState extends State<Gentrackerdashboard> {
];
return WillPopScope(
onWillPop: () => onBackPressed(context),
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
backgroundColor: AppColors.scaffold_bg_color,
appBar: appbar(context, "Gen Tracker"),
body: SafeArea(
child: Column(
body: Column(
children: [
Expanded(
flex: 1,
......
lib/screens/genTracker/GeneratorDetails.dart
View file @ ecd8fcd1
......@@ -69,6 +69,9 @@ class _GeneratordetailsState extends State<Generatordetails> {
var sendwidget = SizedBox(width: 0);
return WillPopScope(
onWillPop: () => onBackPressed(context),
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
appBar: appbar2(
......@@ -78,8 +81,7 @@ class _GeneratordetailsState extends State<Generatordetails> {
sendwidget,
),
backgroundColor: AppColors.scaffold_bg_color,
body: SafeArea(
child: Container(
body: Container(
child: SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
......@@ -818,7 +820,6 @@ class _GeneratordetailsState extends State<Generatordetails> {
),
),
),
),
floatingActionButton: Align(
alignment: Alignment.bottomCenter,
child: InkWell(
......@@ -858,6 +859,7 @@ class _GeneratordetailsState extends State<Generatordetails> {
floatingActionButtonLocation:
FloatingActionButtonLocation.centerFloat,
),
),
);
},
);
......
lib/screens/genTracker/RegisterComplaint.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';
......@@ -26,12 +28,14 @@ class _RegistercomplaintState extends State<Registercomplaint> {
builder: (context, provider, homeProvider, child) {
return WillPopScope(
onWillPop: () => onBackPressed(context),
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
backgroundColor: AppColors.scaffold_bg_color,
appBar: appbar(context, "Register Complaint"),
body: SafeArea(
child: Container(
body: Container(
child: SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
......@@ -496,7 +500,6 @@ class _RegistercomplaintState extends State<Registercomplaint> {
),
),
),
),
floatingActionButton: Container(
child: InkWell(
onTap: () {
......@@ -532,6 +535,7 @@ class _RegistercomplaintState extends State<Registercomplaint> {
floatingActionButtonLocation: FloatingActionButtonLocation
.centerFloat,
),
),
);
},
);
......
lib/screens/genTracker/ScanEnterGeneratorIDScreen.dart
View file @ ecd8fcd1
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:generp/Notifiers/GeneratorDetailsProvider.dart';
import 'package:generp/Utils/commonServices.dart';
......@@ -59,12 +61,14 @@ class _ScanentergeneratoridscreenState extends State<Scanentergeneratoridscreen>
builder: (context, provider, child) {
return WillPopScope(
onWillPop: () => onBackPressed(context),
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
backgroundColor: AppColors.scaffold_bg_color,
appBar: appbar(context, "${widget.from}"),
body: SafeArea(
child: Container(
body: Container(
decoration: BoxDecoration(color: Colors.black),
child: Column(
children: [
......
lib/screens/inventory/GeneratorPartDetailsScreen.dart
View file @ ecd8fcd1
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:generp/screens/finance/FileViewer.dart';
import 'package:generp/screens/notifierExports.dart';
......@@ -58,12 +60,14 @@ class _GeneratorPartDetailsScreenState
onRefresh: () async {
initialiseFunction(context, homeProvider);
},
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
backgroundColor: AppColors.scaffold_bg_color,
appBar: appbar(context, "Gen Inventory"),
body: SafeArea(
child: Container(
body: Container(
child: SingleChildScrollView(
child: Column(
children: [
......
lib/screens/inventory/InventoryScreen.dart
View file @ ecd8fcd1
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:generp/screens/notifierExports.dart';
import 'package:generp/Utils/commonWidgets.dart';
......@@ -37,12 +39,14 @@ class _InventoryScreenState extends State<InventoryScreen> {
builder: (context, provider, child) {
return WillPopScope(
onWillPop: () => onBackPressed(context),
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
backgroundColor: AppColors.scaffold_bg_color,
appBar: appbar(context, "Gen Inventory"),
body: SafeArea(
child: Container(
body: Container(
decoration: BoxDecoration(color: Colors.black),
child: Column(
children: [
......
lib/screens/order/addOrder.dart
View file @ ecd8fcd1
import 'dart:io';
import 'package:dropdown_button2/dropdown_button2.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
......@@ -61,6 +63,9 @@ class _AddorderScreenState extends State<AddorderScreen> {
return Consumer<Addorderprovider>(
builder: (context, provider, child) {
return WillPopScope(
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
backgroundColor: AppColors.white,
......@@ -1420,6 +1425,7 @@ class _AddorderScreenState extends State<AddorderScreen> {
),
),
),
),
onWillPop: () async {
provider.resetForm();
return _onBackPressed(context);
......
lib/screens/order/addPayment.dart
View file @ ecd8fcd1
import 'dart:async';
import 'dart:io';
import 'package:dropdown_button2/dropdown_button2.dart';
import 'package:flutter/material.dart';
......@@ -68,6 +69,9 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> {
return Consumer<Addpaymentprovider>(
builder: (context, provider, child) {
return WillPopScope(
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
backgroundColor: AppColors.white,
......@@ -711,6 +715,7 @@ class _AddpaymentScreenState extends State<AddpaymentScreen> {
),
),
),
),
onWillPop: () async {
provider.resetForm();
return _onBackPressed(context);
......
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