Merge branch 'v2.8_elham_fixes' into 'dev_v2.8_withouth_null_ckecking'

fix button inside our app

See merge request Cloud_Solution/doctor_app_flutter!937
merge-requests/938/merge
Elham Ali 4 years ago
commit f8051cda0a

@ -2,6 +2,6 @@
<Workspace <Workspace
version = "1.0"> version = "1.0">
<FileRef <FileRef
location = "group:Runner.xcodeproj"> location = "self:">
</FileRef> </FileRef>
</Workspace> </Workspace>

@ -177,7 +177,7 @@ 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;
@ -199,7 +199,7 @@ 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();
}, },

@ -374,7 +374,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,
@ -401,7 +400,7 @@ 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,

@ -486,7 +486,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 {

@ -565,7 +565,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

@ -366,7 +366,7 @@ 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();
}, },
@ -386,7 +386,7 @@ class _RegisterConfirmationPatientPageState
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 {
setState(() { setState(() {
isSubmitted = true; isSubmitted = true;

@ -143,7 +143,7 @@ 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 +163,7 @@ 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 +186,7 @@ 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 +206,7 @@ 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);
}, },

@ -326,7 +326,7 @@ 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();
}, },
@ -346,7 +346,7 @@ class _RegisterSearchPatientPageState extends State<RegisterSearchPatientPage> {
borderColor: Color(0xFFB8382B), borderColor: Color(0xFFB8382B),
color: AppGlobal.appRedColor, color: AppGlobal.appRedColor,
fontColor: Colors.white, fontColor: Colors.white,
fontSize: 2.0,
onPressed: () async { onPressed: () async {
setState(() { setState(() {
isSubmitted = true; isSubmitted = true;

@ -440,7 +440,7 @@ 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 +460,7 @@ 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(

@ -13,7 +13,7 @@ class AppButton extends StatefulWidget {
final IconData iconData; final IconData iconData;
final Widget icon; final Widget icon;
final Color color; final Color color;
final double fontSize; double fontSize;
final double padding; final double padding;
final Color fontColor; final Color fontColor;
final bool loading; final bool loading;
@ -32,7 +32,7 @@ class AppButton extends StatefulWidget {
this.iconData, this.iconData,
this.icon, this.icon,
this.color, this.color,
this.fontSize = 16, this.fontSize,
this.padding = 13, this.padding = 13,
this.loading = false, this.loading = false,
this.disabled = false, this.disabled = false,
@ -52,6 +52,9 @@ class AppButton extends StatefulWidget {
class _AppButtonState extends State<AppButton> { class _AppButtonState extends State<AppButton> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
if(widget.fontSize == null ) {
widget.fontSize = SizeConfig.getHeightMultiplier() * 1.9;
}
return Container( return Container(
// height: MediaQuery.of(context).size.height * 0.075, // height: MediaQuery.of(context).size.height * 0.075,
height: widget.height, height: widget.height,

Loading…
Cancel
Save