Show entity picture while camera stream loading

lib/entities/camera/widgets/camera_stream_view.dart

@@ -3,9 +3,8 @@ part of '../../../main.dart';
 class CameraStreamView extends StatefulWidget {
 
   final bool withControls;
-  final CameraEntity entity;
 
-  CameraStreamView({Key key, this.withControls: true, this.entity}) : super(key: key);
+  CameraStreamView({Key key, this.withControls: true}) : super(key: key);
 
   @override
   _CameraStreamViewState createState() => _CameraStreamViewState();
@@ -35,7 +34,7 @@ class _CameraStreamViewState extends State<CameraStreamView> {
     }
     Logger.d("[Camera Player] Loading resources");
     _loading = Completer();
-    _entity = widget.entity ?? EntityModel
+    _entity = EntityModel
           .of(context)
           .entityWrapper
           .entity;
@@ -106,14 +105,14 @@ class _CameraStreamViewState extends State<CameraStreamView> {
     Widget screenWidget;
     if (!_isLoaded) {
       screenWidget = Center(
-        child: CircularProgressIndicator()
+        child: EntityPicture()
       );
     } else if (_entity.supportStream) {
       if (_videoPlayerController.value.initialized) {
         screenWidget = VideoPlayer(_videoPlayerController);
       } else {
         screenWidget = Center(
-          child: CircularProgressIndicator()
+          child: EntityPicture()
         );
       }
     } else {
@@ -192,9 +191,14 @@ class _CameraStreamViewState extends State<CameraStreamView> {
               Navigator.of(context).push(
                 MaterialPageRoute(
                   builder: (conext) => FullScreenPage(
-                    child: CameraStreamView(
-                      withControls: false,
-                      entity: _entity,
+                    child: EntityModel(
+                      child: CameraStreamView(
+                        withControls: false
+                      ),
+                      handleTap: false,
+                      entityWrapper: EntityWrapper(
+                        entity: _entity
+                      ),
                     ),
                   ),
                   fullscreenDialog: true