fix button size

merge-requests/935/head
Elham Rababh 4 years ago
parent c35e24219c
commit 193aed6504

@ -183,7 +183,6 @@ class _UCAFPagerScreenState extends State<UCAFPagerScreen>
borderColor: Colors.white, borderColor: Colors.white,
color: Colors.white, color: Colors.white,
fontColor: Color(0xFFB8382B), fontColor: Color(0xFFB8382B),
fontSize: 2.2,
onPressed: () { onPressed: () {
Navigator.of(context).popUntil((route) { Navigator.of(context).popUntil((route) {
return route.settings.name == PATIENTS_PROFILE; return route.settings.name == PATIENTS_PROFILE;
@ -205,7 +204,6 @@ class _UCAFPagerScreenState extends State<UCAFPagerScreen>
borderColor: Color(0xFFB8382B), borderColor: Color(0xFFB8382B),
color: AppGlobal.appRedColor, color: AppGlobal.appRedColor,
fontColor: Colors.white, fontColor: Colors.white,
fontSize: 2.0,
onPressed: () { onPressed: () {
model.saveUCAFOnTap(); model.saveUCAFOnTap();
}, },

@ -253,7 +253,7 @@ class _PatientProfileScreenState extends State<PatientProfileScreen>
radius: 30, radius: 30,
hPadding: 20, hPadding: 20,
fontWeight: FontWeight.normal, fontWeight: FontWeight.normal,
fontSize: 1.6, // fontSize: 1.6,
icon: Image.asset( icon: Image.asset(
"assets/images/create-episod.png", "assets/images/create-episod.png",
color: Colors.white, color: Colors.white,
@ -289,7 +289,7 @@ class _PatientProfileScreenState extends State<PatientProfileScreen>
radius: 30, radius: 30,
hPadding: 20, hPadding: 20,
fontWeight: FontWeight.normal, fontWeight: FontWeight.normal,
fontSize: 1.6, // fontSize: 1.6,
icon: Image.asset( icon: Image.asset(
"assets/images/modilfy-episode.png", "assets/images/modilfy-episode.png",
color: Colors.white, color: Colors.white,

@ -378,7 +378,6 @@ class MyReferralDetailScreen extends StatelessWidget {
title: TranslationBase.of(context).accept, title: TranslationBase.of(context).accept,
color: Color(0xFF4BA821), color: Color(0xFF4BA821),
fontColor: Colors.white, fontColor: Colors.white,
fontSize: 1.6,
hPadding: 8, hPadding: 8,
vPadding: 12, vPadding: 12,
disabled: model.state == ViewState.Busy, disabled: model.state == ViewState.Busy,
@ -406,7 +405,6 @@ class MyReferralDetailScreen extends StatelessWidget {
title: TranslationBase.of(context).reject, title: TranslationBase.of(context).reject,
color: AppGlobal.appRedColor, color: AppGlobal.appRedColor,
fontColor: Colors.white, fontColor: Colors.white,
fontSize: 1.6,
hPadding: 8, hPadding: 8,
vPadding: 12, vPadding: 12,
disabled: model.state == ViewState.Busy, disabled: model.state == ViewState.Busy,

@ -484,7 +484,6 @@ class ReferralPatientDetailScreen extends StatelessWidget {
color: Colors.red[700], color: Colors.red[700],
fontColor: Colors.white, fontColor: Colors.white,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
fontSize: 1.8,
hPadding: 8, hPadding: 8,
vPadding: 12, vPadding: 12,
onPressed: () async { onPressed: () async {

@ -557,7 +557,6 @@ class ReferredPatientDetailScreen extends StatelessWidget {
color: Colors.red[700], color: Colors.red[700],
fontColor: Colors.white, fontColor: Colors.white,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
fontSize: 1.8,
hPadding: 8, hPadding: 8,
vPadding: 12, vPadding: 12,
disabled: referredPatient.referredDoctorRemarks == null disabled: referredPatient.referredDoctorRemarks == null

@ -363,7 +363,6 @@ class _RegisterConfirmationPatientPageState
borderColor: Color(0xFFeaeaea), borderColor: Color(0xFFeaeaea),
color: Color(0xFFeaeaea), color: Color(0xFFeaeaea),
fontColor: Colors.black, fontColor: Colors.black,
fontSize: 2.2,
onPressed: () { onPressed: () {
Navigator.of(context).pop(); Navigator.of(context).pop();
}, },
@ -383,7 +382,6 @@ class _RegisterConfirmationPatientPageState
borderColor: Color(0xFFB8382B), borderColor: Color(0xFFB8382B),
color: Color(0xFFB8382B), color: Color(0xFFB8382B),
fontColor: Colors.white, fontColor: Colors.white,
fontSize: 2.0,
onPressed: () async { onPressed: () async {
setState(() { setState(() {
isSubmitted = true; isSubmitted = true;

@ -143,7 +143,6 @@ class _RegisterPatientPageState extends State<RegisterPatientPage>
borderColor: Color(0xFFeaeaea), borderColor: Color(0xFFeaeaea),
color: Color(0xFFeaeaea), color: Color(0xFFeaeaea),
fontColor: Colors.black, fontColor: Colors.black,
fontSize: 2.2,
onPressed: () { onPressed: () {
Navigator.of(context).pop(); Navigator.of(context).pop();
}, },
@ -163,7 +162,6 @@ class _RegisterPatientPageState extends State<RegisterPatientPage>
borderColor: Color(0xFF359846), borderColor: Color(0xFF359846),
color: Color(0xFF359846), color: Color(0xFF359846),
fontColor: Colors.white, fontColor: Colors.white,
fontSize: 2.0,
onPressed: () {}, onPressed: () {},
), ),
), ),
@ -186,7 +184,6 @@ class _RegisterPatientPageState extends State<RegisterPatientPage>
borderColor: Color(0xFFeaeaea), borderColor: Color(0xFFeaeaea),
color: Color(0xFFeaeaea), color: Color(0xFFeaeaea),
fontColor: Colors.black, fontColor: Colors.black,
fontSize: 2.2,
onPressed: () { onPressed: () {
Navigator.of(context).pop(); Navigator.of(context).pop();
}, },
@ -206,7 +203,6 @@ class _RegisterPatientPageState extends State<RegisterPatientPage>
borderColor: Color(0xFFB8382B), borderColor: Color(0xFFB8382B),
color: AppGlobal.appRedColor, color: AppGlobal.appRedColor,
fontColor: Colors.white, fontColor: Colors.white,
fontSize: 2.0,
onPressed: () { onPressed: () {
changePageViewIndex(_currentIndex + 1); changePageViewIndex(_currentIndex + 1);
}, },

@ -283,7 +283,6 @@ class _RegisterSearchPatientPageState extends State<RegisterSearchPatientPage> {
borderColor: Color(0xFFeaeaea), borderColor: Color(0xFFeaeaea),
color: Color(0xFFeaeaea), color: Color(0xFFeaeaea),
fontColor: Colors.black, fontColor: Colors.black,
fontSize: 2.2,
onPressed: () { onPressed: () {
Navigator.of(context).pop(); Navigator.of(context).pop();
}, },
@ -303,7 +302,6 @@ class _RegisterSearchPatientPageState extends State<RegisterSearchPatientPage> {
borderColor: Color(0xFFB8382B), borderColor: Color(0xFFB8382B),
color: Color(0xFFB8382B), color: Color(0xFFB8382B),
fontColor: Colors.white, fontColor: Colors.white,
fontSize: 2.0,
onPressed: () async { onPressed: () async {
setState(() { setState(() {
isSubmitted = true; isSubmitted = true;

@ -440,7 +440,6 @@ class _ActivationPageState extends State<ActivationPage> {
borderColor: Color(0xFFeaeaea), borderColor: Color(0xFFeaeaea),
color: Color(0xFFeaeaea), color: Color(0xFFeaeaea),
fontColor: Colors.black, fontColor: Colors.black,
fontSize: 2.2,
onPressed: () { onPressed: () {
Navigator.of(context).pop(); Navigator.of(context).pop();
}, },
@ -460,7 +459,6 @@ class _ActivationPageState extends State<ActivationPage> {
borderColor: Color(0xFFB8382B), borderColor: Color(0xFFB8382B),
color: HexColor("#D02127"), color: HexColor("#D02127"),
fontColor: Colors.white, fontColor: Colors.white,
fontSize: 2.0,
onPressed: () async { onPressed: () async {
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(context);
await widget.model.checkActivationCode( await widget.model.checkActivationCode(

@ -402,19 +402,6 @@ class PatientProfileAppBar extends StatelessWidget with PreferredSizeWidget {
@override @override
Size get preferredSize => Size( Size get preferredSize => Size(
double.maxFinite, double.maxFinite,
// height! == 0
// ? isInpatient
// ? (isFromLabResult! ? 210 : 200)
// : isAppointmentHeader!
// ? 290
// : SizeConfig.isHeightVeryShort
// ? 137
// : SizeConfig.isHeightShort
// ? 190
// : SizeConfig.heightMultiplier *
// (SizeConfig.isWidthLarge ? 25 : 20)
// : height!
// // TODO Elham*2
patientProfileAppBarModel!.height == 0 patientProfileAppBarModel!.height == 0
? patientProfileAppBarModel!.isAppointmentHeader! ? patientProfileAppBarModel!.isAppointmentHeader!
? 270 ? 270

Loading…
Cancel
Save