Fix type of `createControlFactories`

Flet 0.20.0

cookiecutter.json

@@ -7,6 +7,7 @@
     "org_name": "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 }}",
     "hide_loading_animation": true,

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

@@ -50,6 +50,8 @@ android {
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
 
+        minSdkVersion 21
+
         ndk {
             abiFilters 'arm64-v8a', 'armeabi-v7a'
         }

{{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" />
-</manifest>
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+</manifest>

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

@@ -1,5 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <application
         android:label="{{ cookiecutter.project_name }}"
         android:name="${applicationName}"
@@ -17,12 +18,12 @@
                  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" />
             </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.
@@ -31,4 +32,4 @@
             android:name="flutterEmbedding"
             android:value="2" />
     </application>
-</manifest>
+</manifest>

{{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" />
-</manifest>
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+</manifest>

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

@@ -1,49 +1,56 @@
 <?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>
-</plist>
+		<dict>
+			<key>NSAllowsArbitraryLoads</key>
+			<true />
+		</dict>
+		<key>NSMicrophoneUsageDescription</key>
+		<string>Audio Recording</string>
+	</dict>
+</plist>

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

@@ -9,6 +9,10 @@ import 'package:path/path.dart' as path;
 import 'package:serious_python/serious_python.dart';
 import 'package:url_strategy/url_strategy.dart';
 
+{% 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";
@@ -19,6 +23,12 @@ final hideLoadingPage =
 const outLogFilename = "out.log";
 const errorExitCode = 100;
 
+List<CreateControlFactory> createControlFactories = [
+{% for dep in cookiecutter.flutter.dependencies %}
+{{ dep }}.createControl,
+{% endfor %}
+];
+
 const pythonScript = """
 import certifi, os, runpy, socket, sys, traceback
 
@@ -79,6 +89,10 @@ void main() async {
     debugPrint = (String? message, {int? wrapWidth}) => null;
   }
 
+  {% for dep in cookiecutter.flutter.dependencies %}
+  {{ dep }}.ensureInitialized();
+  {% endfor %}
+
   runApp(FutureBuilder(
       future: prepareApp(),
       builder: (BuildContext context, AsyncSnapshot snapshot) {
@@ -89,6 +103,7 @@ void main() async {
                   pageUrl: pageUrl,
                   assetsDir: assetsDir,
                   hideLoadingPage: hideLoadingPage,
+                  createControlFactories: createControlFactories
                 )
               : FutureBuilder(
                   future: runPythonApp(),
@@ -107,6 +122,7 @@ void main() async {
                         pageUrl: pageUrl,
                         assetsDir: assetsDir,
                         hideLoadingPage: hideLoadingPage,
+                        createControlFactories: createControlFactories
                       );
                     }
                   });

{{cookiecutter.out_dir}}/pubspec.yaml

@@ -18,7 +18,7 @@ dependencies:
   #     path: src/serious_python
   #     ref: 'd059aef'
 
-  flet: ^0.19.0
+  flet: ^0.20.0
   # flet:
   #   git:
   #     url: https://github.com/flet-dev/flet.git

{{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.25.0/full/pyodide.js");
 
 self.pythonModuleName = null;
 self.initialized = false;