Merge branch 'flutter_vervion_2_by_elham' into 'flutter_2_developemt'

d

See merge request Cloud_Solution/doctor_app_flutter!900
merge-requests/910/merge
Elham Ali 4 years ago
commit 707cede87c

@ -53,11 +53,9 @@ class ProjectViewModel with ChangeNotifier {
void loadSharedPrefLanguage() async {
currentLanguage = await sharedPref.getString(APP_Language);
_appLocale = Locale(currentLanguage);
_isArabic = currentLanguage != null
? currentLanguage == 'ar'
_isArabic = currentLanguage == 'ar'
? true
: false
: false;
: false;
notifyListeners();
}

@ -252,7 +252,7 @@ class _RegisterSearchPatientPageState extends State<RegisterSearchPatientPage> {
_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<RegisterSearchPatientPage> {
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()

@ -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<charts.Series> seriesList;
final List<Series<dynamic, num>> seriesList;
final String chartTitle;
final bool animate;
final bool includeArea;
@ -27,9 +29,10 @@ class AppLineChart extends StatelessWidget {
return Container(
child: Column(
children: <Widget>[
Text(
AppText(
chartTitle,
style: TextStyle(fontSize: 24.0, fontWeight: FontWeight.bold),
fontSize: 24,
fontWeight: FontWeight.bold
),
Expanded(
child: charts.LineChart(seriesList,

@ -299,7 +299,7 @@ class PatientCard extends StatelessWidget {
imageUrl: patientInfo
.nationalityFlagURL !=
null
? patientInfo.nationalityFlagURL
? patientInfo.nationalityFlagURL!
: '',
height: 25,
width: 30,

@ -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),

@ -24,7 +24,7 @@ class AppTextFieldCustom extends StatefulWidget {
final int? maxLines;
final List<TextInputFormatter>? inputFormatters;
final Function(String)? onChanged;
final Function? onFieldSubmitted;
final VoidCallback? onFieldSubmitted;
final String? validationError;
final bool? isPrscription;
@ -152,7 +152,7 @@ class _AppTextFieldCustomState extends State<AppTextFieldCustom> {
widget.onChanged!(value);
}
},
onFieldSubmitted: widget.onFieldSubmitted!(),
onFieldSubmitted: (_)=>widget.onFieldSubmitted,
obscureText: widget.isSecure!),
)
: AppText(

@ -23,7 +23,7 @@ class AppTextFieldCustomSearch extends StatelessWidget {
final TextEditingController? searchController;
final Function? onChangeFun;
final Function? onFieldSubmitted;
final Function(String)? onFieldSubmitted;
final Widget ?positionedChild;
final IconButton? suffixIcon;
@ -55,7 +55,7 @@ class AppTextFieldCustomSearch extends StatelessWidget {
),
controller: searchController,
onChanged: onChangeFun!(),
onFieldSubmitted: onFieldSubmitted,
onFieldSubmitted: ()=>onFieldSubmitted,
validationError: validationError),
if (positionedChild != null)
Positioned(right: 35, top: 5, child: positionedChild!)

@ -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

Loading…
Cancel
Save