07-07-2025 By Sai Srinivas

Pubspec and Safe Area.

lib/screens/serviceEngineer/PCWallet.dart

+import 'dart:io';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:generp/Notifiers/PCWalletProvider.dart';
@@ -32,6 +34,9 @@ class _PcwalletState extends State<Pcwallet> {
         final groupedData = provider.groupByDate(provider.historyList);
         return WillPopScope(
           onWillPop: () => onBackPressed(context),
+          child: SafeArea(
+            top: false,
+            bottom: Platform.isIOS?false:true,
             child: Scaffold(
               resizeToAvoidBottomInset: true,
               appBar: AppBar(
@@ -94,8 +99,7 @@ class _PcwalletState extends State<Pcwallet> {
                 ),
               ),
               backgroundColor: AppColors.scaffold_bg_color,
-            body: SafeArea(
-              child: Container(
+              body: Container(
                 child: SingleChildScrollView(
                   child: Column(
                     children: [

lib/screens/serviceEngineer/PaymentDetails.dart

+import 'dart:io';
+
 import 'package:dropdown_button2/dropdown_button2.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
@@ -66,12 +68,14 @@ class _PaymentdetailsState extends State<Paymentdetails> {
                 widget.genId,
               );
             },
+            child: SafeArea(
+              top: false,
+              bottom: Platform.isIOS?false:true,
               child: Scaffold(
                 resizeToAvoidBottomInset: true,
                 appBar: appbar(context, "Payment Details"),
                 backgroundColor: AppColors.scaffold_bg_color,
-              body: SafeArea(
-                child: SingleChildScrollView(
+                body: SingleChildScrollView(
                   child: RefreshIndicator.adaptive(
                     color: AppColors.app_blue,
                     onRefresh: () async {
@@ -425,7 +429,6 @@ class _PaymentdetailsState extends State<Paymentdetails> {
                     ),
                   ),
                 ),
-              ),
                 floatingActionButtonLocation:
                     FloatingActionButtonLocation.centerFloat,
                 floatingActionButton: InkWell(
@@ -480,6 +483,7 @@ class _PaymentdetailsState extends State<Paymentdetails> {
                 ),
               ),
             ),
+          ),
         );
       },
     );

lib/screens/serviceEngineer/PendingComplaints.dart

+import 'dart:io';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:generp/Notifiers/PendingComplaintsProvider.dart';
@@ -36,6 +38,9 @@ class _PendingcomplaintsState extends State<Pendingcomplaints> {
       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,
@@ -55,9 +60,7 @@ class _PendingcomplaintsState extends State<Pendingcomplaints> {
                   child: SvgPicture.asset("assets/svg/scanner.svg"),
                 ),
               ),
-            body: SafeArea(
-              child:
-                  provider.technician_complaint_list.isNotEmpty
+              body: provider.technician_complaint_list.isNotEmpty
                   ? Container(
                     child: ListView.builder(
                       scrollDirection: Axis.vertical,

lib/screens/serviceEngineer/TodayMontlyVisists.dart

+import 'dart:io';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:generp/Utils/commonWidgets.dart';
@@ -46,12 +48,14 @@ class _TodaymontlyvisistsState extends State<Todaymontlyvisists> {
       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, provider.title),
-            body:SafeArea(child:
-            provider.visitsList.isNotEmpty
+              body:provider.visitsList.isNotEmpty
                   ? Container(
                 child: ListView.builder(
                   scrollDirection: Axis.vertical,
@@ -281,7 +285,8 @@ class _TodaymontlyvisistsState extends State<Todaymontlyvisists> {
                   },
                 ),
               )
-                : Emptywidget(context),)
+                  : Emptywidget(context)
+            ),
           ),
         );
       },

lib/screens/serviceEngineer/UpdateComplaints.dart

+import 'dart:io';
+
 import 'package:dropdown_button2/dropdown_button2.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
@@ -41,6 +43,9 @@ class _UpdatecomplaintsState extends State<Updatecomplaints> {
             provider.resetAll();
             return onBackPressed(context);
           },
+          child: SafeArea(
+            top: false,
+            bottom: Platform.isIOS?false:true,
             child: Scaffold(
               resizeToAvoidBottomInset: true,
               appBar: appbar2(
@@ -50,8 +55,7 @@ class _UpdatecomplaintsState extends State<Updatecomplaints> {
                 SizedBox(width: 0),
               ),
               backgroundColor: AppColors.scaffold_bg_color,
-            body: SafeArea(
-              child: Container(
+              body: Container(
                 padding: EdgeInsets.symmetric(horizontal: 10, vertical: 10),
                 decoration: BoxDecoration(
                   color: Colors.white,
@@ -389,7 +393,6 @@ class _UpdatecomplaintsState extends State<Updatecomplaints> {
                   ),
                 ),
               ),
-            ),
               floatingActionButtonLocation:
                   FloatingActionButtonLocation.centerFloat,
               floatingActionButton: InkResponse(
@@ -441,6 +444,7 @@ class _UpdatecomplaintsState extends State<Updatecomplaints> {
                 ),
               ),
             ),
+          ),
         );
       },
     );

lib/screens/serviceEngineer/VisitDetails.dart

+import 'dart:io';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:generp/Notifiers/VisitDetailsProvider.dart';
@@ -39,12 +41,14 @@ class _VisitdetailsState extends State<Visitdetails> {
         var complaintDetails = provider.complaintDetailsNew;
         return WillPopScope(
           onWillPop: () => onBackPressed(context),
+          child: SafeArea(
+            top: false,
+            bottom: Platform.isIOS?false:true,
             child: Scaffold(
               resizeToAvoidBottomInset: true,
               appBar: appbar(context, "Visit Details"),
               backgroundColor: AppColors.scaffold_bg_color,
-            body: SafeArea(
-              child: SizedBox(
+              body: SizedBox(
                 child: SingleChildScrollView(
                   child: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
@@ -313,7 +317,6 @@ class _VisitdetailsState extends State<Visitdetails> {
                   ),
                 ),
               ),
-            ),
               floatingActionButton: Align(
                 alignment: Alignment.bottomCenter,
                 child: InkWell(
@@ -352,6 +355,7 @@ class _VisitdetailsState extends State<Visitdetails> {
               floatingActionButtonLocation:
                   FloatingActionButtonLocation.centerFloat,
             ),
+          ),
         );
       },
     );

lib/screens/serviceEngineer/scanComplaintDetails.dart

+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 _ScancomplaintdetailsState extends State<Scancomplaintdetails> {
       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, "Pending Complaints"),
-            body: SafeArea(
-              child: Container(
+              body: Container(
                 decoration: BoxDecoration(color: Colors.black),
                 child: Column(
                   children: [

lib/screens/serviceEngineer/serviceEngineerDashboard.dart

+import 'dart:io';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:generp/Notifiers/ServiceEngineerDashboardProvider.dart';
@@ -32,6 +34,9 @@ class _ServiceengineerdashboardState extends State<Serviceengineerdashboard> {
       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,
@@ -94,8 +99,7 @@ class _ServiceengineerdashboardState extends State<Serviceengineerdashboard> {
                   ),
                 ),
               ),
-            body: SafeArea(
-              child: Container(
+              body: Container(
                 child: SingleChildScrollView(
                   child: Column(
                     children: [

lib/screens/splash.dart

@@ -139,10 +139,12 @@ class _SplashState extends State<Splash> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return SafeArea(
+      top: false,
+      bottom: Platform.isIOS?false:true,
+      child: Scaffold(
         resizeToAvoidBottomInset: true,
-      body: SafeArea(
-        child: Consumer<SplashVersionNotifier>(
+        body: Consumer<SplashVersionNotifier>(
           builder: (context, value, child) {
             return Container(
               alignment: Alignment.center,

lib/services/api_calling.dart

@@ -1730,6 +1730,7 @@ print("send otp:${data}");
         'approved_amount': approved_amount,
         'proposed_payment_account_id': proposed_payment_account_id,
       };
+        // print(data);
       final res = await post(data, approveRejectPaymentRequestSubmitUrl, {});
       if (res != null) {
         print(data);

pubspec.lock

@@ -37,10 +37,10 @@ packages:
     dependency: transitive
     description:
       name: async
-      sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb"
+      sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
       url: "https://pub.dev"
     source: hosted
-    version: "2.13.0"
+    version: "2.12.0"
   auto_size_text:
     dependency: "direct main"
     description:
@@ -293,10 +293,10 @@ packages:
     dependency: transitive
     description:
       name: fake_async
-      sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
+      sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.3"
+    version: "1.3.2"
   ffi:
     dependency: transitive
     description:
@@ -940,26 +940,26 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "8dcda04c3fc16c14f48a7bb586d4be1f0d1572731b6d81d51772ef47c02081e0"
+      sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
       url: "https://pub.dev"
     source: hosted
-    version: "11.0.1"
+    version: "10.0.8"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
+      sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.10"
+    version: "3.0.9"
   leak_tracker_testing:
     dependency: transitive
     description:
       name: leak_tracker_testing
-      sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
+      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.2"
+    version: "3.0.1"
   lints:
     dependency: transitive
     description:
@@ -1665,10 +1665,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02
+      sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
       url: "https://pub.dev"
     source: hosted
-    version: "15.0.0"
+    version: "14.3.1"
   web:
     dependency: transitive
     description:

pubspec.yaml

@@ -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
 # 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.
-version: 1.0.91+95
+version: 1.0.92+96
 
 environment:
   sdk: ^3.7.2
@@ -124,18 +124,6 @@ flutter:
   # "family" key with the font family name, and a "fonts" key with a
   # list giving the asset and other descriptors for the font. For
   # 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:
     - family: Nexa
       fonts: