Update serious_python dependency override

Enabled the serious_python override with a new git reference 'app-zip-windows-fix' to address issues related to Windows app zipping. Previously, the override was commented out and pointed to 'android-crash-fix'.

cookiecutter.json

@@ -2,17 +2,31 @@
     "out_dir": "",
     "python_module_name": "main",
     "project_name": "",
+    "project_name_slug": "",
     "project_description": "",
     "product_name": "{{ cookiecutter.project_name }}",
-    "org_name": "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": "/",
-    "kotlin_dir": "{{ cookiecutter.org_name.replace('.', cookiecutter.sep) }}{{ cookiecutter.sep }}{{ cookiecutter.project_name }}{{ cookiecutter.sep }}",
+    "bundle_id": "{{ cookiecutter.bundle_id if 'bundle_id' in cookiecutter else cookiecutter.org_name + '.' + cookiecutter.project_name_slug }}",
-    "hide_loading_animation": true,
+    "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' }}",
-    "team_id": "",
+    "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_2.replace('.', cookiecutter.sep) }}{{ cookiecutter.sep }}{{ cookiecutter.package_name }}{{ cookiecutter.sep }}",
     "base_url": "/",
     "route_url_strategy": "path",
     "web_renderer": "canvaskit",
-    "use_color_emoji": "false"
+    "use_color_emoji": "false",
+    "pwa_background_color": "#FFFFFF",
+    "pwa_theme_color": "#0175C2",
+    "split_per_abi": false,
+    "options": null,
+    "pyproject": null,
+    "_extensions": ["cookiecutter_extensions.FletExtension"]
 }

cookiecutter_extensions.py

@@ -0,0 +1,22 @@
+from jinja2 import pass_context
+from jinja2.ext import Extension
+
+
+class FletExtension(Extension):
+    def __init__(self, environment):
+        super(FletExtension, self).__init__(environment)
+        environment.globals["get_pyproject"] = self.get_pyproject
+
+    @pass_context
+    def get_pyproject(self, context, setting):
+        pyproject = context.get("cookiecutter", {}).get("pyproject", {})
+
+        if not setting:
+            return pyproject
+
+        d = pyproject
+        for k in setting.split("."):
+            d = d.get(k)
+            if d is None:
+                return None
+        return d

{{cookiecutter.out_dir}}/.vars

@@ -0,0 +1,3 @@
+{% for key, value in cookiecutter.items() -%}
+{{ key }}: {{ value }}
+{% endfor %}

{{cookiecutter.out_dir}}/android/app/build.gradle

@@ -23,9 +23,18 @@ if (flutterVersionName == null) {
 }
 
 android {
-    namespace "{{ cookiecutter.org_name }}.{{ cookiecutter.project_name }}"
+    namespace "{{ cookiecutter.org_name_2 }}.{{ cookiecutter.package_name }}"
     compileSdkVersion flutter.compileSdkVersion
-    ndkVersion flutter.ndkVersion
+
+    packagingOptions {
+        jniLibs {
+            useLegacyPackaging true
+        }
+        doNotStrip "*/arm64-v8a/libpython*.so"
+        doNotStrip "*/armeabi-v7a/libpython*.so"
+        doNotStrip "*/x86/libpython*.so"
+        doNotStrip "*/x86_64/libpython*.so"
+    }
     
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -40,26 +49,51 @@ android {
         main.java.srcDirs += 'src/main/kotlin'
     }
 
+    {% set min_sdk_version = get_pyproject("tool.flet.android.min_sdk_version") %}
+    {% set target_sdk_version = get_pyproject("tool.flet.android.target_sdk_version") %}
+
     defaultConfig {        
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
+        applicationId "{{ cookiecutter.org_name_2 }}.{{ cookiecutter.package_name }}"
-        applicationId "{{ cookiecutter.org_name }}.{{ cookiecutter.project_name }}"
+        minSdkVersion {{ min_sdk_version if min_sdk_version else "flutter.minSdkVersion" }}
-        // You can update the following values to match your application needs.
+        targetSdkVersion {{ target_sdk_version if target_sdk_version else "flutter.targetSdkVersion" }}
-        // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
-        minSdkVersion flutter.minSdkVersion
-        targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
 
+        println("Gradle build config:")
+        println("  minSdkVersion: {{ min_sdk_version if min_sdk_version else "$flutter.minSdkVersion" }}")
+        println("  targetSdkVersion: {{ target_sdk_version if target_sdk_version else "$flutter.targetSdkVersion" }}")
+        println("  versionCode: $flutter.versionCode")
+        println("  versionName: $flutter.versionName")
+
+// flet: split_per_abi {% if not cookiecutter.split_per_abi %}
         ndk {
-            abiFilters 'arm64-v8a', 'armeabi-v7a'
+            {% if cookiecutter.options.target_arch %}
+            abiFilters {% for arch in cookiecutter.options.target_arch %}'{{ arch }}'{% if not loop.last %}, {% endif %}{% endfor %}
+            {% else %}
+            abiFilters 'arm64-v8a', 'armeabi-v7a', 'x86_64'
+            {% endif %}
+        }
+// flet: end of split_per_abi {% endif %}
+    }
+
+// flet: android_signing {% if cookiecutter.options.android_signing %}
+    signingConfigs {
+        release {
+            keyAlias System.getenv('FLET_ANDROID_SIGNING_KEY_ALIAS')
+            keyPassword System.getenv('FLET_ANDROID_SIGNING_KEY_PASSWORD')
+            storeFile System.getenv('FLET_ANDROID_SIGNING_KEY_STORE') ? file(System.getenv('FLET_ANDROID_SIGNING_KEY_STORE')) : null
+            storePassword System.getenv('FLET_ANDROID_SIGNING_KEY_STORE_PASSWORD')
         }
     }
+// flet: end of android_signing {% endif %}
 
     buildTypes {
         release {
-            // TODO: Add your own signing config for the release build.
+// flet: android_signing {% if cookiecutter.options.android_signing %}
-            // Signing with the debug keys for now, so `flutter run --release` works.
+            signingConfig signingConfigs.release
+// {% else %}
             signingConfig signingConfigs.debug
+// flet: end of android_signing {% endif %}
         }
     }
 }

{{cookiecutter.out_dir}}/android/app/proguard-rules.pro

@@ -0,0 +1,2 @@
+-keep class com.flet.serious_python_android.** { *; }
+-keepnames class * { *; }

{{cookiecutter.out_dir}}/android/app/src/debug/AndroidManifest.xml

@@ -3,5 +3,6 @@
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
-    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
 </manifest>

{{cookiecutter.out_dir}}/android/app/src/main/AndroidManifest.xml

@@ -1,9 +1,24 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <uses-permission android:name="android.permission.INTERNET"/>
+    <!-- flet: permission {% for k, v in cookiecutter.options.android_permissions.items() %} {% if v == True %} -->
+    <uses-permission android:name="{{ k }}" />
+    <!-- flet: end of permission {% endif %} {% endfor %} -->
+
+    <!-- flet: feature {% for k, v in cookiecutter.options.android_features.items() %} -->
+    <uses-feature android:name="{{ k }}" android:required="{% if v == True %}true{% else %}false{% endif %}" />
+    <!-- flet: end of feature {% endfor %} -->
+
+    <!-- {% set manifest_application = cookiecutter.pyproject.get('tool', {}).get('flet', {}).get('android', {}).get('manifest_application', {}) %} -->
     <application
-        android:label="{{ cookiecutter.project_name }}"
+        android:label="{{ cookiecutter.product_name }}"
         android:name="${applicationName}"
+        android:enableOnBackInvokedCallback="true"
+        {% if manifest_application -%}{% for k, v in cookiecutter.pyproject.tool.flet.android.manifest_application.items() -%}
+        android:{{ k }}="{{ v }}"
+        {% endfor -%}{% endif -%}
         android:icon="@mipmap/ic_launcher">
+        <!-- flet: meta-data {% for k, v in cookiecutter.options.android_meta_data.items() %} -->
+        <meta-data android:name="{{ k }}" android:value="{{ v }}" />
+        <!-- flet: end of meta-data {% endfor %} -->
         <activity
             android:name=".MainActivity"
             android:exported="true"
