Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor ui #30

Merged
merged 6 commits into from Jun 17, 2014
Merged
Changes from 1 commit
Commits
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.
+564 −1,068
Diff settings

Always

Just for now

optimize css file and view base file

  • Loading branch information...
GaryDeng committed Jun 16, 2014
commit e95b6953d269cd643ffd0dd7224927b8a1e1bc81
Copy path View file

Large diffs are not rendered by default.

Oops, something went wrong.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -39,5 +39,6 @@ disconnect.reason.connectionDropped=Meeting connection was dropped!
disconnect.reason.meetingEnded=Current meeting has been ended
disconnect.reason.userLoggedOut=You have logged out of the meeting
disconnect.reason.userKickedOut=You have been kicked out of the meeting
disconnect.reason.userExit=Exit
deskshare.noDeskshare = No desktop stream to display
deskshare.title = Desktop Sharing
@@ -25,4 +25,5 @@ userDetail.cameraBtn.text=Mostrar câmera
userDetail.privateChatBtn.text=Bate-papo privado
userDetail.you=(você)
video.title=Vídeo
video.noVideo=Nenhum vídeo para apresentar
video.noVideo=Nenhum vídeo para apresentar
disconnect.reason.userExit=Saída
@@ -69,25 +69,19 @@
]]>
</fx:Script>
<s:layout>
<s:VerticalLayout gap="0"
paddingBottom="0"
paddingLeft="0"
paddingRight="0"
paddingTop="5"
/>
<s:VerticalLayout />
</s:layout>
<s:states>
<s:State name="others_state"/>
<s:State name="me_state"/>
</s:states>
<s:Group id="nameTimeGroup" width="100%">
<s:Label id="username" left="0" width="50%" color="#9E9E9E"
paddingLeft="5" paddingRight="5" textAlign="left" left.me_state="" right.me_state="0" textAlign.me_state="right"/>
textAlign="left" left.me_state="" right.me_state="0" textAlign.me_state="right"/>
<s:Label id="time" right="0" width="50%" color="#9E9E9E"
paddingLeft="5" paddingRight="5" textAlign="right" left.me_state="0" right.me_state="" textAlign.me_state="left"/>
textAlign="right" left.me_state="0" right.me_state="" textAlign.me_state="left"/>
</s:Group>
<s:Group width="100%">
<s:RichEditableText editable="false" selectable="false" id="message" width="100%" paddingLeft="5" paddingRight="5"
textAlign="left"/>
<s:RichEditableText editable="false" selectable="false" id="message" width="100%" textAlign="left"/>
</s:Group>
</s:ItemRenderer>
@@ -9,45 +9,30 @@
>
<s:Group id="mainshell" width="100%" height="100%" styleName="mainshell">
<s:layout>
<s:VerticalLayout gap="0"
paddingBottom="0"
paddingLeft="0"
paddingRight="0"
paddingTop="0"
/>
<s:VerticalLayout />
</s:layout>

<s:Group width="100%" >
<s:layout>
<s:HorizontalLayout gap="5"
paddingBottom="10"
paddingLeft="10"
paddingRight="10"
paddingTop="10"
/>
<s:HorizontalLayout />
</s:layout>
<ui:ProfileButton id="profileBtn" />
<s:Label id="pageTitle0" width="100%" styleName="pageNameStyle" text="{resourceManager.getString('resources', 'chat.public.title')}" />
<ui:SwapCameraButton id="swapCameraBtn" />
<ui:MicButton id="microphoneBtn" />
<ui:SwapCameraButton id="swapCameraBtn" visible="false" styleName="swapCameraButtonStyle topButtonStyle"/>
<ui:MicButton id="microphoneBtn" styleName="micButtonStyle topButtonStyle"/>
</s:Group>
<s:Scroller width="100%" height="100%">
<s:VGroup height="100%" width="100%" paddingTop="10" paddingLeft="5" paddingRight="10">
<s:VGroup height="100%" width="100%" >
<chat:ChatList id="chatlist" width="100%" height="100%" contentBackgroundColor="white"/>
</s:VGroup>
</s:Scroller>
<s:Group width="100%" height="8%">
<s:layout>
<s:HorizontalLayout gap="5"
paddingBottom="10"
paddingLeft="10"
paddingRight="10"
paddingTop="10"
/>
<s:HorizontalLayout />
</s:layout>
<s:TextInput id="inputMessage0" width="80%" height="100%"/>
<s:Button id="sendButton0" width="20%" height="100%" label="{resourceManager.getString('resources', 'chat.sendBtn.text')}" enabled="{inputMessage0.text!=''}"/>
</s:Group>
<common:MenuButtonsView width="100%" />
<common:MenuButtonsView />
</s:Group>
</view:NoTabView>
@@ -48,29 +48,23 @@
]]>
</fx:Script>
<s:layout>
<s:HorizontalLayout gap="0"
paddingBottom="0"
paddingLeft="0"
paddingRight="0"
paddingTop="5"
/>
<s:HorizontalLayout />
</s:layout>
<s:states>
<s:State name="NormalState"/>
<s:State name="ButtonState"/>
</s:states>
<s:Group width="100%">
<s:layout>
<s:HorizontalLayout paddingLeft="0" paddingRight="0" paddingBottom="0" paddingTop="0"/>
<s:HorizontalLayout />
</s:layout>
<s:Label id="title" left="0" right="0" width="100%" height="100%" color="#000000"
paddingLeft="5" paddingRight="5" textAlign="left" verticalAlign="middle"
<s:Label id="title" left="0" right="0" width="100%" height="100%" color="#000000" textAlign="left" verticalAlign="middle"
text.ButtonState="+ {resourceManager.getString('resources', 'chat.item.privateChat')}"/>
<s:Button id="newMessages" buttonMode="false" horizontalCenter="0"
styleName="newMessagesButtonStyle" verticalCenter="0"
visible.ButtonState="{_buttonStateVisible}"
visible.NormalState="{_normalStateVisible}"/>

