Serik
/
aman-kassa-flutter
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Merge branch 'master' into backend_nfc 

# Conflicts:
#	android/app/build.gradle
#	lib/views/home/home_view.dart
#	pubspec.yaml
backend_nfc
suvaissov 2021-03-03 17:39:13 +06:00
parent e4bf1db47b fd4168b614
commit 54df0728f3
4 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/app/build.gradle
View File

@ -34,7 +34,7 @@ if (keystorePropertiesFile.exists()) {
android { android {
compileSdkVersion 28 compileSdkVersion 29
sourceSets { sourceSets {
main.java.srcDirs += 'src/main/kotlin' main.java.srcDirs += 'src/main/kotlin'

30
lib/views/home/components/bottom_bar.dart
View File

@ -29,24 +29,30 @@ class BottomBar extends StatelessWidget {
? BottomNavigationBarItem( ? BottomNavigationBarItem(
backgroundColor: menuColor, backgroundColor: menuColor,
icon: Icon(MdiIcons.cashRegister, color: Colors.white), icon: Icon(MdiIcons.cashRegister, color: Colors.white),
title: new Text( label: 'Касса',
'Касса', // title: new Text(
style: TextStyle(color: Colors.white), // 'Касса',
)) // style: TextStyle(color: Colors.white),
// )
)
: BottomNavigationBarItem( : BottomNavigationBarItem(
backgroundColor: menuColor, backgroundColor: menuColor,
icon: Icon(MdiIcons.calculator, color: Colors.white), icon: Icon(MdiIcons.calculator, color: Colors.white),
title: new Text( label: 'Калькулятор',
'Калькулятор', // title: new Text(
style: TextStyle(color: Colors.white), // 'Калькулятор',
)), // style: TextStyle(color: Colors.white),
// )
),
BottomNavigationBarItem( BottomNavigationBarItem(
backgroundColor: menuColor, backgroundColor: menuColor,
icon: Icon(MdiIcons.tune, color: Colors.white), icon: Icon(MdiIcons.tune, color: Colors.white),
title: new Text( label: 'Опции'
'Опции', // title: new Text(
style: TextStyle(color: Colors.white), // 'Опции',
)), // style: TextStyle(color: Colors.white),
// )
),
], ],
onTap: (index) { onTap: (index) {
pageController.animateToPage( pageController.animateToPage(

5
lib/views/home/tabs/kassaView/ProductAddBottomSheet.dart
View File

@ -78,7 +78,8 @@ class _ProductAddBottomSheetState extends State<ProductAddBottomSheet> {
decimal: false, decimal: false,
), ),
inputFormatters: <TextInputFormatter>[ inputFormatters: <TextInputFormatter>[
WhitelistingTextInputFormatter.digitsOnly // WhitelistingTextInputFormatter.digitsOnly
FilteringTextInputFormatter.digitsOnly
], ],
controller: countController, controller: countController,
onChanged: calcOnChange, onChanged: calcOnChange,
@ -95,7 +96,7 @@ class _ProductAddBottomSheetState extends State<ProductAddBottomSheet> {
keyboardType: keyboardType:
const TextInputType.numberWithOptions(decimal: true), const TextInputType.numberWithOptions(decimal: true),
inputFormatters: <TextInputFormatter>[ inputFormatters: <TextInputFormatter>[
WhitelistingTextInputFormatter(RegExp("^[0-9.]*")), FilteringTextInputFormatter.allow(RegExp("^[0-9.]*")),
], ],
controller: priceController, controller: priceController,
onChanged: calcOnChange, onChanged: calcOnChange,

2
lib/widgets/dialog_manager.dart
View File

@ -122,7 +122,7 @@ class _DialogManagerState extends State<DialogManager> {
inputFormatters: <TextInputFormatter>[ inputFormatters: <TextInputFormatter>[
if (request.formatType == "phone") maskFormatter, if (request.formatType == "phone") maskFormatter,
if (request.formatType == null) if (request.formatType == null)
WhitelistingTextInputFormatter(RegExp("^[0-9.]*")), FilteringTextInputFormatter.allow(RegExp("^[0-9.]*")),
], ],
) )
], ],