From 50b3694cace80e0ba39286e85df019af905fb0f2 Mon Sep 17 00:00:00 2001 From: suvaissov Date: Mon, 18 Jan 2021 12:19:55 +0600 Subject: [PATCH 1/3] pin locker before start --- pubspec.yaml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pubspec.yaml b/pubspec.yaml index a5bfcdf..fe85302 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -8,28 +8,28 @@ 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 - responsive_builder: ^0.2.0+2 - provider: ^4.3.2+1 - logger: ^0.9.2 - get_it: ^4.0.4 - equatable: ^1.2.4 + redux_persist_flutter: ^0.8.3 + responsive_builder: ^0.3.0 + provider: ^4.3.2+4 + logger: ^0.9.4 + get_it: ^5.0.4 + equatable: ^1.2.5 http: ^0.12.2 - sqflite: ^1.3.1 - path_provider: ^1.6.14 - google_fonts: ^1.1.0 - material_design_icons_flutter: ^4.0.5345 + sqflite: ^1.3.2+2 + path_provider: ^1.6.27 + google_fonts: ^1.1.1 + material_design_icons_flutter: ^4.0.5855 intl: ^0.16.1 barcode_scan: ^3.0.1 - device_info: ^0.4.2+7 + 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 dev_dependencies: flutter_test: From 923e32274a86a9be4080fdc105e7180af2e48f81 Mon Sep 17 00:00:00 2001 From: suvaissov Date: Mon, 18 Jan 2021 12:47:59 +0600 Subject: [PATCH 2/3] fix deprecate methods --- lib/views/home/components/bottom_bar.dart | 30 +++++++++++-------- lib/views/home/home_view.dart | 1 + .../tabs/kassaView/ProductAddBottomSheet.dart | 5 ++-- lib/widgets/dialog_manager.dart | 2 +- pubspec.lock | 8 ++--- 5 files changed, 27 insertions(+), 19 deletions(-) diff --git a/lib/views/home/components/bottom_bar.dart b/lib/views/home/components/bottom_bar.dart index 0fb052f..8401901 100644 --- a/lib/views/home/components/bottom_bar.dart +++ b/lib/views/home/components/bottom_bar.dart @@ -29,24 +29,30 @@ class BottomBar extends StatelessWidget { ? BottomNavigationBarItem( backgroundColor: menuColor, icon: Icon(MdiIcons.cashRegister, color: Colors.white), - title: new Text( - 'Касса', - style: TextStyle(color: Colors.white), - )) + label: 'Касса', + // title: new Text( + // 'Касса', + // style: TextStyle(color: Colors.white), + // ) + ) : BottomNavigationBarItem( backgroundColor: menuColor, icon: Icon(MdiIcons.calculator, color: Colors.white), - title: new Text( - 'Калькулятор', - style: TextStyle(color: Colors.white), - )), + label: 'Калькулятор', + // title: new Text( + // 'Калькулятор', + // style: TextStyle(color: Colors.white), + // ) + ), BottomNavigationBarItem( backgroundColor: menuColor, icon: Icon(MdiIcons.tune, color: Colors.white), - title: new Text( - 'Опции', - style: TextStyle(color: Colors.white), - )), + label: 'Опции' + // title: new Text( + // 'Опции', + // style: TextStyle(color: Colors.white), + // ) + ), ], onTap: (index) { pageController.animateToPage( diff --git a/lib/views/home/home_view.dart b/lib/views/home/home_view.dart index 46c3459..72aab32 100644 --- a/lib/views/home/home_view.dart +++ b/lib/views/home/home_view.dart @@ -85,6 +85,7 @@ class _HomeViewState extends State { converter: (store) => store.state.settingState, builder: (context, vm) { return PageView( + pageSnapping: true, onPageChanged: (index) { setState(() { selectedTabIndex = index; diff --git a/lib/views/home/tabs/kassaView/ProductAddBottomSheet.dart b/lib/views/home/tabs/kassaView/ProductAddBottomSheet.dart index cc8134e..9ff7521 100644 --- a/lib/views/home/tabs/kassaView/ProductAddBottomSheet.dart +++ b/lib/views/home/tabs/kassaView/ProductAddBottomSheet.dart @@ -78,7 +78,8 @@ class _ProductAddBottomSheetState extends State { decimal: false, ), inputFormatters: [ - WhitelistingTextInputFormatter.digitsOnly + // WhitelistingTextInputFormatter.digitsOnly + FilteringTextInputFormatter.digitsOnly ], controller: countController, onChanged: calcOnChange, @@ -95,7 +96,7 @@ class _ProductAddBottomSheetState extends State { keyboardType: const TextInputType.numberWithOptions(decimal: true), inputFormatters: [ - WhitelistingTextInputFormatter(RegExp("^[0-9.]*")), + FilteringTextInputFormatter.allow(RegExp("^[0-9.]*")), ], controller: priceController, onChanged: calcOnChange, diff --git a/lib/widgets/dialog_manager.dart b/lib/widgets/dialog_manager.dart index 8380062..26dc986 100644 --- a/lib/widgets/dialog_manager.dart +++ b/lib/widgets/dialog_manager.dart @@ -122,7 +122,7 @@ class _DialogManagerState extends State { inputFormatters: [ if (request.formatType == "phone") maskFormatter, if (request.formatType == null) - WhitelistingTextInputFormatter(RegExp("^[0-9.]*")), + FilteringTextInputFormatter.allow(RegExp("^[0-9.]*")), ], ) ], diff --git a/pubspec.lock b/pubspec.lock index e5e4568..861beca 100644 --- a/pubspec.lock +++ b/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,7 +145,7 @@ 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: @@ -169,7 +169,7 @@ packages: name: get_it url: "https://pub.dartlang.org" source: hosted - version: "4.0.4" + version: "5.0.4" google_fonts: dependency: "direct main" 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: From fd4168b614e849ae5632423f0182edab6448a70a Mon Sep 17 00:00:00 2001 From: suvaissov Date: Thu, 4 Feb 2021 19:48:29 +0600 Subject: [PATCH 3/3] change target SDK to 29 --- android/app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 3010ab1..196e0fe 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -34,7 +34,7 @@ if (keystorePropertiesFile.exists()) { android { - compileSdkVersion 28 + compileSdkVersion 29 sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -47,7 +47,7 @@ android { defaultConfig { applicationId "kz.com.aman.kassa" minSdkVersion 18 - targetSdkVersion 28 + targetSdkVersion 29 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"