diff --git a/lib/new_views/app_style/app_color.dart b/lib/new_views/app_style/app_color.dart index 3dcf8ca5..dfc7c3a1 100644 --- a/lib/new_views/app_style/app_color.dart +++ b/lib/new_views/app_style/app_color.dart @@ -29,6 +29,7 @@ class AppColor { static const Color neutral120 = Color(0xff7D859A); static const Color neutral130 = Color(0xffE0E0E0); static const Color neutral140 = Color(0xffE6E6E6); + static const Color neutral150 = Color(0xffA1A1A1); //background diff --git a/lib/new_views/common_widgets/app_filled_button.dart b/lib/new_views/common_widgets/app_filled_button.dart index 196b6c9b..3d99c4d9 100644 --- a/lib/new_views/common_widgets/app_filled_button.dart +++ b/lib/new_views/common_widgets/app_filled_button.dart @@ -8,6 +8,7 @@ class AppFilledButton extends StatelessWidget { final VoidCallback? onPressed; final String label; final bool maxWidth, loading; + final double? fontSize; final bool showIcon; final Widget? icon; final Color? buttonColor; @@ -15,7 +16,17 @@ class AppFilledButton extends StatelessWidget { final bool showBorder; const AppFilledButton( - {this.onPressed, required this.label, this.maxWidth = false, this.showIcon = false, this.icon, this.loading = false, this.showBorder = false, this.buttonColor, this.textColor, Key? key}) + {this.onPressed, + required this.label, + this.maxWidth = false, + this.showIcon = false, + this.icon, + this.fontSize, + this.loading = false, + this.showBorder = false, + this.buttonColor, + this.textColor, + Key? key}) : super(key: key); @override @@ -39,14 +50,16 @@ class AppFilledButton extends StatelessWidget { ), ) : showIcon && icon != null - ? Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ + ? Row(mainAxisAlignment: MainAxisAlignment.center, children: [ icon!, 8.width, label.heading6(context).custom(color: textColor ?? AppColor.background(context)), ]) - : label.heading6(context).custom(color: textColor ?? AppColor.background(context)), + : label.heading6(context).custom( + color: textColor ?? AppColor.background(context), + align: TextAlign.center, + fontSize: fontSize ?? 16.toScreenWidth, + ), ).onPress(onPressed); } } diff --git a/lib/service_request_latest/views/components/action_button/footer_action_button.dart b/lib/service_request_latest/views/components/action_button/footer_action_button.dart index a2d63d57..c28d6c96 100644 --- a/lib/service_request_latest/views/components/action_button/footer_action_button.dart +++ b/lib/service_request_latest/views/components/action_button/footer_action_button.dart @@ -170,8 +170,9 @@ class FooterActionButton { child: AppFilledButton( label: context.translation.assetRetiredPendingOpManagementApproval, buttonColor: AppColor.neutral140, - onPressed: () async { - }, + textColor: AppColor.neutral150, + fontSize: 12.toScreenWidth, + )); } }