From 7c587141d41a5fbab4f1973370d14b3c2c966195 Mon Sep 17 00:00:00 2001
From: Ghazi Triki <ghazi.triki@riadvice.tn>
Date: Fri, 6 Jul 2018 14:39:29 +0100
Subject: [PATCH] Add starting screensharing label to mobile.
---
clients/flash/air-client/src/Default.css | 5 ++
clients/flash/air-client/src/css/hdpi.css | 12 ++--
clients/flash/air-client/src/css/ldpi.css | 4 ++
clients/flash/air-client/src/css/mdpi.css | 6 +-
clients/flash/air-client/src/css/xhdpi.css | 4 ++
clients/flash/air-client/src/css/xxhdpi.css | 6 +-
clients/flash/air-client/src/css/xxxhdpi.css | 4 ++
.../screenshare/views/IOSScreenshareView.as | 58 +++++++++----------
8 files changed, 62 insertions(+), 37 deletions(-)
diff --git a/clients/flash/air-client/src/Default.css b/clients/flash/air-client/src/Default.css
index bdbd0eb52e..0ff768a7c5 100755
--- a/clients/flash/air-client/src/Default.css
+++ b/clients/flash/air-client/src/Default.css
@@ -375,3 +375,8 @@ settings|SettingsItemRenderer {
borderColorOver : PropertyReference("grey700");
borderColorDown : PropertyReference("grey700");
}
+
+.startingScreensharingLabel {
+ color : PropertyReference("bbbBlack");
+ textAlign : center;
+}
\ No newline at end of file
diff --git a/clients/flash/air-client/src/css/hdpi.css b/clients/flash/air-client/src/css/hdpi.css
index 1797d518cf..a6e870b095 100755
--- a/clients/flash/air-client/src/css/hdpi.css
+++ b/clients/flash/air-client/src/css/hdpi.css
@@ -58,8 +58,8 @@
padding: 10.50;
gap: 6.00;
leftIndent: 33.00;
- fontSize: 23.00;
- nameFontSize: 23.00;
+ fontSize: 24.00;
+ nameFontSize: 24.00;
timeFontSize: 21.00;
}
@@ -131,8 +131,8 @@
}
.sendButton {
- diameter: 48.00;
- fontSize: 22.00;
+ diameter: 42.00;
+ fontSize: 22.50;
}
.titleGroup {
@@ -221,4 +221,8 @@
.audioButtonStyle {
iconSize: 66.00;
}
+
+ .startingScreensharingLabel {
+ fontSize: 42.00;
+ }
}
diff --git a/clients/flash/air-client/src/css/ldpi.css b/clients/flash/air-client/src/css/ldpi.css
index 3cd66acbca..99aeba7e37 100755
--- a/clients/flash/air-client/src/css/ldpi.css
+++ b/clients/flash/air-client/src/css/ldpi.css
@@ -221,4 +221,8 @@
.audioButtonStyle {
iconSize: 33.000;
}
+
+ .startingScreensharingLabel {
+ fontSize: 21.000;
+ }
}
diff --git a/clients/flash/air-client/src/css/mdpi.css b/clients/flash/air-client/src/css/mdpi.css
index 191b02de0c..5d8bc2ed42 100755
--- a/clients/flash/air-client/src/css/mdpi.css
+++ b/clients/flash/air-client/src/css/mdpi.css
@@ -132,7 +132,7 @@
.sendButton {
diameter: 28.0;
- fontSize: 15;
+ fontSize: 15.0;
}
.titleGroup {
@@ -221,4 +221,8 @@
.audioButtonStyle {
iconSize: 44.0;
}
+
+ .startingScreensharingLabel {
+ fontSize: 28.0;
+ }
}
diff --git a/clients/flash/air-client/src/css/xhdpi.css b/clients/flash/air-client/src/css/xhdpi.css
index b238f81348..8effe499fa 100755
--- a/clients/flash/air-client/src/css/xhdpi.css
+++ b/clients/flash/air-client/src/css/xhdpi.css
@@ -209,4 +209,8 @@
.audioButtonStyle {
iconSize : 88;
}
+
+ .startingScreensharingLabel {
+ fontSize : 56;
+ }
}
diff --git a/clients/flash/air-client/src/css/xxhdpi.css b/clients/flash/air-client/src/css/xxhdpi.css
index 8e6e62c31b..c75820f5c8 100755
--- a/clients/flash/air-client/src/css/xxhdpi.css
+++ b/clients/flash/air-client/src/css/xxhdpi.css
@@ -132,7 +132,7 @@
.sendButton {
diameter: 84.0;
- fontSize: 45;
+ fontSize: 45.0;
}
.titleGroup {
@@ -221,4 +221,8 @@
.audioButtonStyle {
iconSize: 132.0;
}
+
+ .startingScreensharingLabel {
+ fontSize: 84.0;
+ }
}
diff --git a/clients/flash/air-client/src/css/xxxhdpi.css b/clients/flash/air-client/src/css/xxxhdpi.css
index 146b8b5e1c..b95b4f244f 100755
--- a/clients/flash/air-client/src/css/xxxhdpi.css
+++ b/clients/flash/air-client/src/css/xxxhdpi.css
@@ -221,4 +221,8 @@
.audioButtonStyle {
iconSize: 176;
}
+
+ .startingScreensharingLabel {
+ fontSize: 112;
+ }
}
diff --git a/clients/flash/air-client/src/org/bigbluebutton/air/screenshare/views/IOSScreenshareView.as b/clients/flash/air-client/src/org/bigbluebutton/air/screenshare/views/IOSScreenshareView.as
index 753c5a0c96..608d6aa28e 100755
--- a/clients/flash/air-client/src/org/bigbluebutton/air/screenshare/views/IOSScreenshareView.as
+++ b/clients/flash/air-client/src/org/bigbluebutton/air/screenshare/views/IOSScreenshareView.as
@@ -7,6 +7,7 @@ package org.bigbluebutton.air.screenshare.views {
import mx.formatters.DateFormatter;
import spark.components.Image;
+ import spark.components.Label;
import spark.components.ProgressBar;
import org.bigbluebutton.BBBRtmpPlayer;
@@ -23,21 +24,23 @@ package org.bigbluebutton.air.screenshare.views {
protected var originalVideoHeight:Number;
- private var _waitingBar : ProgressBar;
-
- private var _waitingTimer : Timer;
+ private var _waitingBar:ProgressBar;
- private var _connectionId : String;
+ private var _waitingTimer:Timer;
- private const WAITING_SECONDS : int = 15;
+ private var _connectionId:String;
+
+ private var _startingLabel:Label;
+
+ private const WAITING_SECONDS:int = 15;
protected var dateFormat:DateFormatter = new DateFormatter("Y-MM-DD J:NN:SS:QQ");
-
+
private function waitingTimerProgressHandler(e:TimerEvent):void {
trace("PROGRESS " + _waitingTimer.currentCount);
_waitingBar.currentProgress = _waitingTimer.currentCount;
}
-
+
public function resizeForProgressBar():void {
// if we have device where screen width less than screen height e.g. phone
if (width < height) {
@@ -67,10 +70,13 @@ package org.bigbluebutton.air.screenshare.views {
}
}
- _waitingBar.x = width - _waitingBar.width;
+ _startingLabel.x = _waitingBar.x = width - _waitingBar.width;
_waitingBar.y = height - _waitingBar.height;
+
+ _startingLabel.y = _waitingBar.y + (_waitingBar.height * 0.5);
+ _startingLabel.width = _waitingBar.width;
+ _startingLabel.height = _waitingBar.height;
}
-
public function resizeForPortrait():void {
// if we have device where screen width less than screen height e.g. phone
@@ -110,8 +116,6 @@ package org.bigbluebutton.air.screenshare.views {
}
public function startStream(uri:String, streamName:String, imgWidth:Number, imgHeight:Number, meetingId:String, authToken:String, externalUserId:String):void {
-
-
_waitingBar = new ProgressBar();
_waitingBar.width = imgWidth;
@@ -124,11 +128,18 @@ package org.bigbluebutton.air.screenshare.views {
_waitingBar.bottom = 20;
_waitingBar.styleName = "micLevelProgressBar";
+ _startingLabel = new Label();
+
+ _startingLabel.horizontalCenter = 0;
+ _startingLabel.text = "Starting screen sharing";
+ _startingLabel.styleName = "startingScreensharingLabel";
+
addChild(_waitingBar);
+ addChild(_startingLabel);
_waitingTimer = new Timer(1000, WAITING_SECONDS);
_waitingTimer.addEventListener(TimerEvent.TIMER, waitingTimerProgressHandler);
-
+
if (player) {
close();
}
@@ -153,24 +164,6 @@ package org.bigbluebutton.air.screenshare.views {
player.play();
}
-/* private function showProgressBar() : void {
- _waitingBar = new ProgressBar();
- _waitingBar.currentProgress = 0;
- _waitingBar.totalProgress = 100;
- _waitingBar.percentWidth = 80;
- _waitingBar.percentHeight = 100;
- _waitingBar.bottom = 20;
- _waitingBar.horizontalCenter = 0;
- _waitingBar.verticalCenter = 0;
- _waitingBar.styleName = "micLevelProgressBar";
-
- addChild(_waitingBar);
-
- _waitingTimer = new Timer(1000, WAITING_SECONDS);
- _waitingTimer.addEventListener(TimerEvent.TIMER, waitingTimerProgressHandler);
- _waitingTimer.start();
- }
-*/
private function onConnected(e:BBBRtmpPlayerEvent):void {
trace(dateFormat.format(new Date()) + " EVENT: " + e.type + " MESSAGE: " + e.getMessage());
if (_waitingBar && _waitingBar.parent == this) {
@@ -178,6 +171,9 @@ package org.bigbluebutton.air.screenshare.views {
_waitingBar.currentProgress = WAITING_SECONDS;
removeChild(_waitingBar);
}
+ if (_startingLabel && _startingLabel.parent == this) {
+ removeChild(_startingLabel);
+ }
if (image) {
image.source = player.getBmpData();
}
@@ -208,7 +204,7 @@ package org.bigbluebutton.air.screenshare.views {
removeChild(image);
}
videoComp = null;
- player = null;
+ player = null;
}
}
--
GitLab