From 70b3776aa77948055b4394873db7df7c274b2301 Mon Sep 17 00:00:00 2001 From: Elham Rababh Date: Thu, 9 Dec 2021 11:52:51 +0200 Subject: [PATCH] fix tabs --- .../referral/patient_referral_screen.dart | 111 ++++-------------- 1 file changed, 24 insertions(+), 87 deletions(-) diff --git a/lib/screens/patients/profile/referral/patient_referral_screen.dart b/lib/screens/patients/profile/referral/patient_referral_screen.dart index de1d5958..f4459dba 100644 --- a/lib/screens/patients/profile/referral/patient_referral_screen.dart +++ b/lib/screens/patients/profile/referral/patient_referral_screen.dart @@ -2,6 +2,7 @@ import 'dart:ui'; import 'package:doctor_app_flutter/config/size_config.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/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; @@ -17,10 +18,10 @@ class PatientReferralScreen extends StatefulWidget { _PatientReferralScreen createState() => _PatientReferralScreen(); } -class _PatientReferralScreen extends State with SingleTickerProviderStateMixin { - +class _PatientReferralScreen extends State + with SingleTickerProviderStateMixin { TabController _tabController; - int index=0; + int index = 0; @override void initState() { @@ -41,7 +42,6 @@ class _PatientReferralScreen extends State with SingleTic _tabController.dispose(); } - @override Widget build(BuildContext context) { return AppScaffold( @@ -51,17 +51,11 @@ class _PatientReferralScreen extends State with SingleTic extendBodyBehindAppBar: true, // backgroundColor: Colors.white, appBar: PreferredSize( - preferredSize: Size.fromHeight(MediaQuery.of(context).size.height * 0.070), + preferredSize: + Size.fromHeight(MediaQuery.of(context).size.height * 0.070), child: Center( child: Container( - height: MediaQuery.of(context).size.height * 0.070, - decoration: BoxDecoration( - border: Border( - bottom: BorderSide( - color: Theme.of(context).dividerColor, - width: 1), //width: 0.7 - ), - color: Colors.white), + height: Helpers.getTabHeight(context), child: Center( child: TabBar( isScrollable: false, @@ -69,93 +63,36 @@ class _PatientReferralScreen extends State with SingleTic indicatorColor: Colors.transparent, indicatorWeight: 1.0, indicatorSize: TabBarIndicatorSize.tab, - labelColor: Theme.of(context).primaryColor, - labelPadding: EdgeInsets.only(top: 0, left:0, right: 0,bottom: 0), + labelPadding: + EdgeInsets.only(top: 0, left: 0, right: 0, bottom: 0), unselectedLabelColor: Colors.grey[800], tabs: [ 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), + decoration: Helpers.getBoxTabsBoxDecoration( + isActive: index == 0, isFirst: true), child: Center( - child: Container( - 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, - ), - ), - ), + child: Helpers.getTabText(title:TranslationBase.of(context).myReferredPatient, isActive:index == 0 ) ), ), - Container( - 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( - height: MediaQuery.of(context).size.height * 0.070, - decoration: TextFieldsUtils.containerBorderDecoration( - index == 1 - ? Color(0xFFD02127 ) - : Color(0xFFEAEAEA), - index == 1 ? Color(0xFFD02127) : Color(0xFFEAEAEA), - borderRadius: 4, - borderWidth: 0), - child: Center( - child: AppText( - TranslationBase.of(context).referral, - fontSize: SizeConfig.textMultiplier * 1.8, - color: index == 1 ? Colors.white : Color(0xFF2B353E), - fontWeight: FontWeight.w700, - ), - ), + Center( + child: Container( + decoration:Helpers.getBoxTabsBoxDecoration( + isActive: index == 1, isMiddle: true), + child: Center( + child:Helpers.getTabText(title:TranslationBase.of(context).referral, isActive:index == 1 ) ), ), ), - 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( - height: MediaQuery.of(context).size.height * 0.070, - decoration: TextFieldsUtils.containerBorderDecoration( - index == 2 - ? Color(0xFFD02127 ) - : Color(0xFFEAEAEA), - index == 2 ? Color(0xFFD02127) : Color(0xFFEAEAEA), - borderRadius: 4, - borderWidth: 0), - child: Center( - child: AppText( - TranslationBase.of(context).discharged, - fontSize: SizeConfig.textMultiplier * 1.8, - color: index == 2 ? Colors.white : Color(0xFF2B353E), - fontWeight: FontWeight.w700, - ), - ), + Center( + child: Container( + decoration:Helpers.getBoxTabsBoxDecoration( + isActive: index == 2, isLast: true), + child: Center( + child: Helpers.getTabText(title:TranslationBase.of(context).discharged, isActive:index == 2 ), ), ), ), - ], ), ),