Merge branch 'master' into nfc-android

# Conflicts:
#	android/app/build.gradle
#	android/app/src/main/AndroidManifest.xml

android/app/build.gradle

@@ -45,7 +45,7 @@ android {
     }
 
     defaultConfig {
-        applicationId "com.example.aman_kassa_flutter"
+        applicationId "kz.com.aman.kassa"
         minSdkVersion 21
         targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()

android/app/src/debug/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.aman_kassa_flutter">
+    package="kz.com.aman.kassa">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

android/app/src/main/AndroidManifest.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.example.aman_kassa_flutter">
-    <!--
+	package="kz.com.aman.kassa">    <!--
          io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
          In most cases you can leave this as-is, but you if you want to provide

android/app/src/main/kotlin/kz/com/aman/kassa/MainActivity.kt

@@ -1,4 +1,4 @@
-package com.example.aman_kassa_flutter
+package kz.com.aman.kassa
 
 import android.app.Activity
 import android.content.Intent

lib/widgets/fields/busy_button.dart

@@ -52,26 +52,24 @@ class _BusyButtonState extends State<BusyButton> {
               mainAxisAlignment: MainAxisAlignment.center,
               children: <Widget>[
                 !widget.busy
-                    ? Expanded(
-                        child: Row(
-                          mainAxisAlignment: MainAxisAlignment.center,
-                          children: <Widget>[
-                            widget.icon != null
-                                ? Container(
-                                    child: (Icon(
-                                      widget.icon,
-                                      color: whiteColor,
-                                    )),
-                                    margin: const EdgeInsets.only(right: 10.0),
-                                  )
-                                : (Container()),
-                            AutoSizeText(
-                              widget.title,
-                              textAlign: TextAlign.center,
-                              style: buttonTitleTextStyle,
-                            ),
-                          ],
-                        ),
+                    ? Row(
+                        mainAxisAlignment: MainAxisAlignment.center,
+                        children: <Widget>[
+                          widget.icon != null
+                              ? Container(
+                                  child: (Icon(
+                                    widget.icon,
+                                    color: whiteColor,
+                                  )),
+                                  margin: const EdgeInsets.only(right: 10.0),
+                                )
+                              : (Container()),
+                          AutoSizeText(
+                            widget.title,
+                            textAlign: TextAlign.center,
+                            style: buttonTitleTextStyle,
+                          ),
+                        ],
                       )
                     : CircularProgressIndicator(
                         strokeWidth: 2,