This comment has been minimized.

Copy link
@capilkey

capilkey Jun 13, 2014

Member

Are the two states actually need for the item renderer? It seems like you could just set the visibility directly in the data setter.

<s:Button styleName="arrowRightStyle" horizontalCenter="0" verticalCenter="0" height="100%"/>
<s:Image styleName="iconStyle arrowRightStyle" horizontalCenter="0" verticalCenter="0" height="100%"/>
</s:Group>

</s:ItemRenderer>
@@ -10,27 +10,17 @@
>
<s:Group id="mainshell" width="100%" height="100%" styleName="mainshell">
<s:layout>
<s:VerticalLayout gap="0"
paddingBottom="0"
paddingLeft="0"
paddingRight="0"
paddingTop="0"
/>
<s:VerticalLayout />
</s:layout>

<s:Group width="100%" >
<s:layout>
<s:HorizontalLayout gap="5"
paddingBottom="10"
paddingLeft="10"
paddingRight="10"
paddingTop="10"
/>
<s:HorizontalLayout />
</s:layout>
<ui:ProfileButton id="profileBtn" />
<s:Label width="100%" styleName="pageNameStyle" text="{resourceManager.getString('resources', 'chat.title')}" />
<ui:SwapCameraButton id="swapCameraBtn" />
<ui:MicButton id="microphoneBtn" />
<ui:SwapCameraButton id="swapCameraBtn" visible="false" styleName="swapCameraButtonStyle topButtonStyle"/>
<ui:MicButton id="microphoneBtn" styleName="micButtonStyle topButtonStyle"/>
</s:Group>

