From 2d267cbfe633308e44c6f020c0b21b301aaf972a Mon Sep 17 00:00:00 2001
From: OutdatedGuy <everythingoutdated@gmail.com>
Date: Tue, 11 Jun 2024 17:01:49 +0530
Subject: [PATCH] feat: support for Flutter 3.22 template

---
 lib/constants.dart         |  3 +--
 lib/platforms/android.dart | 16 ++++------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/lib/constants.dart b/lib/constants.dart
index c00732a..28ee24f 100644
--- a/lib/constants.dart
+++ b/lib/constants.dart
@@ -124,8 +124,7 @@ package {{packageName}}
 
 import io.flutter.embedding.android.FlutterActivity
 
-class MainActivity: FlutterActivity() {
-}
+class MainActivity: FlutterActivity()
 ''';
 
 const _androidJavaMainActivityTemplate = '''
diff --git a/lib/platforms/android.dart b/lib/platforms/android.dart
index d97b548..9b5e827 100644
--- a/lib/platforms/android.dart
+++ b/lib/platforms/android.dart
@@ -140,20 +140,12 @@ void _setBuildGradlePackageName({
   final buildGradleString = buildGradleFile.readAsStringSync();
   final newPackageIDBuildGradleString = buildGradleString
       .replaceAll(
-        RegExp('applicationId "(.*?)"'),
-        'applicationId "$packageName"',
+        RegExp('applicationId\\s*=?\\s*["\'].*?["\']'),
+        'applicationId = "$packageName"',
       )
       .replaceAll(
-        RegExp("applicationId '(.*?)'"),
-        'applicationId "$packageName"',
-      )
-      .replaceAll(
-        RegExp('namespace "(.*?)"'),
-        'namespace "$packageName"',
-      )
-      .replaceAll(
-        RegExp("namespace '(.*?)'"),
-        'namespace "$packageName"',
+        RegExp('namespace\\s*=?\\s*["\'].*?["\']'),
+        'namespace = "$packageName"',
       );
 
   buildGradleFile.writeAsStringSync(newPackageIDBuildGradleString);