diff --git a/android/app/build.gradle b/android/app/build.gradle index d097f46..a4bfe82 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -13,12 +13,12 @@ if (flutterRoot == null) { def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { - flutterVersionCode = '1' + flutterVersionCode = '3' } def flutterVersionName = localProperties.getProperty('flutter.versionName') if (flutterVersionName == null) { - flutterVersionName = '1.0' + flutterVersionName = '1.0.3' } apply plugin: 'com.android.application' diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 8d35288..87beaf6 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -14,6 +14,7 @@ android:name="io.flutter.app.FlutterApplication" android:label="Аман Касса" android:icon="@mipmap/ic_launcher" + android:roundIcon="@mipmap/ic_launcher_rounded" android:usesCleartextTraffic="true"> [ Icon(choice.icon, color: primaryColor,), + SizedBox(width: 5,), Text(choice.title) ], ), ); diff --git a/lib/views/home/tabs/AdditionalTab.dart b/lib/views/home/tabs/AdditionalTab.dart index d8ff9e2..e72c440 100644 --- a/lib/views/home/tabs/AdditionalTab.dart +++ b/lib/views/home/tabs/AdditionalTab.dart @@ -258,7 +258,7 @@ class _AdditionalTabState extends State { title: 'Денег в кассе', onPressed: _checkMoney, busy: isMoneyCheckBusy, - icon: Icons.attach_money, + icon: MdiIcons.walletOutline, mainColor: primaryColor, ), ], diff --git a/lib/widgets/components/calculator/calculator-button.dart b/lib/widgets/components/calculator/calculator-button.dart index 96d146a..a444df5 100644 --- a/lib/widgets/components/calculator/calculator-button.dart +++ b/lib/widgets/components/calculator/calculator-button.dart @@ -17,12 +17,12 @@ class CalculatorButton extends StatelessWidget { Widget build(BuildContext context) { return Expanded( child: Container( - decoration: BoxDecoration( - border: Border.all( - color: Colors.black, - width: 1.2, - ), - ), + // decoration: BoxDecoration( + // border: Border.all( + // color: Colors.black, + // width: 1.2, + // ), + // ), child: FlatButton( onPressed: () => onTap(buttonText: text), child: Text( @@ -32,6 +32,10 @@ class CalculatorButton extends StatelessWidget { padding: const EdgeInsets.all(20), highlightColor: Colors.blueGrey[100], splashColor: Colors.blueAccent[100], + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(0), + side: BorderSide(color: Colors.black) + ), color: buildMainColor(), ))); } diff --git a/lib/widgets/fields/aman_icon_button.dart b/lib/widgets/fields/aman_icon_button.dart index 424c448..cd905ae 100644 --- a/lib/widgets/fields/aman_icon_button.dart +++ b/lib/widgets/fields/aman_icon_button.dart @@ -29,7 +29,7 @@ class _AmanIconButtonState extends State { Widget build(BuildContext context) { return GestureDetector( child: InkWell( - + borderRadius: BorderRadius.circular(15), onTap: widget.busy ? () {} : widget.onPressed, child: Container( //height: 75, diff --git a/lib/widgets/fields/aman_icon_button_horizontal.dart b/lib/widgets/fields/aman_icon_button_horizontal.dart index 7c929c6..9dd4ea5 100644 --- a/lib/widgets/fields/aman_icon_button_horizontal.dart +++ b/lib/widgets/fields/aman_icon_button_horizontal.dart @@ -27,6 +27,7 @@ class _AmanIconButtonHorizontalState extends State { Widget build(BuildContext context) { return GestureDetector( child: InkWell( + borderRadius: BorderRadius.circular(3), onTap: widget.onPressed, child: Row( mainAxisAlignment: MainAxisAlignment.center,