<chatrooms:ChatRoomsList id="chatroomslist" width="100%" height="100%" />
@@ -3,7 +3,6 @@
xmlns:s="library://ns.adobe.com/flex/spark"
xmlns:view="org.bigbluebutton.core.view.*"
xmlns:ui="org.bigbluebutton.view.ui.*"
xmlns:assets="assets.*"
xmlns:common="org.bigbluebutton.view.navigation.pages.common.*"
width="100%"
>
@@ -17,11 +16,11 @@
<!-- Place non-visual elements (e.g., services, value objects) here -->
</fx:Declarations>
<s:layout>
<s:HorizontalLayout gap="0" horizontalAlign="center" paddingBottom="0" paddingLeft="0" paddingRight="0" paddingTop="0"/>
<s:HorizontalLayout gap="0"/>
</s:layout>
<ui:NavigationButton id="deskshareBtn0" navigateTo="{[PagesENUM.DESKSHARE]}" width="100%" visible="false" includeInLayout="false" styleName="deskshareBtnStyle" height="{getStyle('height')}"/>
<ui:NavigationButton id="presentationBtn0" width="100%" navigateTo="{[PagesENUM.PRESENTATION]}" styleName="presentationBtnStyle" height="{getStyle('height')}"/>
<ui:NavigationButton id="videochatBtn0" navigateTo="{[PagesENUM.VIDEO_CHAT]}" width="100%" styleName="videochatBtnStyle" height="{getStyle('height')}"/>
<ui:NavigationButton id="chatBtn0" navigateTo="{[PagesENUM.CHATROOMS,PagesENUM.CHAT,PagesENUM.SELECT_PARTICIPANT]}" width="100%" styleName="chatBtnStyle" height="{getStyle('height')}"/>
<ui:NavigationButton id="participantsBtn0" navigateTo="{[PagesENUM.PARTICIPANTS,PagesENUM.USER_DETAIS]}" width="100%" styleName="participantsBtnStyle" height="{getStyle('height')}"/>
<ui:NavigationButton id="deskshareBtn0" navigateTo="{[PagesENUM.DESKSHARE]}" width="100%" visible="false" includeInLayout="false" styleName="deskshareBtnStyle" />
<ui:NavigationButton id="presentationBtn0" width="100%" navigateTo="{[PagesENUM.PRESENTATION]}" styleName="presentationBtnStyle" />
<ui:NavigationButton id="videochatBtn0" navigateTo="{[PagesENUM.VIDEO_CHAT]}" width="100%" styleName="videochatBtnStyle" />
<ui:NavigationButton id="chatBtn0" navigateTo="{[PagesENUM.CHATROOMS,PagesENUM.CHAT,PagesENUM.SELECT_PARTICIPANT]}" width="100%" styleName="chatBtnStyle" />
<ui:NavigationButton id="participantsBtn0" navigateTo="{[PagesENUM.PARTICIPANTS,PagesENUM.USER_DETAIS]}" width="100%" styleName="participantsBtnStyle" />
</s:Group>
@@ -16,35 +16,22 @@

<s:Group id="mainshell" width="100%" height="100%" styleName="mainshell">
<s:layout>
<s:VerticalLayout gap="0"
paddingBottom="0"
paddingLeft="0"
paddingRight="0"
paddingTop="0" />
<s:VerticalLayout />
</s:layout>

<s:Group width="100%" id="topMenuBar0" >
<s:layout>
<s:HorizontalLayout gap="5"
paddingBottom="10"
paddingTop="10"
paddingLeft="10"
paddingRight="10" />
<s:HorizontalLayout />
</s:layout>
<ui:ProfileButton id="profileBtn" />
<s:Label width="100%" styleName="pageNameStyle" text="{resourceManager.getString('resources', 'deskshare.title')}" />
<ui:SwapCameraButton id="swapCameraBtn" />
<ui:MicButton id="microphoneBtn" />
<ui:SwapCameraButton id="swapCameraBtn" visible="false" styleName="swapCameraButtonStyle topButtonStyle"/>
<ui:MicButton id="microphoneBtn" styleName="micButtonStyle topButtonStyle"/>
</s:Group>

<s:Group id="deskshareGroup0" width="100%" height="100%" >
<s:layout>
<s:VerticalLayout gap="0"
paddingBottom="0"
paddingLeft="0"
paddingRight="0"
paddingTop="0"
/>
<s:VerticalLayout />
</s:layout>
<s:Label id="noDeskshareMessage0" width="90%" height="100%" visible="true" text="{resourceManager.getString('resources', 'deskshare.noDeskshare')}" />
</s:Group>
@@ -32,7 +32,7 @@
text.USER_KICKED_OUT="{resourceManager.getString('resources', 'disconnect.reason.userKickedOut')}"
text.USER_LOGGED_OUT="{resourceManager.getString('resources', 'disconnect.reason.userLoggedOut')}">
</s:Label>
<s:Button id="exitButton0" width="50%" content="Exit" />
<s:Button id="exitButton0" width="50%" content="{resourceManager.getString('resources', 'disconnect.reason.userExit')}"/>
</s:Group>

