Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6

# Conflicts:
#	lib/pages/livecare/live_care_payment_page.dart
#	lib/pages/medical/smart_watch_health_data/steps/stepsTracker.dart
#	lib/pages/medical/vital_sign/vital_sign_details_screen.dart
#	lib/pages/medical/vital_sign/vital_sign_item_details_screen.dart
#	lib/pages/medical/vital_sign/vital_sing_chart_and_detials.dart
#	lib/pages/medical/vital_sign/vital_sing_chart_blood_pressure.dart

lib/core/viewModels/AlHabibMedicalService/H2O_view_model.dart

@@ -1,6 +1,6 @@
 import 'dart:math' as math;
 
-import 'package:flutter_charts/flutter_charts.dart' as charts;
+import 'package:flutter_charts/flutter_charts.dart' as Charts;
 import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
 import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/H2O/insert_user_activity_request_model.dart';
 import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/H2O/user_detail_model.dart';
@@ -94,7 +94,7 @@ class H2OViewModel extends BaseViewModel {
     }
   }
 
-  List<charts.Series<ChartSeries, String>> createUserProgressForWeekDataSeries() {
+  List<Charts.<ChartSeries, String>> createUserProgressForWeekDataSeries() {
     List<ChartSeries> globalData = [];
     _h2OService.userProgressForWeekDataList.forEach((UserProgressForWeekDataModel data) {
       globalData.add(new ChartSeries(data.dayName!, data.percentageConsumed!));
@@ -108,7 +108,7 @@ class H2OViewModel extends BaseViewModel {
       minValue = -1;
     }
     return [
-      new charts.series<ChartSeries, String>(
+       Charts.series<ChartSeries, String>(
         id: 'Global Revenue',
         domainFn: (ChartSeries sales, _) => sales.y,
         measureFn: (ChartSeries sales, _) => sales.x,

lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/location_page.dart

@@ -29,6 +29,7 @@ import 'package:provider/provider.dart';
 
 class LocationPage extends StatefulWidget {
   final Function(PickResult)? onPick;
+
   // final double latitude;
   // final double longitude;
   final dynamic model;
@@ -76,7 +77,8 @@ class _LocationPageState extends State<LocationPage> {
         //Changed By Aamir
         _kGooglePlex.toMap() as Map<dynamic, dynamic>,
         onCameraMove: (camera) {
-          _updatePosition(camera as CameraPosition);
+          print("Changed By Aamir");
+          _updatePosition(camera);
         },
         onMapCreated: () {
           currentPostion = LatLng(projectViewModel.latitude, projectViewModel.longitude);

lib/pages/AlHabibMedicalService/h2o/h20_setting.dart

@@ -508,7 +508,9 @@ class _H2oSettingState extends State<H2oSetting> {
           child: PopupMenuButton(
               child: CommonDropDownView(TranslationBase.of(context).unit, unitTitle, (){}),
               onSelected: (value) {
-                onUnitTap(value);
+                print("Changed By Aamir");
+                // Changed By Aamir
+               /// onUnitTap(value);
               },
               itemBuilder: (context) => _list),
         )

lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/bmi_calculator.dart

@@ -269,7 +269,9 @@ class _BMICalculatorState extends State<BMICalculator> {
           child: PopupMenuButton(
               child: CommonDropDownView(TranslationBase.of(context).unit, unitTitle, (){}),
               onSelected: (value) {
-                onUnitTap(value);
+                // Changed By Aamir
+                print("Changed By Aamir");
+                // onUnitTap(value);
               },
               itemBuilder: (context) => _list),
         )

lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_calculator.dart

@@ -609,7 +609,9 @@ class _BmrCalculatorState extends State<BmrCalculator> {
           child: PopupMenuButton(
               child: CommonDropDownView(TranslationBase.of(context).unit, unitTitle, (){}),
               onSelected: (value) {
-                onUnitTap(value);
+                //Changed By Aamir
+                print("Changed By Aamir");
+               // onUnitTap(value);
               },
               itemBuilder: (context) => _list),
         )

lib/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat.dart

@@ -630,7 +630,8 @@ class _BodyFatState extends State<BodyFat> {
           child: PopupMenuButton(
               child: CommonDropDownView(TranslationBase.of(context).unit, unitTitle, (){}),
               onSelected: (value) {
-                onUnitTap(value);
+                print("Changed By Aamir");
+             //   onUnitTap(value);
               },
               itemBuilder: (context) => _list),
         )

lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart

@@ -557,7 +557,8 @@ class _CalorieCalculatorState extends State<CalorieCalculator> {
           child: PopupMenuButton(
               child: CommonDropDownView(TranslationBase.of(context).unit, unitTitle, (){}),
               onSelected: (value) {
-                onUnitTap(value);
+                print("Changed By Aamir");
+               // onUnitTap(value);
               },
               itemBuilder: (context) => _list),
         )

lib/pages/AlHabibMedicalService/health_calculator/ideal_body/ideal_body.dart

@@ -478,7 +478,9 @@ class _IdealBodyState extends State<IdealBody> {
           child: PopupMenuButton(
               child: CommonDropDownView(TranslationBase.of(context).unit, unitTitle, (){}),
               onSelected: (value) {
-                onUnitTap(value);
+
+                print("Changed By Aamir");
+            //    onUnitTap(value);
               },
               itemBuilder: (context) => _list),
         )

lib/pages/ChildVaccines/child_vaccines_page.dart

@@ -12,6 +12,8 @@ import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
+import '../Blood/new_text_Field.dart';
+
 class ChildVaccinesPage extends StatefulWidget {
   @override
   _ChildVaccinesPageState createState() => _ChildVaccinesPageState();
@@ -84,8 +86,8 @@ class _ChildVaccinesPageState extends State<ChildVaccinesPage> with SingleTicker
                 padding: const EdgeInsets.all(10.0),
                 child: Container(
                   margin: EdgeInsets.only(left: 10, right: 10, top: 15),
-                  child: TextFields(
-                    fillColor: Colors.red,
+                  child: NewTextFields(
+                   // fillColor: Colors.red,
                     hintText: model.user != null ? model.user!.emailAddress : "",
                     controller: titleController,
                     fontSize: 20,

lib/pages/ChildVaccines/new/child_initial_page.dart

@@ -76,8 +76,9 @@ class _ChildVaccinesPageState extends State<ChildInitialPage> with SingleTickerP
                   SizedBox(
                     height: 20,
                   ),
-                  TextFields(
-                    fillColor: Colors.red,
+                  NewTextFields(
+                  ///  fillColor: Colors.red,
+                    //Changed By Aamir
                     hintText: model.user != null ? model.user!.emailAddress : "",
                     controller: titleController,
                     fontSize: 14,

lib/pages/Covid-DriveThru/covid-dirvethru-questions.dart

@@ -235,7 +235,7 @@ class CovidDirveThruQuestionsState extends State<CovidDirveThruQuestions> {
                     height: 50,
                     elevation: 0,
                     color: all2 ? CustomColors.accentColor : CustomColors.grey,
-                    disabledColor: Theme.of(context).appBarTheme.color!.withOpacity(0.25),
+                    disabledColor: Theme.of(context).appBarTheme.backgroundColor!.withOpacity(0.25),
                     shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)),
                     child: Text(
                       localize.next,

lib/pages/ErService/rapid-response-team/rrt-pickup-address-page.dart

@@ -245,8 +245,8 @@ class RRTRequestPickupAddressPageState extends State<RRTRequestPickupAddressPage
       child: Container(
         width: size,
         height: size,
-        decoration: BoxDecoration(borderRadius: BorderRadius.circular(20), border: Border.all(width: 2, color: Theme.of(context).appBarTheme.color!)),
-        child: Container(margin: EdgeInsets.all(margin), decoration: BoxDecoration(color: Theme.of(context).appBarTheme.color, borderRadius: BorderRadius.circular(20))),
+        decoration: BoxDecoration(borderRadius: BorderRadius.circular(20), border: Border.all(width: 2, color: Theme.of(context).appBarTheme.backgroundColor!)),
+        child: Container(margin: EdgeInsets.all(margin), decoration: BoxDecoration(color: Theme.of(context).appBarTheme.backgroundColor, borderRadius: BorderRadius.circular(20))),
       ),
     );
   }

lib/pages/ErService/rapid-response-team/rrt-request-page.dart

@@ -126,13 +126,13 @@ class RRTRequestPageState extends State<RRTRequestPage> {
               ),
               priceTable(context),
               acceptPolicy(),
-              Container(height: 0.5, color: Theme.of(context).appBarTheme.color), //  Seperator
+              Container(height: 0.5, color: Theme.of(context).appBarTheme.backgroundColor), //  Seperator
 
               Container(
                   padding: EdgeInsets.only(top: 20, bottom: 5),
                   alignment: Alignment.center,
                   child: Text(TranslationBase.of(context).youCanPayByTheFollowingOptions,
-                      style: TextStyle(fontSize: 13, color: Theme.of(context).appBarTheme.color, fontWeight: FontWeight.w500), maxLines: 2)),
+                      style: TextStyle(fontSize: 13, color: Theme.of(context).appBarTheme.backgroundColor, fontWeight: FontWeight.w500), maxLines: 2)),
 
               Container(margin: EdgeInsets.only(left: 15.0, right: 15.0, top: 10.0), child: getPaymentMethods())
             ],
@@ -173,15 +173,15 @@ class RRTRequestPageState extends State<RRTRequestPage> {
       children: [
         Container(
           height: 30,
-          decoration: BoxDecoration(color: Theme.of(context).appBarTheme.color, borderRadius: BorderRadius.only(topLeft: radius, topRight: radius)),
+          decoration: BoxDecoration(color: Theme.of(context).appBarTheme.backgroundColor, borderRadius: BorderRadius.only(topLeft: radius, topRight: radius)),
           child: Center(child: Text(TranslationBase.of(context).approximateServiceFee, style: TextStyle(color: Colors.white, fontSize: 12, fontWeight: FontWeight.w500, letterSpacing: 1))),
         ),
         pricingRow(label: TranslationBase.of(context).patientShare, value: '$amount ${TranslationBase.of(context).sar}'),
-        Container(height: 0.5, color: Theme.of(context).appBarTheme.color),
+        Container(height: 0.5, color: Theme.of(context).appBarTheme.backgroundColor),
         pricingRow(label: TranslationBase.of(context).patientTaxToDo, value: '$vat ${TranslationBase.of(context).sar}'),
-        Container(height: 0.5, color: Theme.of(context).appBarTheme.color),
+        Container(height: 0.5, color: Theme.of(context).appBarTheme.backgroundColor),
         pricingRow(label: TranslationBase.of(context).patientShareWithTax, value: '$total ${TranslationBase.of(context).sar}', labelBold: true),
-        Container(height: 0.5, color: Theme.of(context).appBarTheme.color),
+        Container(height: 0.5, color: Theme.of(context).appBarTheme.backgroundColor),
       ],
     );
   }
@@ -196,7 +196,7 @@ class RRTRequestPageState extends State<RRTRequestPage> {
           Spacer(),
           Container(
             height: 35,
-            color: Theme.of(context).appBarTheme.color,
+            color: Theme.of(context).appBarTheme.backgroundColor,
             width: 0.5,
           ),
           Container(

lib/pages/landing/landing_page_pharmcy.dart

@@ -77,7 +77,7 @@ class _LandingPagePharmacyState extends State<LandingPagePharmacy> {
             PharmacyPage(),
             PharmacyCategorisePage(),
             PharmacyProfilePage(moveToOrder: false, changeTab: changeCurrentTab),
-            CartOrderPage(changeTab: changeCurrentTab),
+            CartOrderPage(changeTab:  changeCurrentTab),
           ],
         ),
       ),

lib/pages/livecare/live_care_payment_page.dart

@@ -50,10 +50,10 @@ class _LiveCarePatmentPageState extends State<LiveCarePatmentPage> {
       showNewAppBarTitle: true,
       showNewAppBar: true,
       description: TranslationBase.of(context).erConsultation,
-      // onTap: () {
-      //   Navigator.pop(context);
-      //   Navigator.pop(context);
-      // },
+      onTap: () {
+        //Navigator.pop(context);
+        Navigator.pop(context);
+      },
       body: Container(
         width: double.infinity,
         height: double.infinity,

lib/pages/medical/smart_watch_health_data/steps/stepsTracker.dart

@@ -19,9 +19,9 @@ class StepsTracker extends StatefulWidget {
 }
 
 class _StepsTrackerState extends State<StepsTracker> with SingleTickerProviderStateMixin {
-  TabController? _tabController;
+  late TabController _tabController;
 
-  ProjectViewModel? projectViewModel;
+  late ProjectViewModel projectViewModel;
 
   int weeklyStatsAvgValue = 0;
   int monthlyStatsAvgValue = 0;
@@ -76,13 +76,13 @@ class _StepsTrackerState extends State<StepsTracker> with SingleTickerProviderSt
             unselectedLabelColor: Color(0xff575757),
             labelPadding: EdgeInsets.only(top: 0, bottom: 0, left: 20, right: 20),
             labelStyle: TextStyle(
-              fontFamily: projectViewModel!.isArabic ? 'Cairo' : 'Poppins',
+              fontFamily: projectViewModel.isArabic ? 'Cairo' : 'Poppins',
               fontSize: 16,
               fontWeight: FontWeight.w600,
               letterSpacing: -0.48,
             ),
             unselectedLabelStyle: TextStyle(
-              fontFamily: projectViewModel!.isArabic ? 'Cairo' : 'Poppins',
+              fontFamily: projectViewModel.isArabic ? 'Cairo' : 'Poppins',
               fontSize: 16,
               fontWeight: FontWeight.w600,
               letterSpacing: -0.48,
@@ -129,7 +129,7 @@ class _StepsTrackerState extends State<StepsTracker> with SingleTickerProviderSt
       res['Med_GetWeekStepsTransactionsStsList'].forEach((element) {
         weekyStepsList.add(new WeeklyStepsResModel.fromJson(element));
         if (element['Value'] != null) {
-          num value = num.parse(element['Value'] ?? "0");
+          num value = num.tryParse(element['Value'] ?? "0")!;
           avgWeeklyStepsValue += value.toInt();
           weeklyDataLength++;
         }
@@ -158,7 +158,7 @@ class _StepsTrackerState extends State<StepsTracker> with SingleTickerProviderSt
       res['Med_GetMonthStepsTransactionsStsList'].forEach((element) {
         monthlyStepsList.add(new WeeklyStepsResModel.fromJson(element));
         if (element['Value'] != null) {
-          num value = num.parse(element['Value'] ?? "0");
+          num value = num.tryParse(element['Value'] ?? "0")!;
           avgMonthlyStepsValue += value.toInt();
           monthlyDataLength++;
         }
@@ -244,8 +244,8 @@ class _StepsTrackerState extends State<StepsTracker> with SingleTickerProviderSt
         (element) {
           yearlyTimeSeriesData.add(
             TimeSeriesSales2(
-              new DateTime(element.year!, element.month!, 1),
-              element.valueSum! != null ? double.parse(element.valueSum.toString()) : 0.0,
+               DateTime(element.year!, element.month!, 1),
+              element.valueSum != null ? double.tryParse(element.valueSum.toString())! : 0.0,
             ),
           );
         },

lib/pages/medical/vital_sign/vital_sign_details_screen.dart

@@ -44,7 +44,7 @@ class VitalSignDetailsScreen extends StatelessWidget {
     imagesInfo.add(ImagesInfo(
         imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-vital-signs/en/1.png', imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-vital-signs/ar/1.png'));
     return BaseView<VitalSignViewModel>(
-      onModelReady: appointmentNo != null && projectID != null ? (model) => model.getPatientVitalSign(appointmentNo: appointmentNo, projectID: projectID!) : (model) => model!.getPatientVitalSign(),
+      onModelReady: appointmentNo != null && projectID != null ? (model) => model.getPatientVitalSign(appointmentNo: appointmentNo, projectID: projectID!) : (model) => model.getPatientVitalSign(),
       builder: (_, mode, widget) {
         initList(context, mode);
         return AppScaffold(

lib/pages/medical/vital_sign/vital_sign_item_details_screen.dart

@@ -9,12 +9,12 @@ import 'package:provider/provider.dart';
 
 class VitalSignItemDetailsScreen extends StatelessWidget {
   final VitalSignDetails? pageKey;
-  final String? pageTitle;
+  final String pageTitle;
   List<Map>? VSchart;
 
-  VitalSignItemDetailsScreen({this.vitalList, this.pageKey, this.pageTitle});
+  VitalSignItemDetailsScreen({required this.vitalList, this.pageKey, required this.pageTitle});
 
-  final List<VitalSignResModel>? vitalList;
+  final List<VitalSignResModel> vitalList;
 
   @override
   Widget build(BuildContext context) {
@@ -157,20 +157,20 @@ class VitalSignItemDetailsScreen extends StatelessWidget {
       default:
     }
     return AppScaffold(
-      appBarTitle: pageTitle!,
+      appBarTitle: pageTitle,
       isShowAppBar: true,
       showNewAppBarTitle: true,
       showNewAppBar: true,
 
       body: ListView(
         children: VSchart!.map((chartInfo) {
-          var vitalListTemp = vitalList!.where(
+          var vitalListTemp = vitalList.where(
             (element) => element.toJson()[chartInfo['viewKey']] != null,
           );
 
           if (vitalListTemp.length != 0 && chartInfo['viewKey'] == 'BloodPressure') {
             return VitalSingChartBloodPressure(
-              vitalList: vitalList!,
+              vitalList: vitalList,
               name: projectViewModel.isArabic ? chartInfo['nameAr'] : chartInfo['name'],
               title1: chartInfo['title1'],
               title2: projectViewModel.isArabic ? chartInfo['title2Ar'] : chartInfo['title2'],
@@ -182,7 +182,7 @@ class VitalSignItemDetailsScreen extends StatelessWidget {
 
           return vitalListTemp.length != 0
               ? VitalSingChartAndDetials(
-                  vitalList: vitalList!,
+                  vitalList: vitalList,
                   name: projectViewModel.isArabic ? chartInfo['nameAr'] : chartInfo['name'],
                   title1: chartInfo['title1'],
                   title2: projectViewModel.isArabic ? chartInfo['title2Ar'] : chartInfo['title2'],

lib/pages/medical/vital_sign/vital_sing_chart_and_detials.dart

@@ -35,7 +35,7 @@ class VitalSingChartAndDetials extends StatefulWidget {
 class _VitalSingChartAndDetialsState extends State<VitalSingChartAndDetials> {
   List<TimeSeriesSales2> timeSeriesData = [];
   bool isExpended = true;
-  ProjectViewModel? projectViewModel;
+  late ProjectViewModel projectViewModel;
 
   @override
   void initState() {
@@ -116,7 +116,7 @@ class _VitalSingChartAndDetialsState extends State<VitalSingChartAndDetials> {
           TableRow(
             children: [
               Utils.tableColumnValue(
-                  "${projectViewModel!.isArabic ? DateUtil.getWeekDayArabic(labResultList[i].vitalSignDate!.weekday) : DateUtil.getWeekDay(labResultList[i].vitalSignDate!.weekday)}, ${labResultList[i].vitalSignDate!.day} ${projectViewModel!.isArabic ? DateUtil.getMonthArabic(labResultList[i].vitalSignDate!.month) : DateUtil.getMonth(labResultList[i].vitalSignDate!.month)}, ${labResultList[i].vitalSignDate!.year}",
+                  "${projectViewModel.isArabic ? DateUtil.getWeekDayArabic(labResultList[i].vitalSignDate!.weekday) : DateUtil.getWeekDay(labResultList[i].vitalSignDate!.weekday)}, ${labResultList[i].vitalSignDate!.day} ${projectViewModel.isArabic ? DateUtil.getMonthArabic(labResultList[i].vitalSignDate!.month) : DateUtil.getMonth(labResultList[i].vitalSignDate!.month)}, ${labResultList[i].vitalSignDate!.year}",
                   isLast: i == (labResultList.length - 1)),
               Utils.tableColumnValue('${labResultList[i].toJson()[widget.viewKey]}', isLast: i == (labResultList.length - 1)),
             ],
@@ -134,7 +134,7 @@ class _VitalSingChartAndDetialsState extends State<VitalSingChartAndDetials> {
           if (element.toJson()[widget.viewKey] != null && element.toJson()[widget.viewKey]?.toInt() != 0)
             timeSeriesData.add(
               TimeSeriesSales2(
-                new DateTime(element.vitalSignDate!.year, element.vitalSignDate!.month, element.vitalSignDate!.day),
+                DateTime(element.vitalSignDate!.year, element.vitalSignDate!.month, element.vitalSignDate!.day),
                 element.toJson()[widget.viewKey].toDouble(),
               ),
             );

lib/pages/medical/vital_sign/vital_sing_chart_blood_pressure.dart

@@ -31,7 +31,7 @@ class VitalSingChartBloodPressure extends StatelessWidget {
   final String title3;
   List<TimeSeriesSales2> timeSeriesData1 = [];
   List<TimeSeriesSales2> timeSeriesData2 = [];
-  ProjectViewModel? projectViewModel;
+  late ProjectViewModel projectViewModel;
 
   @override
   Widget build(BuildContext context) {
@@ -112,7 +112,7 @@ class VitalSingChartBloodPressure extends StatelessWidget {
           TableRow(
             children: [
               Utils.tableColumnValue(
-                  "${projectViewModel!.isArabic ? DateUtil.getWeekDayArabic(labResultList[i].vitalSignDate!.weekday) : DateUtil.getWeekDay(labResultList[i].vitalSignDate!.weekday)}, ${labResultList[i].vitalSignDate!.day} ${projectViewModel!.isArabic ? DateUtil.getMonthArabic(labResultList[i].vitalSignDate!.month) : DateUtil.getMonth(labResultList[i].vitalSignDate!.month)}, ${labResultList[i].vitalSignDate!.year}",
+                  "${projectViewModel.isArabic ? DateUtil.getWeekDayArabic(labResultList[i].vitalSignDate!.weekday) : DateUtil.getWeekDay(labResultList[i].vitalSignDate!.weekday)}, ${labResultList[i].vitalSignDate!.day} ${projectViewModel.isArabic ? DateUtil.getMonthArabic(labResultList[i].vitalSignDate!.month) : DateUtil.getMonth(labResultList[i].vitalSignDate!.month)}, ${labResultList[i].vitalSignDate!.year}",
                   isLast: i == (labResultList.length - 1)),
               Utils.tableColumnValue('${labResultList[i].toJson()[viewKey1]}', isLast: i == (labResultList.length - 1)),
               Utils.tableColumnValue('${labResultList[i].toJson()[viewKey2]}', isLast: i == (labResultList.length - 1)),

lib/pages/pharmacies/medicine_search_screen.dart

@@ -13,6 +13,7 @@ import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
+import '../Blood/new_text_Field.dart';
 import '../base/base_view.dart';
 
 class MedicineSearch extends StatelessWidget {
@@ -42,7 +43,7 @@ class MedicineSearch extends StatelessWidget {
                       ),
                       child: Form(
                         key: _formKey,
-                        child: TextFields(
+                        child: NewTextFields(
                           hintText:
                               TranslationBase.of(context).searchMedicineHere,
                           inputAction: TextInputAction.search,

lib/pages/pharmacies/screens/cart-page/cart-order-page.dart

@@ -22,9 +22,9 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
 class CartOrderPage extends StatefulWidget {
-  final VoidCallbackAction? changeTab;
+    final dynamic? changeTab;
 
-  const CartOrderPage({Key? key, this.changeTab}) : super(key: key);
+   CartOrderPage({Key? key,  this.changeTab}) : super(key: key);
 
   @override
   _CartOrderPageState createState() => _CartOrderPageState();

lib/pages/pharmacies/search_brands_page.dart

@@ -12,6 +12,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
 
+import '../Blood/new_text_Field.dart';
+
 class SearchBrandsPage extends StatefulWidget {
   @override
   _SearchBrandsPageState createState() => _SearchBrandsPageState();
@@ -48,7 +50,7 @@ class _SearchBrandsPageState extends State<SearchBrandsPage> {
                         width: MediaQuery.of(context).size.width * 0.79,
                         child: Form(
                           key: _formKey,
-                          child: TextFields(
+                          child: NewTextFields(
                             autoFocus: true,
                             hintText: TranslationBase.of(context).search,
                             fontSize: 19.0,

lib/pages/pharmacy/profile/profile.dart

@@ -30,7 +30,7 @@ dynamic languageID;
 
 class PharmacyProfilePage extends StatefulWidget {
   final bool moveToOrder;
-  final VoidCallbackAction? changeTab;
+  final dynamic changeTab;
 
   PharmacyProfilePage({required this.moveToOrder, this.changeTab});
 

lib/pages/search_products_page.dart

@@ -18,6 +18,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
 
+import 'Blood/new_text_Field.dart';
 import 'base/base_view.dart';
 import 'package:intl/intl.dart' as international;
 
@@ -58,7 +59,7 @@ class _SearchProductsPageState extends State<SearchProductsPage> {
                         width: MediaQuery.of(context).size.width * 0.70,
                         child: Form(
                           key: _formKey,
-                          child: TextFields(
+                          child: NewTextFields(
                             autoFocus: true,
                             hintText: TranslationBase.of(context).search,
                             fontSize: 14.5,

lib/uitl/location_util.dart

@@ -40,9 +40,7 @@ class LocationUtils {
 
             if (permission == LocationPermission.denied || permission == LocationPermission.deniedForever) {
               if (Platform.isAndroid) {
-                Utils.showPermissionConsentDialog(context, TranslationBase
-                    .of(context)
-                    .locationPermissionDialog, () async {
+                Utils.showPermissionConsentDialog(context, TranslationBase.of(context).locationPermissionDialog, () async {
                   final hasPermission = await _handlePermission();
                   if (hasPermission) {
                     Geolocator.getCurrentPosition(desiredAccuracy: LocationAccuracy.medium, timeLimit: Duration(seconds: 10)).then((value) {
@@ -54,9 +52,7 @@ class LocationUtils {
                   }
                 });
               } else {
-                if (await Permission.location
-                    .request()
-                    .isGranted) {
+                if (await Permission.location.request().isGranted) {
                   getCurrentLocation(callBack: callBack);
                 } else {
                   setZeroLocation();
@@ -122,7 +118,8 @@ class LocationUtils {
               Location location = locationResult.lastLocation!;
               locationService.removeLocationUpdatesCb(_locationUpdateCbId);
               callBack(LatLng(location.latitude!, location.longitude!));
-              setLocation(Position(
+              setLocation(
+                Position(
                   latitude: location.latitude!,
                   longitude: location.longitude!,
                   altitude: location.altitude!,
@@ -131,7 +128,11 @@ class LocationUtils {
                   heading: 0.0,
                   speed: 0.0,
                   speedAccuracy: 1,
-               ));
+                  altitudeAccuracy: 0,
+                  headingAccuracy: 0,
+                  // Added by Aamir
+                ),
+              );
             }, onLocationAvailability: (locationAvailability) {
               print("onLocationAvailability: $locationAvailability");
             }));
@@ -155,18 +156,10 @@ class LocationUtils {
   showErrorLocationDialog(bool isPermissionError) {
     ConfirmDialog dialog = new ConfirmDialog(
         context: context,
-        confirmMessage: TranslationBase
-            .of(context)
-            .locationDialogMessage,
-        okText: TranslationBase
-            .of(context)
-            .confirm,
-        cancelText: TranslationBase
-            .of(context)
-            .cancel_nocaps,
-        okFunction: () =>
-        {ConfirmDialog.closeAlertDialog(context), if (isPermissionError) Geolocator.openAppSettings() else
-          Geolocator.openLocationSettings(), Navigator.of(context).canPop()},
+        confirmMessage: TranslationBase.of(context).locationDialogMessage,
+        okText: TranslationBase.of(context).confirm,
+        cancelText: TranslationBase.of(context).cancel_nocaps,
+        okFunction: () => {ConfirmDialog.closeAlertDialog(context), if (isPermissionError) Geolocator.openAppSettings() else Geolocator.openLocationSettings(), Navigator.of(context).canPop()},
         cancelFunction: () => {});
     return dialog.showAlertDialog(context);
   }

lib/widgets/app_map/google_huawei_map.dart

@@ -10,7 +10,7 @@ import 'package:huawei_hmsavailability/huawei_hmsavailability.dart';
 import 'package:huawei_map/huawei_map.dart' as hmsMap;
 
 class AppMap extends StatefulWidget {
-  late VoidCallback onCameraMove;
+  late dynamic onCameraMove;
   late Map initialCamera;
 
   AppMapState? _state;

lib/widgets/others/app_scaffold_widget.dart

@@ -242,7 +242,7 @@ class _AppScaffoldState extends State<AppScaffold> {
                         dropDownList: widget.dropDownList! ?? [],
                         dropDownIndexChange: widget.dropDownIndexChange,
                         appBarIcons: widget.appBarIcons!,
-                        onTap: widget.onTap!,
+                        onTap:widget.onTap,
                       ))
                   : (widget.isShowAppBar!
                       ? widget.customAppBar != null
@@ -338,6 +338,7 @@ class NewAppBarWidget extends StatelessWidget implements PreferredSizeWidget {
   List<String>? dropDownList;
   final void Function(int?)? dropDownIndexChange;
   final List<Widget>? appBarIcons;
+  
   VoidCallbackAction? onTap;
 
   NewAppBarWidget({Key? key, this.showTitle = false, this.showDropDown = false, this.title = "", this.dropDownList, this.appBarIcons, this.dropdownIndexValue, this.dropDownIndexChange, this.onTap})