Merge branch 'develop' of github.com:thecodingmachine/workadventure

docs/maps/meeting-rooms.md

@@ -11,6 +11,7 @@ In order to create Jitsi meet zones:
 
 *   You must create a specific layer.
 *   In layer properties, you MUST add a "`jitsiRoom`" property (of type "`string`"). The value of the property is the name of the room in Jitsi. Note: the name of the room will be "slugified" and prepended with the name of the instance of the map (so that different instances of the map have different rooms)
+*   You may also use "jitsiWidth" property (of type "number" between 0 and 100) to control the width of the iframe containing the meeting room.
 
 ## Triggering of the "Jitsi meet" action
 

front/src/Components/Video/VideoMediaBox.svelte

@@ -7,8 +7,6 @@
     import {videoFocusStore} from "../../Stores/VideoFocusStore";
     import {showReportScreenStore} from "../../Stores/ShowReportScreenStore";
     import {getColorByString, srcObject} from "./utils";
-    import {obtainedMediaConstraintIsMobileStore} from "../../Stores/MediaStore";
-    import {onDestroy} from "svelte";
 
     export let peer: VideoPeer;
     let streamStore = peer.streamStore;
@@ -20,12 +18,6 @@
         showReportScreenStore.set({ userId:peer.userId, userName: peer.userName });
     }
 
-    let isMobile : boolean|null;
-    const unsubscribe = obtainedMediaConstraintIsMobileStore.subscribe(value => {
-        isMobile = value;
-    });
-    onDestroy(unsubscribe);
-
 </script>
 
 <div class="video-container nes-container is-rounded is-dark">
@@ -45,7 +37,7 @@
         <img alt="Report this user" src={reportImg}>
         <span>Report/Block</span>
     </button>
-    <video class:mobile="{isMobile === true}" use:srcObject={$streamStore} autoplay playsinline on:click={() => videoFocusStore.toggleFocus(peer)}></video>
+    <video use:srcObject={$streamStore} autoplay playsinline on:click={() => videoFocusStore.toggleFocus(peer)}></video>
     <img src={blockSignImg} class="block-logo" alt="Block" />
     {#if $constraintStore && $constraintStore.audio !== false}
         <SoundMeterWidget stream={$streamStore}></SoundMeterWidget>

front/src/WebRtc/VideoPeer.ts

@@ -7,7 +7,6 @@ import type { UserSimplePeerInterface } from "./SimplePeer";
 import { readable, Readable, Unsubscriber } from "svelte/store";
 import {
     localStreamStore,
-    obtainedMediaConstraintIsMobileStore,
     obtainedMediaConstraintStore,
     ObtainedMediaStreamConstraints,
 } from "../Stores/MediaStore";
@@ -162,9 +161,6 @@ export class VideoPeer extends Peer {
                 } else {
                     mediaManager.disabledVideoByUserId(this.userId);
                 }
-                if (message.isMobile != undefined) {
-                    obtainedMediaConstraintIsMobileStore.set(message.isMobile);
-                }
             } else if (message.type === MESSAGE_TYPE_MESSAGE) {
                 if (!blackListManager.isBlackListed(this.userUuid)) {
                     chatMessagesStore.addExternalMessage(this.userId, message.message);

front/style/mobile-style.scss

@@ -40,7 +40,6 @@
   .main-section {
     position: absolute;
     width: 100%;
-    min-width: 400px;
 
     & > div {
       z-index: 2;

front/style/style.scss

@@ -44,7 +44,7 @@ body .message-info.warning {
     video {
         width: 100%;
         height: 100%;
-        max-height: 90vh;
+        object-fit: cover;
 
         &.mobile{
             width: 100%;
@@ -73,7 +73,6 @@ body .message-info.warning {
         left: 5px;
         bottom: 5px;
         padding: 10px;
-        z-index: 2;
 
         &.active {
             display: block !important;
@@ -552,6 +551,10 @@ input[type=range]:focus::-ms-fill-upper {
     margin: 2%;
     transition: margin-left 0.2s, margin-right 0.2s, margin-bottom 0.2s, margin-top 0.2s, max-height 0.2s, max-width 0.2s;
     pointer-events: auto;
+
+    video {
+        max-height: 21vh;
+    }
 }
 
 .sidebar>div:hover {