From d5d57e7997be8a67d007c07c9b943d49270294ac Mon Sep 17 00:00:00 2001 From: Elham Rababah Date: Sun, 2 May 2021 13:20:28 +0300 Subject: [PATCH] fix new design issue --- ios/Podfile.lock | 2 +- lib/config/config.dart | 2 +- lib/config/localized_values.dart | 2 +- lib/landing_page.dart | 2 +- lib/screens/doctor/doctor_reply_screen.dart | 2 +- .../out_patient/out_patient_screen.dart | 42 +++++++++++++++---- .../assessment/add_assessment_details.dart | 1 + .../update_Chief_complaints.dart | 42 ++++++++++++------- lib/widgets/shared/app_drawer_widget.dart | 4 -- lib/widgets/shared/drawer_item_widget.dart | 4 -- 10 files changed, 67 insertions(+), 36 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 878a1850..2f4607e0 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -322,4 +322,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 649616dc336b3659ac6b2b25159d8e488e042b69 -COCOAPODS: 1.10.1 +COCOAPODS: 1.10.0.rc.1 diff --git a/lib/config/config.dart b/lib/config/config.dart index 9596a029..07151d1d 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -336,7 +336,7 @@ const TRANSACTION_NO = 0; const LANGUAGE_ID = 2; const STAMP = '2020-04-27T12:17:17.721Z'; const IP_ADDRESS = '9.9.9.9'; -const VERSION_ID = 5.8; +const VERSION_ID = 5.9; const CHANNEL = 9; const SESSION_ID = 'BlUSkYymTt'; const IS_LOGIN_FOR_DOCTOR_APP = true; diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index d5999b21..c2d77da5 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -847,7 +847,7 @@ const Map> localizedValues = { "en": "Apply Reschedule Leave", "ar": "التقدم بطلب أو إعادة جدولة الإجازة" }, - "myQRCode": {"en": "My QR Code", "ar": "My QR Code"}, + "myQRCode": {"en": "My QR Code", "ar": " كود QR "}, "patientIDMobilenational": { "en": "Patient ID, National ID, Mobile Number", "ar": "هوية المريض ، الهوية الوطنية ، رقم الهاتف المحمول" diff --git a/lib/landing_page.dart b/lib/landing_page.dart index 99e1694f..13d4e92b 100644 --- a/lib/landing_page.dart +++ b/lib/landing_page.dart @@ -90,7 +90,7 @@ class _LandingPageState extends State { case 2: return TranslationBase.of(context).qr; case 3: - return TranslationBase.of(context).replay; + return TranslationBase.of(context).replay2; } } } diff --git a/lib/screens/doctor/doctor_reply_screen.dart b/lib/screens/doctor/doctor_reply_screen.dart index f522561f..dcbe9667 100644 --- a/lib/screens/doctor/doctor_reply_screen.dart +++ b/lib/screens/doctor/doctor_reply_screen.dart @@ -34,7 +34,7 @@ class DoctorReplyScreen extends StatelessWidget { }, child: AppScaffold( baseViewModel: model, - appBarTitle: TranslationBase.of(context).replay2, + appBarTitle: "ghgh",//TranslationBase.of(context).replay2, isShowAppBar: false, body: model.listDoctorWorkingHoursTable.isEmpty ? DrAppEmbeddedError(error: TranslationBase.of(context).noItem) diff --git a/lib/screens/patients/out_patient/out_patient_screen.dart b/lib/screens/patients/out_patient/out_patient_screen.dart index 4d0ce94a..e2e6e94c 100644 --- a/lib/screens/patients/out_patient/out_patient_screen.dart +++ b/lib/screens/patients/out_patient/out_patient_screen.dart @@ -109,7 +109,7 @@ class _OutPatientsScreenState extends State { baseViewModel: model, body: Column( children: [ - Container( + Container( // color: Colors.red, height: screenSize.height * 0.070, decoration: TextFieldsUtils @@ -155,11 +155,40 @@ class _OutPatientsScreenState extends State { borderRadius: 4, borderWidth: 0), child: Center( - child: AppText( - item, - fontSize: SizeConfig.textMultiplier * 1.8, - color: _isActive ? Colors.white : Color(0xFF2B353E), - fontWeight: FontWeight.w700, + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + AppText( + item, + fontSize: SizeConfig.textMultiplier * 1.8, + color: _isActive ? Colors.white : Color(0xFF2B353E), + fontWeight: FontWeight.w700, + ), + _isActive&&_activeLocation!=0 ?Container( + padding: EdgeInsets.all(2), + margin: EdgeInsets.symmetric(horizontal: 5), + decoration: + new BoxDecoration( + color: Colors.white, + borderRadius: + BorderRadius.circular( + 50), + ), + constraints: BoxConstraints( + minWidth: 20, + minHeight: 20, + ), + child: new Text( + model.filterData.length.toString(), + style: new TextStyle( + color: Colors.red, + fontSize: 10 + ), + textAlign: + TextAlign.center, + ), + ):Container(), + ], ), ), ), @@ -169,7 +198,6 @@ class _OutPatientsScreenState extends State { }).toList(), ), ), - SizedBox(height: 18.5), Container( width: SizeConfig.screenWidth * 0.9, diff --git a/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart b/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart index 87015bbb..47d639ad 100644 --- a/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart +++ b/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart @@ -351,6 +351,7 @@ class _AddAssessmentDetailsState extends State { hintText: TranslationBase.of(context).remarks, maxLines: 18, minLines: 5, + inputType: TextInputType.multiline, controller: remarkController, onChanged: (value) { widget.mySelectedAssessment.remark = diff --git a/lib/screens/patients/profile/soap_update/subjective/cheif_complaints/update_Chief_complaints.dart b/lib/screens/patients/profile/soap_update/subjective/cheif_complaints/update_Chief_complaints.dart index 216fbd53..0e5e6ec1 100644 --- a/lib/screens/patients/profile/soap_update/subjective/cheif_complaints/update_Chief_complaints.dart +++ b/lib/screens/patients/profile/soap_update/subjective/cheif_complaints/update_Chief_complaints.dart @@ -40,22 +40,28 @@ class UpdateChiefComplaints extends StatelessWidget { maxLines: 25, minLines: 7, hasBorder: true, - validationError:complaintsControllerError !=''?complaintsControllerError:null , - + inputType: TextInputType.multiline, + validationError: complaintsControllerError != '' + ? complaintsControllerError + : null, ), SizedBox( height: 20, ), AppTextFieldCustom( - hintText: TranslationBase - .of(context) - .historyOfPresentIllness, - controller: illnessController, - maxLines: 25, - minLines: 7, + hintText: TranslationBase + .of(context) + .historyOfPresentIllness, + controller: illnessController, + inputType: TextInputType.multiline, + + maxLines: 25, + minLines: 7, hasBorder: true, - validationError:illnessControllerError !=''?illnessControllerError:null , + validationError: illnessControllerError != '' + ? illnessControllerError + : null, ), SizedBox( height: 10, @@ -67,14 +73,18 @@ class UpdateChiefComplaints extends StatelessWidget { height: 10, ), AppTextFieldCustom( - hintText: TranslationBase - .of(context) - .currentMedications, - controller: medicationController, + hintText: TranslationBase + .of(context) + .currentMedications, + controller: medicationController, maxLines: 25, - minLines: 7, - hasBorder: true, - validationError:medicationControllerError !=''?medicationControllerError:null , + minLines: 7, + hasBorder: true, + inputType: TextInputType.multiline, + + validationError: medicationControllerError != '' + ? medicationControllerError + : null, ), SizedBox( diff --git a/lib/widgets/shared/app_drawer_widget.dart b/lib/widgets/shared/app_drawer_widget.dart index 8509bc95..ebb49e6f 100644 --- a/lib/widgets/shared/app_drawer_widget.dart +++ b/lib/widgets/shared/app_drawer_widget.dart @@ -16,9 +16,6 @@ import 'app_texts_widget.dart'; DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); -// OWNER : Ibrahim albitar -// DATE : 06-04-2020 -// DESCRIPTION : Custom App Drawer for app. class AppDrawer extends StatefulWidget { @override @@ -26,7 +23,6 @@ class AppDrawer extends StatefulWidget { } class _AppDrawerState extends State { - bool _isInit = true; Helpers helpers = new Helpers(); ProjectViewModel projectsProvider; diff --git a/lib/widgets/shared/drawer_item_widget.dart b/lib/widgets/shared/drawer_item_widget.dart index 6b8e8d48..2b8ce40d 100644 --- a/lib/widgets/shared/drawer_item_widget.dart +++ b/lib/widgets/shared/drawer_item_widget.dart @@ -5,10 +5,6 @@ import 'package:flutter/material.dart'; import '../shared/app_texts_widget.dart'; -// OWNER : Ibrahim albitar -// DATE : 08-04-2020 -// DESCRIPTION : Custom Drawer item for app. - class DrawerItem extends StatefulWidget { final String title; final String subTitle;