From 54691e8837366f302bb0e6c7a09adae059d19239 Mon Sep 17 00:00:00 2001
From: iGoX <code@igox.org>
Date: Wed, 25 Mar 2026 12:53:07 +0100
Subject: [PATCH] [Android] Rework flutter build command

---
 android/flutter-build-apk.ps1 | 7 +++++--
 android/flutter-build-apk.sh  | 8 ++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/android/flutter-build-apk.ps1 b/android/flutter-build-apk.ps1
index db768ac..e1a26df 100644
--- a/android/flutter-build-apk.ps1
+++ b/android/flutter-build-apk.ps1
@@ -1,8 +1,11 @@
-$buildType = if ($args[0]) { $args[0] } else { "debug" }
+$buildType = if ($args[0]) { $args[0] } else { "release" }
+$buildName = if ($args[1]) { $args[1] } else { "0.0.0" }
+$buildNumber = "$buildName-$(Get-Date -Format 'yyyyMMddHHmmss')"
+
 $apkDir = "..\build\app\outputs\flutter-apk"
 $baseName = "org.igox.apps.android.busylight-buddy"
 
-flutter build apk --$buildType
+flutter build apk --$buildType --build-name=${buildName} --build-number ${buildNumber} --target-platform android-arm,android-arm64,android-x64
 
 # Rename APK
 $oldApk = "$apkDir\app-$buildType.apk"
diff --git a/android/flutter-build-apk.sh b/android/flutter-build-apk.sh
index 4d6cbf9..de2aca8 100755
--- a/android/flutter-build-apk.sh
+++ b/android/flutter-build-apk.sh
@@ -1,9 +1,13 @@
 #!/bin/bash
-BUILD_TYPE=${1:-debug}
+BUILD_TYPE=${1:-release}
+BUILD_NAME=${2:-0.0.0}
+BUILD_NUMBER="$BUILD_NAME-$(date +%Y%m%d%H%M%S)"
+
+
 APK_DIR="../build/app/outputs/flutter-apk"
 BASE_NAME="org.igox.apps.android.busylight-buddy"
 
-flutter build apk --$BUILD_TYPE
+flutter build apk --$BUILD_TYPE --build-name=$BUILD_NAME --build-number=$BUILD_NUMBER --target-platform android-arm,android-arm64,android-x64
 
 # Rename APK
 OLD_APK="$APK_DIR/app-$BUILD_TYPE.apk"