fix bugs after up dependencies version

android/app/build.gradle

@@ -47,7 +47,7 @@ android {
     defaultConfig {
         applicationId "kz.com.aman.kassa"
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         multiDexEnabled true

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

@@ -171,8 +171,12 @@ public class CardRefundAmanHandlerImpl implements EasyCardRefundCallbackHandler<
 
     @Override
     public void onTransactionExecutionStatusChanged(TransactionExecutionStatus newStatus) {
-        Timber.d("onTransactionExecutionStatusChanged: %s", newStatus.name());
+        System.out.println("----->---->---->onTransactionExecutionStatusChanged: " + newStatus.name());
-        plugin.getActivity().runOnUiThread(() -> Toast.makeText(plugin.getActivity(), newStatus.name(), Toast.LENGTH_SHORT).show());
+        plugin.getActivity().runOnUiThread(() ->  {
+            if(newStatus!=null && newStatus.equals(TransactionExecutionStatus.TAP_CARD)) {
+                Toast.makeText(plugin.getActivity(), newStatus.name(), Toast.LENGTH_SHORT).show();
+            }
+        });
     }
 
     @Override

lib/main.dart

@@ -6,6 +6,7 @@ import 'package:flutter_redux/flutter_redux.dart';
 import 'package:aman_kassa_flutter/shared/app_colors.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/screenutil.dart';
+import 'package:flutter_screenutil/screenutil_init.dart';
 import 'package:google_fonts/google_fonts.dart';
 //service & tools
 import 'package:aman_kassa_flutter/redux/store.dart';
@@ -40,25 +41,29 @@ class MainApplication extends StatelessWidget {
 
     return StoreProvider<AppState>(
         store: Redux.store,
-        child: MaterialApp(
+        child: ScreenUtilInit(
-          theme: ThemeData(
+          designSize: Size(411.43, 683.43),
-            backgroundColor: backgroundColor,
+          allowFontScaling: false,
-            primaryColor: primaryColor,
+          child: MaterialApp(
-            accentColor: yellowColor,
+            theme: ThemeData(
-            scaffoldBackgroundColor: Colors.white,
+              backgroundColor: backgroundColor,
-              textTheme: GoogleFonts.latoTextTheme(
+              primaryColor: primaryColor,
-                Theme.of(context).textTheme,
+              accentColor: yellowColor,
-              )
+              scaffoldBackgroundColor: Colors.white,
+                textTheme: GoogleFonts.latoTextTheme(
+                  Theme.of(context).textTheme,
+                )
+            ),
+            debugShowCheckedModeBanner: false,
+            builder: (context, child) => Navigator(
+              key: locator<DialogService>().dialogNavigationKey,
+              onGenerateRoute: (settings) => MaterialPageRoute(
+                  builder: (context) => DialogManager(child: child)),
+            ),
+            navigatorKey: locator<NavigatorService>().navigatorKey,
+            home: StartUpView(), // first page
+            onGenerateRoute: generateRoute,
           ),
-          debugShowCheckedModeBanner: false,
-          builder: (context, child) => Navigator(
-            key: locator<DialogService>().dialogNavigationKey,
-            onGenerateRoute: (settings) => MaterialPageRoute(
-                builder: (context) => DialogManager(child: child)),
-          ),
-          navigatorKey: locator<NavigatorService>().navigatorKey,
-          home: StartUpView(), // first page
-          onGenerateRoute: generateRoute,
         ),
       );
   }

lib/views/home/components/popup_menu.dart

@@ -30,8 +30,8 @@ class _PopupMenuState extends State<PopupMenu> {
 
     List<Choice> _choices = <Choice>[
       const Choice(title: 'Информация о ККМ', icon: Icons.info_outline, command: 'infokkm'),
-      if (version >= 24 )
+      //if (version >= 24 )
-       const Choice(title: 'Bank', icon: Icons.text_fields, command: 'bank'),
+      // const Choice(title: 'Bank', icon: Icons.text_fields, command: 'bank'),
       if (version >= 24 )
         const Choice(title: 'Настройка Tap2Phone', icon: MdiIcons.nfc, command: 'tap2phone'),
       const Choice(title: 'Выйти', icon: Icons.exit_to_app, command: 'exit')

lib/views/start_up/start_up_view.dart

@@ -21,9 +21,10 @@ class _StartUpViewState extends State<StartUpView> {
 
   @override
   Widget build(BuildContext context) {
-    print(MediaQuery.of(context).size.width);
+    //print(MediaQuery.of(context).size.width);
-    print(MediaQuery.of(context).size.height);
+    //print(MediaQuery.of(context).size.height);
-    ScreenUtil.init(context, width: 411.43, height: 683.43, allowFontScaling: false);
+    //ScreenUtil.init(context, width: 411.43, height: 683.43, allowFontScaling: false);
+    //ScreenUtil.init(, designSize: Size(360, 690));
     return StoreConnector<AppState, UserState>(
         converter: (store) => store.state.userState,
         builder: (context, userState) {

pubspec.lock

@@ -84,7 +84,7 @@ packages:
       name: device_info
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.2+10"
+    version: "1.0.0"
   device_info_platform_interface:
     dependency: transitive
     description:
@@ -145,14 +145,14 @@ packages:
       name: flutter_redux
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.6.0"
+    version: "0.7.0"
   flutter_screenutil:
     dependency: "direct main"
     description:
       name: flutter_screenutil
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.3.1"
+    version: "4.0.2+2"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -169,7 +169,7 @@ packages:
       name: get_it
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.0.4"
+    version: "5.0.3"
   google_fonts:
     dependency: "direct main"
     description:
@@ -211,7 +211,7 @@ packages:
       name: mask_text_input_formatter
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.1"
   matcher:
     dependency: transitive
     description:
@@ -372,7 +372,7 @@ packages:
       name: responsive_builder
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.0+2"
+    version: "0.3.0"
   shared_preferences:
     dependency: transitive
     description:

pubspec.yaml

@@ -1,6 +1,6 @@
 name: aman_kassa_flutter
 description: A new Flutter project.
-version: 1.1.0+24
+version: 1.1.1+26
 environment:
     sdk: '>=2.3.0 <3.0.0'
 dependencies:
@@ -8,29 +8,29 @@ dependencies:
         sdk: flutter
     cupertino_icons: ^0.1.3
     redux: ^4.0.0+3
-    flutter_redux: ^0.6.0
+    flutter_redux: ^0.7.0
     redux_thunk: ^0.3.0
     redux_persist: ^0.8.4
-    redux_persist_flutter: ^0.8.2
+    redux_persist_flutter: ^0.8.3
-    responsive_builder: ^0.2.0+2
+    responsive_builder: ^0.3.0
-    provider: ^4.3.1
+    provider: ^4.3.2+3
-    logger: ^0.9.2
+    logger: ^0.9.4
-    get_it: ^4.0.4
+    get_it: ^5.0.3
-    equatable: ^1.2.3
+    equatable: ^1.2.5
     http: ^0.12.2
-    sqflite: ^1.3.1
+    sqflite: ^1.3.2+1
-    path_provider: ^1.6.11
+    path_provider: ^1.6.24
-    google_fonts: ^1.1.0
+    google_fonts: ^1.1.1
-    material_design_icons_flutter: ^4.0.5345
+    material_design_icons_flutter: ^4.0.5755
     intl: ^0.16.1
     barcode_scan: ^3.0.1
-    device_info: ^0.4.2+4
+    device_info: ^1.0.0
     esys_flutter_share: ^1.0.2
     auto_size_text: ^2.1.0
-    url_launcher: ^5.5.0
+    url_launcher: ^5.7.10
     qr_flutter: ^3.2.0
-    mask_text_input_formatter: ^1.0.7
+    mask_text_input_formatter: ^1.2.1
-    flutter_screenutil: ^2.3.1
+    flutter_screenutil: ^4.0.2+2
 dev_dependencies:
     flutter_test:
         sdk: flutter