From a578d92cb7a080ce2b874a362aa1adde7de01b71 Mon Sep 17 00:00:00 2001 From: Elham Rababh Date: Tue, 14 Dec 2021 15:25:50 +0200 Subject: [PATCH] fix the arabic issues --- .../doctor_replay/doctor_reply_screen.dart | 8 ++++-- .../In_patient/in_patient_screen.dart | 15 ++++++---- .../out_patient/out_patient_screen.dart | 14 ++++++---- .../referral/patient_referral_screen.dart | 10 +++++-- lib/util/helpers.dart | 28 +++++++++++++++---- 5 files changed, 53 insertions(+), 22 deletions(-) diff --git a/lib/screens/doctor/doctor_replay/doctor_reply_screen.dart b/lib/screens/doctor/doctor_replay/doctor_reply_screen.dart index d30457b4..7957d4bd 100644 --- a/lib/screens/doctor/doctor_replay/doctor_reply_screen.dart +++ b/lib/screens/doctor/doctor_replay/doctor_reply_screen.dart @@ -1,6 +1,7 @@ import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/viewModel/doctor_replay_view_model.dart'; +import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/doctor/doctor_replay/doctor_repaly_chat.dart'; import 'package:doctor_app_flutter/util/helpers.dart'; @@ -14,6 +15,7 @@ import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils import 'package:doctor_app_flutter/widgets/shared/text_fields/text_fields_utils.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; import 'all_doctor_questions.dart'; import 'not_replaied_Doctor_Questions.dart'; @@ -139,11 +141,13 @@ class _DoctorReplyScreenState extends State Widget tabWidget(Size screenSize, bool isActive, String title, {int counter = -1, bool isFirst = false, bool isMiddle = false, - bool isLast = false,context}) { + bool isLast = false,context, }) { + ProjectViewModel projectViewModel= Provider.of(context); + return Center( child: Container( height: Helpers.getTabHeight(context), - decoration: Helpers.getBoxTabsBoxDecoration(isActive: isActive,isFirst: isFirst, isMiddle: isMiddle, isLast: isLast), + decoration: Helpers.getBoxTabsBoxDecoration(isActive: isActive,isFirst: isFirst, isMiddle: isMiddle, isLast: isLast, projectViewModel: projectViewModel), child: Row( mainAxisAlignment: MainAxisAlignment.center, children: [ diff --git a/lib/screens/patients/In_patient/in_patient_screen.dart b/lib/screens/patients/In_patient/in_patient_screen.dart index ebb3118a..cadab9be 100644 --- a/lib/screens/patients/In_patient/in_patient_screen.dart +++ b/lib/screens/patients/In_patient/in_patient_screen.dart @@ -63,7 +63,6 @@ class _InPatientScreenState extends State Widget build(BuildContext context) { final screenSize = MediaQuery.of(context).size; PatientSearchRequestModel requestModel = PatientSearchRequestModel(); - ProjectViewModel projectsProvider = Provider.of(context); return BaseView( onModelReady: (model) async { @@ -142,13 +141,13 @@ class _InPatientScreenState extends State // unselectedLabelColor: Colors.grey[800], tabs: [ tabWidget(screenSize, _activeTab == 0, - TranslationBase.of(context).inPatientAll, + TranslationBase.of(context).inPatientAll,context: context, counter: model.inPatientList.length, isFirst: true), tabWidget(screenSize, _activeTab == 1, TranslationBase.of(context).myInPatientTitle, - counter: model.myIinPatientList.length, isMiddle: true), + counter: model.myIinPatientList.length, isMiddle: true, context: context,), tabWidget(screenSize, _activeTab == 2, - TranslationBase.of(context).discharged, isLast:true), + TranslationBase.of(context).discharged, isLast:true, context: context,), ], ), ), @@ -201,11 +200,15 @@ class _InPatientScreenState extends State {int counter = -1, bool isFirst = false, bool isMiddle = false, - bool isLast = false,}) { + bool isLast = false,BuildContext context}) { + + ProjectViewModel projectsProvider = Provider.of(context); + + return Center( child: Container( height: Helpers.getTabHeight(context), - decoration:Helpers.getBoxTabsBoxDecoration(isActive: isActive,isFirst: isFirst, isMiddle: isMiddle, isLast: isLast), + decoration:Helpers.getBoxTabsBoxDecoration(isActive: isActive,isFirst: isFirst, isMiddle: isMiddle, isLast: isLast,projectViewModel: projectsProvider), child: Row( mainAxisAlignment: MainAxisAlignment.center, children: [ diff --git a/lib/screens/patients/out_patient/out_patient_screen.dart b/lib/screens/patients/out_patient/out_patient_screen.dart index 59601ea7..a43a4582 100644 --- a/lib/screens/patients/out_patient/out_patient_screen.dart +++ b/lib/screens/patients/out_patient/out_patient_screen.dart @@ -147,19 +147,21 @@ class _OutPatientsScreenState extends State { isFirst: _times.indexOf(item) == 0, isLast: _times.indexOf(item) == _times.length - 1, - isMiddle: _times.indexOf(item) != 0 && _times.indexOf(item) != _times.length - 1 - - ), + isMiddle: _times.indexOf(item) != 0 && + _times.indexOf(item) != _times.length - 1, + projectViewModel: projectsProvider), child: Center( child: Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - Helpers.getTabText(title: item, isActive: _isActive), + Helpers.getTabText( + title: item, isActive: _isActive), _isActive && _activeLocation != 0 && model.state == ViewState.Idle - ? Helpers.getTabCounter(isActive:_isActive,counter: model.filterData.length) - + ? Helpers.getTabCounter( + isActive: _isActive, + counter: model.filterData.length) : Container(), ], ), diff --git a/lib/screens/patients/profile/referral/patient_referral_screen.dart b/lib/screens/patients/profile/referral/patient_referral_screen.dart index 4dab4270..59e58198 100644 --- a/lib/screens/patients/profile/referral/patient_referral_screen.dart +++ b/lib/screens/patients/profile/referral/patient_referral_screen.dart @@ -1,6 +1,7 @@ import 'dart:ui'; import 'package:doctor_app_flutter/config/size_config.dart'; +import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/screens/patients/patient_search/patient_search_header.dart'; import 'package:doctor_app_flutter/screens/patients/profile/referral/referred-patient-screen.dart'; import 'package:doctor_app_flutter/util/helpers.dart'; @@ -10,6 +11,7 @@ import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/text_fields_utils.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; import '../../ReferralDischargedPatientPage.dart'; import 'my-referral-inpatient-screen.dart'; @@ -45,6 +47,8 @@ class _PatientReferralScreen extends State @override Widget build(BuildContext context) { + ProjectViewModel projectsProvider = Provider.of(context); + return AppScaffold( isShowAppBar: true, appBar: PatientSearchHeader( @@ -75,7 +79,7 @@ class _PatientReferralScreen extends State tabs: [ Container( decoration: Helpers.getBoxTabsBoxDecoration( - isActive: index == 0, isFirst: true), + isActive: index == 0, isFirst: true, projectViewModel:projectsProvider ), child: Center( child: Helpers.getTabText(title:TranslationBase.of(context).myReferredPatient, isActive:index == 0 ) ), @@ -83,7 +87,7 @@ class _PatientReferralScreen extends State Center( child: Container( decoration:Helpers.getBoxTabsBoxDecoration( - isActive: index == 1, isMiddle: true), + isActive: index == 1, isMiddle: true, projectViewModel:projectsProvider ), child: Center( child:Helpers.getTabText(title:TranslationBase.of(context).referral, isActive:index == 1 ) ), @@ -92,7 +96,7 @@ class _PatientReferralScreen extends State Center( child: Container( decoration:Helpers.getBoxTabsBoxDecoration( - isActive: index == 2, isLast: true), + isActive: index == 2, isLast: true, projectViewModel:projectsProvider ), child: Center( child: Helpers.getTabText(title:TranslationBase.of(context).discharged, isActive:index == 2 ), ), diff --git a/lib/util/helpers.dart b/lib/util/helpers.dart index cdf45732..42816f9f 100644 --- a/lib/util/helpers.dart +++ b/lib/util/helpers.dart @@ -335,27 +335,45 @@ class Helpers { bool isMiddle = false, bool isLast = false, bool isActive = false, - double radius = 6.0}) { + double radius = 6.0, ProjectViewModel projectViewModel}) { return BoxDecoration( color: isActive ? AppGlobal.appRedColor : Color(0xFFEAEAEA), shape: BoxShape.rectangle, borderRadius: BorderRadius.only( - topRight: Radius.circular(isActive + topRight: projectViewModel.isArabic?Radius.circular(isActive + ? isLast || isMiddle + ? radius + : 0 + : 0):Radius.circular(isActive ? isFirst || isMiddle ? radius : 0 : 0), - topLeft: Radius.circular(isActive + + + topLeft: projectViewModel.isArabic? Radius.circular(isActive + ? isFirst || isMiddle + ? radius + : 0 + : 0):Radius.circular(isActive ? isLast || isMiddle ? radius : 0 : 0), - bottomRight: Radius.circular(isActive + bottomRight: projectViewModel.isArabic? Radius.circular(isActive + ? isLast || isMiddle + ? radius + : 0 + : 0): Radius.circular(isActive ? isFirst || isMiddle ? radius : 0 : 0), - bottomLeft: Radius.circular(isActive + bottomLeft:projectViewModel.isArabic? Radius.circular(isActive + ? isFirst || isMiddle + ? radius + : 0 + : 0): Radius.circular(isActive ? isLast || isMiddle ? radius : 0