From 9043b531ab4f3fd939b20f2271df6f7a7b24ea39 Mon Sep 17 00:00:00 2001
From: Feodor Fitsner <feodor@appveyor.com>
Date: Fri, 21 Feb 2025 16:19:42 -0800
Subject: [PATCH] Misc template var fixes for 0.27.0

---
 cookiecutter.json                                          | 7 ++++---
 {{cookiecutter.out_dir}}/android/app/build.gradle          | 4 ++--
 .../kotlin/{{ cookiecutter.kotlin_dir }}/MainActivity.kt   | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/cookiecutter.json b/cookiecutter.json
index 8fc8547..7ff80c0 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -5,20 +5,21 @@
     "project_name_slug": "",
     "project_description": "",
     "product_name": "{{ cookiecutter.project_name }}",
-    "org_name": "{{ cookiecutter.org_name if 'org_name' in cookiecutter else cookiecutter.bundle_id.rsplit('.', 1)[0] if 'bundle_id' in cookiecutter else 'com.flet' }}",
+    "org_name": "{{ cookiecutter.org_name if 'org_name' in cookiecutter else 'com.flet' }}",
     "company_name": "Your Company",
     "copyright": "Copyright (c) 2023 Your Company",
     "flutter": null,
     "sep": "/",
     "hide_loading_animation": true,
-    "bundle_id": "{{ cookiecutter.bundle_id if 'bundle_id' in cookiecutter else cookiecutter.org_name + '.' + cookiecutter.project_name }}",
+    "bundle_id": "{{ cookiecutter.bundle_id if 'bundle_id' in cookiecutter else cookiecutter.org_name + '.' + cookiecutter.project_name_slug }}",
+    "org_name_2": "{{ cookiecutter.bundle_id.rsplit('.', 1)[0] if 'bundle_id' in cookiecutter else cookiecutter.org_name if 'org_name' in cookiecutter else 'com.flet' }}",
     "ios_provisioning_profile": "",
     "ios_export_method": "",
     "ios_signing_certificate": "",
     "ios_export_options": {},
     "ios_team_id": "",
     "package_name": "{{ cookiecutter.bundle_id.rsplit('.', 1)[-1].replace('-', '_') if 'bundle_id' in cookiecutter else cookiecutter.project_name }}",
-    "kotlin_dir": "{{ cookiecutter.org_name.replace('.', cookiecutter.sep) }}{{ cookiecutter.sep }}{{ cookiecutter.package_name }}{{ cookiecutter.sep }}",
+    "kotlin_dir": "{{ cookiecutter.org_name_2.replace('.', cookiecutter.sep) }}{{ cookiecutter.sep }}{{ cookiecutter.package_name }}{{ cookiecutter.sep }}",
     "base_url": "/",
     "route_url_strategy": "path",
     "web_renderer": "canvaskit",
diff --git a/{{cookiecutter.out_dir}}/android/app/build.gradle b/{{cookiecutter.out_dir}}/android/app/build.gradle
index 7ac30b3..72456cc 100644
--- a/{{cookiecutter.out_dir}}/android/app/build.gradle
+++ b/{{cookiecutter.out_dir}}/android/app/build.gradle
@@ -23,7 +23,7 @@ if (flutterVersionName == null) {
 }
 
 android {
-    namespace "{{ cookiecutter.org_name }}.{{ cookiecutter.project_name }}"
+    namespace "{{ cookiecutter.org_name_2 }}.{{ cookiecutter.package_name }}"
     compileSdkVersion flutter.compileSdkVersion
 
     packagingOptions {
@@ -50,7 +50,7 @@ android {
     }
 
     defaultConfig {
-        applicationId "{{ cookiecutter.bundle_id }}"
+        applicationId "{{ cookiecutter.org_name_2 }}.{{ cookiecutter.package_name }}"
         minSdkVersion flutter.minSdkVersion
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
diff --git a/{{cookiecutter.out_dir}}/android/app/src/main/kotlin/{{ cookiecutter.kotlin_dir }}/MainActivity.kt b/{{cookiecutter.out_dir}}/android/app/src/main/kotlin/{{ cookiecutter.kotlin_dir }}/MainActivity.kt
index aa1cf92..8e797f0 100644
--- a/{{cookiecutter.out_dir}}/android/app/src/main/kotlin/{{ cookiecutter.kotlin_dir }}/MainActivity.kt	
+++ b/{{cookiecutter.out_dir}}/android/app/src/main/kotlin/{{ cookiecutter.kotlin_dir }}/MainActivity.kt	
@@ -1,4 +1,4 @@
-package {{ cookiecutter.org_name }}.{{ cookiecutter.package_name }}
+package {{ cookiecutter.org_name_2 }}.{{ cookiecutter.package_name }}
 
 import io.flutter.embedding.android.FlutterActivity