Replace button by floatingActionButton; show 20 last transcations; Use flutter way for version controle

lib/api.dart

@@ -80,7 +80,7 @@ Future getBalance(String pubkey) async {
 // Get history
 Future getHistory(String pubkey) async {
   print(pubkey);
-  var number = 3;
+  var number = 20;
   var query = """{
         txsHistoryBc(
             pubkeyOrScript: "$pubkey"

lib/main.dart

@@ -94,8 +94,8 @@ class _MyAppState extends State<MyApp> {
                                 errorBorder: InputBorder.none,
                                 disabledBorder: InputBorder.none,
                               ),
-                            style:
+                              style: TextStyle(
-                                TextStyle(fontSize: 30.0, color: Colors.black)),
+                                  fontSize: 30.0, color: Colors.black)),
                           TextField(
                               // Affichage history
                               enabled: false,
@@ -118,7 +118,6 @@ class _MyAppState extends State<MyApp> {
                                   height: 1.5,
                                   color: Colors.black)),
                           SizedBox(height: 20),
-                        this._buttonGroup(),
                           SizedBox(height: 70),
                           // Expanded(
                           //     child: ListView.builder(
@@ -141,42 +140,22 @@ class _MyAppState extends State<MyApp> {
                   ],
                 );
               },
-          )
-          // floatingActionButton: FloatingActionButton(
-          //   onPressed: () => _scanBytes(),
-          //   tooltip: 'Prennez une photo',
-          //   child: const Icon(Icons.camera_alt),
-          // ),
             ),
-    );
+            floatingActionButton: Container(
-  }
+              height: 80.0,
-
+              width: 80.0,
-  Widget _buttonGroup() {
+              child: FittedBox(
-    return Row(
+                child: FloatingActionButton(
-      children: <Widget>[
+                  onPressed: () => _scan(),
-        Expanded(
+                  // label: Text('Scanner'),
-          flex: 1,
+                  child: Container(
-          child: SizedBox(
+                      height: 40.0,
-            height: 120,
+                      width: 40.0,
-            child: InkWell(
+                      child: Image.asset('images/scanner.png')),
-              onTap: _scan,
+                  backgroundColor: Color.fromARGB(500, 204, 255, 255),
-              child: Card(
-                child: Column(
-                  children: <Widget>[
-                    Expanded(
-                      flex: 2,
-                      child: Image.asset('images/scanner.png'),
-                    ),
-                    Divider(height: 20),
-                    Expanded(flex: 1, child: Text("Scanner")),
-                  ],
                 ),
               ),
-            ),
+            )));
-          ),
-        ),
-      ],
-    );
   }
 
   Future checkNode() async {
@@ -188,8 +167,10 @@ class _MyAppState extends State<MyApp> {
   Future _scan() async {
     await Permission.camera.request();
     String barcode = await scanner.scan();
-    this._outputPubkey.text = "";
+    // this._outputPubkey.text = "";
+    if (barcode != null) {
       isPubkey(barcode);
+    }
     return barcode;
   }
 

pubspec.yaml

@@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.0.0+1
+version: 0.0.0+3
 
 environment:
   sdk: ">=2.7.0 <3.0.0"

scripts/build-apk.sh

@@ -1,13 +1,18 @@
 #!/bin/bash
 
-[[ -z $1 ]] && echo "Please choose a version." && exit 1
+# [[ -z $1 ]] && echo "Please choose a version." && exit 1
 
-flutter build apk --split-per-abi
+fVersion=$(grep "version: " pubspec.yaml | awk '{ print $2 }')
 
 APPNAME="gecko"
-VERSION="$1"
+VERSION=$(awk -F '+' '{ print $1 }' <<<$fVersion)
+BUILD=$(awk -F '+' '{ print $2 }' <<<$fVersion)
 ori_app="app.apk"
 
+echo "Nom du build final: ${APPNAME}-${VERSION}+${BUILD}.apk"
+
+flutter build apk --split-per-abi --build-name $VERSION --build-number $BUILD
+
 if [[ -d $HOME/Téléchargements ]]; then
     DL="$HOME/Téléchargements"
 elif [[ -d $HOME/Downloads ]]; then
@@ -16,7 +21,7 @@ else
     DL="/tmp"
 fi
 
-appPath="$DL/${APPNAME}-${VERSION}.apk"
+appPath="$DL/${APPNAME}-${VERSION}+${BUILD}.apk"
 mv build/app/outputs/flutter-apk/$ori_app "$appPath" && echo "$appPath" || exit 1
 
 exit 0