Android - Added separation for development/production builds

.github/workflows/build.yml

@@ -63,26 +63,25 @@ jobs:
           flutter build apk --release \
             --build-name=$VERSION_NAME \
             --build-number=$GITHUB_RUN_NUMBER \
-            --dart-define=FLAVOR=release
+            --flavor production
 
           # Build AAB
           flutter build appbundle --release \
             --build-name=$VERSION_NAME \
             --build-number=$GITHUB_RUN_NUMBER \
-            --dart-define=FLAVOR=release
+            --flavor production
 
       - name: Rename APK and AAB
         run: |
-          mv build/app/outputs/flutter-apk/app-release.apk "build/app/outputs/flutter-apk/${{ env.APP_NAME }}-${{ env.VERSION_NAME }}-signed.apk"
-          mv build/app/outputs/bundle/release/app-release.aab "build/app/outputs/bundle/release/${{ env.APP_NAME }}-${{ env.VERSION_NAME }}-signed.aab"
+          mkdir -p build/app/outputs/android_artifacts
+          mv build/app/outputs/flutter-apk/app-production-release.apk "build/app/outputs/android_artifacts/${{ env.APP_NAME }}-Android-${{ env.VERSION_NAME }}.apk"
+          mv build/app/outputs/bundle/productionRelease/app-production-release.aab "build/app/outputs/android_artifacts/${{ env.APP_NAME }}-Android-${{ env.VERSION_NAME }}.aab"
 
       - name: Archive Android artifacts
         uses: actions/[email protected]
         with:
           name: ${{ env.APP_NAME }}-Android-${{ env.VERSION_NAME }}
-          path: |
-            build/app/outputs/flutter-apk/${{ env.APP_NAME }}-${{ env.VERSION_NAME }}-signed.apk
-            build/app/outputs/bundle/release/${{ env.APP_NAME }}-${{ env.VERSION_NAME }}-signed.aab
+          path: build/app/outputs/android_artifacts/            
 
   build-windows:
     #Use windows-2019, latest(2022) causes MSVCP140.dll related crashes
@@ -274,6 +273,7 @@ jobs:
           path: build/web
 
       - name: Deploy to ghcr.io
+        if: startsWith(github.ref, 'refs/tags/v')
         uses: mr-smithers-excellent/docker-build-push@v6
         with:
           image: fladder
@@ -283,9 +283,11 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build Github pages web
+        if: startsWith(github.ref, 'refs/tags/v')        
         run: flutter build web --base-href /${{ github.event.repository.name }}/ --release --build-number=$GITHUB_RUN_NUMBER
 
       - name: Deploy to GitHub Pages
+        if: startsWith(github.ref, 'refs/tags/v')        
         uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }} # Automatically provided by GitHub Actions

.vscode/launch.json

@@ -5,51 +5,62 @@
 	"version": "0.2.0",
 	"configurations": [
 		{
-			"name": "fladder",
+			"name": "Fladder Development (debug)",
 			"request": "launch",
 			"type": "dart",
 			"args": [
-				"--web-port",
-				"8096"
-			],
+				"--flavor",
+				"development"
+			]
 		},
 		{
-			"name": "fladder (profile mode)",
+			"name": "Fladder Production (debug)",
 			"request": "launch",
 			"type": "dart",
-			"flutterMode": "profile",
 			"args": [
-				"--web-port",
-				"9090"
-			],
+				"--flavor",
+				"production"
+			]
 		},
 		{
-			"name": "fladder (release mode)",
+			"name": "Fladder Development (profile mode)",
 			"request": "launch",
 			"type": "dart",
-			"flutterMode": "release",
+			"flutterMode": "profile",
 			"args": [
-				"--web-port",
-				"9090"
-			],
+				"--flavor",
+				"development"
+			]
 		},
 		{
-			"name": "Android",
+			"name": "Fladder Production (profile mode)",
 			"request": "launch",
 			"type": "dart",
+			"flutterMode": "profile",
+			"args": [
+				"--flavor",
+				"production"
+			]
 		},
 		{
-			"name": "iPhone",
+			"name": "Fladder Development (release mode)",
 			"request": "launch",
 			"type": "dart",
-			"deviceId": "iphone"
+			"flutterMode": "release",
+			"args": [
+				"--flavor",
+				"development"
+			]
 		},
 		{
-			"name": "Windows",
+			"name": "Fladder Production (release mode)",
 			"request": "launch",
 			"type": "dart",
-			"flutterMode": "debug",
-			"deviceId": "windows"
+			"flutterMode": "release",
+			"args": [
+				"--flavor",
+				"production"
+			]
 		},
 		{
 			"name": "Web",
@@ -72,20 +83,5 @@
 				"9090"
 			],
 		},