@@ -17,13 +32,24 @@
                  while the Flutter UI initializes. After that, this theme continues
                  to determine the Window background behind the Flutter UI. -->
             <meta-data
-              android:name="io.flutter.embedding.android.NormalTheme"
+                android:name="io.flutter.embedding.android.NormalTheme"
-              android:resource="@style/NormalTheme"
+                android:resource="@style/NormalTheme"
-              />
+            />
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
+                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />   <!-- Google TV -->
             </intent-filter>
+            <!-- flet: deep linking {% if cookiecutter.options.deep_linking.scheme and cookiecutter.options.deep_linking.host %} -->
+            <meta-data android:name="flutter_deeplinking_enabled" android:value="true" />
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="{{ cookiecutter.options.deep_linking.scheme }}"
+                    android:host="{{ cookiecutter.options.deep_linking.host }}" />
+            </intent-filter>
+            <!-- flet: end of deep linking {% endif %} -->
         </activity>
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->

{{cookiecutter.out_dir}}/android/app/src/main/kotlin/{{ cookiecutter.kotlin_dir }}/MainActivity.kt

@@ -1,4 +1,4 @@
-package {{ cookiecutter.org_name }}.{{ cookiecutter.project_name }}
+package {{ cookiecutter.org_name_2 }}.{{ cookiecutter.package_name }}
 
 import io.flutter.embedding.android.FlutterActivity
 

{{cookiecutter.out_dir}}/android/app/src/profile/AndroidManifest.xml

@@ -3,5 +3,6 @@
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
-    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
 </manifest>

{{cookiecutter.out_dir}}/android/build.gradle

@@ -1,12 +1,11 @@
 buildscript {
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = '1.9.24'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

{{cookiecutter.out_dir}}/android/gradle.properties

@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true

{{cookiecutter.out_dir}}/android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip

{{cookiecutter.out_dir}}/android/settings.gradle

@@ -10,11 +10,20 @@ pluginManagement {
 
     includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
 
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+
     plugins {
         id "dev.flutter.flutter-gradle-plugin" version "1.0.0" apply false
     }
 }
 
-include ":app"
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version "8.3.1" apply false
+}
 
-apply from: "${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+include ":app"

{{cookiecutter.out_dir}}/ios/Podfile

@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-platform :ios, '12.0'
+platform :ios, '13.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'

{{cookiecutter.out_dir}}/ios/Runner.xcodeproj/project.pbxproj

@@ -345,7 +345,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -360,9 +360,16 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-{% if cookiecutter.team_id %}				
+{% if cookiecutter.ios_team_id %}				
-				DEVELOPMENT_TEAM = {{ cookiecutter.team_id }};
+				DEVELOPMENT_TEAM = "{{ cookiecutter.ios_team_id }}";
+{% endif %}
+{% if cookiecutter.ios_signing_certificate %}				
+				CODE_SIGN_IDENTITY = "{{ cookiecutter.ios_signing_certificate }}";
+{% endif %}
+{% if cookiecutter.ios_provisioning_profile %}				
+				PROVISIONING_PROFILE_SPECIFIER = "{{ cookiecutter.ios_provisioning_profile }}";
 {% endif %}
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -370,7 +377,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = {{ cookiecutter.org_name }}.{{ cookiecutter.project_name }};
+				PRODUCT_BUNDLE_IDENTIFIER = {{ cookiecutter.bundle_id }};
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -387,7 +394,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = {{ cookiecutter.org_name }}.{{ cookiecutter.project_name }}.RunnerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = {{ cookiecutter.bundle_id }}.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -405,7 +412,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = {{ cookiecutter.org_name }}.{{ cookiecutter.project_name }}.RunnerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = {{ cookiecutter.bundle_id }}.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
@@ -421,7 +428,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = {{ cookiecutter.org_name }}.{{ cookiecutter.project_name }}.RunnerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = {{ cookiecutter.bundle_id }}.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
@@ -475,7 +482,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -524,7 +531,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -541,9 +548,16 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-{% if cookiecutter.team_id %}				
+{% if cookiecutter.ios_team_id %}				
-				DEVELOPMENT_TEAM = {{ cookiecutter.team_id }};
+				DEVELOPMENT_TEAM = "{{ cookiecutter.ios_team_id }}";
+{% endif %}
+{% if cookiecutter.ios_signing_certificate %}				
+				CODE_SIGN_IDENTITY = "{{ cookiecutter.ios_signing_certificate }}";
+{% endif %}
+{% if cookiecutter.ios_provisioning_profile %}				
+				PROVISIONING_PROFILE_SPECIFIER = "{{ cookiecutter.ios_provisioning_profile }}";
 {% endif %}
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -551,7 +565,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = {{ cookiecutter.org_name }}.{{ cookiecutter.project_name }};
+				PRODUCT_BUNDLE_IDENTIFIER = {{ cookiecutter.bundle_id }};
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -566,9 +580,16 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-{% if cookiecutter.team_id %}				
+{% if cookiecutter.ios_team_id %}				
-				DEVELOPMENT_TEAM = {{ cookiecutter.team_id }};
+				DEVELOPMENT_TEAM = "{{ cookiecutter.ios_team_id }}";
+{% endif %}
+{% if cookiecutter.ios_signing_certificate %}				
+				CODE_SIGN_IDENTITY = "{{ cookiecutter.ios_signing_certificate }}";
+{% endif %}
+{% if cookiecutter.ios_provisioning_profile %}				
+				PROVISIONING_PROFILE_SPECIFIER = "{{ cookiecutter.ios_provisioning_profile }}";
 {% endif %}
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -576,7 +597,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = {{ cookiecutter.org_name }}.{{ cookiecutter.project_name }};
+				PRODUCT_BUNDLE_IDENTIFIER = {{ cookiecutter.bundle_id }};
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;

{{cookiecutter.out_dir}}/ios/Runner/AppDelegate.swift

@@ -1,7 +1,7 @@
 import UIKit
 import Flutter
 
