From 7b246adbb4407aeb1c1093d7052b11ab01c47a3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Jakubowski?= <pawel.jakubowski@leancode.pl>
Date: Tue, 17 Dec 2024 17:12:11 +0100
Subject: [PATCH] Use TextDirectio from context for layoutDirection when
 creating a surface view

---
 .../lib/src/android_video_player.dart         | 56 ++++++++++---------
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/packages/video_player/video_player_android/lib/src/android_video_player.dart b/packages/video_player/video_player_android/lib/src/android_video_player.dart
index 664a41d2e373..d68a354dbc4d 100644
--- a/packages/video_player/video_player_android/lib/src/android_video_player.dart
+++ b/packages/video_player/video_player_android/lib/src/android_video_player.dart
@@ -167,32 +167,36 @@ class AndroidVideoPlayer extends VideoPlayerPlatform {
 
     // FIXME Check if this setup is complete
 
-    return IgnorePointer(
-      // IgnorePointer so that GestureDetector can be used above the platform view.
-      child: PlatformViewLink(
-        viewType: viewType,
-        surfaceFactory: (
-          BuildContext context,
-          PlatformViewController controller,
-        ) {
-          return AndroidViewSurface(
-            controller: controller as AndroidViewController,
-            gestureRecognizers: const <Factory<OneSequenceGestureRecognizer>>{},
-            hitTestBehavior: PlatformViewHitTestBehavior.opaque,
-          );
-        },
-        onCreatePlatformView: (PlatformViewCreationParams params) {
-          return PlatformViewsService.initSurfaceAndroidView(
-            id: params.id,
-            viewType: viewType,
-            layoutDirection: TextDirection.ltr,
-            creationParams: creationParams,
-            creationParamsCodec: AndroidVideoPlayerApi.pigeonChannelCodec,
-            onFocus: () => params.onFocusChanged(true),
-          )
-            ..addOnPlatformViewCreatedListener(params.onPlatformViewCreated)
-            ..create();
-        },
+    return Builder(
+      builder: (BuildContext context) => IgnorePointer(
+        // IgnorePointer so that GestureDetector can be used above the platform view.
+        child: PlatformViewLink(
+          viewType: viewType,
+          surfaceFactory: (
+            BuildContext context,
+            PlatformViewController controller,
+          ) {
+            return AndroidViewSurface(
+              controller: controller as AndroidViewController,
+              gestureRecognizers: const <Factory<
+                  OneSequenceGestureRecognizer>>{},
+              hitTestBehavior: PlatformViewHitTestBehavior.opaque,
+            );
+          },
+          onCreatePlatformView: (PlatformViewCreationParams params) {
+            return PlatformViewsService.initSurfaceAndroidView(
+              id: params.id,
+              viewType: viewType,
+              layoutDirection:
+                  Directionality.maybeOf(context) ?? TextDirection.ltr,
+              creationParams: creationParams,
+              creationParamsCodec: AndroidVideoPlayerApi.pigeonChannelCodec,
+              onFocus: () => params.onFocusChanged(true),
+            )
+              ..addOnPlatformViewCreatedListener(params.onPlatformViewCreated)
+              ..create();
+          },
+        ),
       ),
     );
   }