[AIR] merge shared assets directory with air-client

clients/flash/air-client/src/Default.css

@@ -2,6 +2,7 @@
 @namespace mx "library://ns.adobe.com/flex/mx";
 @namespace libChat "org.bigbluebutton.lib.chat.views.*";
 @namespace main "org.bigbluebutton.air.main.views.*";
+@namespace mainLib "org.bigbluebutton.lib.main.views.*";
 @namespace participants "org.bigbluebutton.lib.participants.views.*";
 @namespace users "org.bigbluebutton.lib.user.views.*";
 @namespace usersAIR "org.bigbluebutton.air.users.views.*";
@@ -13,7 +14,7 @@
 @namespace ex "http://flex.apache.org/experimental/ns";
 
 @font-face {
-	src        : url("../../shared/assets/fonts/SourceSansPro/SourceSansPro-Regular.ttf");
+	src        : url("assets/fonts/SourceSansPro/SourceSansPro-Regular.ttf");
 	fontFamily : SourceSansPro;
 	fontStyle  : normal;
 	fontWeight : normal;
@@ -21,7 +22,7 @@
 }
 
 @font-face {
-	src        : url("../../shared/assets/fonts/SourceSansPro/SourceSansPro-Semibold.ttf");
+	src        : url("assets/fonts/SourceSansPro/SourceSansPro-Semibold.ttf");
 	fontFamily : SourceSansPro;
 	fontStyle  : normal;
 	fontWeight : bold;
@@ -29,7 +30,7 @@
 }
 
 @font-face {
-	src        : url("../../shared/assets/fonts/SourceSansPro/SourceSansPro-Italic.ttf");
+	src        : url("assets/fonts/SourceSansPro/SourceSansPro-Italic.ttf");
 	fontFamily : SourceSansPro;
 	fontStyle  : italic;
 	fontWeight : normal;
@@ -37,7 +38,7 @@
 }
 
 @font-face {
-	src        : url("../../shared/assets/fonts/SourceSansPro/SourceSansPro-Bold.ttf");
+	src        : url("../assets/fonts/SourceSansPro/SourceSansPro-Bold.ttf");
 	fontFamily : SourceSansPro;
 	fontStyle  : normal;
 	fontWeight : heavy;
@@ -45,7 +46,7 @@
 }
 
 @font-face {
-	src        : url("../../shared/assets/fonts/SourceSansPro/SourceSansPro-Regular.ttf");
+	src        : url("assets/fonts/SourceSansPro/SourceSansPro-Regular.ttf");
 	fontFamily : SourceSansProMX;
 	fontStyle  : normal;
 	fontWeight : normal;
@@ -53,7 +54,7 @@
 }
 
 @font-face {
-	src        : url("../../shared/assets/fonts/SourceSansPro/SourceSansPro-Semibold.ttf");
+	src        : url("assets/fonts/SourceSansPro/SourceSansPro-Semibold.ttf");
 	fontFamily : SourceSansProMX;
 	fontStyle  : normal;
 	fontWeight : bold;
@@ -61,7 +62,7 @@
 }
 
 @font-face {
-	src        : url("../../shared/assets/fonts/SourceSansPro/SourceSansPro-Italic.ttf");
+	src        : url("assets/fonts/SourceSansPro/SourceSansPro-Italic.ttf");
 	fontFamily : SourceSansProMX;
 	fontStyle  : italic;
 	fontWeight : normal;
@@ -69,7 +70,7 @@
 }
 
 @font-face {
-	src        : url("../../shared/assets/fonts/SourceSansPro/SourceSansPro-Bold.ttf");
+	src        : url("assets/fonts/SourceSansPro/SourceSansPro-Bold.ttf");
 	fontFamily : SourceSansProMX;
 	fontStyle  : normal;
 	fontWeight : heavy;
@@ -105,6 +106,10 @@ main|MainView {
 	backgroundColor : PropertyReference("bbbBlack");
 }
 
+mainLib|TopToolbarBase {
+	textAlign : center;
+}
+
 main|TopToolbarAIR {
 	backgroundColor : PropertyReference("bbbBlack");
 }
@@ -287,6 +292,10 @@ settings|SettingsItemRenderer {
 	showLabel : false;
 }
 
+.echoTestLabel {
+	textAlign : center;
+}
+
 .userDetailsButton {
 	color : PropertyReference("bbbBlack");
 }

clients/flash/air-client/src/Main.mxml

@@ -4,9 +4,9 @@
 			   applicationComplete="applicationCompleteHandler(event)"
 			   preinitialize="preinitializeHandler(event)"
 			   styleName="mainshell"
-			   xmlns:main="org.bigbluebutton.air.main.views.*" xmlns:setup="org.as3commons.logging.setup.*">
-	<fx:Style source="../../shared/assets/css/common.css" />
-	<fx:Style source="../../shared/assets/css/bbb-icons.css" />
+			   xmlns:main="org.bigbluebutton.air.main.views.*"
+			   xmlns:setup="org.as3commons.logging.setup.*">
+	<fx:Style source="css/bbb-icons.css" />
 	<fx:Style source="Default.css" />
 	<fx:Style source="css/ldpi.css" />
 	<fx:Style source="css/mdpi.css" />
@@ -42,7 +42,7 @@
 			import robotlegs.bender.framework.api.LogLevel;
 			import robotlegs.bender.framework.impl.Context;
 
-			include "../../shared/ColorPalette.as"
+			include "css/ColorPalette.as"
 			
 			protected var context:IContext;
 			

clients/flash/shared/assets/css/bbb-icons.css → clients/flash/air-client/src/css/bbb-icons.css

@@ -3,7 +3,7 @@
 @namespace s "library://ns.adobe.com/flex/spark";
 
 @font-face {
-	src: url("../../shared/assets/fonts/BBBIcons/bbb-icons.ttf");
+	src: url("../assets/fonts/BBBIcons/bbb-icons.ttf");
 	fontFamily: BBBIcons;
 	fontStyle: normal;
 	fontWeight: normal;
@@ -11,7 +11,7 @@
 }
 
 @font-face {
-	src: url("../../shared/assets/fonts/BBBIcons/bbb-icons.ttf");
+	src: url("../assets/fonts/BBBIcons/bbb-icons.ttf");
 	fontFamily: BBBIcons;
 	fontStyle: normal;
 	fontWeight: bold;

clients/flash/shared/assets/README.txt

-Icons generated by http://android-ui-utils.googlecode.com/hg/asset-studio/dist/icons-launcher.html
-
-To create new icons use the following settings: 
-
-Settings: Color 100%
-Scaling: Center
-Shape: Bevel
-Background: White 
-Padding: 5%
-Trim: True
-Color: #1e1c1c
-
-In order to generate gray icons, you can use the following URL directly:
-
-http://romannurik.github.io/AndroidAssetStudio/icons-launcher.html#foreground.type=image&foreground.space.trim=1&foreground.space.pad=0.05&foreColor=8a8e90%2C100&crop=0&backgroundShape=bevel&backColor=ffffff%2C100&effects=none
-
-The code below was used in order to automatically process the downloaded icons and copy them to the res/ directory:
-
-```
-for i in `ls -1`; do
-  cd $i
-  for dir in `ls -1`; do mv $dir `echo $dir | sed 's:mipmap:drawable:g'`; done
-  for file in `find -name *.png`; do mv $file `echo $file | sed "s:ic_launcher:${PWD##*/}:g"`; done
-  cp -R * ../../res/
-  cd ..
-done
-```

clients/flash/shared/assets/css/common.css

-@namespace s "library://ns.adobe.com/flex/spark";
-@namespace mx "library://ns.adobe.com/flex/mx";
-@namespace views "org.bigbluebutton.lib.main.views.*";
-@namespace users "org.bigbluebutton.lib.user.views.*";
-
-views|TopToolbarBase {
-	textAlign : center;
-}
-
-.echoTestLabel {
-	textAlign : center;
-}