Skip to content
Permalink
Browse files

Merge pull request #35 from SenecaCDOT-BigBlueButton/optimize-videoch…

…atview

Optimize videochatview
  • Loading branch information...
capilkey committed Jul 15, 2014
2 parents 5ee8859 + 20ae6a3 commit 03afd2bd24a5502b16aeb58046b7e13e832cda88
@@ -10,6 +10,12 @@ s|Button
chromeColor: #918E8E;
}

s|Group.videoTextFieldStyle
{
color: #FFFFFF;
font-family: Verdana;
}

view|TopView.topView
{
fontWeight: bold;
@@ -132,7 +138,6 @@ s|Image.iconStyle
s|View.viewStyle
{
lineColor: #000000;
userDetailslineColor: #AF0000;
textColor: #BEBEBE;
}

@@ -144,11 +149,17 @@ s|SkinnableContainer.containerStyle

s|Application.mainshellStyle
{
topActionBarColor: #444544;
topActionBarColor: #646262;
imageScaleX:0.6;
imageScaleY:0.6;
}

s|Group.pageStyle
{
left:0;
right:0;
}

global
{
font-family: Verdana;
@@ -173,15 +184,16 @@ global
paddingBottom: 10;
}

s|Group.pageStyle
s|Group.videoTextFieldStyle
{
left:4;
right:4;
fontSize:14;
indent: 20;
loadingImageSource: "assets/res/drawable-mdpi/videoLoading.png";
}

s|View.viewStyle
{
weight: 2;
lineWeight: 2;
}

s|SkinnableContainer.containerStyle
@@ -411,15 +423,16 @@ global
paddingBottom: 15;
}

s|Group.pageStyle
s|Group.videoTextFieldStyle
{
left:6;
right:6;
fontSize:22;
indent: 30;
loadingImageSource: "assets/res/drawable-hdpi/videoLoading.png";
}

s|View.viewStyle
{
weight: 3;
lineWeight: 3;
}

s|SkinnableContainer.containerStyle
@@ -648,15 +661,16 @@ global
paddingBottom: 20;
}

s|Group.pageStyle
s|Group.videoTextFieldStyle
{
left:8;
right:8;
fontSize:28;
indent: 40;
loadingImageSource: "assets/res/drawable-xhdpi/videoLoading.png";
}

s|View.viewStyle
{
weight: 4;
lineWeight: 4;
}

s|SkinnableContainer.containerStyle
@@ -880,15 +894,16 @@ global
paddingBottom: 30;
}

s|Group.pageStyle
s|Group.videoTextFieldStyle
{
left:12;
right:12;
fontSize:42;
indent: 60;
loadingImageSource: "assets/res/drawable-xxhdpi/videoLoading.png";
}

s|View.viewStyle
{
weight: 6;
lineWeight: 6;
}

