Oct 6, 2025 · Oct 6, 2025 · Oct 9, 2025 · Oct 6, 2025
diff --git a/engine/src/flutter/shell/platform/darwin/ios/platform_view_ios.h b/engine/src/flutter/shell/platform/darwin/ios/platform_view_ios.h
  AccessibilityBridge* GetAccessibilityBridge() { return accessibility_bridge_.get(); }

 private:
  void ApplyLocaleToOwnerController();
  /// Smart pointer for use with objective-c observers.
  /// This guarantees we remove the observer.
  class ScopedObserver {
diff --git a/engine/src/flutter/shell/platform/darwin/ios/platform_view_ios.mm b/engine/src/flutter/shell/platform/darwin/ios/platform_view_ios.mm
    accessibility_bridge_.reset();
  }
  owner_controller_ = owner_controller;
  owner_controller_.applicationLocale =
      application_locale_.empty() ? nil : @(application_locale_.data());
  ApplyLocaleToOwnerController();

  // Add an observer that will clear out the owner_controller_ ivar and
  // the accessibility_bridge_ in case the view controller is deleted.
 // |PlatformView|
 void PlatformViewIOS::SetApplicationLocale(std::string locale) {
  application_locale_ = std::move(locale);
  if (owner_controller_) {
    owner_controller_.applicationLocale =
        application_locale_.empty() ? nil : @(application_locale_.data());
  }
  ApplyLocaleToOwnerController();
 }

 // |PlatformView|
  return std::make_unique<VsyncWaiterIOS>(task_runners_);
 }

 // |PlatformView|
 void PlatformViewIOS::OnPreEngineRestart() const {
  if (accessibility_bridge_) {
    accessibility_bridge_.get()->clearState();
  [owner_controller_.textInputPlugin reset];
 }

 // |PlatformView|
 std::unique_ptr<std::vector<std::string>> PlatformViewIOS::ComputePlatformResolvedLocales(
    const std::vector<std::string>& supported_locale_data) {
  size_t localeDataLength = 3;
  return out;
 }

 void PlatformViewIOS::ApplyLocaleToOwnerController() {
  if (owner_controller_) {
    owner_controller_.applicationLocale =
        application_locale_.empty() ? nil : @(application_locale_.data());
  }
 }

 PlatformViewIOS::ScopedObserver::ScopedObserver() {}

 PlatformViewIOS::ScopedObserver::~ScopedObserver() {
diff --git a/engine/src/flutter/shell/platform/darwin/ios/platform_view_ios_test.mm b/engine/src/flutter/shell/platform/darwin/ios/platform_view_ios_test.mm
    std::string locale = "en-US";
    platform_view->SetApplicationLocale(locale);
    platform_view->SetOwnerViewController(flutterViewController);
    OCMVerify([flutterViewController setApplicationLocale:@"en-US"]) latch.Signal();
    OCMVerify([flutterViewController setApplicationLocale:@"en-US"]);
    latch.Signal();
  });
  latch.Wait();
Original file line number	Diff line number	Diff line change
Expand Up		@@ -141,6 +141,7 @@ class PlatformViewIOS final : public PlatformView {
		AccessibilityBridge* GetAccessibilityBridge() { return accessibility_bridge_.get(); }

		private:
		void ApplyLocaleToOwnerController();
		/// Smart pointer for use with objective-c observers.
		/// This guarantees we remove the observer.
		class ScopedObserver {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -66,8 +66,7 @@ new PlatformMessageHandlerIos(task_runners.GetPlatformTaskRunner())) {}
		accessibility_bridge_.reset();
		}
		owner_controller_ = owner_controller;
		owner_controller_.applicationLocale =
		application_locale_.empty() ? nil : @(application_locale_.data());
		ApplyLocaleToOwnerController();

		// Add an observer that will clear out the owner_controller_ ivar and
		// the accessibility_bridge_ in case the view controller is deleted.
Expand DownExpand Up		@@ -164,10 +163,7 @@ new PlatformMessageHandlerIos(task_runners.GetPlatformTaskRunner())) {}
		// \|PlatformView\|
		void PlatformViewIOS::SetApplicationLocale(std::string locale) {
		application_locale_ = std::move(locale);
		if (owner_controller_) {
		owner_controller_.applicationLocale =
		application_locale_.empty() ? nil : @(application_locale_.data());
		}
		ApplyLocaleToOwnerController();
		}

		// \|PlatformView\|
Expand All		@@ -189,6 +185,7 @@ new PlatformMessageHandlerIos(task_runners.GetPlatformTaskRunner())) {}
		return std::make_unique<VsyncWaiterIOS>(task_runners_);
		}

		// \|PlatformView\|
		void PlatformViewIOS::OnPreEngineRestart() const {
		if (accessibility_bridge_) {
		accessibility_bridge_.get()->clearState();
Expand All		@@ -201,6 +198,7 @@ new PlatformMessageHandlerIos(task_runners.GetPlatformTaskRunner())) {}
		[owner_controller_.textInputPlugin reset];
		}

		// \|PlatformView\|
		std::unique_ptr<std::vector<std::string>> PlatformViewIOS::ComputePlatformResolvedLocales(
		const std::vector<std::string>& supported_locale_data) {
		size_t localeDataLength = 3;
Expand DownExpand Up		@@ -235,6 +233,13 @@ new PlatformMessageHandlerIos(task_runners.GetPlatformTaskRunner())) {}
		return out;
		}

		void PlatformViewIOS::ApplyLocaleToOwnerController() {
		if (owner_controller_) {
		owner_controller_.applicationLocale =
		application_locale_.empty() ? nil : @(application_locale_.data());
		}
		}

		PlatformViewIOS::ScopedObserver::ScopedObserver() {}

		PlatformViewIOS::ScopedObserver::~ScopedObserver() {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -132,7 +132,8 @@ - (void)testLocaleCanBeSetWithoutViewController {
		std::string locale = "en-US";
		platform_view->SetApplicationLocale(locale);
		platform_view->SetOwnerViewController(flutterViewController);
		OCMVerify([flutterViewController setApplicationLocale:@"en-US"]) latch.Signal();
		OCMVerify([flutterViewController setApplicationLocale:@"en-US"]);
		latch.Signal();
		});
		latch.Wait();

Expand Down