icons android
|
|
@ -13,12 +13,12 @@ if (flutterRoot == null) {
|
||||||
|
|
||||||
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
|
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
|
||||||
if (flutterVersionCode == null) {
|
if (flutterVersionCode == null) {
|
||||||
flutterVersionCode = '1'
|
flutterVersionCode = '3'
|
||||||
}
|
}
|
||||||
|
|
||||||
def flutterVersionName = localProperties.getProperty('flutter.versionName')
|
def flutterVersionName = localProperties.getProperty('flutter.versionName')
|
||||||
if (flutterVersionName == null) {
|
if (flutterVersionName == null) {
|
||||||
flutterVersionName = '1.0'
|
flutterVersionName = '1.0.3'
|
||||||
}
|
}
|
||||||
|
|
||||||
apply plugin: 'com.android.application'
|
apply plugin: 'com.android.application'
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@
|
||||||
android:name="io.flutter.app.FlutterApplication"
|
android:name="io.flutter.app.FlutterApplication"
|
||||||
android:label="Аман Касса"
|
android:label="Аман Касса"
|
||||||
android:icon="@mipmap/ic_launcher"
|
android:icon="@mipmap/ic_launcher"
|
||||||
|
android:roundIcon="@mipmap/ic_launcher_rounded"
|
||||||
android:usesCleartextTraffic="true">
|
android:usesCleartextTraffic="true">
|
||||||
<activity
|
<activity
|
||||||
android:name=".MainActivity"
|
android:name=".MainActivity"
|
||||||
|
|
|
||||||
|
Before Width: | Height: | Size: 544 B After Width: | Height: | Size: 2.9 KiB |
|
After Width: | Height: | Size: 5.0 KiB |
|
After Width: | Height: | Size: 4.9 KiB |
|
Before Width: | Height: | Size: 442 B After Width: | Height: | Size: 1.9 KiB |
|
After Width: | Height: | Size: 2.9 KiB |
|
After Width: | Height: | Size: 2.9 KiB |
|
Before Width: | Height: | Size: 721 B After Width: | Height: | Size: 4.1 KiB |
|
After Width: | Height: | Size: 7.7 KiB |
|
After Width: | Height: | Size: 7.3 KiB |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 7.0 KiB |
|
After Width: | Height: | Size: 14 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 10 KiB |
|
After Width: | Height: | Size: 23 KiB |
|
After Width: | Height: | Size: 18 KiB |
|
|
@ -30,6 +30,7 @@ class PopupMenu extends StatelessWidget {
|
||||||
value: choice,
|
value: choice,
|
||||||
child: Row(children: <Widget>[
|
child: Row(children: <Widget>[
|
||||||
Icon(choice.icon, color: primaryColor,),
|
Icon(choice.icon, color: primaryColor,),
|
||||||
|
SizedBox(width: 5,),
|
||||||
Text(choice.title)
|
Text(choice.title)
|
||||||
], ),
|
], ),
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -258,7 +258,7 @@ class _AdditionalTabState extends State<AdditionalTab> {
|
||||||
title: 'Денег в кассе',
|
title: 'Денег в кассе',
|
||||||
onPressed: _checkMoney,
|
onPressed: _checkMoney,
|
||||||
busy: isMoneyCheckBusy,
|
busy: isMoneyCheckBusy,
|
||||||
icon: Icons.attach_money,
|
icon: MdiIcons.walletOutline,
|
||||||
mainColor: primaryColor,
|
mainColor: primaryColor,
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
|
|
|
||||||
|
|
@ -17,12 +17,12 @@ class CalculatorButton extends StatelessWidget {
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return Expanded(
|
return Expanded(
|
||||||
child: Container(
|
child: Container(
|
||||||
decoration: BoxDecoration(
|
// decoration: BoxDecoration(
|
||||||
border: Border.all(
|
// border: Border.all(
|
||||||
color: Colors.black,
|
// color: Colors.black,
|
||||||
width: 1.2,
|
// width: 1.2,
|
||||||
),
|
// ),
|
||||||
),
|
// ),
|
||||||
child: FlatButton(
|
child: FlatButton(
|
||||||
onPressed: () => onTap(buttonText: text),
|
onPressed: () => onTap(buttonText: text),
|
||||||
child: Text(
|
child: Text(
|
||||||
|
|
@ -32,6 +32,10 @@ class CalculatorButton extends StatelessWidget {
|
||||||
padding: const EdgeInsets.all(20),
|
padding: const EdgeInsets.all(20),
|
||||||
highlightColor: Colors.blueGrey[100],
|
highlightColor: Colors.blueGrey[100],
|
||||||
splashColor: Colors.blueAccent[100],
|
splashColor: Colors.blueAccent[100],
|
||||||
|
shape: RoundedRectangleBorder(
|
||||||
|
borderRadius: BorderRadius.circular(0),
|
||||||
|
side: BorderSide(color: Colors.black)
|
||||||
|
),
|
||||||
color: buildMainColor(),
|
color: buildMainColor(),
|
||||||
)));
|
)));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,7 @@ class _AmanIconButtonState extends State<AmanIconButton> {
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return GestureDetector(
|
return GestureDetector(
|
||||||
child: InkWell(
|
child: InkWell(
|
||||||
|
borderRadius: BorderRadius.circular(15),
|
||||||
onTap: widget.busy ? () {} : widget.onPressed,
|
onTap: widget.busy ? () {} : widget.onPressed,
|
||||||
child: Container(
|
child: Container(
|
||||||
//height: 75,
|
//height: 75,
|
||||||
|
|
|
||||||
|
|
@ -27,6 +27,7 @@ class _AmanIconButtonHorizontalState extends State<AmanIconButtonHorizontal> {
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return GestureDetector(
|
return GestureDetector(
|
||||||
child: InkWell(
|
child: InkWell(
|
||||||
|
borderRadius: BorderRadius.circular(3),
|
||||||
onTap: widget.onPressed,
|
onTap: widget.onPressed,
|
||||||
child: Row(
|
child: Row(
|
||||||
mainAxisAlignment: MainAxisAlignment.center,
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
|
|
|
||||||