Merge branch 'Dec_fixes' into 'development'

Dec fixes

See merge request Cloud_Solution/doctor_app_flutter!924
merge-requests/925/merge
Elham Ali 4 years ago
commit 10bbf51c52

@ -53,7 +53,7 @@ const Map<String, Map<String, String>> localizedValues = {
"service": {"en": "Service", "ar": "خدمة"}, "service": {"en": "Service", "ar": "خدمة"},
"referral": {"en": "Referral", "ar": "الإحالة"}, "referral": {"en": "Referral", "ar": "الإحالة"},
"inPatient": {"en": "In Patients", "ar": "مرضاي"}, "inPatient": {"en": "In Patients", "ar": "مرضاي"},
"myInPatient": {"en": "My\n Patients", "ar": "مرضاي\nالمنومين"}, "myInPatient": {"en": "My\n In Patients", "ar": "مرضاي\nالمنومين"},
"myInPatientTitle": {"en": "My Patients", "ar": "مرضاي المنومين"}, "myInPatientTitle": {"en": "My Patients", "ar": "مرضاي المنومين"},
"inPatientLabel": {"en": "InPatients", "ar": "المريض المنوم"}, "inPatientLabel": {"en": "InPatients", "ar": "المريض المنوم"},
"inPatientAll": {"en": "All Patients", "ar": "جميع المرضى المنومين"}, "inPatientAll": {"en": "All Patients", "ar": "جميع المرضى المنومين"},

@ -37,6 +37,7 @@ class _MyReferralInPatientScreenState extends State<MyReferralInPatientScreen> {
children: [ children: [
Container( Container(
margin: EdgeInsets.only(top: 70), margin: EdgeInsets.only(top: 70),
child: Container(
child: PatientTypeRadioWidget( child: PatientTypeRadioWidget(
(patientType) async { (patientType) async {
setState(() { setState(() {
@ -52,6 +53,7 @@ class _MyReferralInPatientScreenState extends State<MyReferralInPatientScreen> {
}, },
), ),
), ),
),
model.myReferralPatients.isEmpty model.myReferralPatients.isEmpty
? Center( ? Center(
child: Column( child: Column(
@ -73,6 +75,7 @@ class _MyReferralInPatientScreenState extends State<MyReferralInPatientScreen> {
) )
: Expanded( : Expanded(
child: SingleChildScrollView( child: SingleChildScrollView(
child: Container(
child: Container( child: Container(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@ -163,6 +166,7 @@ class _MyReferralInPatientScreenState extends State<MyReferralInPatientScreen> {
), ),
), ),
), ),
),
], ],
), ),
), ),

@ -3,6 +3,7 @@ import 'dart:ui';
import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/screens/patients/patient_search/patient_search_header.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/screens/patients/profile/referral/referred-patient-screen.dart';
import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
@ -45,20 +46,21 @@ class _PatientReferralScreen extends State<PatientReferralScreen>
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return AppScaffold( return AppScaffold(
isShowAppBar: true,
appBar: PatientSearchHeader( appBar: PatientSearchHeader(
title: TranslationBase.of(context).patientsreferral, title: TranslationBase.of(context).patientsreferral,
), ),
body: Column( appBarTitle: TranslationBase.of(context).patientsreferral,
children: <Widget>[ body: Scaffold(
Container( extendBodyBehindAppBar: true,
//height: MediaQuery.of(context).size.height * 0.050, // backgroundColor: Colors.white,
decoration: BoxDecoration( appBar: PreferredSize(
border: Border( preferredSize:
bottom: BorderSide( Size.fromHeight(MediaQuery.of(context).size.height * 0.070),
color: Theme.of(context).dividerColor, child: Center(
width: 1), //width: 0.7 child: Container(
), height: Helpers.getTabHeight(context),
color: Colors.white), child: Center(
child: TabBar( child: TabBar(
isScrollable: false, isScrollable: false,
controller: _tabController, controller: _tabController,
@ -71,83 +73,38 @@ class _PatientReferralScreen extends State<PatientReferralScreen>
unselectedLabelColor: Colors.grey[800], unselectedLabelColor: Colors.grey[800],
tabs: [ tabs: [
Container( Container(
width: MediaQuery.of(context).size.width * 0.33, decoration: Helpers.getBoxTabsBoxDecoration(
height: MediaQuery.of(context).size.height * 0.070, isActive: index == 0, isFirst: true),
decoration: TextFieldsUtils.containerBorderDecoration(
Color(0Xffffffff), Color(0xFFCCCCCC),
borderRadius: 4, borderWidth: 0),
child: Center( child: Center(
child: Container( child: Helpers.getTabText(title:TranslationBase.of(context).myReferredPatient, isActive:index == 0 )
height: MediaQuery.of(context).size.height * 0.070,
decoration: TextFieldsUtils.containerBorderDecoration(
index == 0 ? Color(0xFFD02127) : Color(0xFFEAEAEA),
index == 0 ? Color(0xFFD02127) : Color(0xFFEAEAEA),
borderRadius: 4,
borderWidth: 0),
child: Center(
child: AppText(
TranslationBase.of(context).myReferredPatient,
fontSize: SizeConfig.textMultiplier * 1.8,
color: index == 0 ? Colors.white : Color(0xFF2B353E),
fontWeight: FontWeight.w700,
),
),
),
), ),
), ),
Container( Center(
width: MediaQuery.of(context).size.width * 0.34,
height: MediaQuery.of(context).size.height * 0.070,
decoration: TextFieldsUtils.containerBorderDecoration(
Color(0Xffffffff), Color(0xFFCCCCCC),
borderRadius: 4, borderWidth: 0),
child: Center(
child: Container( child: Container(
height: MediaQuery.of(context).size.height * 0.070, decoration:Helpers.getBoxTabsBoxDecoration(
decoration: TextFieldsUtils.containerBorderDecoration( isActive: index == 1, isMiddle: true),
index == 1 ? Color(0xFFD02127) : Color(0xFFEAEAEA),
index == 1 ? Color(0xFFD02127) : Color(0xFFEAEAEA),
borderRadius: 4,
borderWidth: 0),
child: Center( child: Center(
child: AppText( child:Helpers.getTabText(title:TranslationBase.of(context).referral, isActive:index == 1 )
TranslationBase.of(context).referral,
fontSize: SizeConfig.textMultiplier * 1.8,
color: index == 1 ? Colors.white : Color(0xFF2B353E),
fontWeight: FontWeight.w700,
),
), ),
), ),
), ),
), Center(
Container(
width: MediaQuery.of(context).size.width * 0.33,
height: MediaQuery.of(context).size.height * 0.070,
decoration: TextFieldsUtils.containerBorderDecoration(
Color(0Xffffffff), Color(0xFFCCCCCC),
borderRadius: 4, borderWidth: 0),
child: Center(
child: Container( child: Container(
height: MediaQuery.of(context).size.height * 0.070, decoration:Helpers.getBoxTabsBoxDecoration(
decoration: TextFieldsUtils.containerBorderDecoration( isActive: index == 2, isLast: true),
index == 2 ? Color(0xFFD02127) : Color(0xFFEAEAEA),
index == 2 ? Color(0xFFD02127) : Color(0xFFEAEAEA),
borderRadius: 4,
borderWidth: 0),
child: Center( child: Center(
child: AppText( child: Helpers.getTabText(title:TranslationBase.of(context).discharged, isActive:index == 2 ),
TranslationBase.of(context).discharged,
fontSize: SizeConfig.textMultiplier * 1.8,
color: index == 2 ? Colors.white : Color(0xFF2B353E),
fontWeight: FontWeight.w700,
), ),
), ),
), ),
],
),
), ),
), ),
],
), ),
), ),
body: Column(
children: <Widget>[
Expanded( Expanded(
child: TabBarView( child: TabBarView(
physics: BouncingScrollPhysics(), physics: BouncingScrollPhysics(),
@ -162,6 +119,6 @@ class _PatientReferralScreen extends State<PatientReferralScreen>
) )
], ],
), ),
); ));
} }
} }

@ -1,3 +1,4 @@
import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -118,8 +119,9 @@ class MethodTypeCard extends StatelessWidget {
AppText( AppText(
label, label,
fontSize: SizeConfig.getTextMultiplierBasedOnWidth()* (SizeConfig.isHeightVeryShort?3:3.7), fontSize: SizeConfig.getTextMultiplierBasedOnWidth()* (SizeConfig.isHeightVeryShort?3:3.7),
color: Color(0xFF2B353E), color: AppGlobal.appTextColor,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w600,
letterSpacing: -0.48,
) )
], ],
), ),

@ -37,7 +37,9 @@ class GetActivityCard extends StatelessWidget {
AppText( AppText(
value.kPIParameter, value.kPIParameter,
textOverflow: TextOverflow.clip, textOverflow: TextOverflow.clip,
fontSize: SizeConfig.getTextMultiplierBasedOnWidth(width: width)* (SizeConfig.isHeightVeryShort?8: SizeConfig.isHeightShort?8: 9), fontHeight: 1.4,
fontSize: SizeConfig.getTextMultiplierBasedOnWidth(width: width)* (SizeConfig.isHeightVeryShort?8: SizeConfig.isHeightShort?8: 9.3),
color: AppGlobal.appTextColor, color: AppGlobal.appTextColor,
textAlign: TextAlign.start, textAlign: TextAlign.start,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,

@ -126,7 +126,7 @@ class GetOutPatientStack extends StatelessWidget {
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 2.5, fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 2.5,
textAlign: TextAlign.center, textAlign: TextAlign.center,
color: Color(0xFF2B353E), color: Color(0xFF2B353E),
fontWeight: FontWeight.w700, fontWeight: FontWeight.w500,
letterSpacing: -0.3, letterSpacing: -0.3,
), ),
AppText( AppText(

@ -55,7 +55,7 @@ class PatientReferralItemWidget extends StatelessWidget {
ProjectViewModel projectViewModel = Provider.of(context); ProjectViewModel projectViewModel = Provider.of(context);
return Container( return Container(
margin: EdgeInsets.only(left: 16.0, right: 16.0, top: 8.0), margin: EdgeInsets.only(left: 16.0, right: 16.0, top: 0.0),
child: Column( child: Column(
children: [ children: [
Container( Container(

@ -104,7 +104,6 @@ class PatientProfileButton extends StatelessWidget {
color: color ?? AppGlobal.appTextColor, color: color ?? AppGlobal.appTextColor,
letterSpacing: -0.33, letterSpacing: -0.33,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
textAlign: TextAlign.left, textAlign: TextAlign.left,
fontSize: SizeConfig.textMultiplier * 1.30, fontSize: SizeConfig.textMultiplier * 1.30,
), ),
@ -113,6 +112,7 @@ class PatientProfileButton extends StatelessWidget {
color: color ?? Color(0xFF2B353E), color: color ?? Color(0xFF2B353E),
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
textAlign: TextAlign.left, textAlign: TextAlign.left,
fontHeight: 1.4,
fontSize: SizeConfig.textMultiplier * 1.30, fontSize: SizeConfig.textMultiplier * 1.30,
), ),
if (isLoading) DrAppCircularProgressIndeicator() if (isLoading) DrAppCircularProgressIndeicator()

Loading…
Cancel
Save