diff --git a/lib/screens/patients/register_patient/RegisterSearchPatientPage.dart b/lib/screens/patients/register_patient/RegisterSearchPatientPage.dart index 556d6748..975ef30e 100644 --- a/lib/screens/patients/register_patient/RegisterSearchPatientPage.dart +++ b/lib/screens/patients/register_patient/RegisterSearchPatientPage.dart @@ -252,7 +252,7 @@ class _RegisterSearchPatientPageState extends State { _birthDateInGregorian = selectedDate; birthDateInHijri = HijriCalendar() .gregorianToHijri(selectedDate.year, - selectedDate.month, selectedDate.day); + selectedDate.month, selectedDate.day) as HijriCalendar; print(_birthDateInGregorian); print(birthDateInHijri); @@ -384,7 +384,7 @@ class _RegisterSearchPatientPageState extends State { Function(dynamic) updateDate) async { if (calenderType == CalenderType.Hijri) { HijriCalendar hijriDate = HijriCalendar.fromDate(DateTime.now()); - final HijriCalendar pickedH = await showHijriDatePicker( + final HijriCalendar? pickedH = await showHijriDatePicker( context: context, initialDate: birthDateInHijri ?? hijriDate, lastDate: new HijriCalendar() diff --git a/lib/widgets/charts/app_line_chart.dart b/lib/widgets/charts/app_line_chart.dart index e3265595..b6c9fb3f 100644 --- a/lib/widgets/charts/app_line_chart.dart +++ b/lib/widgets/charts/app_line_chart.dart @@ -1,4 +1,6 @@ import 'package:charts_flutter/flutter.dart' as charts; +import 'package:charts_flutter/flutter.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:flutter/material.dart'; /// chart line @@ -8,7 +10,7 @@ import 'package:flutter/material.dart'; /// [includeArea] chart include Area /// [stacked] stacked chart over the design class AppLineChart extends StatelessWidget { - final List seriesList; + final List> seriesList; final String chartTitle; final bool animate; final bool includeArea; @@ -27,9 +29,10 @@ class AppLineChart extends StatelessWidget { return Container( child: Column( children: [ - Text( + AppText( chartTitle, - style: TextStyle(fontSize: 24.0, fontWeight: FontWeight.bold), + fontSize: 24, + fontWeight: FontWeight.bold ), Expanded( child: charts.LineChart(seriesList, diff --git a/lib/widgets/patients/patient_card/PatientCard.dart b/lib/widgets/patients/patient_card/PatientCard.dart index 65876517..2e6010ce 100644 --- a/lib/widgets/patients/patient_card/PatientCard.dart +++ b/lib/widgets/patients/patient_card/PatientCard.dart @@ -299,7 +299,7 @@ class PatientCard extends StatelessWidget { imageUrl: patientInfo .nationalityFlagURL != null - ? patientInfo.nationalityFlagURL + ? patientInfo.nationalityFlagURL! : '', height: 25, width: 30, diff --git a/lib/widgets/shared/bottom_navigation_item.dart b/lib/widgets/shared/bottom_navigation_item.dart index 37dbe28c..eed6ebc4 100644 --- a/lib/widgets/shared/bottom_navigation_item.dart +++ b/lib/widgets/shared/bottom_navigation_item.dart @@ -73,7 +73,7 @@ class BottomNavigationItem extends StatelessWidget { toAnimate: false, position: BadgePosition.topEnd(), shape: BadgeShape.circle, - badgeColor: Colors.red[800], + badgeColor: Colors.red[800]!, borderRadius: BorderRadius.circular(8), badgeContent: Container( // padding: EdgeInsets.all(2.0), diff --git a/pubspec.yaml b/pubspec.yaml index b67d4eb5..98f5a7d5 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -40,7 +40,7 @@ dependencies: connectivity: ^3.0.6 maps_launcher: ^2.0.0 url_launcher: ^6.0.6 - charts_flutter: ^0.10.0 + charts_flutter: ^0.12.0 flutter_swiper: ^1.1.6 #Icons eva_icons_flutter: ^3.0.0 @@ -99,15 +99,15 @@ dependencies: html_editor_enhanced: ^2.1.1 #Network Image - cached_network_image: ^2.5.0 + cached_network_image: ^3.1.0+1 # Badges - badges: ^1.1.4 + badges: ^2.0.1 # Hijri # hijri: ^2.0.3 - hijri_picker: ^2.0.0 + hijri_picker: ^3.0.0