From b0d17e8776419e2574c093fc724491c0b37fc1c6 Mon Sep 17 00:00:00 2001
From: Feodor Fitsner <feodor@appveyor.com>
Date: Fri, 4 Apr 2025 19:54:13 -0700
Subject: [PATCH] Fix extensions

---
 {{cookiecutter.out_dir}}/lib/main.dart | 12 ++++++------
 {{cookiecutter.out_dir}}/pubspec.yaml  | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/{{cookiecutter.out_dir}}/lib/main.dart b/{{cookiecutter.out_dir}}/lib/main.dart
index 8821d89..384ba47 100644
--- a/{{cookiecutter.out_dir}}/lib/main.dart
+++ b/{{cookiecutter.out_dir}}/lib/main.dart
@@ -14,6 +14,10 @@ import 'package:window_manager/window_manager.dart';
 
 import "python.dart";
 
+{% for dep in cookiecutter.flutter.dependencies %}
+import 'package:{{ dep }}/{{ dep }}.dart' as {{ dep }};
+{% endfor %}
+
 /*
 {% 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")
@@ -33,10 +37,6 @@ 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";
@@ -46,9 +46,9 @@ const appBootScreenMessage = '{{ boot_screen_message | default("Preparing the ap
 final showAppStartupScreen = bool.tryParse("{{ show_startup_screen }}".toLowerCase()) ?? false;
 const appStartupScreenMessage = '{{ startup_screen_message | default("Getting things ready…", true) }}';
 
-List<CreateControlFactory> extensions = [
+List<FletExtension> extensions = [
 {% for dep in cookiecutter.flutter.dependencies %}
-{{ dep }}.Extension,
+{{ dep }}.Extension(),
 {% endfor %}
 ];
 
diff --git a/{{cookiecutter.out_dir}}/pubspec.yaml b/{{cookiecutter.out_dir}}/pubspec.yaml
index 49a630e..0f8a3ed 100644
--- a/{{cookiecutter.out_dir}}/pubspec.yaml
+++ b/{{cookiecutter.out_dir}}/pubspec.yaml
@@ -21,13 +21,13 @@ dependencies:
   window_manager: ^0.4.3
   
 dependency_overrides:
-  flet: 0.27.6
+  #flet: 0.27.6
 
-  # flet:
-  #   git:
-  #     path: packages/flet
-  #     ref: feodor/flet-0-27-5-fixes
-  #     url: https://github.com/flet-dev/flet.git
+  flet:
+    git:
+      path: packages/flet
+      ref: v1
+      url: https://github.com/flet-dev/flet.git
 
   # serious_python:
   #   git: