linux build

cache previews in sqlite db
actor page
outsouce different players in seperate classes

lib/video_screen/actor_tile.dart

@@ -1,63 +0,0 @@
-import 'package:flutter/material.dart';
-
-import '../platform.dart';
-import '../types/actor.dart';
-
-class ActorTile extends StatefulWidget {
-  const ActorTile({Key? key, required this.actor}) : super(key: key);
-  final Actor actor;
-
-  @override
-  State<ActorTile> createState() => _ActorTileState();
-}
-
-class _ActorTileState extends State<ActorTile> {
-  @override
-  Widget build(BuildContext context) {
-    return ClipRRect(
-      borderRadius: BorderRadius.circular(20.0),
-      child: Stack(
-        children: [
-          Container(
-            child: Column(
-              children: [
-                Text(
-                  widget.actor.name,
-                  style: TextStyle(fontSize: isTV() ? 8 : 10.5),
-                  overflow: TextOverflow.clip,
-                  maxLines: 1,
-                ),
-                SizedBox(
-                  height: 100,
-                  width: 100,
-                )
-              ],
-            ),
-            color: Color(0x6a94a6ff),
-          ),
-          Positioned.fill(
-            child: Material(
-              color: Colors.transparent,
-              child: GestureDetector(
-                behavior: HitTestBehavior.translucent,
-                onLongPress: () {},
-                onLongPressEnd: (details) {},
-                child: InkWell(
-                  onTap: () {
-                    // Navigator.push(
-                    //   context,
-                    //   MaterialPageRoute(
-                    //     builder: (context) =>
-                    //         VideoScreen(metaData: widget.dta),
-                    //   ),
-                    // );
-                  },
-                ),
-              ),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}

lib/video_screen/info_view.dart

@@ -2,21 +2,22 @@ import 'dart:convert';
 
 import 'package:flutter/material.dart';
 import 'package:openmediacentermobile/screen_loading.dart';
+import 'package:openmediacentermobile/preview/tag_tile.dart';
 import 'package:openmediacentermobile/types/video_data.dart';
-import 'package:openmediacentermobile/video_screen/actor_tile.dart';
+import 'package:openmediacentermobile/preview/actor_tile.dart';
 
 import '../api/api.dart';
 import '../types/actor.dart';
 
-class ActorView extends StatefulWidget {
-  const ActorView({Key? key, required this.vdata}) : super(key: key);
+class InfoView extends StatefulWidget {
+  const InfoView({Key? key, required this.vdata}) : super(key: key);
   final VideoData vdata;
 
   @override
-  State<ActorView> createState() => _ActorViewState();
+  State<InfoView> createState() => _InfoViewState();
 }
 
-class _ActorViewState extends State<ActorView> {
+class _InfoViewState extends State<InfoView> {
   late Future<List<Actor>> _data;
 
   @override
@@ -66,7 +67,7 @@ class _ActorViewState extends State<ActorView> {
                     Text("Tags:"),
                     Row(
                       children: widget.vdata.tags
-                          .map((e) => Text(e.tagName))
+                          .map((e) => TagTile(tag: e))
                           .toList(growable: false),
                     )
                   ]));

lib/video_screen/videoscreen.dart

@@ -0,0 +1,165 @@
+import 'dart:async';
+import 'dart:convert';
+import 'package:flutter/material.dart';
+
+import '../api/api.dart';
+import '../api/token.dart';
+import '../platform.dart';
+import '../screen_loading.dart';
+import '../types/video.dart';
+import '../types/video_data.dart';
+import 'info_view.dart';
+
+import 'videoscreen_desktop.dart'
+    if (dart.library.html) 'videoscreen_mobile.dart';
+import 'videoscreen_mobile.dart';
+
+class VideoScreen extends StatefulWidget {
+  const VideoScreen({Key? key, required this.metaData}) : super(key: key);
+  final VideoT metaData;
+
+  @override
+  State<VideoScreen> createState() => _VideoScreenState();
+}
+
+class _VideoScreenState extends State<VideoScreen> {
+  bool _appBarVisible = true;
+  Timer? _appBarTimer;
+  late Future<VideoData> _videoData;
+  PageController _controller = PageController(
+    initialPage: 0,
+  );
+
+  String url = "";
+
+  Future<VideoData> loadVideoData() async {
+    final data =
+        await API.query("video", "loadVideo", {'MovieId': widget.metaData.id});
+
+    final d = jsonDecode(data);
+    final video = VideoData.fromJson(d);
+    return video;
+  }
+
+  void initPlayer() async {
+    final videodata = await _videoData;
+
+    final token = await Token.getInstance().getToken();
+    if (token == null) return;
+
+    final baseurl = token.domain;
+    // todo not static middle path
+    final path = baseurl + "/videos/vids/" + videodata.movieUrl;
+
+    url = path;
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    _videoData = loadVideoData();
+    initPlayer();
+    _setAppBarTimer();
+  }
+
+  @override
+  void dispose() {
+    _controller.dispose();
+    _appBarTimer?.cancel();
+    super.dispose();
+  }
+
+  void _setAppBarTimer() {
+    _appBarTimer?.cancel();
+    _appBarTimer = Timer(
+      Duration(seconds: 3),
+      () {
+        setState(() {
+          _appBarVisible = false;
+        });
+      },
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: FutureBuilder(
+        future: _videoData,
+        builder: (context, AsyncSnapshot<VideoData> snapshot) {
+          if (snapshot.hasError) {
+            return Text("Error");
+          } else if (snapshot.hasData) {
+            return MouseRegion(
+              onHover: (PointerEvent event) async {
+                if (isDesktop()) {
+                  if (event.delta.dx != 0 || event.delta.dy != 0) {
+                    setState(() {
+                      _appBarVisible = true;
+                    });
+                    _setAppBarTimer();
+                  }
+                }
+              },
+              child: GestureDetector(
+                onPanDown: (details) async {
+                  if (_appBarVisible) {
+                    await Future.delayed(Duration(milliseconds: 100));
+                    setState(() {
+                      _appBarVisible = false;
+                    });
+                  } else {
+                    if (!isDesktop()) {
+                      setState(() {
+                        _appBarVisible = true;
+                      });
+                      _setAppBarTimer();
+                    }
+                  }
+                },
+                behavior: HitTestBehavior.opaque,
+                child: Stack(children: [
+                  PageView(
+                      scrollDirection: Axis.vertical,
+                      controller: _controller,
+                      children: [
+                        Center(
+                            child: isDesktop()
+                                ? VideoScreenDesktop(
+                                    url: url,
+                                  )
+                                : VideoScreenMobile(
+                                    url: url,
+                                  )),
+                        InfoView(
+                          vdata: snapshot.data!,
+                        )
+                      ]),
+                  if (_appBarVisible)
+                    new Positioned(
+                      top: 0.0,
+                      left: 0.0,
+                      right: 0.0,
+                      child: AppBar(
+                        title: Text(widget.metaData.title),
+                        leading: new IconButton(
+                          icon: new Icon(Icons.arrow_back_ios,
+                              color: Colors.grey),
+                          onPressed: () => Navigator.of(context).pop(),
+                        ),
+                        backgroundColor:
+                            Theme.of(context).primaryColor.withOpacity(0.3),
+                        elevation: 0.0,
+                      ),
+                    ),
+                ]),
+              ),
+            );
+          } else {
+            return ScreenLoading();
+          }
+        },
+      ),
+    );
+  }
+}

lib/video_screen/videoscreen_desktop.dart

@@ -1,198 +1,22 @@
-import 'dart:async';
-import 'dart:convert';
 import 'dart:math';
 
-import 'package:chewie/chewie.dart';
-import "package:dart_vlc/dart_vlc.dart";
+import 'package:dart_vlc/dart_vlc.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:openmediacentermobile/preview/preview_tile.dart';
-import 'package:openmediacentermobile/screen_loading.dart';
-import 'package:openmediacentermobile/video_screen/actor_view.dart';
-import 'package:video_player/video_player.dart';
 
-import '../api/api.dart';
-import '../api/token.dart';
-import '../platform.dart';
-import '../types/video_data.dart';
-
-class VideoScreen extends StatefulWidget {
-  const VideoScreen({Key? key, required this.metaData}) : super(key: key);
-  final VideoT metaData;
+class VideoScreenDesktop extends StatefulWidget {
+  const VideoScreenDesktop({Key? key, required this.url}) : super(key: key);
+  final String url;
 
   @override
-  State<VideoScreen> createState() => _VideoScreenState();
+  State<VideoScreenDesktop> createState() => _VideoScreenDesktopState();
 }
 
-class _VideoScreenState extends State<VideoScreen> {
-  Player? _player =
-      isDesktop() ? Player(id: Random().nextInt(0x7fffffff)) : null;
-  ChewieController? _chewieController;
-
-  bool _appBarVisible = true;
-  Timer? _appBarTimer;
-  late Future<VideoData> _videoData;
-
-  Future<VideoData> loadVideoData() async {
-    final data =
-        await API.query("video", "loadVideo", {'MovieId': widget.metaData.id});
-
-    final d = jsonDecode(data);
-    final video = VideoData.fromJson(d);
-    return video;
-  }
-
-  void initPlayer() async {
-    final videodata = await _videoData;
-
-    final token = await Token.getInstance().getToken();
-    if (token == null) return;
-
-    final baseurl = token.domain;
-    // todo not static middle path
-    final path = baseurl + "/videos/vids/" + videodata.movieUrl;
-
-    if (isDesktop()) {
-      final media2 = Media.network(path);
-
-      _player?.open(
-        media2,
-        autoStart: true, // default
-      );
-    } else {
-      final VideoPlayerController _controller =
-          VideoPlayerController.network(path);
-      await _controller.initialize();
-
-      _chewieController = ChewieController(
-          videoPlayerController: _controller,
-          autoPlay: true,
-          looping: true,
-          allowFullScreen: true,
-          allowMuting: true,
-          allowPlaybackSpeedChanging: true,
-          zoomAndPan: true);
-
-      setState(() {});
-    }
-  }
-
-  @override
-  void initState() {
-    super.initState();
-
-    _videoData = loadVideoData();
-    initPlayer();
-
-    if (isDesktop()) {
-      RawKeyboard.instance.addListener((value) {
-        if (value.logicalKey == LogicalKeyboardKey.arrowRight) {
-          _player
-              ?.seek(_player!.position.position! + const Duration(seconds: 5));
-        } else if (value.logicalKey == LogicalKeyboardKey.arrowLeft) {
-          _player
-              ?.seek(_player!.position.position! + const Duration(seconds: -5));
-        }
-      });
-    }
-
-    _setAppBarTimer();
-  }
-
-  @override
-  void dispose() {
-    if (isDesktop()) {
-      _player?.dispose();
-    } else {
-      _chewieController?.videoPlayerController.dispose();
-      _chewieController?.dispose();
-    }
-    _controller.dispose();
-    _appBarTimer?.cancel();
-    super.dispose();
-  }
-
-  void _setAppBarTimer() {
-    _appBarTimer?.cancel();
-    _appBarTimer = Timer(
-      Duration(seconds: 3),
-      () {
-        setState(() {
-          _appBarVisible = false;
-        });
-      },
-    );
-  }
-
-  PageController _controller = PageController(
-    initialPage: 0,
-  );
+class _VideoScreenDesktopState extends State<VideoScreenDesktop> {
+  Player _player = Player(id: Random().nextInt(0x7fffffff));
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
-      body: FutureBuilder(
-        future: _videoData,
-        builder: (context, AsyncSnapshot<VideoData> snapshot) {
-          if (snapshot.hasError) {
-            return Text("Error");
-          } else if (snapshot.hasData) {
-            return MouseRegion(
-              onHover: (PointerEvent event) async {
-                if (event.delta.dx != 0 || event.delta.dy != 0) {
-                  if (_appBarVisible) {
-                    await Future.delayed(Duration(milliseconds: 100));
-                    setState(() {
-                      _appBarVisible = false;
-                    });
-                  } else {
-                    setState(() {
-                      _appBarVisible = true;
-                    });
-                    _setAppBarTimer();
-                  }
-                }
-              },
-              child: Stack(children: [
-                PageView(
-                    scrollDirection: Axis.vertical,
-                    controller: _controller,
-                    children: [
-                      Center(
-                          child:
-                              isDesktop() ? videoDesktop() : videoNotDesktop()),
-                      ActorView(
-                        vdata: snapshot.data!,
-                      )
-                    ]),
-                if (_appBarVisible)
-                  new Positioned(
-                    top: 0.0,
-                    left: 0.0,
-                    right: 0.0,
-                    child: AppBar(
-                      title: Text(widget.metaData.title),
-                      leading: new IconButton(
-                        icon:
-                            new Icon(Icons.arrow_back_ios, color: Colors.grey),
-                        onPressed: () => Navigator.of(context).pop(),
-                      ),
-                      backgroundColor:
-                          Theme.of(context).primaryColor.withOpacity(0.3),
-                      elevation: 0.0,
-                    ),
-                  ),
-              ]),
-            );
-          } else {
-            return ScreenLoading();
-          }
-        },
-      ),
-    );
-  }
-
-  Widget videoDesktop() {
     return Video(
       player: _player,
       scale: 1.0, // default
@@ -201,16 +25,29 @@ class _VideoScreenState extends State<VideoScreen> {
     );
   }
 
-  Widget videoNotDesktop() {
-    if (_chewieController == null) {
-      return Column(
-        crossAxisAlignment: CrossAxisAlignment.center,
-        mainAxisAlignment: MainAxisAlignment.center,
-        children: const [CircularProgressIndicator(), Text("loading...")],
-      );
-    }
-    return Chewie(
-      controller: _chewieController!,
+  @override
+  void initState() {
+    super.initState();
+
+    final media2 = Media.network(widget.url);
+
+    _player.open(
+      media2,
+      autoStart: true, // default
     );
+
+    RawKeyboard.instance.addListener((value) {
+      if (value.logicalKey == LogicalKeyboardKey.arrowRight) {
+        _player.seek(_player.position.position! + const Duration(seconds: 5));
+      } else if (value.logicalKey == LogicalKeyboardKey.arrowLeft) {
+        _player.seek(_player.position.position! + const Duration(seconds: -5));
+      }
+    });
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+    _player.dispose();
   }
 }

lib/video_screen/videoscreen_mobile.dart

@@ -0,0 +1,59 @@
+import 'package:chewie/chewie.dart';
+import 'package:flutter/material.dart';
+import 'package:video_player/video_player.dart';
+
+class VideoScreenMobile extends StatefulWidget {
+  const VideoScreenMobile({Key? key, required this.url}) : super(key: key);
+  final String url;
+
+  @override
+  State<VideoScreenMobile> createState() => _VideoScreenMobileState();
+}
+
+class _VideoScreenMobileState extends State<VideoScreenMobile> {
+  ChewieController? _chewieController;
+
+  @override
+  Widget build(BuildContext context) {
+    if (_chewieController == null) {
+      return Column(
+        crossAxisAlignment: CrossAxisAlignment.center,
+        mainAxisAlignment: MainAxisAlignment.center,
+        children: const [CircularProgressIndicator(), Text("loading...")],
+      );
+    }
+    return Chewie(
+      controller: _chewieController!,
+    );
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+    _chewieController?.videoPlayerController.dispose();
+    _chewieController?.dispose();
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    _init();
+  }
+
+  void _init() async {
+    final VideoPlayerController _controller =
+        VideoPlayerController.network(widget.url);
+    await _controller.initialize();
+
+    _chewieController = ChewieController(
+        videoPlayerController: _controller,
+        autoPlay: true,
+        looping: true,
+        allowFullScreen: true,
+        allowMuting: true,
+        allowPlaybackSpeedChanging: true,
+        zoomAndPan: true);
+
+    setState(() {});
+  }
+}

lib/video_screen/videoscreen_web.dart

@@ -1,52 +0,0 @@
-import 'dart:convert';
-
-import 'package:flutter/material.dart';
-
-import '../api/api.dart';
-import '../api/token.dart';
-import '../log/log.dart';
-
-class VideoScreen extends StatefulWidget {
-  const VideoScreen({Key? key, required this.videoID}) : super(key: key);
-  final int videoID;
-
-  @override
-  State<VideoScreen> createState() => _VideoScreenState();
-}
-
-class _VideoScreenState extends State<VideoScreen> {
-  void loadData() async {
-    final data =
-        await API.query("video", "loadVideo", {'MovieId': widget.videoID});
-
-    final d = jsonDecode(data);
-
-    final url = d["MovieUrl"];
-    final token = await Token.getInstance().getToken();
-    if (token == null) return;
-
-    final baseurl = token.domain;
-    // todo not static middle path
-    final String path = baseurl + "/videos/vids/" + url;
-    Log.d(path);
-  }
-
-  @override
-  void initState() {
-    super.initState();
-
-    loadData();
-
-    // todo hide appbar after some seonds
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        title: const Text('Second Route'),
-      ),
-      body: const Center(child: Text("Todo to implement")),
-    );
-  }
-}