diff --git a/lib/main.dart b/lib/main.dart index f843520..6c4523d 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -5,7 +5,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/flutter_screenutil.dart'; import 'package:flutter_screenutil/screenutil_init.dart'; import 'package:google_fonts/google_fonts.dart'; //service & tools @@ -44,7 +44,7 @@ class MainApplication extends StatelessWidget { child: ScreenUtilInit( designSize: Size(411.43, 683.43), allowFontScaling: false, - child: MaterialApp( + builder: () => MaterialApp( theme: ThemeData( backgroundColor: backgroundColor, primaryColor: primaryColor, diff --git a/lib/views/payment/payment_view.dart b/lib/views/payment/payment_view.dart index 3e8d3fa..3cdeee1 100644 --- a/lib/views/payment/payment_view.dart +++ b/lib/views/payment/payment_view.dart @@ -30,7 +30,7 @@ import 'package:aman_kassa_flutter/widgets/fields/busy_button.dart'; import 'package:aman_kassa_flutter/widgets/loader/Dialogs.dart'; import 'package:flutter/material.dart'; import 'package:flutter_redux/flutter_redux.dart'; -import 'package:flutter_screenutil/screenutil.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:aman_kassa_flutter/views/payment/halyk_pos_service.dart'; import '../../core/models/aman_dao.dart'; diff --git a/lib/views/payment_nfc/payment_nfc_view.dart b/lib/views/payment_nfc/payment_nfc_view.dart index d95c9b0..f775eb5 100644 --- a/lib/views/payment_nfc/payment_nfc_view.dart +++ b/lib/views/payment_nfc/payment_nfc_view.dart @@ -39,7 +39,7 @@ import 'package:aman_kassa_flutter/widgets/loader/Dialogs.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_redux/flutter_redux.dart'; -import 'package:flutter_screenutil/screenutil.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:logger/logger.dart'; class PaymentNfcView extends StatefulWidget { diff --git a/lib/views/payment_nfc/widgets/background_view.dart b/lib/views/payment_nfc/widgets/background_view.dart index 9856ef1..be5cf23 100644 --- a/lib/views/payment_nfc/widgets/background_view.dart +++ b/lib/views/payment_nfc/widgets/background_view.dart @@ -1,6 +1,6 @@ import 'package:aman_kassa_flutter/shared/app_colors.dart'; import 'package:flutter/cupertino.dart'; -import 'package:flutter_screenutil/screenutil.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; class BackgroundView extends StatelessWidget { @override diff --git a/lib/views/payment_nfc/widgets/card_view.dart b/lib/views/payment_nfc/widgets/card_view.dart index bc5c717..618c8a6 100644 --- a/lib/views/payment_nfc/widgets/card_view.dart +++ b/lib/views/payment_nfc/widgets/card_view.dart @@ -1,6 +1,6 @@ import 'package:aman_kassa_flutter/shared/ui_helpers.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/screenutil.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; class CardView extends StatefulWidget { diff --git a/lib/views/payment_nfc/widgets/logo_view.dart b/lib/views/payment_nfc/widgets/logo_view.dart index e3d3fad..cb926b0 100644 --- a/lib/views/payment_nfc/widgets/logo_view.dart +++ b/lib/views/payment_nfc/widgets/logo_view.dart @@ -1,6 +1,6 @@ import 'package:aman_kassa_flutter/shared/app_colors.dart'; import 'package:flutter/cupertino.dart'; -import 'package:flutter_screenutil/screenutil.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; class LogoView extends StatelessWidget { @override diff --git a/lib/views/payment_nfc/widgets/phone_view.dart b/lib/views/payment_nfc/widgets/phone_view.dart index fc42389..5a3a892 100644 --- a/lib/views/payment_nfc/widgets/phone_view.dart +++ b/lib/views/payment_nfc/widgets/phone_view.dart @@ -3,7 +3,7 @@ import 'package:aman_kassa_flutter/shared/ui_helpers.dart'; import 'package:auto_size_text/auto_size_text.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/screenutil.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; class PhoneView extends StatefulWidget { diff --git a/lib/views/start_up/start_up_view.dart b/lib/views/start_up/start_up_view.dart index a82f31c..191c0f6 100644 --- a/lib/views/start_up/start_up_view.dart +++ b/lib/views/start_up/start_up_view.dart @@ -3,7 +3,7 @@ import 'package:aman_kassa_flutter/redux/state/user_state.dart'; import 'package:aman_kassa_flutter/redux/store.dart'; import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/screenutil.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; class StartUpView extends StatefulWidget { diff --git a/pubspec.lock b/pubspec.lock index 2b3bd71..2edab47 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -21,7 +21,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.5.0" + version: "2.6.1" auto_size_text: dependency: "direct main" description: @@ -126,7 +126,7 @@ packages: name: equatable url: "https://pub.dartlang.org" source: hosted - version: "1.2.5" + version: "1.2.6" esc_pos_bluetooth: dependency: "direct main" description: @@ -161,14 +161,14 @@ packages: name: ffi url: "https://pub.dartlang.org" source: hosted - version: "0.1.3" + version: "1.1.2" file: dependency: transitive description: name: file url: "https://pub.dartlang.org" source: hosted - version: "5.2.1" + version: "6.1.2" fixnum: dependency: transitive description: @@ -215,7 +215,7 @@ packages: name: flutter_screenutil url: "https://pub.dartlang.org" source: hosted - version: "4.0.2+5" + version: "4.0.4+1" flutter_test: dependency: "direct dev" description: flutter @@ -239,14 +239,14 @@ packages: name: get_it url: "https://pub.dartlang.org" source: hosted - version: "5.0.4" + version: "5.0.6" google_fonts: dependency: "direct main" description: name: google_fonts url: "https://pub.dartlang.org" source: hosted - version: "1.1.1" + version: "1.1.2" hex: dependency: transitive description: @@ -337,7 +337,7 @@ packages: name: material_design_icons_flutter url: "https://pub.dartlang.org" source: hosted - version: "4.0.5855" + version: "4.0.5955" meta: dependency: transitive description: @@ -351,7 +351,7 @@ packages: name: nested url: "https://pub.dartlang.org" source: hosted - version: "0.0.4" + version: "1.0.0" path: dependency: transitive description: @@ -365,7 +365,7 @@ packages: name: path_provider url: "https://pub.dartlang.org" source: hosted - version: "1.6.27" + version: "1.6.28" path_provider_linux: dependency: transitive description: @@ -393,14 +393,14 @@ packages: name: path_provider_windows url: "https://pub.dartlang.org" source: hosted - version: "0.0.4+3" + version: "0.0.5" pedantic: dependency: transitive description: name: pedantic url: "https://pub.dartlang.org" source: hosted - version: "1.9.2" + version: "1.11.1" permission_handler: dependency: "direct main" description: @@ -428,7 +428,7 @@ packages: name: platform url: "https://pub.dartlang.org" source: hosted - version: "2.2.1" + version: "3.0.0" plugin_platform_interface: dependency: transitive description: @@ -442,21 +442,21 @@ packages: name: process url: "https://pub.dartlang.org" source: hosted - version: "3.0.13" + version: "4.2.1" protobuf: dependency: transitive description: name: protobuf url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.1.4" provider: dependency: "direct main" description: name: provider url: "https://pub.dartlang.org" source: hosted - version: "4.3.2+4" + version: "4.3.3" qr: dependency: transitive description: @@ -554,7 +554,7 @@ packages: name: shared_preferences_windows url: "https://pub.dartlang.org" source: hosted - version: "0.0.1+3" + version: "0.0.2+3" sky_engine: dependency: transitive description: flutter @@ -566,21 +566,21 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.0" + version: "1.8.1" sqflite: dependency: "direct main" description: name: sqflite url: "https://pub.dartlang.org" source: hosted - version: "1.3.2+2" + version: "1.3.2+4" sqflite_common: dependency: transitive description: name: sqflite_common url: "https://pub.dartlang.org" source: hosted - version: "1.0.3" + version: "1.0.3+3" stack_trace: dependency: transitive description: @@ -622,7 +622,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.19" + version: "0.3.0" typed_data: dependency: transitive description: @@ -664,7 +664,7 @@ packages: name: url_launcher_web url: "https://pub.dartlang.org" source: hosted - version: "0.1.5+1" + version: "0.1.5+3" url_launcher_windows: dependency: transitive description: @@ -685,7 +685,7 @@ packages: name: win32 url: "https://pub.dartlang.org" source: hosted - version: "1.7.4" + version: "2.2.4" xdg_directories: dependency: transitive description: @@ -701,5 +701,5 @@ packages: source: hosted version: "4.5.1" sdks: - dart: ">=2.12.0-0.0 <3.0.0" + dart: ">=2.13.0 <3.0.0" flutter: ">=1.22.2"