s|SkinnableContainer.containerStyle
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,5 +1,5 @@
package org.bigbluebutton.view.navigation.pages.common
{
{
import mx.core.FlexGlobals;

import org.bigbluebutton.model.IUserSession;
@@ -20,16 +20,29 @@ package org.bigbluebutton.view.navigation.pages.common

public override function initialize():void
{
userUISession.loadingSignal.add(loadingFinished);

userUISession.loadingSignal.add(loadingFinished);
}

private function loadingFinished(loading:Boolean):void
{
if (!loading)
{
/*var users:ArrayCollection = userSession.userList.users;*/
userUISession.loadingSignal.remove(loadingFinished);
view.menuDeskshareButton.visible = view.menuDeskshareButton.includeInLayout = userSession.deskshareConnection.isStreaming;
userSession.deskshareConnection.isStreamingSignal.add(onDeskshareStreamChange);
if (userSession.deskshareConnection != null)
{
view.menuDeskshareButton.visible = view.menuDeskshareButton.includeInLayout = userSession.deskshareConnection.isStreaming;
userSession.deskshareConnection.isStreamingSignal.add(onDeskshareStreamChange);
}
/*userSession.userList.userChangeSignal.add(userChangeHandler);
for each(var u:User in users)
{
if(u.hasStream)
{
view.menuVideoChatButton.visible = view.menuVideoChatButton.includeInLayout = true;
break;
}
}*/
}
}
/**
@@ -40,12 +53,38 @@ package org.bigbluebutton.view.navigation.pages.common
view.menuDeskshareButton.visible = view.menuDeskshareButton.includeInLayout = isDeskshareStreaming;
}

/*private function userChangeHandler(user:User, property:int):void
{
var users:ArrayCollection = userSession.userList.users;
var hasStream : Boolean = false;
if (property == UserList.HAS_STREAM )
{
if(user.hasStream)
{
hasStream = true;
}
else
{
for each(var u:User in users)
{
if(u.hasStream)
{
hasStream = true;
break;
}
}
}
view.menuVideoChatButton.visible = view.menuVideoChatButton.includeInLayout = hasStream;
}
}*/

/**
* Unsubscribe from listening for Deskshare Streaming Signal
*/
public override function destroy():void
{
userSession.deskshareConnection.isStreamingSignal.remove(onDeskshareStreamChange);
/*userSession.userList.userChangeSignal.remove(userChangeHandler);*/
}
}
}
@@ -90,40 +90,40 @@ package org.bigbluebutton.view.navigation.pages.common
// make the video height full height of the screen
video.height = screenHeight;
// calculate width based on a video height, it order to keep the same aspect ratio
video.width = ((originalVideoWidth * video.height)/originalVideoHeight);
video.width = ((originalVideoWidth * video.height)/originalVideoHeight);

// if calculated width appeared to be bigger than screen width, recalculuate the video size based on height
if (screenWidth < video.width) {
// make the video width full width of the screen
video.width = screenWidth;
// calculate height based on a video width, it order to keep the same aspect ratio
video.height = (video.width/originalVideoWidth) * originalVideoHeight;
}
}
}
}

public function resizeForLandscape():void
{
if (screenHeight < screenWidth)
{
if (screenHeight < screenWidth)
{
video.height = screenWidth;
video.width = ((originalVideoWidth * video.height)/originalVideoHeight);

if (screenWidth < video.width)
if (screenWidth < video.width)
{
video.width = screenHeight;
video.height = (video.width/originalVideoWidth) * originalVideoHeight;
}
}
else {
}
}
else {
video.width = screenHeight;
video.height = (video.width/originalVideoWidth) * originalVideoHeight;

if (screenHeight < video.height) {
video.height = screenWidth;
video.width = ((originalVideoWidth * video.height)/originalVideoHeight);
}
}
video.width = ((originalVideoWidth * video.height)/originalVideoHeight);
}
}
}

