diff --git a/lib/core/viewModels/AlHabibMedicalService/H2O_view_model.dart b/lib/core/viewModels/AlHabibMedicalService/H2O_view_model.dart index 23ee31c0..26f1bf0f 100644 --- a/lib/core/viewModels/AlHabibMedicalService/H2O_view_model.dart +++ b/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> createUserProgressForWeekDataSeries() { + List> createUserProgressForWeekDataSeries() { List 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( + Charts.series( id: 'Global Revenue', domainFn: (ChartSeries sales, _) => sales.y, measureFn: (ChartSeries sales, _) => sales.x, diff --git a/lib/core/viewModels/medical/vital_sign_view_model.dart b/lib/core/viewModels/medical/vital_sign_view_model.dart index b669c693..232246d4 100644 --- a/lib/core/viewModels/medical/vital_sign_view_model.dart +++ b/lib/core/viewModels/medical/vital_sign_view_model.dart @@ -19,7 +19,7 @@ class VitalSignViewModel extends BaseViewModel { String respirationBeatPerMinute = "0"; String bloodPressure = "0 / 0"; - getPatientVitalSign({int? appointmentNo, required int projectID}) async { + getPatientVitalSign({int? appointmentNo, int? projectID}) async { setState(ViewState.Busy); if (appointmentNo != null && projectID != null) { diff --git a/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/location_page.dart b/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/location_page.dart index 3930afca..1ac2f90d 100644 --- a/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/location_page.dart +++ b/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 { //Changed By Aamir _kGooglePlex.toMap() as Map, onCameraMove: (camera) { - _updatePosition(camera as CameraPosition); + print("Changed By Aamir"); + _updatePosition(camera); }, onMapCreated: () { currentPostion = LatLng(projectViewModel.latitude, projectViewModel.longitude); diff --git a/lib/pages/AlHabibMedicalService/h2o/h20_setting.dart b/lib/pages/AlHabibMedicalService/h2o/h20_setting.dart index ee7f03c3..bd6267f0 100644 --- a/lib/pages/AlHabibMedicalService/h2o/h20_setting.dart +++ b/lib/pages/AlHabibMedicalService/h2o/h20_setting.dart @@ -508,7 +508,9 @@ class _H2oSettingState extends State { 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), ) diff --git a/lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/bmi_calculator.dart b/lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/bmi_calculator.dart index cb91f85d..020f9abb 100644 --- a/lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/bmi_calculator.dart +++ b/lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/bmi_calculator.dart @@ -269,7 +269,9 @@ class _BMICalculatorState extends State { 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), ) diff --git a/lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_calculator.dart b/lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_calculator.dart index 0291f762..fbd0dffb 100644 --- a/lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_calculator.dart +++ b/lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_calculator.dart @@ -609,7 +609,9 @@ class _BmrCalculatorState extends State { 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), ) diff --git a/lib/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat.dart b/lib/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat.dart index da558d39..838fdfb3 100644 --- a/lib/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat.dart +++ b/lib/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat.dart @@ -630,7 +630,8 @@ class _BodyFatState extends State { child: PopupMenuButton( child: CommonDropDownView(TranslationBase.of(context).unit, unitTitle, (){}), onSelected: (value) { - onUnitTap(value); + print("Changed By Aamir"); + // onUnitTap(value); }, itemBuilder: (context) => _list), ) diff --git a/lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart b/lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart index f3f4589c..ca5bb4e0 100644 --- a/lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart +++ b/lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart @@ -557,7 +557,8 @@ class _CalorieCalculatorState extends State { child: PopupMenuButton( child: CommonDropDownView(TranslationBase.of(context).unit, unitTitle, (){}), onSelected: (value) { - onUnitTap(value); + print("Changed By Aamir"); + // onUnitTap(value); }, itemBuilder: (context) => _list), ) diff --git a/lib/pages/AlHabibMedicalService/health_calculator/ideal_body/ideal_body.dart b/lib/pages/AlHabibMedicalService/health_calculator/ideal_body/ideal_body.dart index 910bb4a1..6c63eed7 100644 --- a/lib/pages/AlHabibMedicalService/health_calculator/ideal_body/ideal_body.dart +++ b/lib/pages/AlHabibMedicalService/health_calculator/ideal_body/ideal_body.dart @@ -478,7 +478,9 @@ class _IdealBodyState extends State { child: PopupMenuButton( child: CommonDropDownView(TranslationBase.of(context).unit, unitTitle, (){}), onSelected: (value) { - onUnitTap(value); + + print("Changed By Aamir"); + // onUnitTap(value); }, itemBuilder: (context) => _list), ) diff --git a/lib/pages/ChildVaccines/child_vaccines_page.dart b/lib/pages/ChildVaccines/child_vaccines_page.dart index 5d6a62ea..d48811be 100644 --- a/lib/pages/ChildVaccines/child_vaccines_page.dart +++ b/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 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, diff --git a/lib/pages/ChildVaccines/new/child_initial_page.dart b/lib/pages/ChildVaccines/new/child_initial_page.dart index 127611dc..aba29817 100644 --- a/lib/pages/ChildVaccines/new/child_initial_page.dart +++ b/lib/pages/ChildVaccines/new/child_initial_page.dart @@ -76,8 +76,9 @@ class _ChildVaccinesPageState extends State 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, diff --git a/lib/pages/Covid-DriveThru/covid-dirvethru-questions.dart b/lib/pages/Covid-DriveThru/covid-dirvethru-questions.dart index 9c91aa6d..334bf759 100644 --- a/lib/pages/Covid-DriveThru/covid-dirvethru-questions.dart +++ b/lib/pages/Covid-DriveThru/covid-dirvethru-questions.dart @@ -235,7 +235,7 @@ class CovidDirveThruQuestionsState extends State { 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, diff --git a/lib/pages/ErService/rapid-response-team/rrt-pickup-address-page.dart b/lib/pages/ErService/rapid-response-team/rrt-pickup-address-page.dart index 3aee659f..b43c57b0 100644 --- a/lib/pages/ErService/rapid-response-team/rrt-pickup-address-page.dart +++ b/lib/pages/ErService/rapid-response-team/rrt-pickup-address-page.dart @@ -246,8 +246,8 @@ class RRTRequestPickupAddressPageState extends State { ), 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 { 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 { Spacer(), Container( height: 35, - color: Theme.of(context).appBarTheme.color, + color: Theme.of(context).appBarTheme.backgroundColor, width: 0.5, ), Container( diff --git a/lib/pages/landing/landing_page_pharmcy.dart b/lib/pages/landing/landing_page_pharmcy.dart index 429c7176..61ee9af0 100644 --- a/lib/pages/landing/landing_page_pharmcy.dart +++ b/lib/pages/landing/landing_page_pharmcy.dart @@ -77,7 +77,7 @@ class _LandingPagePharmacyState extends State { PharmacyPage(), PharmacyCategorisePage(), PharmacyProfilePage(moveToOrder: false, changeTab: changeCurrentTab), - CartOrderPage(changeTab: changeCurrentTab), + CartOrderPage(changeTab: changeCurrentTab), ], ), ), diff --git a/lib/pages/livecare/live_care_payment_page.dart b/lib/pages/livecare/live_care_payment_page.dart index cbca8e58..b6c0561d 100644 --- a/lib/pages/livecare/live_care_payment_page.dart +++ b/lib/pages/livecare/live_care_payment_page.dart @@ -51,7 +51,7 @@ class _LiveCarePatmentPageState extends State { showNewAppBar: true, description: TranslationBase.of(context).erConsultation, onTap: () { - Navigator.pop(context); + //Navigator.pop(context); Navigator.pop(context); }, body: Container( diff --git a/lib/pages/medical/smart_watch_health_data/steps/stepsTracker.dart b/lib/pages/medical/smart_watch_health_data/steps/stepsTracker.dart index aea6fe20..fcd87cfd 100644 --- a/lib/pages/medical/smart_watch_health_data/steps/stepsTracker.dart +++ b/lib/pages/medical/smart_watch_health_data/steps/stepsTracker.dart @@ -19,9 +19,9 @@ class StepsTracker extends StatefulWidget { } class _StepsTrackerState extends State with SingleTickerProviderStateMixin { - TabController _tabController; + late TabController _tabController; - ProjectViewModel projectViewModel; + late ProjectViewModel projectViewModel; int weeklyStatsAvgValue = 0; int monthlyStatsAvgValue = 0; @@ -129,7 +129,7 @@ class _StepsTrackerState extends State with SingleTickerProviderSt res['Med_GetWeekStepsTransactionsStsList'].forEach((element) { weekyStepsList.add(new WeeklyStepsResModel.fromJson(element)); if (element['Value'] != null) { - num value = num.tryParse(element['Value'] ?? "0"); + num value = num.tryParse(element['Value'] ?? "0")!; avgWeeklyStepsValue += value.toInt(); weeklyDataLength++; } @@ -158,7 +158,7 @@ class _StepsTrackerState extends State with SingleTickerProviderSt res['Med_GetMonthStepsTransactionsStsList'].forEach((element) { monthlyStepsList.add(new WeeklyStepsResModel.fromJson(element)); if (element['Value'] != null) { - num value = num.tryParse(element['Value'] ?? "0"); + num value = num.tryParse(element['Value'] ?? "0")!; avgMonthlyStepsValue += value.toInt(); monthlyDataLength++; } @@ -212,8 +212,8 @@ class _StepsTrackerState extends State with SingleTickerProviderSt (element) { weeklyTimeSeriesData.add( TimeSeriesSales2( - DateUtil.convertStringToDate(element.machineDate), - element.value != null ? element.value.toDouble() : 0.0, + DateUtil.convertStringToDate(element.machineDate!), + element.value != null ? element.value!.toDouble() : 0.0, ), ); }, @@ -228,8 +228,8 @@ class _StepsTrackerState extends State with SingleTickerProviderSt (element) { monthlyTimeSeriesData.add( TimeSeriesSales2( - DateUtil.convertStringToDate(element.machineDate), - element.value != null ? element.value.toDouble() : 0.0, + DateUtil.convertStringToDate(element.machineDate!), + element.value != null ? element.value!.toDouble() : 0.0, ), ); }, @@ -244,8 +244,8 @@ class _StepsTrackerState extends State with SingleTickerProviderSt (element) { yearlyTimeSeriesData.add( TimeSeriesSales2( - new DateTime(element.year, element.month, 1), - element.valueSum != null ? double.tryParse(element.valueSum.toString()) : 0.0, + DateTime(element.year!, element.month!, 1), + element.valueSum != null ? double.tryParse(element.valueSum.toString())! : 0.0, ), ); }, @@ -497,7 +497,7 @@ class _StepsTrackerState extends State with SingleTickerProviderSt children: [ Utils.tableColumnValue( '${DateUtil.getDayMonthYearDateFormatted( - new DateTime(step.year, step.month, 1), + new DateTime(step.year!, step.month!, 1), )} ', isCapitable: false, mProjectViewModel: projectViewModel), @@ -527,7 +527,7 @@ class _StepsTrackerState extends State with SingleTickerProviderSt children: [ Utils.tableColumnValue( '${DateUtil.getDayMonthYearDateFormatted( - DateUtil.convertStringToDate(step.machineDate), + DateUtil.convertStringToDate(step.machineDate!), )} ', isCapitable: false, mProjectViewModel: projectViewModel), @@ -557,7 +557,7 @@ class _StepsTrackerState extends State with SingleTickerProviderSt children: [ Utils.tableColumnValue( '${DateUtil.getDayMonthYearDateFormatted( - DateUtil.convertStringToDate(step.machineDate), + DateUtil.convertStringToDate(step.machineDate!), )} ', isCapitable: false, mProjectViewModel: projectViewModel), diff --git a/lib/pages/medical/vital_sign/vital_sign_details_screen.dart b/lib/pages/medical/vital_sign/vital_sign_details_screen.dart index c859c8b3..a2f07522 100644 --- a/lib/pages/medical/vital_sign/vital_sign_details_screen.dart +++ b/lib/pages/medical/vital_sign/vital_sign_details_screen.dart @@ -17,8 +17,8 @@ import 'package:flutter_svg/svg.dart'; class VitalSignDetailsScreen extends StatelessWidget { static const String url = "assets/images/"; - int appointmentNo; - int projectID; + int? appointmentNo; + int? projectID; bool isNotOneAppointment; VitalSignDetailsScreen({this.appointmentNo, this.projectID, this.isNotOneAppointment = true}); @@ -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( - 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( diff --git a/lib/pages/medical/vital_sign/vital_sign_details_wideget.dart b/lib/pages/medical/vital_sign/vital_sign_details_wideget.dart index 048f30f0..0daaf104 100644 --- a/lib/pages/medical/vital_sign/vital_sign_details_wideget.dart +++ b/lib/pages/medical/vital_sign/vital_sign_details_wideget.dart @@ -8,13 +8,13 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; class VitalSignDetailsWidget extends StatefulWidget { - final List vitalList; - final String title1; - final String title2; - final String viewKey; + final List? vitalList; + final String? title1; + final String? title2; + final String? viewKey; VitalSignDetailsWidget( - {Key key, this.vitalList, this.title1, this.title2, this.viewKey}); + {Key? key, this.vitalList, this.title1, this.title2, this.viewKey}); @override _VitalSignDetailsWidgetState createState() => _VitalSignDetailsWidgetState(); @@ -39,7 +39,7 @@ class _VitalSignDetailsWidgetState extends State { children: [ Table( border: TableBorder.symmetric( - inside: BorderSide(width: 2.0, color: Colors.grey[300]), + inside: BorderSide(width: 2.0, color: Colors.grey[300]!), ), children: fullData(projectViewModel), ), @@ -85,7 +85,7 @@ class _VitalSignDetailsWidgetState extends State { height: 60), ) ])); - widget.vitalList.forEach((vital) { + widget.vitalList!.forEach((vital) { var data = vital.toJson()[widget.viewKey]; if (data != 0) tableRow.add(TableRow(children: [ @@ -95,7 +95,7 @@ class _VitalSignDetailsWidgetState extends State { color: Colors.white, child: Center( child: Texts( - '${projectViewModel.isArabic ? DateUtil.getWeekDayArabic(vital.vitalSignDate.weekday) : DateUtil.getWeekDay(vital.vitalSignDate.weekday)}, ${vital.vitalSignDate.day} ${projectViewModel.isArabic ? DateUtil.getMonthArabic(vital.vitalSignDate.month) : DateUtil.getMonth(vital.vitalSignDate.month)}, ${vital.vitalSignDate.year} ', + '${projectViewModel.isArabic ? DateUtil.getWeekDayArabic(vital.vitalSignDate!.weekday) : DateUtil.getWeekDay(vital.vitalSignDate!.weekday)}, ${vital.vitalSignDate!.day} ${projectViewModel.isArabic ? DateUtil.getMonthArabic(vital.vitalSignDate!.month) : DateUtil.getMonth(vital.vitalSignDate!.month)}, ${vital.vitalSignDate!.year} ', textAlign: TextAlign.center, ), ), diff --git a/lib/pages/medical/vital_sign/vital_sign_item.dart b/lib/pages/medical/vital_sign/vital_sign_item.dart index 1549db39..9b89d7f7 100644 --- a/lib/pages/medical/vital_sign/vital_sign_item.dart +++ b/lib/pages/medical/vital_sign/vital_sign_item.dart @@ -8,14 +8,14 @@ import 'package:flutter_svg/flutter_svg.dart'; class VitalSignItem extends StatelessWidget { const VitalSignItem({ - Key key, - @required this.vitalSign, + Key? key, + required this.vitalSign, this.height, this.width, }) : super(key: key); - final double height; - final double width; + final double? height; + final double? width; final VitalSign vitalSign; @override diff --git a/lib/pages/medical/vital_sign/vital_sign_item_details_screen.dart b/lib/pages/medical/vital_sign/vital_sign_item_details_screen.dart index c3c85160..07d3b39f 100644 --- a/lib/pages/medical/vital_sign/vital_sign_item_details_screen.dart +++ b/lib/pages/medical/vital_sign/vital_sign_item_details_screen.dart @@ -8,11 +8,11 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; class VitalSignItemDetailsScreen extends StatelessWidget { - final VitalSignDetails pageKey; + final VitalSignDetails? pageKey; final String pageTitle; - List VSchart; + List? VSchart; - VitalSignItemDetailsScreen({this.vitalList, this.pageKey, this.pageTitle}); + VitalSignItemDetailsScreen({required this.vitalList, this.pageKey, required this.pageTitle}); final List vitalList; @@ -163,7 +163,7 @@ class VitalSignItemDetailsScreen extends StatelessWidget { showNewAppBar: true, body: ListView( - children: VSchart.map((chartInfo) { + children: VSchart!.map((chartInfo) { var vitalListTemp = vitalList.where( (element) => element.toJson()[chartInfo['viewKey']] != null, ); diff --git a/lib/pages/medical/vital_sign/vital_sing_chart_and_detials.dart b/lib/pages/medical/vital_sign/vital_sing_chart_and_detials.dart index 3211755c..56ea5cf6 100644 --- a/lib/pages/medical/vital_sign/vital_sing_chart_and_detials.dart +++ b/lib/pages/medical/vital_sign/vital_sing_chart_and_detials.dart @@ -14,12 +14,12 @@ import 'LineChartCurved.dart'; class VitalSingChartAndDetials extends StatefulWidget { VitalSingChartAndDetials({ - Key key, - @required this.vitalList, - @required this.name, - @required this.viewKey, - @required this.title1, - @required this.title2, + Key? key, + required this.vitalList, + required this.name, + required this.viewKey, + required this.title1, + required this.title2, }) : super(key: key); final List vitalList; @@ -35,7 +35,7 @@ class VitalSingChartAndDetials extends StatefulWidget { class _VitalSingChartAndDetialsState extends State { List timeSeriesData = []; bool isExpended = true; - ProjectViewModel projectViewModel; + late ProjectViewModel projectViewModel; @override void initState() { @@ -116,7 +116,7 @@ class _VitalSingChartAndDetialsState extends State { 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 { 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(), ), ); diff --git a/lib/pages/medical/vital_sign/vital_sing_chart_blood_pressure.dart b/lib/pages/medical/vital_sign/vital_sing_chart_blood_pressure.dart index 2d04e91a..4b29c9ec 100644 --- a/lib/pages/medical/vital_sign/vital_sing_chart_blood_pressure.dart +++ b/lib/pages/medical/vital_sign/vital_sing_chart_blood_pressure.dart @@ -12,14 +12,14 @@ import 'LineChartCurvedBloodPressure.dart'; class VitalSingChartBloodPressure extends StatelessWidget { VitalSingChartBloodPressure({ - Key key, - @required this.vitalList, - @required this.name, - @required this.viewKey1, - @required this.viewKey2, - @required this.title1, - @required this.title2, - @required this.title3, + Key? key, + required this.vitalList, + required this.name, + required this.viewKey1, + required this.viewKey2, + required this.title1, + required this.title2, + required this.title3, }) : super(key: key); final List vitalList; @@ -31,7 +31,7 @@ class VitalSingChartBloodPressure extends StatelessWidget { final String title3; List timeSeriesData1 = []; List 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)), @@ -131,14 +131,14 @@ class VitalSingChartBloodPressure extends StatelessWidget { if (element.toJson()[viewKey1]?.toInt() != 0) timeSeriesData1.add( TimeSeriesSales2( - new DateTime(element.vitalSignDate.year, element.vitalSignDate.month, element.vitalSignDate.day), + new DateTime(element.vitalSignDate!.year, element.vitalSignDate!.month, element.vitalSignDate!.day), element.toJson()[viewKey1].toDouble(), ), ); if (element.toJson()[viewKey2]?.toInt() != 0) timeSeriesData2.add( TimeSeriesSales2( - new DateTime(element.vitalSignDate.year, element.vitalSignDate.month, element.vitalSignDate.day), + new DateTime(element.vitalSignDate!.year, element.vitalSignDate!.month, element.vitalSignDate!.day), element.toJson()[viewKey2].toDouble(), ), ); diff --git a/lib/pages/packages_offers/PackageOrderCompletedPage.dart b/lib/pages/packages_offers/PackageOrderCompletedPage.dart index ee56d325..453de1fc 100644 --- a/lib/pages/packages_offers/PackageOrderCompletedPage.dart +++ b/lib/pages/packages_offers/PackageOrderCompletedPage.dart @@ -19,7 +19,7 @@ class PackageOrderCompletedPage extends StatelessWidget { String? subTitle; String? actionTitle; - PackageOrderCompletedPage({this.buttonWidth, this.buttonHeight, required this.heading, required this.title, required this.subTitle, this.actionTitle}); + PackageOrderCompletedPage({this.buttonWidth, this.buttonHeight, this.heading, this.title, this.subTitle, this.actionTitle}); @override Widget build(BuildContext context) { diff --git a/lib/pages/pharmacies/medicine_search_screen.dart b/lib/pages/pharmacies/medicine_search_screen.dart index 49fd1be8..e76425a4 100644 --- a/lib/pages/pharmacies/medicine_search_screen.dart +++ b/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, diff --git a/lib/pages/pharmacies/screens/cart-page/cart-order-page.dart b/lib/pages/pharmacies/screens/cart-page/cart-order-page.dart index f5d0391c..d44cb426 100644 --- a/lib/pages/pharmacies/screens/cart-page/cart-order-page.dart +++ b/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(); diff --git a/lib/pages/pharmacies/search_brands_page.dart b/lib/pages/pharmacies/search_brands_page.dart index b8a5152d..44e261d6 100644 --- a/lib/pages/pharmacies/search_brands_page.dart +++ b/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 { 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, diff --git a/lib/pages/pharmacy/profile/profile.dart b/lib/pages/pharmacy/profile/profile.dart index b47e5456..5583a9ac 100644 --- a/lib/pages/pharmacy/profile/profile.dart +++ b/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}); diff --git a/lib/pages/search_products_page.dart b/lib/pages/search_products_page.dart index 6f428e4b..974b5b98 100644 --- a/lib/pages/search_products_page.dart +++ b/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 { 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, diff --git a/lib/uitl/location_util.dart b/lib/uitl/location_util.dart index 6a94e87b..94381ad2 100644 --- a/lib/uitl/location_util.dart +++ b/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); } diff --git a/lib/widgets/app_map/google_huawei_map.dart b/lib/widgets/app_map/google_huawei_map.dart index 1ae54f79..35d3a24a 100644 --- a/lib/widgets/app_map/google_huawei_map.dart +++ b/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; diff --git a/lib/widgets/others/app_scaffold_widget.dart b/lib/widgets/others/app_scaffold_widget.dart index 89e80792..501dc12f 100644 --- a/lib/widgets/others/app_scaffold_widget.dart +++ b/lib/widgets/others/app_scaffold_widget.dart @@ -242,7 +242,7 @@ class _AppScaffoldState extends State { 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? dropDownList; final void Function(int?)? dropDownIndexChange; final List? appBarIcons; + VoidCallbackAction? onTap; NewAppBarWidget({Key? key, this.showTitle = false, this.showDropDown = false, this.title = "", this.dropDownList, this.appBarIcons, this.dropdownIndexValue, this.dropDownIndexChange, this.onTap})