</view:NoTabView>
@@ -29,9 +29,9 @@
</view:states>
<s:Group id="mainshell" width="100%" height="100%" styleName="mainshell">
<s:layout>
<s:VerticalLayout paddingTop="15" paddingBottom="15" horizontalAlign="center" verticalAlign="middle"/>
<s:VerticalLayout horizontalAlign="center" verticalAlign="middle"/>
</s:layout>
<s:Image styleName="bbbLogoStyle" verticalCenter="0" horizontalCenter="0"/>
<s:Image styleName="bbbLogoStyle" />
<s:Label id="messageText0" width="90%"
includeIn="ChecksumError,GenericError,InvalidMeetingIdentifier,InvalidPassword,NoRedirect"
text.ChecksumError="{resourceManager.getString('resources', 'login.error.checksumError')}"
@@ -39,22 +39,22 @@
</fx:Script>
<s:Group left="0" width="100%">
<s:layout>
<s:HorizontalLayout gap="0" paddingBottom="5" paddingLeft="0" paddingRight="0" paddingTop="5" verticalAlign="middle" />
<s:HorizontalLayout verticalAlign="middle" />
</s:layout>
<s:Group left="0" width="5%" >
<s:Button id="profileIcon" left="0" styleName="profileIconStyle" />
<s:Button id="presentationIcon" left="0" styleName="presentationIconStyle" />
<s:Group left="0" >
<s:Image id="profileIcon" left="0" styleName="iconStyle profileIconStyle" />
<s:Image id="presentationIcon" left="0" styleName="iconStyle presentationIconStyle" />
</s:Group>
<s:Button id="handIcon" width="5%" styleName="handIconStyle" />
<s:Image id="handIcon" styleName="iconStyle handIconStyle" />
<s:Label id="labelDisplay" width="70%" horizontalCenter="0"
text="Lucas Jones&#xd;" textAlign="left" verticalAlign="middle"/>
<s:Button id="cameraIcon" width="5%" styleName="cameraIconStyle" />
<s:Group left="0" width="5%">
<s:Button id="micIcon" styleName="micIconStyle" />
<s:Button id="micOffIcon" styleName="micOffIconStyle" visible="false" />
<s:Image id="cameraIcon" styleName="iconStyle cameraIconStyle" />
<s:Group left="0" >
<s:Image id="micIcon" styleName="iconStyle micIconStyle" />
<s:Image id="micOffIcon" styleName="iconStyle micOffIconStyle" visible="false" />
</s:Group>
<s:Button id="soundIcon" width="5%" styleName="soundIconStyle" />
<s:Button styleName="arrowRightStyle" width="5%" />
<s:Image id="soundIcon" styleName="iconStyle soundIconStyle" />
<s:Image styleName="iconStyle arrowRightStyle" />
</s:Group>

</s:ItemRenderer>
@@ -9,16 +9,16 @@
>
<s:Group id="mainshell" width="100%" height="100%" styleName="mainshell">
<s:layout>
<s:VerticalLayout gap="0" paddingBottom="0" paddingLeft="0" paddingRight="0" paddingTop="0"/>
<s:VerticalLayout/>
</s:layout>
<s:Group width="100%">
<s:layout>
<s:HorizontalLayout gap="5" paddingBottom="10" paddingLeft="10" paddingRight="10" paddingTop="10" />
<s:HorizontalLayout />
</s:layout>
<ui:ProfileButton id="profileBtn" />
<s:Label width="100%" styleName="pageNameStyle" text="{resourceManager.getString('resources', 'participants.title')}"/>
<ui:SwapCameraButton id="swapCameraBtn" />
<ui:MicButton id="microphoneBtn" />
<ui:SwapCameraButton id="swapCameraBtn" visible="false" styleName="swapCameraButtonStyle topButtonStyle"/>
<ui:MicButton id="microphoneBtn" styleName="micButtonStyle topButtonStyle" />
</s:Group>
<participants:ParticipantsList id="participantslist" width="100%" height="100%" />
<common:MenuButtonsView />
@@ -9,22 +9,22 @@

<s:Group id="mainshell" width="100%" height="100%" styleName="mainshell">
<s:layout>
<s:VerticalLayout gap="0" paddingBottom="0" paddingLeft="0" paddingRight="0" paddingTop="0" />
<s:VerticalLayout />
</s:layout>

<s:Group width="100%" >
<s:layout>
<s:HorizontalLayout gap="5" paddingBottom="10" paddingLeft="10" paddingRight="10" paddingTop="10" />
<s:HorizontalLayout />
</s:layout>
<ui:ProfileButton id="profileBtn" />
<s:Label id="presentationName" width="100%" styleName="pageNameStyle" text="" />
<ui:SwapCameraButton id="swapCameraBtn" />
<ui:MicButton id="microphoneBtn" />
<ui:SwapCameraButton id="swapCameraBtn" visible="false" styleName="swapCameraButtonStyle topButtonStyle"/>
<ui:MicButton id="microphoneBtn" styleName="micButtonStyle topButtonStyle"/>
</s:Group>

<s:Group id="content" width="100%" height="100%">
<s:layout>
<s:VerticalLayout gap="0" paddingBottom="0" paddingLeft="0" paddingRight="0" paddingTop="0"/>
<s:VerticalLayout />
</s:layout>
<s:Image id="slide" width="100%" height="100%" />
</s:Group>
Oops, something went wrong.
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.