diff --git a/android/app/build.gradle b/android/app/build.gradle index 8199b42..cdbbd2a 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' 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/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.]*")), ], ) ],