-		{
-			"name": "AndroidTV",
-			"request": "launch",
-			"program": "lib/android_tv/main.dart",
-			"type": "dart",
-		},
 	],
-	"compounds": [
-		{
-			"name": "All Devices",
-			"configurations": [
-				"Windows",
-				"Android"
-			],
-		}
-	]
 }

.vscode/tasks.json

@@ -75,10 +75,15 @@
 			"command": "dart",
 			"args": [
 				"run",
-				"icons_launcher:create"
+				"icons_launcher:create",
+				"--flavors",
+				"development,production"
 			],
-			"label": "dart: generate launcher icons",
-			"detail": ""
+			"label": "dart: generate icons_launcher",
+			"detail": "",
+			"options": {
+				"cwd": "${workspaceFolder}"
+			}
 		}
 	],
 }

android/app/build.gradle

@@ -68,12 +68,24 @@ android {
 
     buildTypes {
 		release {
+            minifyEnabled true
+            shrinkResources true
+            proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
 			signingConfig signingConfigs.release
 		}
-		debug{
-			applicationIdSuffix = ".debug"
-		}
     }	
+
+    flavorDimensions "default"
+    productFlavors {        
+        development {
+            dimension "default"
+            applicationIdSuffix ".dev"
+        }
+        production {
+            dimension "default"
+            applicationIdSuffix ""
+        }
+    }
 }
 
 flutter {

android/app/src/development/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+  <background android:drawable="@color/ic_launcher_background"/>
+  <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+  <monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
+</adaptive-icon>

android/app/src/development/res/values/colors.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <color name="ic_launcher_background">#FF21013A</color>
+</resources>

android/app/src/production/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+  <background android:drawable="@color/ic_launcher_background"/>
+  <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+  <monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
+</adaptive-icon>

android/app/src/production/res/values/colors.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <color name="ic_launcher_background">#FF3A2101</color>
+</resources>

android/build.gradle

@@ -7,6 +7,10 @@ allprojects {
 
 rootProject.buildDir = '../build'
 
+buildscript {
+    ext.kotlin_version = '1.8.0'
+}
+
 //[Fixes AAPT: error: resource android:attr/lStar not found]
 subprojects {
     afterEvaluate { project ->

icons_launcher-development.yaml

@@ -0,0 +1,24 @@
+icons_launcher:
+  image_path: "icons/development/fladder_icon.png"
+  platforms:
+    android:
+      adaptive_foreground_image: "icons/development/fladder_icon.png"
+      adaptive_background_color: "#21013a"
+      adaptive_monochrome_image: "icons/development/fladder_adaptive_icon.png"
+      notification_image: icons/fladder_notification_icon.png
+      enable: true
+    ios:
+      image_path: "icons/development/fladder_store_icon.jpg"
+      enable: true
+    windows:
+      image_path: "icons/development/fladder_icon_desktop.png"
+      enable: true
+    macos:
+      image_path: "icons/development/fladder_macos_icon.png"
+      enable: true
+    linux:
+      image_path: "icons/development/fladder_icon_desktop.png"
+      enable: true
+    web:
+      favicon_path: "icons/development/fladder_icon_desktop.png"
+      enable: true

icons_launcher-production.yaml

@@ -0,0 +1,24 @@
+icons_launcher:
+  image_path: "icons/production/fladder_icon.png"
+  platforms:
+    android:
+      adaptive_foreground_image: "icons/production/fladder_icon.png"
+      adaptive_background_color: "#3a2101"
+      adaptive_monochrome_image: "icons/production/fladder_adaptive_icon.png"
+      notification_image: icons/fladder_notification_icon.png
+      enable: true
+    ios:
+      image_path: "icons/production/fladder_store_icon.jpg"
+      enable: true
+    windows:
+      image_path: "icons/production/fladder_icon_desktop.png"
+      enable: true
+    macos:
+      image_path: "icons/production/fladder_macos_icon.png"
+      enable: true
+    linux:
+      image_path: "icons/production/fladder_icon_desktop.png"
+      enable: true
+    web:
+      favicon_path: "icons/production/fladder_icon_desktop.png"
+      enable: true