diff --git a/images/splash.gif b/images/splash.gif new file mode 100644 index 0000000..b8b8bee Binary files /dev/null and b/images/splash.gif differ diff --git a/images/splash_screen_new.gif b/images/splash_screen_new.gif new file mode 100644 index 0000000..b0640d2 Binary files /dev/null and b/images/splash_screen_new.gif differ diff --git a/lib/common/splash_screen.dart b/lib/common/splash_screen.dart index 0798148..4bd1939 100644 --- a/lib/common/splash_screen.dart +++ b/lib/common/splash_screen.dart @@ -60,7 +60,7 @@ class _SplashScreenState extends State { loginCheck(); super.initState(); Future.delayed( - const Duration(seconds: 3), + const Duration(seconds: 5), () => Navigator.push( context, MaterialPageRoute(builder: (context) => _defaultHome), @@ -73,7 +73,7 @@ class _SplashScreenState extends State { children: [ Container( decoration: const BoxDecoration( - image: DecorationImage(image: AssetImage("images/splashscreen.png"), fit: BoxFit.fill,), + image: DecorationImage(image: AssetImage("images/splash_screen_new.gif"), fit: BoxFit.fill,), ), ), diff --git a/lib/models/dynamic_code_model.dart b/lib/models/dynamic_code_model.dart index a60f6ac..80585ee 100644 --- a/lib/models/dynamic_code_model.dart +++ b/lib/models/dynamic_code_model.dart @@ -2,6 +2,10 @@ class DynamicCodeModel { String doctorId = ''; String dynamicCode = ''; String recordId = ''; + String requestedDoctor = ''; + String problemDoctorName = ''; + String problem = ''; + String problemCategory = ''; DynamicCodeModel(); @@ -10,7 +14,11 @@ class DynamicCodeModel { rtvm.doctorId = json['doctorId'] ?? ''; rtvm.dynamicCode= json['dynamicCode']??''; - rtvm.recordId= json['recordId']??''; + rtvm.requestedDoctor=json['doctorDetails']['doctorName']??''; + rtvm.problem=json['recordDetails']['problem']??''; + rtvm.problemDoctorName=json['recordDetails']['doctorName']??''; + rtvm.problemCategory=json['recordDetails']['problemCategory']??''; + rtvm.recordId= json['recordDetails']['recordId']??''; return rtvm; } diff --git a/lib/my_connections/dynamic_code_doctor.dart b/lib/my_connections/dynamic_code_doctor.dart index 5a7256d..cd32420 100644 --- a/lib/my_connections/dynamic_code_doctor.dart +++ b/lib/my_connections/dynamic_code_doctor.dart @@ -101,67 +101,141 @@ class _DynamicCodeState extends State { Container( - child: Row( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, children: [ - Column( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.start, + Row( children: [ - Text( - 'Doctor Id', - style: labelTextStyle(), + Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + 'Requested Doctor', + style: labelTextStyle(), + ), + SizedBox(height:MediaQuery.of(context).size.height * .01,), + Text( + 'Dynamic code', + style: labelTextStyle(), + ), + SizedBox(height:MediaQuery.of(context).size.height * .01,), + Text( + 'Record Id', + style: labelTextStyle(), + ), + + ], ), - SizedBox(height:MediaQuery.of(context).size.height * .01,), - Text( - 'Dynamic code', - style: labelTextStyle(), + SizedBox(width:MediaQuery.of(context).size.width * .01,), + Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + ':', + style: labelTextStyle(), + ), + SizedBox(height:MediaQuery.of(context).size.height * .01,), + Text( + ':', + style: labelTextStyle(), + ), + SizedBox(height:MediaQuery.of(context).size.height * .01,), + Text( + ':', + style: labelTextStyle(), + ), + + + ], ), - SizedBox(height:MediaQuery.of(context).size.height * .01,), - Text( - 'Record Id', - style: labelTextStyle(), + SizedBox(width:MediaQuery.of(context).size.width * .01,), + Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text('Dr. '+originalList[index].requestedDoctor.toString().toUpperCase(),style: valuesTextStyle()), + SizedBox(height:MediaQuery.of(context).size.height * .01,), + Text( + originalList[index].dynamicCode, + style: valuesTextStyle(), + ), + SizedBox(height:MediaQuery.of(context).size.height * .01,), + Text( + originalList[index].recordId, + style: valuesTextStyle(), + ), + ], ), - ], ), - SizedBox(width:MediaQuery.of(context).size.width * .01,), - Column( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.start, + SizedBox(height:MediaQuery.of(context).size.height * .01,), + Text('Problem Details',style: problemTextStyle(),), + SizedBox(height:MediaQuery.of(context).size.height * .01,), + Row( children: [ - Text( - ':', - style: labelTextStyle(), - ), - SizedBox(height:MediaQuery.of(context).size.height * .01,), - Text( - ':', - style: labelTextStyle(), + Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + 'Problem', + style: labelTextStyle(), + ), + SizedBox(height:MediaQuery.of(context).size.height * .01,), + Text( + 'Doctor Name', + style: labelTextStyle(), + ), + SizedBox(height:MediaQuery.of(context).size.height * .01,), + Text( + 'Problem Category', + style: labelTextStyle(), + ), + + ], ), - SizedBox(height:MediaQuery.of(context).size.height * .01,), - Text( - ':', - style: labelTextStyle(), - ), - - - ], - ), - SizedBox(width:MediaQuery.of(context).size.width * .01,), - Column( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text(originalList[index].doctorId.toString().toUpperCase(),style: valuesTextStyle()), - SizedBox(height:MediaQuery.of(context).size.height * .01,), - Text( - originalList[index].dynamicCode, - style: valuesTextStyle(), + SizedBox(width:MediaQuery.of(context).size.width * .01,), + Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + ':', + style: labelTextStyle(), + ), + SizedBox(height:MediaQuery.of(context).size.height * .01,), + Text( + ':', + style: labelTextStyle(), + ), + SizedBox(height:MediaQuery.of(context).size.height * .01,), + Text( + ':', + style: labelTextStyle(), + ), + + + ], ), - SizedBox(height:MediaQuery.of(context).size.height * .01,), - Text( - originalList[index].recordId, - style: valuesTextStyle(), + SizedBox(width:MediaQuery.of(context).size.width * .01,), + Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text(originalList[index].problem.toString().toUpperCase(),style: valuesTextStyle()), + SizedBox(height:MediaQuery.of(context).size.height * .01,), + Text( + 'Dr. '+originalList[index].problemDoctorName.toUpperCase(), + style: valuesTextStyle(), + ), + SizedBox(height:MediaQuery.of(context).size.height * .01,), + Text( + originalList[index].problemCategory.toUpperCase(), + style: valuesTextStyle(), + ), + ], ), ], ),