From 349070a0585938ea4b455e8370664c05037e5726 Mon Sep 17 00:00:00 2001
From: Donald Nweyilobu <donnywellson@gmail.com>
Date: Sun, 13 Oct 2024 18:10:53 +0100
Subject: [PATCH] chore: Update project files after Flutter upgrade

---
 .metadata                         | 26 +++++++-------------------
 windows/flutter/CMakeLists.txt    |  7 ++++++-
 windows/runner/flutter_window.cpp |  5 +++++
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/.metadata b/.metadata
index 623a8e999f..ab4d53edd0 100644
--- a/.metadata
+++ b/.metadata
@@ -1,11 +1,11 @@
 # This file tracks properties of this Flutter project.
 # Used by Flutter tool to assess capabilities and perform upgrades etc.
 #
-# This file should be version controlled.
+# This file should be version controlled and should not be manually edited.
 
 version:
-  revision: c9dd4584702dc5ab67a6dc9c6ebaa33739bac811
-  channel: main
+  revision: "05ef4d31315f538bf0a60600e0e6efaf89acc6c2"
+  channel: "main"
 
 project_type: app
 
@@ -13,23 +13,11 @@ project_type: app
 migration:
   platforms:
     - platform: root
-      create_revision: c9dd4584702dc5ab67a6dc9c6ebaa33739bac811
-      base_revision: c9dd4584702dc5ab67a6dc9c6ebaa33739bac811
+      create_revision: 05ef4d31315f538bf0a60600e0e6efaf89acc6c2
+      base_revision: 05ef4d31315f538bf0a60600e0e6efaf89acc6c2
     - platform: android
-      create_revision: c9dd4584702dc5ab67a6dc9c6ebaa33739bac811
-      base_revision: c9dd4584702dc5ab67a6dc9c6ebaa33739bac811
-    - platform: ios
-      create_revision: c9dd4584702dc5ab67a6dc9c6ebaa33739bac811
-      base_revision: c9dd4584702dc5ab67a6dc9c6ebaa33739bac811
-    - platform: linux
-      create_revision: c9dd4584702dc5ab67a6dc9c6ebaa33739bac811
-      base_revision: c9dd4584702dc5ab67a6dc9c6ebaa33739bac811
-    - platform: macos
-      create_revision: c9dd4584702dc5ab67a6dc9c6ebaa33739bac811
-      base_revision: c9dd4584702dc5ab67a6dc9c6ebaa33739bac811
-    - platform: windows
-      create_revision: c9dd4584702dc5ab67a6dc9c6ebaa33739bac811
-      base_revision: c9dd4584702dc5ab67a6dc9c6ebaa33739bac811
+      create_revision: 05ef4d31315f538bf0a60600e0e6efaf89acc6c2
+      base_revision: 05ef4d31315f538bf0a60600e0e6efaf89acc6c2
 
   # User provided section
 
diff --git a/windows/flutter/CMakeLists.txt b/windows/flutter/CMakeLists.txt
index 930d2071a3..903f4899d6 100644
--- a/windows/flutter/CMakeLists.txt
+++ b/windows/flutter/CMakeLists.txt
@@ -10,6 +10,11 @@ include(${EPHEMERAL_DIR}/generated_config.cmake)
 # https://github.com/flutter/flutter/issues/57146.
 set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper")
 
+# Set fallback configurations for older versions of the flutter tool.
+if (NOT DEFINED FLUTTER_TARGET_PLATFORM)
+  set(FLUTTER_TARGET_PLATFORM "windows-x64")
+endif()
+
 # === Flutter Library ===
 set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll")
 
@@ -92,7 +97,7 @@ add_custom_command(
   COMMAND ${CMAKE_COMMAND} -E env
     ${FLUTTER_TOOL_ENVIRONMENT}
     "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat"
-      windows-x64 $<CONFIG>
+      ${FLUTTER_TARGET_PLATFORM} $<CONFIG>
   VERBATIM
 )
 add_custom_target(flutter_assemble DEPENDS
diff --git a/windows/runner/flutter_window.cpp b/windows/runner/flutter_window.cpp
index b25e363efa..955ee3038f 100644
--- a/windows/runner/flutter_window.cpp
+++ b/windows/runner/flutter_window.cpp
@@ -31,6 +31,11 @@ bool FlutterWindow::OnCreate() {
     this->Show();
   });
 
+  // Flutter can complete the first frame before the "show window" callback is
+  // registered. The following call ensures a frame is pending to ensure the
+  // window is shown. It is a no-op if the first frame hasn't completed yet.
+  flutter_controller_->ForceRedraw();
+
   return true;
 }