public function rotateVideo(rotation:Number):void
@@ -202,6 +202,6 @@ package org.bigbluebutton.view.navigation.pages.common
ns.close();
ns = null;
}
}
}
}
}
@@ -25,7 +25,7 @@
<s:Label id="userName" width="100%" />
<s:Line width="100%" height="0" >
<s:stroke>
<s:SolidColorStroke color="{getStyle('lineColor')}" weight="{getStyle('weight')}" />
<s:SolidColorStroke color="{getStyle('lineColor')}" weight="{getStyle('lineWeight')}" />
</s:stroke>
</s:Line>
<s:Button id="logoutButton0" width="100%" styleName="logoutButtonStyle" />
@@ -41,13 +41,13 @@
<s:Button id="shareCameraBtn0" width="100%" styleName="profileSettingsButtonStyle" />
<s:Line height="0" width="100%" >
<s:stroke>
<s:SolidColorStroke color="{getStyle('lineColor')}" weight="{getStyle('weight')}"/>
<s:SolidColorStroke color="{getStyle('lineColor')}" weight="{getStyle('lineWeight')}"/>
</s:stroke>
</s:Line>
<s:Button id="shareMicBtn0" width="100%" label="{resourceManager.getString('resources', 'profile.settings.mic.off')}" styleName="profileSettingsButtonStyle"/>
<s:Line height="0" width="100%" >
<s:stroke>
<s:SolidColorStroke color="{getStyle('lineColor')}" weight="{getStyle('weight')}" />
<s:SolidColorStroke color="{getStyle('lineColor')}" weight="{getStyle('lineWeight')}" />
</s:stroke>
</s:Line>
<s:Button id="raiseHandButton0" width="100%" label="{resourceManager.getString('resources', 'profile.settings.handRaise')}" styleName="profileSettingsButtonStyle" />
@@ -65,14 +65,14 @@
groupName="cameraQualityTypeRadioButtonGroup" width="100%" value="low" />
<s:Line height="0" width="100%" >
<s:stroke>
<s:SolidColorStroke color="{getStyle('lineColor')}" weight="{getStyle('weight')}"/>
<s:SolidColorStroke color="{getStyle('lineColor')}" weight="{getStyle('lineWeight')}"/>
</s:stroke>
</s:Line>
<s:RadioButton id="mediumQuality" label="{resourceManager.getString('resources', 'profile.settings.cameraQuality.medium') + ' (320x240)'}"
groupName="cameraQualityTypeRadioButtonGroup" width="100%" value="medium" />
<s:Line height="0" width="100%">
<s:stroke>
<s:SolidColorStroke color="{getStyle('lineColor')}" weight="{getStyle('weight')}" />
<s:SolidColorStroke color="{getStyle('lineColor')}" weight="{getStyle('lineWeight')}" />
</s:stroke>
</s:Line>
<s:RadioButton id="highQuality" label="{resourceManager.getString('resources', 'profile.settings.cameraQuality.high') + ' (640x480)'}"
@@ -25,7 +25,7 @@
</s:Group>
<s:Line width="90%" height="0" >
<s:stroke>
<s:SolidColorStroke color="{getStyle('userDetailslineColor')}" weight="{getStyle('weight')}" />
<s:SolidColorStroke color="{getStyle('lineColor')}" weight="{getStyle('lineWeight')}" />
</s:stroke>
</s:Line>
<s:Group width="100%" styleName="userDetail" height="{getStyle('height')}">
@@ -38,7 +38,7 @@
</s:Group>
<s:Line width="90%" height="0" >
<s:stroke>
<s:SolidColorStroke color="{getStyle('userDetailslineColor')}" weight="{getStyle('weight')}" />
<s:SolidColorStroke color="{getStyle('lineColor')}" weight="{getStyle('lineWeight')}" />
</s:stroke>
</s:Line>
<s:Group width="100%" styleName="userDetail" height="{getStyle('height')}">
@@ -61,7 +61,7 @@
</s:Group>
<s:Line width="90%" height="0" >
<s:stroke>
<s:SolidColorStroke color="{getStyle('userDetailslineColor')}" weight="{getStyle('weight')}" />
<s:SolidColorStroke color="{getStyle('lineColor')}" weight="{getStyle('lineWeight')}" />
</s:stroke>
</s:Line>
<s:Group width="50%" height="100%">
@@ -6,7 +6,9 @@ package org.bigbluebutton.view.navigation.pages.videochat
import org.osflash.signals.ISignal;

import spark.components.Group;
import spark.components.Label;
import spark.components.Label;
import spark.components.List;
import spark.components.Scroller;

public interface IVideoChatView extends IView
{
@@ -15,5 +17,6 @@ package org.bigbluebutton.view.navigation.pages.videochat
function get noVideoMessage():Label
function getDisplayedUserID():String
function get videoGroup():Group
function get streamlist():List
}
}
Oops, something went wrong.

0 comments on commit 03afd2b

Please sign in to comment.
You can’t perform that action at this time.