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

Merge branch 'master' into nfc-android 

# Conflicts:
#	android/app/build.gradle
#	android/app/src/main/AndroidManifest.xml
backend_nfc
Serik.Uvaissov 2020-07-13 13:11:30 +06:00
parent e5f6cad039 34123689de
commit 4f9bea7980
5 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/app/build.gradle
View File

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

2
android/app/src/debug/AndroidManifest.xml
View File

@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <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 <!-- Flutter needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc. to allow setting breakpoints, to provide hot reload, etc.
--> -->

3
android/app/src/main/AndroidManifest.xml
View File

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

2
android/app/src/main/kotlin/com/example/aman_kassa_flutter/MainActivity.kt → android/app/src/main/kotlin/kz/com/aman/kassa/MainActivity.kt
View File

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

38
lib/widgets/fields/busy_button.dart
View File

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