Added possibility to show fullscreen in portrait mode

Ugotoru-Inc · Oct 17, 2020 · 31b4688 · 31b4688
1 parent 31a284e
commit 31b4688
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -275,6 +275,11 @@ Possible configuration options:
     /// Defines if the player will sleep in fullscreen or not
     final bool allowedScreenSleep;
 
+    /// Defines aspect ratio which will be used in fullscreen
+    final double fullScreenAspectRatio;
+
+    /// Defines the set of allowed device orientations on entering fullscreen
+    final List<DeviceOrientation> deviceOrientationsOnFullScreen;
 
     /// Defines the system overlays visible after exiting fullscreen
     final List<SystemUiOverlay> systemOverlaysAfterFullScreen;

diff --git a/example/lib/other_page/other_page.dart b/example/lib/other_page/other_page.dart
@@ -1,5 +1,6 @@
 import 'package:better_player/better_player.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 
 class OtherPage extends StatefulWidget {
   @override
@@ -46,6 +47,11 @@ class _OtherPageState extends State<OtherPage> {
           "https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ForBiggerBlazes.mp4",
           betterPlayerConfiguration: BetterPlayerConfiguration(
             aspectRatio: 16 / 9,
+            fullScreenAspectRatio: 9 / 16,
+            deviceOrientationsOnFullScreen: [
+              DeviceOrientation.portraitUp,
+              DeviceOrientation.portraitDown
+            ],
           ),
         ),
       ),

diff --git a/lib/src/configuration/better_player_configuration.dart b/lib/src/configuration/better_player_configuration.dart
@@ -42,6 +42,12 @@ class BetterPlayerConfiguration {
   /// Defines if the player will sleep in fullscreen or not
   final bool allowedScreenSleep;
 
+  /// Defines aspect ratio which will be used in fullscreen
+  final double fullScreenAspectRatio;
+
+  /// Defines the set of allowed device orientations on entering fullscreen
+  final List<DeviceOrientation> deviceOrientationsOnFullScreen;
+
   /// Defines the system overlays visible after exiting fullscreen
   final List<SystemUiOverlay> systemOverlaysAfterFullScreen;
 
@@ -82,6 +88,11 @@ class BetterPlayerConfiguration {
     this.showControlsOnInitialize = true,
     this.errorBuilder,
     this.allowedScreenSleep = true,
+    this.fullScreenAspectRatio,
+    this.deviceOrientationsOnFullScreen = const [
+      DeviceOrientation.landscapeLeft,
+      DeviceOrientation.landscapeRight,
+    ],
     this.systemOverlaysAfterFullScreen = SystemUiOverlay.values,
     this.deviceOrientationsAfterFullScreen = const [
       DeviceOrientation.portraitUp,
@@ -109,6 +120,8 @@ class BetterPlayerConfiguration {
     bool showControlsOnInitialize,
     Widget Function(BuildContext context, String errorMessage) errorBuilder,
     bool allowedScreenSleep,
+    double fullScreenAspectRatio,
+    List<DeviceOrientation> deviceOrientationsOnFullScreen,
     List<SystemUiOverlay> systemOverlaysAfterFullScreen,
     List<DeviceOrientation> deviceOrientationsAfterFullScreen,
     BetterPlayerRoutePageBuilder routePageBuilder,
@@ -131,6 +144,8 @@ class BetterPlayerConfiguration {
             showControlsOnInitialize ?? this.showControlsOnInitialize,
         errorBuilder: errorBuilder ?? this.errorBuilder,
         allowedScreenSleep: allowedScreenSleep ?? this.allowedScreenSleep,
+        deviceOrientationsOnFullScreen: deviceOrientationsOnFullScreen ??
+            this.deviceOrientationsOnFullScreen,
         systemOverlaysAfterFullScreen:
             systemOverlaysAfterFullScreen ?? this.systemOverlaysAfterFullScreen,
         deviceOrientationsAfterFullScreen: deviceOrientationsAfterFullScreen ??

diff --git a/lib/src/core/better_player.dart b/lib/src/core/better_player.dart
@@ -166,10 +166,10 @@ class BetterPlayerState extends State<BetterPlayer> {
 
     SystemChrome.setEnabledSystemUIOverlays([]);
     if (isAndroid) {
-      SystemChrome.setPreferredOrientations([
-        DeviceOrientation.landscapeLeft,
-        DeviceOrientation.landscapeRight,
-      ]);
+      SystemChrome.setPreferredOrientations(
+        widget.controller.betterPlayerConfiguration
+            .deviceOrientationsOnFullScreen,
+      );
     }
 
     if (!widget.controller.allowedScreenSleep) {

diff --git a/lib/src/core/better_player_with_controls.dart b/lib/src/core/better_player_with_controls.dart
@@ -62,13 +62,23 @@ class _BetterPlayerWithControlsState extends State<BetterPlayerWithControls> {
     final BetterPlayerController betterPlayerController =
         BetterPlayerController.of(context);
 
+    var aspectRatio;
+    if (betterPlayerController.isFullScreen) {
+      aspectRatio = betterPlayerController
+              .betterPlayerConfiguration.fullScreenAspectRatio ??
+          BetterPlayerUtils.calculateAspectRatio(context);
+    } else {
+      aspectRatio =
+          betterPlayerController.betterPlayerConfiguration.aspectRatio ??
+              BetterPlayerUtils.calculateAspectRatio(context);
+    }
+
     return Center(
       child: Container(
         width: double.infinity,
         color: Colors.black,
         child: AspectRatio(
-          aspectRatio: betterPlayerController.aspectRatio ??
-              BetterPlayerUtils.calculateAspectRatio(context),
+          aspectRatio: aspectRatio,
           child: _buildPlayerWithControls(betterPlayerController, context),
         ),
       ),
@@ -80,7 +90,7 @@ class _BetterPlayerWithControlsState extends State<BetterPlayerWithControls> {
     var configuration = betterPlayerController.betterPlayerConfiguration;
     var rotation = configuration.rotation;
 
-    if (!(rotation <= 360 && rotation % 90 == 0)){
+    if (!(rotation <= 360 && rotation % 90 == 0)) {
       print("Invalid rotation provided. Using rotation = 0");
       rotation = 0;
     }