http://redmine.helios-soft.kz/issues/1791 HalyPos разместить логотип банка при оплате POS

android/app/src/main/java/kz/com/aman/kassa/handler/CardPaymentHandlerImpl.java

@@ -228,7 +228,7 @@ public class CardPaymentHandlerImpl implements CardPaymentCallbackHandler<Result
         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();
             }
         });
     }

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();
             }
         });
     }

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);
 

lib/views/payment/payment_view.dart

@@ -169,7 +169,7 @@ class _PaymentViewState extends State<PaymentView> {
           ),
           verticalSpaceLarge,
           _nfsButtonRender(),
-          verticalSpaceLarge,
+          verticalSpaceSmall,
           Expanded(
             child: Container(),
           ),
@@ -201,25 +201,39 @@ class _PaymentViewState extends State<PaymentView> {
                 _navigatorService.push(PaymentNfcViewRoute,
                     arguments: widget.model);
               },
-              splashColor: primaryColor.withOpacity(0.4),
+              splashColor: halykColor.withOpacity(0.4),
-              borderRadius: BorderRadius.circular(9.0),
+              borderRadius: BorderRadius.circular(10.0),
-              highlightColor: primaryColor.withOpacity(0.1),
+              highlightColor: halykColor.withOpacity(0.1),
-              child: Container(
+              child: Stack(
-                padding: const EdgeInsets.all(8.0),
+                alignment: Alignment.center,
-                decoration: BoxDecoration(
+                children: [
-                  border: Border.all(color: primaryColor),
+                  Opacity(
-                  borderRadius: BorderRadius.circular(9.0)
+                    opacity: 0.25,
-                ),
+                    child: Image.asset(
-                child: Column(
+                      'assets/images/halyk-bank.png',
-                  children: [
+                      fit: BoxFit.cover,
-                    Icon(
+                      width: ScreenUtil().setSp(80.0),
-                      MdiIcons.nfc,
+                      height: ScreenUtil().setSp(90.0),
-                      color: primaryColor,
-                      size: ScreenUtil().setSp(60.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 ),),
+                      ],
+                    ),
+                  ),
+                ],
               ),
             );
       }

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<PaymentNfcView> {
                 child: Stack(
                   children: <Widget>[
                     BackgroundView(),
+                    LogoView(),
                     TextStateView(
                       status: status,
                     ),

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),
+          ),
+        ));
+  }
+}