-@UIApplicationMain
+@main
 @objc class AppDelegate: FlutterAppDelegate {
   override func application(
     _ application: UIApplication,

{{cookiecutter.out_dir}}/ios/Runner/Info.plist

@@ -1,49 +1,101 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
+	<dict>
-	<key>CFBundleDevelopmentRegion</key>
+		<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
+		<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleDisplayName</key>
+		<key>CFBundleDisplayName</key>
-	<string>{{ cookiecutter.product_name }}</string>
+		<string>{{ cookiecutter.product_name }}</string>
-	<key>CFBundleExecutable</key>
+		<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
+		<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
+		<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+		<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
+		<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
+		<string>6.0</string>
-	<key>CFBundleName</key>
+		<key>CFBundleName</key>
-	<string>{{ cookiecutter.project_name }}</string>
+		<string>{{ cookiecutter.project_name }}</string>
-	<key>CFBundlePackageType</key>
+		<key>CFBundlePackageType</key>
-	<string>APPL</string>
+		<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
+		<key>CFBundleShortVersionString</key>
-	<string>$(FLUTTER_BUILD_NAME)</string>
+		<string>$(FLUTTER_BUILD_NAME)</string>
-	<key>CFBundleSignature</key>
+		<key>CFBundleSignature</key>
-	<string>????</string>
+		<string>????</string>
-	<key>CFBundleVersion</key>
+		<key>CFBundleVersion</key>
-	<string>$(FLUTTER_BUILD_NUMBER)</string>
+		<string>$(FLUTTER_BUILD_NUMBER)</string>
-	<key>LSRequiresIPhoneOS</key>
+		<key>LSRequiresIPhoneOS</key>
-	<true/>
+		<true />
-	<key>UILaunchStoryboardName</key>
+		<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
+		<string>LaunchScreen</string>
-	<key>UIMainStoryboardFile</key>
+		<key>UIMainStoryboardFile</key>
-	<string>Main</string>
+		<string>Main</string>
-	<key>UISupportedInterfaceOrientations</key>
+		<key>UISupportedInterfaceOrientations</key>
-	<array>
+		<array>
-		<string>UIInterfaceOrientationPortrait</string>
+			<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
+			<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
+			<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
+		</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
+		<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
+		<array>
-		<string>UIInterfaceOrientationPortrait</string>
+			<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+			<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
+			<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
+			<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
+		</array>
-	<key>CADisableMinimumFrameDurationOnPhone</key>
+		<key>CADisableMinimumFrameDurationOnPhone</key>
-	<true/>
+		<true />
-	<key>UIApplicationSupportsIndirectInputEvents</key>
+		<key>UIApplicationSupportsIndirectInputEvents</key>
-	<true/>
+		<true />
-</dict>
+		<key>NSAppTransportSecurity</key>
+		<dict>
+			<key>NSAllowsArbitraryLoads</key>
+			<true />
+		</dict>
+		<!-- flet: deep linking {% if cookiecutter.options.deep_linking.scheme and cookiecutter.options.deep_linking.host%} -->
+		<key>FlutterDeepLinkingEnabled</key>
+		<true />
+		<key>CFBundleURLTypes</key>
+		<array>
+			<dict>
+				<key>CFBundleTypeRole</key>
+				<string>Editor</string>
+				<key>CFBundleURLName</key>
+				<string>{{ cookiecutter.options.deep_linking.host }}</string>
+				<key>CFBundleURLSchemes</key>
+				<array>
+					<string>{{ cookiecutter.options.deep_linking.scheme }}</string>
+				</array>
+			</dict>
+		</array>
+		<!-- flet: end of deep linking {% endif %} -->
+
+		{% macro render_dict(d) -%}
+		{% for key, value in d.items() -%}
+		<key>{{ key }}</key>
+		{% if value is string -%}
+		<string>{{ value }}</string>
+		{% elif value is boolean -%}
+		<{{ "true" if value else "false" }}/>
+		{% elif value is mapping -%}
+		<dict>
+			{{ render_dict(value) }}
+		</dict>
+		{% elif value is sequence -%}  {# Support for lists/arrays #}
+		<array>
+			{% for item in value -%}
+				{% if item is string -%}
+				<string>{{ item }}</string>
+				{% elif item is boolean -%}
+				<{{ "true" if item else "false" }}/>
+				{% elif item is mapping -%}
+				<dict>
+					{{ render_dict(item) }}
+				</dict>
+				{% endif -%}
+			{% endfor -%}
+		</array>
+		{% endif -%}
+		{% endfor -%}
+		{% endmacro -%}
+		{{ render_dict(cookiecutter.options.info_plist) }}
+	</dict>
 </plist>

{{cookiecutter.out_dir}}/ios/exportOptions.plist

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>method</key>
+    <string>{{ cookiecutter.ios_export_method }}</string>
+    <key>provisioningProfiles</key>
+    <dict>
+        <key>{{ cookiecutter.bundle_id }}</key>
+        <string>{{ cookiecutter.ios_provisioning_profile }}</string>
+    </dict>
+
+    {% if cookiecutter.ios_team_id %}
+    <key>teamID</key>
+    <string>{{ cookiecutter.ios_team_id }}</string>
+    {% endif %}
+
+    {% if cookiecutter.ios_signing_certificate %}
+    <key>signingCertificate</key>
+    <string>{{ cookiecutter.ios_signing_certificate }}</string>
+    {% endif %}
+
+    {% macro render_dict(d) -%}
+    {% for key, value in d.items() -%}
+    <key>{{ key }}</key>
+    {% if value is string -%}
+    <string>{{ value }}</string>
+    {% elif value is boolean -%}
+    <{{ "true" if value else "false" }}/>
+    {% elif value is mapping -%}
+    <dict>
+        {{ render_dict(value) }}
+    </dict>
+    {% elif value is sequence -%}  {# Support for lists/arrays #}
+    <array>
+        {% for item in value -%}
+            {% if item is string -%}
+            <string>{{ item }}</string>
+            {% elif item is boolean -%}
+            <{{ "true" if item else "false" }}/>
+            {% elif item is mapping -%}
+            <dict>
+                {{ render_dict(item) }}
+            </dict>
+            {% endif -%}
+        {% endfor -%}
+    </array>
+    {% endif -%}
+    {% endfor -%}
+    {% endmacro -%}
+    {{ render_dict(cookiecutter.ios_export_options) }}
+</dict>
+</plist>

{{cookiecutter.out_dir}}/lib/main.dart

@@ -5,93 +5,79 @@ import 'package:flet/flet.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:package_info_plus/package_info_plus.dart';
 import 'package:path/path.dart' as path;
+import 'package:path_provider/path_provider.dart' as path_provider;
 import 'package:serious_python/serious_python.dart';
 import 'package:url_strategy/url_strategy.dart';
+import 'package:window_manager/window_manager.dart';
+
+import "python.dart";
+
+/*
+{% set show_boot_screen = get_pyproject("tool.flet." ~ cookiecutter.options.config_platform ~ ".app.boot_screen.show")
+                        or get_pyproject("tool.flet.app.boot_screen.show")
+                        or False %}
+{% set boot_screen_message = get_pyproject("tool.flet." ~ cookiecutter.options.config_platform ~ ".app.boot_screen.message")
+                        or get_pyproject("tool.flet.app.boot_screen.message") %}
+
+{% set show_startup_screen = get_pyproject("tool.flet." ~ cookiecutter.options.config_platform ~ ".app.startup_screen.show")
+                        or get_pyproject("tool.flet.app.startup_screen.show")
+                        or False %}
+{% set startup_screen_message = get_pyproject("tool.flet." ~ cookiecutter.options.config_platform ~ ".app.startup_screen.message")
+                        or get_pyproject("tool.flet.app.startup_screen.message") %}
+
+show_boot_screen: {{ show_boot_screen }}
+boot_screen_message: {{ boot_screen_message }}
+show_startup_screen: {{ show_startup_screen }}
+startup_screen_message: {{ startup_screen_message }}
+*/
+
+{% for dep in cookiecutter.flutter.dependencies %}
+import 'package:{{ dep }}/{{ dep }}.dart' as {{ dep }};
+{% endfor %}
 
 const bool isProduction = bool.fromEnvironment('dart.vm.product');
 
 const assetPath = "app/app.zip";
 const pythonModuleName = "{{ cookiecutter.python_module_name }}";
-final hideLoadingPage =
+final showAppBootScreen = bool.tryParse("{{ show_boot_screen }}".toLowerCase()) ?? false;
-    bool.tryParse("{{ cookiecutter.hide_loading_animation }}".toLowerCase()) ??
+const appBootScreenMessage = '{{ boot_screen_message | default("Preparing the app for its first launch…", true) }}';
-        true;
+final showAppStartupScreen = bool.tryParse("{{ show_startup_screen }}".toLowerCase()) ?? false;
-const outLogFilename = "out.log";
+const appStartupScreenMessage = '{{ startup_screen_message | default("Getting things ready…", true) }}';
-const errorExitCode = 100;
 
-const pythonScript = """
+List<CreateControlFactory> createControlFactories = [
-import certifi, os, runpy, socket, sys, traceback
+{% for dep in cookiecutter.flutter.dependencies %}
+{{ dep }}.createControl,
+{% endfor %}
+];
 
-os.environ["REQUESTS_CA_BUNDLE"] = certifi.where()
+String outLogFilename = "";
-os.environ["SSL_CERT_FILE"] = certifi.where()
-
-if os.getenv("FLET_PLATFORM") == "android":
-    import ssl
-
-    def create_default_context(
-        purpose=ssl.Purpose.SERVER_AUTH, *, cafile=None, capath=None, cadata=None
-    ):
-        return ssl.create_default_context(
-            purpose=purpose, cafile=certifi.where(), capath=capath, cadata=cadata
-        )
-
-    ssl._create_default_https_context = create_default_context
-
-out_file = open("$outLogFilename", "w+", buffering=1)
-
-callback_socket_addr = os.environ.get("FLET_PYTHON_CALLBACK_SOCKET_ADDR")
-if ":" in callback_socket_addr:
-    addr, port = callback_socket_addr.split(":")
-    callback_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-    callback_socket.connect((addr, int(port)))
-else:
-    callback_socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-    callback_socket.connect(callback_socket_addr)
-
-sys.stdout = sys.stderr = out_file
-
-def flet_exit(code=0):
-    callback_socket.sendall(str(code).encode())
-    out_file.close()
-    callback_socket.close()
-
-sys.exit = flet_exit
-
-ex = None
-try:
-    runpy.run_module("{module_name}", run_name="__main__")
-except Exception as e:
-    ex = e
-    traceback.print_exception(e)
-
-sys.exit(0 if ex is None else $errorExitCode)
-""";
 
 // global vars
+List<String> _args = [];
 String pageUrl = "";
 String assetsDir = "";
 String appDir = "";
 Map<String, String> environmentVariables = {};
 
-void main() async {
+void main(List<String> args) async {
-  if (isProduction) {
+  _args = List<String>.from(args);
-    // ignore: avoid_returning_null_for_void
-    debugPrint = (String? message, {int? wrapWidth}) => null;
-  }
 
   runApp(FutureBuilder(
       future: prepareApp(),
       builder: (BuildContext context, AsyncSnapshot snapshot) {
         if (snapshot.hasData) {
           // OK - start Python program
-          return kIsWeb
+          return kIsWeb || (isDesktopPlatform() && _args.isNotEmpty)
               ? FletApp(
                   pageUrl: pageUrl,
                   assetsDir: assetsDir,
-                  hideLoadingPage: hideLoadingPage,
+                  showAppStartupScreen: showAppStartupScreen,
-                )
+                  appStartupScreenMessage: appStartupScreenMessage,
+                  createControlFactories: createControlFactories)
               : FutureBuilder(
-                  future: runPythonApp(),
+                  future: runPythonApp(args),
                   builder:
                       (BuildContext context, AsyncSnapshot<String?> snapshot) {
                     if (snapshot.hasData || snapshot.hasError) {
@@ -104,10 +90,11 @@ void main() async {
                     } else {
                       // no result of error
                       return FletApp(
-                        pageUrl: pageUrl,
+                          pageUrl: pageUrl,
-                        assetsDir: assetsDir,
+                          assetsDir: assetsDir,
-                        hideLoadingPage: hideLoadingPage,
+                          showAppStartupScreen: showAppStartupScreen,
-                      );
+                          appStartupScreenMessage: appStartupScreenMessage,
+                          createControlFactories: createControlFactories);
                     }
                   });
         } else if (snapshot.hasError) {
@@ -118,12 +105,25 @@ void main() async {
                   text: snapshot.error.toString()));
         } else {
           // loading
-          return const MaterialApp(home: BlankScreen());
+          return MaterialApp(home: showAppBootScreen ? const BootScreen() : const BlankScreen());
         }
       }));
 }
 
 Future prepareApp() async {
+  if (!_args.contains("--debug")) {
+    // ignore: avoid_returning_null_for_void
+    debugPrint = (String? message, {int? wrapWidth}) => null;
+  } else {
+    _args.remove("--debug");
+  }
+
+  await setupDesktop();
+
+  {% for dep in cookiecutter.flutter.dependencies %}
+  {{ dep }}.ensureInitialized();
+  {% endfor %}
+
   if (kIsWeb) {
     // web mode - connect via HTTP
     pageUrl = Uri.base.toString();
@@ -131,9 +131,22 @@ Future prepareApp() async {
     if (routeUrlStrategy == "path") {
       setPathUrlStrategy();
     }
+  } else if (_args.isNotEmpty && isDesktopPlatform()) {
+    // developer mode
+    debugPrint("Flet app is running in Developer mode");
+    pageUrl = _args[0];
+    if (_args.length > 1) {
+      var pidFilePath = _args[1];
+      debugPrint("Args contain a path to PID file: $pidFilePath}");
+      var pidFile = await File(pidFilePath).create();
+      await pidFile.writeAsString("$pid");
+    }
+    if (_args.length > 2) {
+      assetsDir = _args[2];
+      debugPrint("Args contain a path assets directory: $assetsDir}");
+    }
   } else {
-    await setupDesktop();
+    // production mode
-
     // extract app from asset
     appDir = await extractAssetZip(assetPath, checkHash: true);
 
@@ -142,6 +155,29 @@ Future prepareApp() async {
 
     assetsDir = path.join(appDir, "assets");
 
+    // configure apps DATA and TEMP directories
+    WidgetsFlutterBinding.ensureInitialized();
+
+    var appTempPath = (await path_provider.getApplicationCacheDirectory()).path;
+    var appDataPath =
+        (await path_provider.getApplicationDocumentsDirectory()).path;
+
+    if (defaultTargetPlatform != TargetPlatform.iOS &&
+        defaultTargetPlatform != TargetPlatform.android) {
+      // append app name to the path and create dir
+      PackageInfo packageInfo = await PackageInfo.fromPlatform();
+      appDataPath = path.join(appDataPath, "flet", packageInfo.packageName);
+      if (!await Directory(appDataPath).exists()) {
+        await Directory(appDataPath).create(recursive: true);
+      }
+    }
+
+    environmentVariables["FLET_APP_STORAGE_DATA"] = appDataPath;
+    environmentVariables["FLET_APP_STORAGE_TEMP"] = appTempPath;
+
+    outLogFilename = path.join(appTempPath, "console.log");
+    environmentVariables["FLET_APP_CONSOLE"] = outLogFilename;
+
     environmentVariables["FLET_PLATFORM"] =
         defaultTargetPlatform.name.toLowerCase();
 
@@ -152,7 +188,7 @@ Future prepareApp() async {
       environmentVariables["FLET_SERVER_PORT"] = tcpPort.toString();
     } else {
       // use UDS on other platforms
-      pageUrl = "flet.sock";
+      pageUrl = "flet_$pid.sock";
       environmentVariables["FLET_SERVER_UDS_PATH"] = pageUrl;
     }
   }
@@ -160,8 +196,13 @@ Future prepareApp() async {
   return "";
 }
 
-Future<String?> runPythonApp() async {
+Future<String?> runPythonApp(List<String> args) async {
-  var script = pythonScript.replaceAll('{module_name}', pythonModuleName);
+  var argvItems = args.map((a) => "\"${a.replaceAll('"', '\\"')}\"");
+  var argv = "[${argvItems.isNotEmpty ? argvItems.join(',') : '""'}]";
+  var script = pythonScript
+      .replaceAll("{outLogFilename}", outLogFilename.replaceAll("\\", "\\\\"))
+      .replaceAll('{module_name}', pythonModuleName)
+      .replaceAll('{argv}', argv);
 
   var completer = Completer<String>();
 
@@ -176,7 +217,7 @@ Future<String?> runPythonApp() async {
         'Python output TCP Server is listening on port ${outSocketServer.port}');
     socketAddr = "$tcpAddr:${outSocketServer.port}";
   } else {
-    socketAddr = "stdout.sock";
+    socketAddr = "stdout_$pid.sock";
     if (await File(socketAddr).exists()) {
       await File(socketAddr).delete();
     }
@@ -275,6 +316,34 @@ class ErrorScreen extends StatelessWidget {
   }
 }
 
+class BootScreen extends StatelessWidget {
+  const BootScreen({
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Center(
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            const SizedBox(
+              width: 30,
+              height: 30,
+              child: CircularProgressIndicator(strokeWidth: 3),
+            ),
+            const SizedBox(
+              height: 10,
+            ),
+            Text(appBootScreenMessage, style: Theme.of(context).textTheme.bodySmall,)
+          ],
+        ),
+      ),
+    );
+  }
+}
+
 class BlankScreen extends StatelessWidget {
   const BlankScreen({
     super.key,
@@ -295,3 +364,25 @@ Future<int> getUnusedPort() {
     return port;
   });
 }
+
+Future setupDesktop() async {
+  if (isDesktopPlatform()) {
+    WidgetsFlutterBinding.ensureInitialized();
+    await windowManager.ensureInitialized();
+
+    Map<String, String> env = Platform.environment;
+    var hideWindowOnStart = env["FLET_HIDE_WINDOW_ON_START"];
+    var hideAppOnStart = env["FLET_HIDE_APP_ON_START"];
+    debugPrint("hideWindowOnStart: $hideWindowOnStart");
+    debugPrint("hideAppOnStart: $hideAppOnStart");
+
+    await windowManager.waitUntilReadyToShow(null, () async {
+      if (hideWindowOnStart == null && hideAppOnStart == null) {
+        await windowManager.show();
+        await windowManager.focus();
+      } else if (hideAppOnStart != null) {
+        await windowManager.setSkipTaskbar(true);
+      }
+    });
+  }
+}

{{cookiecutter.out_dir}}/lib/python.dart

@@ -0,0 +1,104 @@
+const errorExitCode = 100;
+
+const pythonScript = """
+import os, runpy, socket, sys, traceback
+
+# fix for cryptography package
+os.environ["CRYPTOGRAPHY_OPENSSL_NO_LEGACY"] = "1"
+
+# fix for: https://github.com/flet-dev/serious-python/issues/85#issuecomment-2065000974
+os.environ["OPENBLAS_NUM_THREADS"] = "1"
+
+def initialize_ctypes():
+    import ctypes.util
+    import os
+    import pathlib
+    import sys
+
+    android_native_lib_dir = os.getenv("ANDROID_NATIVE_LIBRARY_DIR")
+
+    def find_library_override_imp(name: str):
+        if name is None:
+            return None
+        if pathlib.Path(name).exists():
+            return name
+        if sys.platform == "ios":
+            for lf in [
+                f"Frameworks/{name}.framework/{name}",
+                f"Frameworks/lib{name}.framework/lib{name}",
+            ]:
+                lib_path = pathlib.Path(sys.executable).parent.joinpath(lf)
+                if lib_path.exists():
+                    return str(lib_path)
+        elif android_native_lib_dir:
+            for lf in [f"lib{name}.so", f"{name}.so", name]:
+                lib_path = pathlib.Path(android_native_lib_dir).joinpath(lf)
+                if lib_path.exists():
+                    return str(lib_path)
+        return None
+
+    find_library_original = ctypes.util.find_library
+
+    def find_library_override(name):
+        return find_library_override_imp(name) or find_library_original(name)
+
+    ctypes.util.find_library = find_library_override
+
+    CDLL_init_original = ctypes.CDLL.__init__
+
+    def CDLL_init_override(self, name, *args, **kwargs):
+        CDLL_init_original(
+            self, find_library_override_imp(name) or name, *args, **kwargs
+        )
+
+    ctypes.CDLL.__init__ = CDLL_init_override
+
+initialize_ctypes()
+
+out_file = open("{outLogFilename}", "w+", buffering=1)
+
+callback_socket_addr = os.getenv("FLET_PYTHON_CALLBACK_SOCKET_ADDR")
+if ":" in callback_socket_addr:
+    addr, port = callback_socket_addr.split(":")
+    callback_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    callback_socket.connect((addr, int(port)))
+else:
+    callback_socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+    callback_socket.connect(callback_socket_addr)
+
+sys.stdout = sys.stderr = out_file
+
+def flet_exit(code=0):
+    callback_socket.sendall(str(code).encode())
+    out_file.close()
+    callback_socket.close()
+
+sys.exit = flet_exit
+
+ex = None
+try:
+    import certifi
+    
+    os.environ["REQUESTS_CA_BUNDLE"] = certifi.where()
+    os.environ["SSL_CERT_FILE"] = certifi.where()
+
+    if os.getenv("FLET_PLATFORM") == "android":
+        import ssl
+
+        def create_default_context(
+            purpose=ssl.Purpose.SERVER_AUTH, *, cafile=None, capath=None, cadata=None
+        ):
+            return ssl.create_default_context(
+                purpose=purpose, cafile=certifi.where(), capath=capath, cadata=cadata
+            )
+
+        ssl._create_default_https_context = create_default_context
+
+    sys.argv = {argv}
+    runpy.run_module("{module_name}", run_name="__main__")
+except Exception as e:
+    ex = e
+    traceback.print_exception(e)
+
+sys.exit(0 if ex is None else 100)
+""";

{{cookiecutter.out_dir}}/linux/CMakeLists.txt

@@ -7,7 +7,7 @@ project(runner LANGUAGES CXX)
 set(BINARY_NAME "{{ cookiecutter.project_name }}")
 # The unique GTK application identifier for this application. See:
 # https://wiki.gnome.org/HowDoI/ChooseApplicationID
-set(APPLICATION_ID "{{ cookiecutter.org_name }}.{{ cookiecutter.project_name }}")
+set(APPLICATION_ID "{{ cookiecutter.bundle_id }}")
 
 # Explicitly opt in to modern CMake behaviors to avoid warnings with recent
 # versions of CMake.
@@ -41,7 +41,7 @@ endif()
 # of modifying this function.
 function(APPLY_STANDARD_SETTINGS TARGET)
   target_compile_features(${TARGET} PUBLIC cxx_std_14)
-  target_compile_options(${TARGET} PRIVATE -Wall -Werror)
+  target_compile_options(${TARGET} PRIVATE -Wall -Werror -Wno-unused-variable -Wno-unused-function)
   target_compile_options(${TARGET} PRIVATE "$<$<NOT:$<CONFIG:Debug>>:-O3>")
   target_compile_definitions(${TARGET} PRIVATE "$<$<NOT:$<CONFIG:Debug>>:NDEBUG>")
 endfunction()
@@ -73,6 +73,7 @@ apply_standard_settings(${BINARY_NAME})
 # Add dependency libraries. Add any application-specific dependencies here.
 target_link_libraries(${BINARY_NAME} PRIVATE flutter)
 target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK)
+target_link_libraries(${BINARY_NAME} PRIVATE ${MIMALLOC_LIB})
 
 # Run the Flutter tool portions of the build. This must not be removed.
 add_dependencies(${BINARY_NAME} flutter_assemble)
@@ -138,6 +139,12 @@ foreach(plugin ${FLUTTER_PLUGIN_LIST})
   endif()
 endforeach(plugin)
 
+# Copy the native assets provided by the build.dart from all packages.
+set(NATIVE_ASSETS_DIR "${PROJECT_BUILD_DIR}native_assets/linux/")
+install(DIRECTORY "${NATIVE_ASSETS_DIR}"
+   DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
+   COMPONENT Runtime)
+
 # Fully re-copy the assets directory on each build to avoid having stale files
 # from a previous install.
 set(FLUTTER_ASSET_DIR_NAME "flutter_assets")

{{cookiecutter.out_dir}}/linux/flutter/generated_plugin_registrant.cc

@@ -6,20 +6,20 @@
 
 #include "generated_plugin_registrant.h"
 
-#include <audioplayers_linux/audioplayers_linux_plugin.h>
+#include <record_linux/record_linux_plugin.h>
-#include <screen_retriever/screen_retriever_plugin.h>
+#include <screen_retriever_linux/screen_retriever_linux_plugin.h>
 #include <serious_python_linux/serious_python_linux_plugin.h>
 #include <url_launcher_linux/url_launcher_plugin.h>
 #include <window_manager/window_manager_plugin.h>
 #include <window_to_front/window_to_front_plugin.h>
 
 void fl_register_plugins(FlPluginRegistry* registry) {
-  g_autoptr(FlPluginRegistrar) audioplayers_linux_registrar =
+  g_autoptr(FlPluginRegistrar) record_linux_registrar =
-      fl_plugin_registry_get_registrar_for_plugin(registry, "AudioplayersLinuxPlugin");
+      fl_plugin_registry_get_registrar_for_plugin(registry, "RecordLinuxPlugin");
-  audioplayers_linux_plugin_register_with_registrar(audioplayers_linux_registrar);
+  record_linux_plugin_register_with_registrar(record_linux_registrar);
-  g_autoptr(FlPluginRegistrar) screen_retriever_registrar =
+  g_autoptr(FlPluginRegistrar) screen_retriever_linux_registrar =
-      fl_plugin_registry_get_registrar_for_plugin(registry, "ScreenRetrieverPlugin");
+      fl_plugin_registry_get_registrar_for_plugin(registry, "ScreenRetrieverLinuxPlugin");
-  screen_retriever_plugin_register_with_registrar(screen_retriever_registrar);
+  screen_retriever_linux_plugin_register_with_registrar(screen_retriever_linux_registrar);
   g_autoptr(FlPluginRegistrar) serious_python_linux_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "SeriousPythonLinuxPlugin");
   serious_python_linux_plugin_register_with_registrar(serious_python_linux_registrar);

{{cookiecutter.out_dir}}/linux/flutter/generated_plugins.cmake

@@ -3,8 +3,8 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
-  audioplayers_linux
+  record_linux
-  screen_retriever
+  screen_retriever_linux
   serious_python_linux
   url_launcher_linux
   window_manager

{{cookiecutter.out_dir}}/linux/my_application.cc

@@ -7,19 +7,17 @@
 
 #include "flutter/generated_plugin_registrant.h"
 
-struct _MyApplication
+struct _MyApplication {
-{
   GtkApplication parent_instance;
-  char **dart_entrypoint_arguments;
+  char** dart_entrypoint_arguments;
 };
 
 G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION)
 
 // Implements GApplication::activate.
-static void my_application_activate(GApplication *application)
+static void my_application_activate(GApplication* application) {
-{
+  MyApplication* self = MY_APPLICATION(application);
-  MyApplication *self = MY_APPLICATION(application);
+  GtkWindow* window =
-  GtkWindow *window =
       GTK_WINDOW(gtk_application_window_new(GTK_APPLICATION(application)));
 
   // Use a header bar when running in GNOME as this is the common style used
@@ -31,36 +29,31 @@ static void my_application_activate(GApplication *application)
   // if future cases occur).
   gboolean use_header_bar = TRUE;
 #ifdef GDK_WINDOWING_X11
-  GdkScreen *screen = gtk_window_get_screen(window);
+  GdkScreen* screen = gtk_window_get_screen(window);
-  if (GDK_IS_X11_SCREEN(screen))
+  if (GDK_IS_X11_SCREEN(screen)) {
-  {
+    const gchar* wm_name = gdk_x11_screen_get_window_manager_name(screen);
-    const gchar *wm_name = gdk_x11_screen_get_window_manager_name(screen);
+    if (g_strcmp0(wm_name, "GNOME Shell") != 0) {
-    if (g_strcmp0(wm_name, "GNOME Shell") != 0)
-    {
       use_header_bar = FALSE;
     }
   }
 #endif
-  if (use_header_bar)
+  if (use_header_bar) {
-  {
+    GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new());
-    GtkHeaderBar *header_bar = GTK_HEADER_BAR(gtk_header_bar_new());
     gtk_widget_show(GTK_WIDGET(header_bar));
     gtk_header_bar_set_title(header_bar, "{{ cookiecutter.product_name }}");
     gtk_header_bar_set_show_close_button(header_bar, TRUE);
     gtk_window_set_titlebar(window, GTK_WIDGET(header_bar));
-  }
+  } else {
-  else
-  {
     gtk_window_set_title(window, "{{ cookiecutter.product_name }}");
   }
 
   gtk_window_set_default_size(window, 1280, 720);
-  gtk_widget_show(GTK_WIDGET(window));
+  gtk_widget_realize(GTK_WIDGET(window));
 
   g_autoptr(FlDartProject) project = fl_dart_project_new();
   fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments);
 
-  FlView *view = fl_view_new(project);
+  FlView* view = fl_view_new(project);
   gtk_widget_show(GTK_WIDGET(view));
   gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view));
 
@@ -70,18 +63,16 @@ static void my_application_activate(GApplication *application)
 }
 
 // Implements GApplication::local_command_line.
-static gboolean my_application_local_command_line(GApplication *application, gchar ***arguments, int *exit_status)
+static gboolean my_application_local_command_line(GApplication* application, gchar*** arguments, int* exit_status) {
-{
+  MyApplication* self = MY_APPLICATION(application);
-  MyApplication *self = MY_APPLICATION(application);
   // Strip out the first argument as it is the binary name.
   self->dart_entrypoint_arguments = g_strdupv(*arguments + 1);
 
   g_autoptr(GError) error = nullptr;
-  if (!g_application_register(application, nullptr, &error))
+  if (!g_application_register(application, nullptr, &error)) {
-  {
+     g_warning("Failed to register: %s", error->message);
-    g_warning("Failed to register: %s", error->message);
+     *exit_status = 1;
-    *exit_status = 1;
+     return TRUE;
-    return TRUE;
   }
 
   g_application_activate(application);
@@ -90,25 +81,42 @@ static gboolean my_application_local_command_line(GApplication *application, gch
   return TRUE;
 }
 
+// Implements GApplication::startup.
+static void my_application_startup(GApplication* application) {
+  //MyApplication* self = MY_APPLICATION(object);
+
+  // Perform any actions required at application startup.
+
+  G_APPLICATION_CLASS(my_application_parent_class)->startup(application);
+}
+
+// Implements GApplication::shutdown.
+static void my_application_shutdown(GApplication* application) {
+  //MyApplication* self = MY_APPLICATION(object);
+
+  // Perform any actions required at application shutdown.
+
+  G_APPLICATION_CLASS(my_application_parent_class)->shutdown(application);
+}
+
 // Implements GObject::dispose.
-static void my_application_dispose(GObject *object)
+static void my_application_dispose(GObject* object) {
-{
+  MyApplication* self = MY_APPLICATION(object);
-  MyApplication *self = MY_APPLICATION(object);
   g_clear_pointer(&self->dart_entrypoint_arguments, g_strfreev);
   G_OBJECT_CLASS(my_application_parent_class)->dispose(object);
 }
 
-static void my_application_class_init(MyApplicationClass *klass)
+static void my_application_class_init(MyApplicationClass* klass) {
-{
   G_APPLICATION_CLASS(klass)->activate = my_application_activate;
   G_APPLICATION_CLASS(klass)->local_command_line = my_application_local_command_line;
+  G_APPLICATION_CLASS(klass)->startup = my_application_startup;
+  G_APPLICATION_CLASS(klass)->shutdown = my_application_shutdown;
   G_OBJECT_CLASS(klass)->dispose = my_application_dispose;
 }
 
-static void my_application_init(MyApplication *self) {}
+static void my_application_init(MyApplication* self) {}
 
-MyApplication *my_application_new()
+MyApplication* my_application_new() {
-{
   return MY_APPLICATION(g_object_new(my_application_get_type(),
                                      "application-id", APPLICATION_ID,
                                      "flags", G_APPLICATION_NON_UNIQUE,

{{cookiecutter.out_dir}}/macos/Flutter/GeneratedPluginRegistrant.swift

@@ -5,24 +5,26 @@
 import FlutterMacOS
 import Foundation
 
-import audioplayers_darwin
 import package_info_plus
 import path_provider_foundation
-import screen_retriever
+import record_darwin
+import screen_retriever_macos
 import serious_python_darwin
 import shared_preferences_foundation
 import url_launcher_macos
+import wakelock_plus
 import window_manager
 import window_to_front
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
-  AudioplayersDarwinPlugin.register(with: registry.registrar(forPlugin: "AudioplayersDarwinPlugin"))
   FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
-  ScreenRetrieverPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverPlugin"))
+  RecordPlugin.register(with: registry.registrar(forPlugin: "RecordPlugin"))
+  ScreenRetrieverMacosPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverMacosPlugin"))
   SeriousPythonPlugin.register(with: registry.registrar(forPlugin: "SeriousPythonPlugin"))
   SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
   UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
+  WakelockPlusMacosPlugin.register(with: registry.registrar(forPlugin: "WakelockPlusMacosPlugin"))
   WindowManagerPlugin.register(with: registry.registrar(forPlugin: "WindowManagerPlugin"))
   WindowToFrontPlugin.register(with: registry.registrar(forPlugin: "WindowToFrontPlugin"))
 }

{{cookiecutter.out_dir}}/macos/Runner.xcodeproj/project.pbxproj

@@ -226,8 +226,9 @@
 		33CC10E52044A3C60003C045 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				BuildIndependentTargetsInParallel = YES;
 				LastSwiftUpdateCheck = 0920;
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					331C80D4294CF70F00263BE5 = {
@@ -384,7 +385,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = {{ cookiecutter.org_name }}.{{ cookiecutter.project_name }}.RunnerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = {{ cookiecutter.bundle_id }}.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/{{ cookiecutter.project_name }}.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/{{ cookiecutter.project_name }}";
@@ -398,7 +399,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = {{ cookiecutter.org_name }}.{{ cookiecutter.project_name }}.RunnerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = {{ cookiecutter.bundle_id }}.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/{{ cookiecutter.project_name }}.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/{{ cookiecutter.project_name }}";
@@ -412,7 +413,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = {{ cookiecutter.org_name }}.{{ cookiecutter.project_name }}.RunnerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = {{ cookiecutter.bundle_id }}.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/{{ cookiecutter.project_name }}.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/{{ cookiecutter.project_name }}";
@@ -424,6 +425,7 @@
 			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -447,9 +449,11 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CODE_SIGN_IDENTITY = "-";
 				COPY_PHASE_STRIP = NO;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -497,6 +501,7 @@
 			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -520,9 +525,11 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CODE_SIGN_IDENTITY = "-";
 				COPY_PHASE_STRIP = NO;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -550,6 +557,7 @@
 			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -573,9 +581,11 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CODE_SIGN_IDENTITY = "-";
 				COPY_PHASE_STRIP = NO;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;

{{cookiecutter.out_dir}}/macos/Runner/AppDelegate.swift

@@ -1,9 +1,13 @@
 import Cocoa
 import FlutterMacOS
 
-@NSApplicationMain
+@main
 class AppDelegate: FlutterAppDelegate {
   override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
     return true
   }
+
+  override func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool {
+    return true
+  }
 }

{{cookiecutter.out_dir}}/macos/Runner/Configs/AppInfo.xcconfig

@@ -8,7 +8,7 @@
 PRODUCT_NAME = {{ cookiecutter.product_name }}
 
 // The application's bundle identifier
-PRODUCT_BUNDLE_IDENTIFIER = {{ cookiecutter.org_name }}.{{ cookiecutter.project_name }}
+PRODUCT_BUNDLE_IDENTIFIER = {{ cookiecutter.bundle_id }}
 
 // The copyright displayed in application information
 PRODUCT_COPYRIGHT = {{ cookiecutter.copyright }}. All rights reserved.

{{cookiecutter.out_dir}}/macos/Runner/DebugProfile.entitlements

@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
+	<dict>
-	<key>com.apple.security.app-sandbox</key>
+		<!-- flet: entitlement {% for k, v in cookiecutter.options.macos_entitlements.items() %} -->
-	<false/>
+		<key>{{ k }}</key>
-	<key>com.apple.security.cs.allow-jit</key>
+		<!-- flet: True {% if v == True %} -->
-	<true/>
+		<true />
-	<key>com.apple.security.network.server</key>
+		<!-- flet: False {% elif v == False %} -->
-	<true/>
+		<false />
-</dict>
+		<!-- flet: end of entitlement {% endif %} {% endfor %} -->
+	</dict>
 </plist>

{{cookiecutter.out_dir}}/macos/Runner/Info.plist

@@ -1,32 +1,62 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
+	<dict>
-	<key>CFBundleDevelopmentRegion</key>
+		<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
+		<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleExecutable</key>
+		<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
+		<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIconFile</key>
+		<key>CFBundleIconFile</key>
-	<string></string>
+		<string></string>
-	<key>CFBundleIdentifier</key>
+		<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+		<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
+		<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
+		<string>6.0</string>
-	<key>CFBundleName</key>
+		<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
+		<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
+		<key>CFBundlePackageType</key>
-	<string>APPL</string>
+		<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
+		<key>CFBundleShortVersionString</key>
-	<string>$(FLUTTER_BUILD_NAME)</string>
+		<string>$(FLUTTER_BUILD_NAME)</string>
-	<key>CFBundleVersion</key>
+		<key>CFBundleVersion</key>
-	<string>$(FLUTTER_BUILD_NUMBER)</string>
+		<string>$(FLUTTER_BUILD_NUMBER)</string>
-	<key>LSMinimumSystemVersion</key>
+		<key>LSMinimumSystemVersion</key>
-	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
+		<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
-	<key>NSHumanReadableCopyright</key>
+		<key>NSHumanReadableCopyright</key>
-	<string>$(PRODUCT_COPYRIGHT)</string>
+		<string>$(PRODUCT_COPYRIGHT)</string>
-	<key>NSMainNibFile</key>
+		<key>NSMainNibFile</key>
-	<string>MainMenu</string>
+		<string>MainMenu</string>
-	<key>NSPrincipalClass</key>
+		<key>NSPrincipalClass</key>
-	<string>NSApplication</string>
+		<string>NSApplication</string>
-</dict>
+
+		{% macro render_dict(d) -%}
+		{% for key, value in d.items() -%}
+		<key>{{ key }}</key>
+		{% if value is string -%}
+		<string>{{ value }}</string>
+		{% elif value is boolean -%}
+		<{{ "true" if value else "false" }}/>
+		{% elif value is mapping -%}
+		<dict>
+			{{ render_dict(value) }}
+		</dict>
+		{% elif value is sequence -%}  {# Support for lists/arrays #}
+		<array>
+			{% for item in value -%}
+				{% if item is string -%}
+				<string>{{ item }}</string>
+				{% elif item is boolean -%}
+				<{{ "true" if item else "false" }}/>
+				{% elif item is mapping -%}
+				<dict>
+					{{ render_dict(item) }}
+				</dict>
+				{% endif -%}
+			{% endfor -%}
+		</array>
+		{% endif -%}
+		{% endfor -%}
+		{% endmacro -%}
+		{{ render_dict(cookiecutter.options.info_plist) }}
+	</dict>
 </plist>

{{cookiecutter.out_dir}}/macos/Runner/MainFlutterWindow.swift

@@ -1,5 +1,6 @@
 import Cocoa
 import FlutterMacOS
+import window_manager
 
 class MainFlutterWindow: NSWindow {
   override func awakeFromNib() {
@@ -12,4 +13,9 @@ class MainFlutterWindow: NSWindow {
 
     super.awakeFromNib()
   }
+
+  override public func order(_ place: NSWindow.OrderingMode, relativeTo otherWin: Int) {
+    super.order(place, relativeTo: otherWin)
+    hiddenWindowAtLaunch()
+  }
 }

{{cookiecutter.out_dir}}/macos/Runner/Release.entitlements

@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
+	<dict>
-	<key>com.apple.security.app-sandbox</key>
+		<!-- flet: entitlement {% for k, v in cookiecutter.options.macos_entitlements.items() %} -->
-	<false/>
+		<key>{{ k }}</key>
-</dict>
+		<!-- flet: True {% if v == True %} -->
+		<true />
+		<!-- flet: False {% elif v == False %} -->
+		<false />
+		<!-- flet: end of entitlement {% endif %} {% endfor %} -->
+	</dict>
 </plist>

{{cookiecutter.out_dir}}/pubspec.yaml

@@ -1,5 +1,5 @@
-name: {{ cookiecutter.project_name.replace("-", "_") }}
+name: '{{ cookiecutter.project_name }}'
-description: {{ cookiecutter.project_description }}
+description: '{{ cookiecutter.project_description }}'
 publish_to: 'none'
 
 version: 1.0.0+1
@@ -11,30 +11,47 @@ dependencies:
   flutter:
     sdk: flutter
   
-  serious_python: ^0.7.0
+  serious_python: 0.9.8
-  # serious_python:
+
-  #   git:
+  path: ^1.9.0
-  #     url: https://github.com/flet-dev/serious-python
+  url_strategy: ^0.2.0
-  #     path: src/serious_python
+  cupertino_icons: ^1.0.6
-  #     ref: 'd059aef'
+  path_provider: ^2.1.4
+  package_info_plus: ^8.0.2
+  window_manager: ^0.4.3
+  
+dependency_overrides:
+  flet: 0.28.3
 
-  flet: ^0.19.0
   # flet:
   #   git:
+  #     path: packages/flet
+  #     ref: feodor/flet-0-27-5-fixes
   #     url: https://github.com/flet-dev/flet.git
-  #     path: package
-  #     ref: '37b9581'
 
-  path: ^1.8.3
+  # serious_python: 0.9.6
-  url_strategy: ^0.2.0
+
-  cupertino_icons: ^1.0.2
+  serious_python:
+    git:
+      url: https://github.com/flet-dev/serious-python.git
+      ref: app-zip-windows-fix
+      path: src/serious_python
+
+  wakelock_plus: ^1.2.10
+  web: ^1.0.0
+  window_manager: ^0.4.3
+
+# {% if 'flet_webview' in cookiecutter.flutter.dependencies %}
+  webview_flutter_android: 4.10.1
+# {% endif %}
+
+# {% if 'flet_audio_recorder' in cookiecutter.flutter.dependencies %}
+  record: ^5.1.1
+# {% endif %}
 
 dev_dependencies:
-  flutter_test:
+  flutter_launcher_icons: ^0.14.1
-    sdk: flutter
+  flutter_native_splash: ^2.4.1
-
-  flutter_launcher_icons: "^0.13.1"
-  flutter_native_splash: ^2.3.6
   flutter_lints: ^2.0.0
 
 flutter:
@@ -51,6 +68,8 @@ flutter_launcher_icons:
 
   android: true
   image_path_android: "images/icon.png"
+  adaptive_icon_background: '#ffffff'
+  adaptive_icon_foreground: images/icon.png
 
   ios: true
   image_path_ios: "images/icon.png"
@@ -102,14 +121,10 @@ flutter_native_splash:
     # 768 pixels in diameter.
     image: "images/icon.png"
 
-    # Splash screen background color.
-    color: "#ffffff"
-
     # The image_dark, color_dark, icon_background_color_dark, and branding_dark set values that
     # apply when the device is in dark mode. If they are not specified, the app will use the
     # parameters from above.
     image_dark: "images/icon.png"
-    color_dark: "#333333"
 
   # The android, ios and web parameters can be used to disable generating a splash screen on a given
   # platform.

{{cookiecutter.out_dir}}/web/flutter_bootstrap.js

@@ -0,0 +1,12 @@
+{{ '{{flutter_js}}' }}
+{{ '{{flutter_build_config}}' }}
+
+_flutter.loader.load({
+    serviceWorkerSettings: {
+        serviceWorkerVersion: {{ '{{flutter_service_worker_version}}' }},
+    },
+    onEntrypointLoaded: async function (engineInitializer) {
+        const appRunner = await engineInitializer.initializeEngine({useColorEmoji: useColorEmoji});
+        await appRunner.runApp();
+    }
+});

{{cookiecutter.out_dir}}/web/index.html

@@ -2,27 +2,13 @@
 <html>
 
 <head>
-  <!--
-    If you are serving your web app in a path other than the root, change the
-    href value below to reflect the base path you are serving from.
-
-    The path provided below has to start and end with a slash "/" in order for
-    it to work correctly.
-
-    For more details:
-    * https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base
-
-    This is a placeholder for base href that will be replaced by the value of
-    the `--base-href` argument provided to `flutter build`.
-  -->
   <base href="{{ cookiecutter.base_url }}">
-
   <meta charset="UTF-8">
   <meta content="IE=Edge" http-equiv="X-UA-Compatible">
   <meta name="description" content="{{ cookiecutter.project_description }}">
 
   <!-- iOS meta tags & icons -->
-  <meta name="apple-mobile-web-app-capable" content="yes">
+  <meta name="mobile-web-app-capable" content="yes">
   <meta name="apple-mobile-web-app-status-bar-style" content="black">
   <meta name="apple-mobile-web-app-title" content="{{ cookiecutter.product_name }}">
   <link rel="apple-touch-icon" href="icons/Icon-192.png">
@@ -44,34 +30,10 @@
   </script>
 
   <script src="python.js"></script>
-
-  <script>
-    // The value below is injected by flutter build, do not touch.
-    const serviceWorkerVersion = null;
-  </script>
-  <!-- This script adds the flutter initialization JS code -->
-  <script src="flutter.js" defer></script>
 </head>
 
 <body>
-  <script>
+  <script src="flutter_bootstrap.js" async></script>
-    window.addEventListener('load', function (ev) {
-      // Download main.dart.js
-      _flutter.loader.loadEntrypoint({
-        serviceWorker: {
-          serviceWorkerVersion: serviceWorkerVersion,
-        },
-        onEntrypointLoaded: function (engineInitializer) {
-          engineInitializer.initializeEngine({
-            renderer: webRenderer,
-            useColorEmoji: useColorEmoji,
-          }).then(function (appRunner) {
-            appRunner.runApp();
-          });
-        }
-      });
-    });
-  </script>
 </body>
 
 </html>

{{cookiecutter.out_dir}}/web/manifest.json

@@ -3,8 +3,8 @@
     "short_name": "{{ cookiecutter.project_name }}",
     "start_url": ".",
     "display": "standalone",
-    "background_color": "#0175C2",
+    "background_color": "{{ cookiecutter.pwa_background_color }}",
-    "theme_color": "#0175C2",
+    "theme_color": "{{ cookiecutter.pwa_theme_color }}",
     "description": "{{ cookiecutter.project_description }}",
     "orientation": "portrait-primary",
     "prefer_related_applications": false,

{{cookiecutter.out_dir}}/web/python-worker.js

@@ -1,4 +1,4 @@
-importScripts("https://cdn.jsdelivr.net/pyodide/v0.24.1/full/pyodide.js");
+importScripts("https://cdn.jsdelivr.net/pyodide/v0.27.2/full/pyodide.js");
 
 self.pythonModuleName = null;
 self.initialized = false;

{{cookiecutter.out_dir}}/windows/flutter/generated_plugin_registrant.cc

@@ -6,18 +6,18 @@
 
 #include "generated_plugin_registrant.h"
 
-#include <audioplayers_windows/audioplayers_windows_plugin.h>
+#include <record_windows/record_windows_plugin_c_api.h>
-#include <screen_retriever/screen_retriever_plugin.h>
+#include <screen_retriever_windows/screen_retriever_windows_plugin_c_api.h>
 #include <serious_python_windows/serious_python_windows_plugin_c_api.h>
 #include <url_launcher_windows/url_launcher_windows.h>
 #include <window_manager/window_manager_plugin.h>
 #include <window_to_front/window_to_front_plugin.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
-  AudioplayersWindowsPluginRegisterWithRegistrar(
+  RecordWindowsPluginCApiRegisterWithRegistrar(
-      registry->GetRegistrarForPlugin("AudioplayersWindowsPlugin"));
+      registry->GetRegistrarForPlugin("RecordWindowsPluginCApi"));
-  ScreenRetrieverPluginRegisterWithRegistrar(
+  ScreenRetrieverWindowsPluginCApiRegisterWithRegistrar(
-      registry->GetRegistrarForPlugin("ScreenRetrieverPlugin"));
+      registry->GetRegistrarForPlugin("ScreenRetrieverWindowsPluginCApi"));
   SeriousPythonWindowsPluginCApiRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("SeriousPythonWindowsPluginCApi"));
   UrlLauncherWindowsRegisterWithRegistrar(

{{cookiecutter.out_dir}}/windows/flutter/generated_plugins.cmake

@@ -3,8 +3,8 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
-  audioplayers_windows
+  record_windows
-  screen_retriever
+  screen_retriever_windows
   serious_python_windows
   url_launcher_windows
   window_manager