From 084be98c5b34e1070335313eb80d16d123722131 Mon Sep 17 00:00:00 2001
From: Luke Strickland <luke@axxim.net>
Date: Fri, 25 Feb 2022 13:48:16 -0500
Subject: [PATCH] Landscape phone full screen, also adding bluetooth

---
 android/app/src/main/AndroidManifest.xml |  8 ++-
 ios/Runner.xcodeproj/project.pbxproj     |  6 +-
 ios/Runner/Info.plist                    |  2 +-
 lib/screens/AppScreen.dart               |  1 -
 lib/screens/CategoryListScreen.dart      |  1 -
 lib/screens/ChannelScreen.dart           | 75 +++++++++++++-----------
 lib/screens/FollowingScreen.dart         |  1 -
 lib/screens/LoginScreen.dart             |  1 -
 lib/screens/ProfileScreen.dart           |  1 -
 pubspec.yaml                             |  2 +-
 10 files changed, 51 insertions(+), 47 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 6ca3e9c..37f0640 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,8 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="tv.glimesh.app">
 
-    <uses-permission android:name="android.permission.INTERNET"/>
-
     <!-- Provide required visibility configuration for API level 30 and above -->
     <queries>
         <intent>
@@ -61,10 +59,16 @@
             android:name="flutterEmbedding"
             android:value="2" />
     </application>
+
+    <!-- Basic support for WebRTC -->
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
 
+    <!-- Support for Bluetooth headset listening? -->
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+
     <!-- <activity android:name="com.example.glimesh_app.flutter_web_auth.CallbackActivity" >
         <intent-filter android:label="flutter_web_auth">
             <action android:name="android.intent.action.VIEW" />
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index e225689..7996f12 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -357,7 +357,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 21;
+				CURRENT_PROJECT_VERSION = 23;
 				DEVELOPMENT_TEAM = 3TCN256Z4Z;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -488,7 +488,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 21;
+				CURRENT_PROJECT_VERSION = 23;
 				DEVELOPMENT_TEAM = 3TCN256Z4Z;
 				ENABLE_BITCODE = NO;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "i386 arm64";
@@ -514,7 +514,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 21;
+				CURRENT_PROJECT_VERSION = 23;
 				DEVELOPMENT_TEAM = 3TCN256Z4Z;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index 5234706..434a2cc 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -34,7 +34,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>21</string>
+	<string>23</string>
 	<key>FlutterDeepLinkingEnabled</key>
 	<true/>
 	<key>LSRequiresIPhoneOS</key>
diff --git a/lib/screens/AppScreen.dart b/lib/screens/AppScreen.dart
index 1216e40..87a30eb 100644
--- a/lib/screens/AppScreen.dart
+++ b/lib/screens/AppScreen.dart
@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:glimesh_app/components/Loading.dart';
-import 'package:graphql_flutter/graphql_flutter.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:glimesh_app/screens/ProfileScreen.dart';
 import 'package:glimesh_app/screens/CategoryListScreen.dart';
diff --git a/lib/screens/CategoryListScreen.dart b/lib/screens/CategoryListScreen.dart
index ec7f650..6d11065 100644
--- a/lib/screens/CategoryListScreen.dart
+++ b/lib/screens/CategoryListScreen.dart
@@ -7,7 +7,6 @@ import 'package:glimesh_app/models.dart';
 import 'package:glimesh_app/blocs/repos/channel_list_bloc.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:glimesh_app/repository.dart';
