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/Notifiers/GeneratorDetailsProvider.dart
View file @ ecd8fcd1
......@@ -278,7 +278,6 @@ class Generatordetailsprovider extends ChangeNotifier {
}
void resetForm() {
_qrViewController!.dispose();
engNoController.clear();
_selectedComplaintType = null;
_selectedCategoryType = null;
......@@ -289,6 +288,8 @@ class Generatordetailsprovider extends ChangeNotifier {
_selectedCategoryId = "";
_selectedDescriptionId = "";
_selectedDescription = "";
_qrViewController!.dispose();
}
initialFunction(from) async {
......
lib/Notifiers/NearByGeneratorsProvider.dart
View file @ ecd8fcd1
......@@ -130,7 +130,7 @@ set markers(List<Marker> value){
final lat = _currentLocation!.latitude;
final lang = _currentLocation!.longitude!;
_latlongs = '$lat,$lang';
LoadNearbyGeneratorsAPI(context);
LoadNearbyGeneratorsAPI(context,_currentValue);
}
}
......@@ -146,7 +146,7 @@ set markers(List<Marker> value){
}
Future<void> LoadNearbyGeneratorsAPI(BuildContext context) async {
Future<void> LoadNearbyGeneratorsAPI(BuildContext context,radius) async {
if (_latlongs.isEmpty || _currentValue <= 0) {
print("Invalid parameters: latlongs=$_latlongs, currentValue=$_currentValue");
return;
......@@ -231,6 +231,19 @@ set markers(List<Marker> value){
position: _parseLatLng(generator.loc),
icon: BitmapDescriptor.fromBytes(resizedBytes),
infoWindow: InfoWindow(
onTap: () {
print("INFO WINDOW TAP");
Navigator.push(
context, // Use the widget's BuildContext, which is valid here
MaterialPageRoute(
builder: (context) => Generatordetails(
activityName: "NearByGenerators",
genLocation: generator.loc,
generatorId: generator.generatorId,
),
),
);
},
title: "Customer Name: ${generator.accName}",
snippet: "Product Name: ${generator.productName}",
......@@ -238,16 +251,16 @@ set markers(List<Marker> value){
zIndex: 100,
onTap: () {
int index = generatorslist.indexWhere(
(techResponse) =>
techResponse.generatorId == generator.generatorId,
);
onMarkerTap(
context,
"NearByGenerators",
generator.loc,
generator.generatorId,
);
// int index = generatorslist.indexWhere(
// (techResponse) =>
// techResponse.generatorId == generator.generatorId,
// );
// onMarkerTap(
// context,
// "NearByGenerators",
// generator.loc,
// generator.generatorId,
// );
// print("index:${index}");
// Navigator.push(
// context,
......
lib/Notifiers/crmProvider/crmNearbyOpenLeadsProvider.dart
View file @ ecd8fcd1
......@@ -39,7 +39,6 @@ class crmNearbyOpenLeadsProvider extends ChangeNotifier {
Timer? _timer;
File? _image;
bool _isLoading = true;
String _selectedItem = 'Active';
double _currentValue = 1.0;
Timer? _debounceTimer;
......@@ -59,17 +58,13 @@ class crmNearbyOpenLeadsProvider extends ChangeNotifier {
bool get isLoading => _isLoading;
Timer? get timer => _timer;
File? get image => _image;
String get selectedItem => _selectedItem;
double get currentValue => _currentValue;
set currentValue(value){
_currentValue = value;
notifyListeners();
}
set selectedItem(String value){
_selectedItem = value;
notifyListeners();
}
set markers(List<Marker> value){
_markers = value;
......@@ -82,7 +77,6 @@ class crmNearbyOpenLeadsProvider extends ChangeNotifier {
void resetAll(){
_currentValue = 1.0;
_selectedItem = "";
_markers= [];
_addresses = [];
}
......@@ -128,7 +122,7 @@ class crmNearbyOpenLeadsProvider extends ChangeNotifier {
final lat = _currentLocation!.latitude;
final lang = _currentLocation!.longitude!;
_latlongs = '$lat,$lang';
LoadNearbyOpenLeadsAPI(context);
LoadNearbyOpenLeadsAPI(context,_currentValue);
}
}
......@@ -144,7 +138,7 @@ class crmNearbyOpenLeadsProvider extends ChangeNotifier {
}
Future<void> LoadNearbyOpenLeadsAPI(BuildContext context) async {
Future<void> LoadNearbyOpenLeadsAPI(BuildContext context,radius) async {
if (_latlongs.isEmpty || _currentValue <= 0) {
print("Invalid parameters: latlongs=$_latlongs, currentValue=$_currentValue");
return;
......@@ -155,7 +149,7 @@ class crmNearbyOpenLeadsProvider extends ChangeNotifier {
provider.empId,
provider.session,
_latlongs,
_currentValue
radius
);
if (data != null) {
......@@ -223,6 +217,21 @@ class crmNearbyOpenLeadsProvider extends ChangeNotifier {
position: _parseLatLng(leads.loc),
icon: BitmapDescriptor.fromBytes(resizedBytes),
infoWindow: InfoWindow(
onTap:() {
// onMarkerTap(context, leads.id);
Navigator.push(
context, // Use the widget's BuildContext, which is valid here
MaterialPageRoute(
builder: (context) => LeadDetailsByMode(
mode: "",
pageTitleName: "Lead Details",
leadId:leads.id ,
),
),
);
},
anchor: Offset(0, 0),
title: "Name: ${leads.name}",
snippet: "Address: ${leads.address}",
......@@ -234,10 +243,10 @@ class crmNearbyOpenLeadsProvider extends ChangeNotifier {
(techResponse) =>
techResponse.id == leads.id,
);
onMarkerTap(
context,
leads.id,
);
// onMarkerTap(
// context,
// leads.id,
// );
// print("index:${index}");
// Navigator.push(
// context,
......
lib/Notifiers/financeProvider/RequesitionLidtDetailsProvider.dart
View file @ ecd8fcd1
......@@ -317,13 +317,18 @@ String? proposedAmountError;
} catch (e, s) {}
}
String? remarksError;
String? ApprovedAmountError;
Future<void> paymentrequisitionRejectSubmitAPIFunction(context,
mode,
payment_request_id,
approve_remarks,) async {
try {
if(approve_remarks.toString().trim().isEmpty) {
toast(context,"Enter Remarks");
remarksError = "Please Enter Remarks";
notifyListeners();
// toast(context,"Enter Remarks");
return;
}
var provider = Provider.of<HomescreenNotifier>(context, listen: false);
......@@ -362,6 +367,16 @@ String? proposedAmountError;
approve_remarks,
proposed_payment_account_id,
);
if(approved_amount.toString().trim().isEmpty){
ApprovedAmountError = "Enter Amount";
notifyListeners();
return;
}
if(approve_remarks.toString().trim().isEmpty) {
remarksError = "Please Enter Remarks";
notifyListeners();
return;
}
if (data != null) {
if (data.error == "0") {
paymentRequesitionDetails(context, payment_request_id);
......@@ -428,6 +443,8 @@ String? proposedAmountError;
_selectedValue = "";
_selectedID = null;
proposedAmountError = null;
remarksError = null;
ApprovedAmountError = null;
checkDropDownReset();
notifyListeners();
......
lib/main.dart
View file @ ecd8fcd1
......@@ -4,6 +4,7 @@ import 'package:firebase_core/firebase_core.dart';
import 'package:firebase_messaging/firebase_messaging.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_local_notifications/flutter_local_notifications.dart';
import 'package:flutter_ringtone_player/flutter_ringtone_player.dart';
import 'package:generp/Utils/app_colors.dart';
......@@ -149,6 +150,8 @@ class MyApp extends StatelessWidget {
// This widget is the root of your application.
@override
Widget build(BuildContext context) {
// SystemChrome.setApplicationSwitcherDescription(ApplicationSwitcherDescription());
SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
FirebaseMessaging.onMessageOpenedApp.listen((RemoteMessage message) {
String type = message.data['type'] ?? '';
String redirectUrl = message.data['redirect_url'] ?? '';
......@@ -293,6 +296,7 @@ class MyApp extends StatelessWidget {
AppColors.grey_semi.withOpacity(0.6),
),
),
useMaterial3: true
// inputDecorationTheme: InputDecorationTheme(
// hintStyle: TextStyle(
// fontWeight: FontWeight.w400,
......
lib/screens/AttendanceScreen.dart
View file @ ecd8fcd1
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'package:generp/screens/notifierExports.dart';
......@@ -102,6 +104,9 @@ class _AttendanceScreenState extends State<AttendanceScreen> {
},
child: WillPopScope(
onWillPop: () => onBackPressed(context),
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
backgroundColor: AppColors.scaffold_bg_color,
......@@ -748,6 +753,7 @@ class _AttendanceScreenState extends State<AttendanceScreen> {
FloatingActionButtonLocation.centerFloat,
),
),
),
);
},
);
......
lib/screens/CheckInScreen.dart
View file @ ecd8fcd1
......@@ -50,11 +50,13 @@ class _CheckInOutScreenState extends State<CheckInOutScreen> {
onWillPop: () {
provider.dispose();
return onBackPressed(context);},
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
appBar: appbar2(context, widget.getAttendanceStatus==0? "Check In":"Check Out", provider.dispose,SizedBox(width: 0,)),
body:SafeArea(
child: Container(
body:Container(
child: SafeArea(
child: Column(
children: [
......
lib/screens/FrontCameraCapture.dart
View file @ ecd8fcd1
......@@ -80,11 +80,12 @@ class _CheckOutScreenState extends State<FrontCameraCapture> {
Widget build(BuildContext context) {
Size size = MediaQuery.of(context).size;
return Scaffold(
return SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
// appBar: AppBar(automaticallyImplyLeading: false),
body: SafeArea(
child:
isLoading
body: isLoading
? Center(child: CircularProgressIndicator())
: Row(
children: [
......
lib/screens/HomeScreen.dart
View file @ ecd8fcd1
......@@ -164,12 +164,14 @@ class _MyHomePageState extends State<MyHomePage> {
await Future.delayed(const Duration(milliseconds: 600));
homescreen.DashboardApiFunction(context);
},
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
backgroundColor: AppColors.scaffold_bg_color,
body: SafeArea(
child: Container(
body: Container(
child: Column(
children: [
Expanded(
......
lib/screens/LoginScreen.dart
View file @ ecd8fcd1
......@@ -157,11 +157,13 @@ class _LoginScreenState extends State<LoginScreen>
builder: (context, loginProv, child) {
return WillPopScope(
onWillPop: onBackPressed,
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
backgroundColor: AppColors.scaffold_bg_color,
body: SafeArea(
child: KeyboardVisibilityProvider(
body: KeyboardVisibilityProvider(
controller: _keyboardVisibilityController,
child: Stack(
alignment: Alignment.center,
......@@ -694,9 +696,9 @@ class _LoginScreenState extends State<LoginScreen>
],
),
),
),
// bottomNavigationBar: ,
),
),
);
},
);
......
lib/screens/ScannerLogin.dart
View file @ ecd8fcd1
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:qr_code_scanner/qr_code_scanner.dart';
......@@ -20,12 +22,14 @@ class _ScannerloginState extends State<Scannerlogin> {
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, "QR Login"),
body: SafeArea(
child: Container(
body: Container(
decoration: BoxDecoration(color: Colors.black),
child: Column(
children: [
......
lib/screens/UpdatePasswordScreen.dart
View file @ ecd8fcd1
import 'dart:io';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
......@@ -15,12 +17,14 @@ class UpdatePassword extends StatelessWidget {
return WillPopScope(
onWillPop: () => onBackPressed(context),
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
appBar: appbar(context, "Update Password"),
backgroundColor: AppColors.scaffold_bg_color,
body: SafeArea(
child: Container(
body: Container(
child: Column(
children: [
Expanded(
......
lib/screens/WebERPIOS.dart
View file @ ecd8fcd1
......@@ -85,10 +85,12 @@ class _WebERPIOSState extends State<WebERPIOS> {
}
return true; // Allow default back button behavior
},
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
appBar: appbar(context, "ERP"),
body: SafeArea(
child: Container(
body: Container(
child: Column(
children: <Widget>[
Expanded(
......
lib/screens/WebERPScreen.dart
View file @ ecd8fcd1
......@@ -119,11 +119,13 @@ class _WebErpScreenState extends State<WebErpScreen> {
}
return true; // Allow default back button behavior
},
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
appBar: appbar(context, "ERP"),
body: SafeArea(
child: Container(
body: Container(
child: Column(
children: <Widget>[
Expanded(
......
lib/screens/WebWhizzdomScreen.dart
View file @ ecd8fcd1
import 'dart:async';
import 'dart:io';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
......@@ -77,11 +78,13 @@ class _WebWhizzdomScreenState extends State<WebWhizzdomScreen> {
}
return true; // Allow default back button behavior
},
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
appBar: appbar(context, "Whizzdom"),
body: SafeArea(
child: Container(
body: Container(
child: Column(children: <Widget>[
Expanded(
child: Stack(
......
lib/screens/commom/accountLedger.dart
View file @ ecd8fcd1
import 'dart:io';
import 'package:auto_size_text/auto_size_text.dart';
import 'package:dropdown_button2/dropdown_button2.dart';
import 'package:flutter/material.dart';
......@@ -96,6 +98,9 @@ class _AccountledgerState extends State<Accountledger> {
totalValues = [...values, ...values2];
}
return WillPopScope(
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
appBar: appbar2(
......@@ -138,7 +143,7 @@ class _AccountledgerState extends State<Accountledger> {
),
),
backgroundColor: AppColors.scaffold_bg_color,
body: SafeArea(child: provider.isLoading
body: provider.isLoading
? Center(child: CircularProgressIndicator.adaptive(
valueColor: AlwaysStoppedAnimation<Color>(
AppColors.app_blue)
......@@ -559,7 +564,8 @@ class _AccountledgerState extends State<Accountledger> {
],
),
),
)),
),
),
),
onWillPop: () {
return _onBackPressed(context);
......
lib/screens/commom/accountsList.dart
View file @ ecd8fcd1
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_svg/svg.dart';
......@@ -55,6 +57,9 @@ class _AccountslistState extends State<Accountslist> {
var accountList = provider.accountsList;
print(accountList.length);
return WillPopScope(
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
appBar: appbar2(
......@@ -76,9 +81,7 @@ class _AccountslistState extends State<Accountslist> {
),
),
backgroundColor: AppColors.scaffold_bg_color,
body: SafeArea(
child:
provider.isLoading?
body: provider.isLoading?
Center(
child: CircularProgressIndicator(
valueColor: AlwaysStoppedAnimation(AppColors.app_blue),
......
lib/screens/commom/accountsListDetails.dart
View file @ ecd8fcd1
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'package:generp/Notifiers/commonProvider/accountDetailsProvider.dart';
......@@ -48,6 +50,9 @@ class _AccountslistdetailsState extends State<Accountslistdetails> {
overallBalance = totalDebit - totalCredit;
return WillPopScope(
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
appBar: appbar2(
context,
......@@ -73,8 +78,7 @@ class _AccountslistdetailsState extends State<Accountslistdetails> {
),
resizeToAvoidBottomInset: true,
backgroundColor: AppColors.scaffold_bg_color,
body: SafeArea(
child: SizedBox(
body: SizedBox(
child: SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
......
lib/screens/commom/addCommonPayment.dart
View file @ ecd8fcd1
import 'dart:io';
import 'package:dropdown_button2/dropdown_button2.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
......@@ -53,6 +55,9 @@ class _AddcommonpaymentState extends State<Addcommonpayment>{
provider.resetValues();
return onBackPressed(context);
},
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
resizeToAvoidBottomInset: true,
appBar: appbar2(
......@@ -62,8 +67,7 @@ class _AddcommonpaymentState extends State<Addcommonpayment>{
SizedBox(width: 0),
),
backgroundColor: AppColors.white,
body: SafeArea(
child: SizedBox(
body: SizedBox(
child: SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
......@@ -854,7 +858,6 @@ class _AddcommonpaymentState extends State<Addcommonpayment>{
),
),
),
),
bottomNavigationBar: InkResponse(
onTap:
......@@ -889,6 +892,7 @@ class _AddcommonpaymentState extends State<Addcommonpayment>{
),
),
),
),
);
},
);
......
lib/screens/commom/commonDashboard.dart
View file @ ecd8fcd1
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'package:generp/Notifiers/commonProvider/commonPagesProvider.dart';
......@@ -35,12 +37,14 @@ class _CommondashboardState extends State<Commondashboard> {
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, "Common"),
body: SafeArea(
child: GridView.builder(
body: GridView.builder(
padding: EdgeInsets.symmetric(vertical: 10, horizontal: 10),
itemCount: gridPages.length,
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
......@@ -89,7 +93,6 @@ class _CommondashboardState extends State<Commondashboard> {
);
},
),
),
floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat,
floatingActionButton:provider.accessPages
.any((page) => page.id==292)? InkResponse(
......@@ -119,6 +122,7 @@ class _CommondashboardState extends State<Commondashboard> {
),
):SizedBox(height: 0,),
),
),
);
}
);
......
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