fix: disable overlay when video is not playing, add loading overlay (#…

…635)
muxable · Aug 23, 2022 · 87031cf · 87031cf
1 parent b01049f
commit 87031cf
Showing 1 changed file with 91 additions and 62 deletions.
diff --git a/lib/components/stream_preview.dart b/lib/components/stream_preview.dart
@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:convert';
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -24,6 +25,7 @@ class _StreamPreviewState extends State<StreamPreview> {
 
   var _isOverlayActive = false;
   Timer? _overlayTimer;
+  var _playerState = null;
 
   @override
   void didUpdateWidget(StreamPreview oldWidget) {
@@ -40,7 +42,6 @@ class _StreamPreviewState extends State<StreamPreview> {
   Widget build(BuildContext context) {
     return Stack(children: [
       WebView(
-        debuggingEnabled: true,
         initialUrl:
             'https://player.twitch.tv/?channel=${widget.channelDisplayName}&controls=false&parent=chat.rtirl.com&muted=false',
         onWebViewCreated: (controller) {
@@ -70,77 +71,105 @@ class _StreamPreviewState extends State<StreamPreview> {
         javascriptMode: JavascriptMode.unrestricted,
         allowsInlineMediaPlayback: true,
         initialMediaPlaybackPolicy: AutoMediaPlaybackPolicy.always_allow,
+        javascriptChannels: {
+          JavascriptChannel(
+              name: "Flutter",
+              onMessageReceived: (message) {
+                final params = jsonDecode(message.message)["params"];
+                if (params is Map && mounted) {
+                  setState(() => _playerState = params["playback"]);
+                }
+              })
+        },
       ),
-      Positioned.fill(
-        child: GestureDetector(
-          onTap: () {
-            _overlayTimer?.cancel();
-            _overlayTimer = Timer(const Duration(seconds: 3), () {
-              _overlayTimer = null;
+      if (_playerState == null || _playerState == "Idle")
+        Positioned.fill(
+          child: IgnorePointer(
+            child: Container(
+              color: Colors.black.withOpacity(0.8),
+              child: const Center(
+                child: Text(
+                  "Loading (or stream is offline)...",
+                  style: TextStyle(color: Colors.white),
+                ),
+              ),
+            ),
+          ),
+        )
+      else if (_playerState == "Playing")
+        Positioned.fill(
+          child: GestureDetector(
+            onTap: () {
+              _overlayTimer?.cancel();
+              _overlayTimer = Timer(const Duration(seconds: 3), () {
+                _overlayTimer = null;
+                if (!mounted) return;
+                setState(() {
+                  _isOverlayActive = false;
+                });
+              });
               setState(() {
-                _isOverlayActive = false;
+                _isOverlayActive = true;
               });
-            });
-            setState(() {
-              _isOverlayActive = true;
-            });
-          },
-          child: AnimatedOpacity(
-            duration: const Duration(milliseconds: 100),
-            opacity: _isOverlayActive ? 1.0 : 0.0,
-            child: Container(
-              color: Colors.black.withOpacity(0.4),
-              child: Padding(
-                padding: const EdgeInsets.all(8),
-                child: Consumer<StreamPreviewModel>(
-                  builder: (context, model, child) {
-                    return Row(
-                      crossAxisAlignment: CrossAxisAlignment.end,
-                      mainAxisAlignment: MainAxisAlignment.end,
-                      children: [
-                        IconButton(
-                            onPressed: () async {
-                              if (model.volume == 0) {
-                                model.volume = 100;
-                              } else if (model.volume == 100) {
-                                model.volume = 33;
-                              } else {
-                                model.volume = 0;
-                              }
-                              await _controller?.runJavascript(
-                                  "action(Actions.SetMuted, false)");
-                              await _controller?.runJavascript(
-                                  "action(Actions.SetVolume, ${model.volume / 100})");
-                            },
-                            icon: Icon(
-                              model.volume == 0
-                                  ? Icons.volume_mute
-                                  : model.volume == 100
-                                      ? Icons.volume_up
-                                      : Icons.volume_down,
-                            )),
-                        IconButton(
-                            onPressed: () async {
-                              model.isHighDefinition = !model.isHighDefinition;
-                              if (model.isHighDefinition) {
+            },
+            child: AnimatedOpacity(
+              duration: const Duration(milliseconds: 100),
+              opacity: _isOverlayActive ? 1.0 : 0.0,
+              child: Container(
+                color: Colors.black.withOpacity(0.4),
+                child: Padding(
+                  padding: const EdgeInsets.all(8),
+                  child: Consumer<StreamPreviewModel>(
+                    builder: (context, model, child) {
+                      return Row(
+                        crossAxisAlignment: CrossAxisAlignment.end,
+                        mainAxisAlignment: MainAxisAlignment.end,
+                        children: [
+                          IconButton(
+                              onPressed: () async {
+                                if (model.volume == 0) {
+                                  model.volume = 100;
+                                } else if (model.volume == 100) {
+                                  model.volume = 33;
+                                } else {
+                                  model.volume = 0;
+                                }
                                 await _controller?.runJavascript(
-                                    "action(Actions.SetQuality, 'auto')");
-                              } else {
+                                    "action(Actions.SetMuted, false)");
                                 await _controller?.runJavascript(
-                                    "action(Actions.SetQuality, '160p')");
-                              }
-                            },
-                            icon: Icon(
-                                model.isHighDefinition ? Icons.hd : Icons.sd)),
-                      ],
-                    );
-                  },
+                                    "action(Actions.SetVolume, ${model.volume / 100})");
+                              },
+                              icon: Icon(
+                                model.volume == 0
+                                    ? Icons.volume_mute
+                                    : model.volume == 100
+                                        ? Icons.volume_up
+                                        : Icons.volume_down,
+                              )),
+                          IconButton(
+                              onPressed: () async {
+                                model.isHighDefinition =
+                                    !model.isHighDefinition;
+                                if (model.isHighDefinition) {
+                                  await _controller?.runJavascript(
+                                      "action(Actions.SetQuality, 'auto')");
+                                } else {
+                                  await _controller?.runJavascript(
+                                      "action(Actions.SetQuality, '160p')");
+                                }
+                              },
+                              icon: Icon(model.isHighDefinition
+                                  ? Icons.hd
+                                  : Icons.sd)),
+                        ],
+                      );
+                    },
+                  ),
                 ),
               ),
             ),
           ),
         ),
-      ),
     ]);
   }
 }