diff --git a/android/app/src/main/java/kz/com/aman/kassa/handler/CardPaymentHandlerImpl.java b/android/app/src/main/java/kz/com/aman/kassa/handler/CardPaymentHandlerImpl.java index b2b146c..4d144d6 100644 --- a/android/app/src/main/java/kz/com/aman/kassa/handler/CardPaymentHandlerImpl.java +++ b/android/app/src/main/java/kz/com/aman/kassa/handler/CardPaymentHandlerImpl.java @@ -228,7 +228,7 @@ public class CardPaymentHandlerImpl implements CardPaymentCallbackHandler---->---->onTransactionExecutionStatusChanged: " + newStatus.name()); plugin.getActivity().runOnUiThread(() -> { if(newStatus!=null && newStatus.equals(TransactionExecutionStatus.TAP_CARD)) { - Toast.makeText(plugin.getActivity(), newStatus.name(), Toast.LENGTH_SHORT).show(); + Toast.makeText(plugin.getActivity(), "Приложите карту", Toast.LENGTH_SHORT).show(); } }); } diff --git a/android/app/src/main/java/kz/com/aman/kassa/handler/CardRefundAmanHandlerImpl.java b/android/app/src/main/java/kz/com/aman/kassa/handler/CardRefundAmanHandlerImpl.java index 2065870..1b3a975 100644 --- a/android/app/src/main/java/kz/com/aman/kassa/handler/CardRefundAmanHandlerImpl.java +++ b/android/app/src/main/java/kz/com/aman/kassa/handler/CardRefundAmanHandlerImpl.java @@ -174,7 +174,7 @@ public class CardRefundAmanHandlerImpl implements EasyCardRefundCallbackHandler< System.out.println("----->---->---->onTransactionExecutionStatusChanged: " + newStatus.name()); plugin.getActivity().runOnUiThread(() -> { if(newStatus!=null && newStatus.equals(TransactionExecutionStatus.TAP_CARD)) { - Toast.makeText(plugin.getActivity(), newStatus.name(), Toast.LENGTH_SHORT).show(); + Toast.makeText(plugin.getActivity(), "Приложите карту", Toast.LENGTH_SHORT).show(); } }); } diff --git a/assets/images/NBK_Logo.png b/assets/images/NBK_Logo.png new file mode 100644 index 0000000..bcb79f8 Binary files /dev/null and b/assets/images/NBK_Logo.png differ diff --git a/assets/images/halyk-bank.png b/assets/images/halyk-bank.png new file mode 100644 index 0000000..c2f486f Binary files /dev/null and b/assets/images/halyk-bank.png differ diff --git a/lib/shared/app_colors.dart b/lib/shared/app_colors.dart index c4580af..b20dd93 100644 --- a/lib/shared/app_colors.dart +++ b/lib/shared/app_colors.dart @@ -4,6 +4,8 @@ const Color backgroundColor = Color.fromRGBO(255, 255, 255, 1); const Color fillColor = Color.fromRGBO(248, 248, 248, 1); const Color primaryColor = Color.fromRGBO(51, 122, 183, 1); +const Color halykColor = Color.fromRGBO(0, 118, 59, 1); + const Color menuColor = Color.fromRGBO(0, 75, 120, 1); diff --git a/lib/views/payment/payment_view.dart b/lib/views/payment/payment_view.dart index 4d902f7..21a9248 100644 --- a/lib/views/payment/payment_view.dart +++ b/lib/views/payment/payment_view.dart @@ -169,7 +169,7 @@ class _PaymentViewState extends State { ), verticalSpaceLarge, _nfsButtonRender(), - verticalSpaceLarge, + verticalSpaceSmall, Expanded( child: Container(), ), @@ -201,25 +201,39 @@ class _PaymentViewState extends State { _navigatorService.push(PaymentNfcViewRoute, arguments: widget.model); }, - splashColor: primaryColor.withOpacity(0.4), - borderRadius: BorderRadius.circular(9.0), - highlightColor: primaryColor.withOpacity(0.1), - child: Container( - padding: const EdgeInsets.all(8.0), - decoration: BoxDecoration( - border: Border.all(color: primaryColor), - borderRadius: BorderRadius.circular(9.0) - ), - child: Column( - children: [ - Icon( - MdiIcons.nfc, - color: primaryColor, - size: ScreenUtil().setSp(60.0), + splashColor: halykColor.withOpacity(0.4), + borderRadius: BorderRadius.circular(10.0), + highlightColor: halykColor.withOpacity(0.1), + child: Stack( + alignment: Alignment.center, + children: [ + Opacity( + opacity: 0.25, + child: Image.asset( + 'assets/images/halyk-bank.png', + fit: BoxFit.cover, + width: ScreenUtil().setSp(80.0), + height: ScreenUtil().setSp(90.0), ), - Text('Tap2Phone',style: TextStyle(fontSize: ScreenUtil().setSp(10.0), color: primaryColor),), - ], - ), + ), + Container( + padding: const EdgeInsets.all(8.0), + decoration: BoxDecoration( + border: Border.all(color: halykColor), + borderRadius: BorderRadius.circular(10.0) + ), + child: Column( + children: [ + Icon( + MdiIcons.nfc, + color: halykColor, + size: ScreenUtil().setSp(60.0), + ), + Text('Tap2Phone',style: TextStyle(fontSize: ScreenUtil().setSp(10.0), color: halykColor, fontWeight: FontWeight.bold ),), + ], + ), + ), + ], ), ); } diff --git a/lib/views/payment_nfc/payment_nfc_view.dart b/lib/views/payment_nfc/payment_nfc_view.dart index bb0f020..55eca12 100644 --- a/lib/views/payment_nfc/payment_nfc_view.dart +++ b/lib/views/payment_nfc/payment_nfc_view.dart @@ -29,6 +29,7 @@ import 'package:aman_kassa_flutter/views/payment/payment_view.dart'; import 'package:aman_kassa_flutter/views/payment_nfc/widgets/action_view.dart'; import 'package:aman_kassa_flutter/views/payment_nfc/widgets/background_view.dart'; import 'package:aman_kassa_flutter/views/payment_nfc/widgets/card_view.dart'; +import 'package:aman_kassa_flutter/views/payment_nfc/widgets/logo_view.dart'; import 'package:aman_kassa_flutter/views/payment_nfc/widgets/phone_view.dart'; import 'package:aman_kassa_flutter/views/payment_nfc/widgets/text_state.dart'; import 'package:aman_kassa_flutter/widgets/components/calculator/calculator.dart'; @@ -408,6 +409,7 @@ class _PaymentNfcViewState extends State { child: Stack( children: [ BackgroundView(), + LogoView(), TextStateView( status: status, ), diff --git a/lib/views/payment_nfc/widgets/logo_view.dart b/lib/views/payment_nfc/widgets/logo_view.dart new file mode 100644 index 0000000..e3d3fad --- /dev/null +++ b/lib/views/payment_nfc/widgets/logo_view.dart @@ -0,0 +1,22 @@ +import 'package:aman_kassa_flutter/shared/app_colors.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter_screenutil/screenutil.dart'; + +class LogoView extends StatelessWidget { + @override + Widget build(BuildContext context) { + return Positioned( + bottom: ScreenUtil().setSp(75), + left: ScreenUtil().setSp(25), + right: ScreenUtil().setSp(25), + child: Opacity( + opacity: 0.5, + child: Image.asset( + 'assets/images/NBK_Logo.png', + fit: BoxFit.fitHeight, + width: ScreenUtil().setSp(80.0), + height: ScreenUtil().setSp(120.0), + ), + )); + } +}