-import 'package:graphql_flutter/graphql_flutter.dart';
 
 class CategoryListScreen extends StatelessWidget {
   @override
diff --git a/lib/screens/ChannelScreen.dart b/lib/screens/ChannelScreen.dart
index 537e303..3016a43 100644
--- a/lib/screens/ChannelScreen.dart
+++ b/lib/screens/ChannelScreen.dart
@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:glimesh_app/auth.dart';
 import 'package:glimesh_app/blocs/repos/channel_bloc.dart';
 import 'package:glimesh_app/components/Chat.dart';
 import 'package:glimesh_app/components/FTLPlayer.dart';
@@ -15,8 +14,6 @@ class ChannelScreen extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final authState = AuthState.of(context);
-
     return BlocBuilder<ChannelBloc, ChannelState>(
         builder: (BuildContext context, ChannelState state) {
       if (state is ChannelLoading) {
@@ -29,45 +26,28 @@ class ChannelScreen extends StatelessWidget {
 
       if (state is ChannelReady) {
         final JanusEdgeRoute edgeRoute = state.edgeRoute;
-        ChannelBloc bloc = BlocProvider.of<ChannelBloc>(context);
-
-        print("ChannelReady");
 
         Widget chatWidget = Chat(channel: channel);
 
-        Widget videoPlayer = Stack(
-          children: [
-            AspectRatio(
-              aspectRatio: 16 / 9,
-              child: FTLPlayer(channel: channel, edgeUrl: edgeRoute.url),
-            ),
-            InkWell(
-              child: Padding(
-                padding: EdgeInsets.all(5),
-                child: Icon(
-                  Icons.chevron_left,
-                  color: Colors.white70,
-                ),
-              ),
-              onTap: () => Navigator.pop(context),
-            )
-          ],
-        );
-        Widget metadata = Container(
-          child: StreamTitle(
-            channel: channel,
-            allowMetadata: true,
-          ),
-        );
-
         return Scaffold(
           body: SafeArea(
             child: OrientationBuilder(
               builder: (context, orientation) {
                 if (orientation == Orientation.portrait) {
-                  return _buildStacked(edgeRoute.url, videoPlayer, chatWidget);
+                  return _buildStacked(
+                    _videoPlayer(context, edgeRoute.url),
+                    chatWidget,
+                  );
                 } else {
-                  return _buildSidebar(edgeRoute.url, videoPlayer, chatWidget);
+                  double width = MediaQuery.of(context).size.width;
+                  // 1000 is arbitrary...
+                  if (width < 1000) {
+                    return _videoPlayer(context, edgeRoute.url,
+                        forceAspectRatio: false);
+                  } else {
+                    return _buildSidebar(
+                        _videoPlayer(context, edgeRoute.url), chatWidget);
+                  }
                 }
               },
             ),
@@ -79,8 +59,34 @@ class ChannelScreen extends StatelessWidget {
     });
   }
 
+  Widget _videoPlayer(context, url, {forceAspectRatio = true}) {
+    Widget ftlPlayer = FTLPlayer(channel: channel, edgeUrl: url);
+    Widget videoChild = forceAspectRatio
+        ? AspectRatio(
+            aspectRatio: 16 / 9,
+            child: ftlPlayer,
+          )
+        : Center(child: ftlPlayer);
+    final Widget subtree = Stack(
+      children: [
+        videoChild,
+        InkWell(
+          child: Padding(
+            padding: EdgeInsets.all(5),
+            child: Icon(
+              Icons.chevron_left,
+              color: Colors.white70,
+            ),
+          ),
+          onTap: () => Navigator.pop(context),
+        )
+      ],
+    );
+
+    return subtree;
+  }
+
   Widget _buildStacked(
-    String edgeUrl,
     Widget videoPlayer,
     Widget chatWidget,
   ) {
@@ -101,7 +107,6 @@ class ChannelScreen extends StatelessWidget {
   }
 
   Widget _buildSidebar(
-    String edgeUrl,
     Widget videoPlayer,
     Widget chatWidget,
   ) {
diff --git a/lib/screens/FollowingScreen.dart b/lib/screens/FollowingScreen.dart
index 019c7da..73481c7 100644
--- a/lib/screens/FollowingScreen.dart
+++ b/lib/screens/FollowingScreen.dart
@@ -5,7 +5,6 @@ import 'package:glimesh_app/blocs/repos/channel_list_bloc.dart';
 import 'package:glimesh_app/components/ChannelList.dart';
 import 'package:glimesh_app/components/Loading.dart';
 import 'package:glimesh_app/repository.dart';
-import 'package:graphql_flutter/graphql_flutter.dart';
 import 'package:glimesh_app/models.dart';
 
 class FollowingScreen extends StatelessWidget {
diff --git a/lib/screens/LoginScreen.dart b/lib/screens/LoginScreen.dart
index c92de42..b12774e 100644
--- a/lib/screens/LoginScreen.dart
+++ b/lib/screens/LoginScreen.dart
@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:glimesh_app/glimesh.dart';
 import 'package:glimesh_app/auth.dart';
-import 'package:gql_phoenix_link/gql_phoenix_link.dart';
 import 'package:graphql_flutter/graphql_flutter.dart';
 import 'package:auto_size_text/auto_size_text.dart';
 import 'package:package_info_plus/package_info_plus.dart';
diff --git a/lib/screens/ProfileScreen.dart b/lib/screens/ProfileScreen.dart
index 358d644..0e8e553 100644
--- a/lib/screens/ProfileScreen.dart
+++ b/lib/screens/ProfileScreen.dart
@@ -4,7 +4,6 @@ import 'package:glimesh_app/blocs/repos/user_bloc.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:glimesh_app/models.dart';
 import 'package:glimesh_app/repository.dart';
-import 'package:graphql_flutter/graphql_flutter.dart';
 import 'package:url_launcher/url_launcher.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:flutter_markdown/flutter_markdown.dart';
diff --git a/pubspec.yaml b/pubspec.yaml
index 5761776..f6d0c1a 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.0.0+21
+version: 1.0.0+23
 
 environment:
   sdk: '>=2.12.0 <3.0.0'