You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by pe...@apache.org on 2015/08/25 17:46:58 UTC
git commit: [flex-asjs] [refs/heads/develop] - Updates for
MobileTrader to use newer Mobile package classes.
Repository: flex-asjs
Updated Branches:
refs/heads/develop f03e77f54 -> bead628e9
Updates for MobileTrader to use newer Mobile package classes.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/bead628e
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/bead628e
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/bead628e
Branch: refs/heads/develop
Commit: bead628e91e88465aafccccd405f33b0fd3ceed6
Parents: f03e77f
Author: Peter Ent <pe...@apache.org>
Authored: Tue Aug 25 17:46:55 2015 +0200
Committer: Peter Ent <pe...@apache.org>
Committed: Tue Aug 25 17:46:55 2015 +0200
----------------------------------------------------------------------
.../flexjs/MobileTrader/src/MobileTrader.mxml | 2 +-
.../flexjs/MobileTrader/src/MyInitialView.mxml | 2 +-
.../MobileTrader/src/views/AlertsView.mxml | 70 ++++++------
.../MobileTrader/src/views/AssetsView.mxml | 107 +++++++++----------
.../MobileTrader/src/views/SearchView.mxml | 8 +-
.../MobileTrader/src/views/StockView.mxml | 52 ++++-----
.../MobileTrader/src/views/WatchListView.mxml | 2 +-
7 files changed, 119 insertions(+), 124 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bead628e/examples/flexjs/MobileTrader/src/MobileTrader.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MobileTrader/src/MobileTrader.mxml b/examples/flexjs/MobileTrader/src/MobileTrader.mxml
index 8def93c..4537ff3 100755
--- a/examples/flexjs/MobileTrader/src/MobileTrader.mxml
+++ b/examples/flexjs/MobileTrader/src/MobileTrader.mxml
@@ -34,6 +34,6 @@
</js:model>
<js:initialView>
- <local:MyInitialView />
+ <local:MyInitialView width="480" height="640" />
</js:initialView>
</js:Application>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bead628e/examples/flexjs/MobileTrader/src/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MobileTrader/src/MyInitialView.mxml b/examples/flexjs/MobileTrader/src/MyInitialView.mxml
index 606839e..1c6b07d 100755
--- a/examples/flexjs/MobileTrader/src/MyInitialView.mxml
+++ b/examples/flexjs/MobileTrader/src/MyInitialView.mxml
@@ -226,7 +226,7 @@ limitations under the License.
<basic:ViewBaseDataBinding />
</basic:beads>
- <basic:TabbedViewManager id="navController" width="480" height="640" x="0" y="0" viewChanged="tabbedViewChanged(event)">
+ <basic:TabbedViewManager id="navController" width="100%" height="100%" x="0" y="0" viewChanged="tabbedViewChanged(event)">
<basic:navigationBarItems>
<basic:TextButton id="backButton" width="45" height="45" className="BackButton" visible="false" click="goBack(event)">
<basic:beads>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bead628e/examples/flexjs/MobileTrader/src/views/AlertsView.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MobileTrader/src/views/AlertsView.mxml b/examples/flexjs/MobileTrader/src/views/AlertsView.mxml
index 196f827..2c112df 100755
--- a/examples/flexjs/MobileTrader/src/views/AlertsView.mxml
+++ b/examples/flexjs/MobileTrader/src/views/AlertsView.mxml
@@ -17,9 +17,9 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-<basic:View xmlns:fx="http://ns.adobe.com/mxml/2009"
+<js:View xmlns:fx="http://ns.adobe.com/mxml/2009"
title="Alerts"
- xmlns:basic="library://ns.apache.org/flexjs/basic"
+ xmlns:js="library://ns.apache.org/flexjs/basic"
xmlns:local="*"
className="AlertsView" xmlns:renderers="renderers.*">
@@ -52,49 +52,49 @@ limitations under the License.
]]>
</fx:Script>
- <basic:Container x="4" y="10" >
- <basic:beads>
- <basic:HorizontalLayout />
- </basic:beads>
- <basic:Label text="Symbol:" />
- <basic:TextInput id="symbolField" />
- <basic:Label text="Value:" />
- <basic:TextInput id="valueField" />
- <basic:CheckBox text="Higher?" id="higherCheck" />
- <basic:TextButton text="Set" click="onAlertSet()" />
- </basic:Container>
+ <js:Container x="4" y="10" >
+ <js:beads>
+ <js:HorizontalLayout />
+ </js:beads>
+ <js:Label text="Symbol:" />
+ <js:TextInput id="symbolField" />
+ <js:Label text="Value:" />
+ <js:TextInput id="valueField" />
+ <js:CheckBox text="Higher?" id="higherCheck" />
+ <js:TextButton text="Set" click="onAlertSet()" />
+ </js:Container>
- <basic:DataGrid x="0" y="40" width="480" height="200">
- <basic:beads>
- <basic:SimpleBinding
+ <js:DataGrid x="0" y="40" width="100%" height="200">
+ <js:beads>
+ <js:SimpleBinding
eventName="alertsUpdate"
sourceID="dataModel"
sourcePropertyName="alerts"
destinationPropertyName="dataProvider" />
- </basic:beads>
- <basic:columns>
- <basic:DataGridColumn label="Symbol" dataField="symbol">
- <basic:itemRenderer>
+ </js:beads>
+ <js:columns>
+ <js:DataGridColumn label="Symbol" dataField="symbol">
+ <js:itemRenderer>
<fx:Component>
- <basic:StringItemRenderer />
+ <js:StringItemRenderer />
</fx:Component>
- </basic:itemRenderer>
- </basic:DataGridColumn>
- <basic:DataGridColumn label="Alert" dataField="greaterThan">
- <basic:itemRenderer>
+ </js:itemRenderer>
+ </js:DataGridColumn>
+ <js:DataGridColumn label="Alert" dataField="greaterThan">
+ <js:itemRenderer>
<fx:Component>
<renderers:AlertRenderer />
</fx:Component>
- </basic:itemRenderer>
- </basic:DataGridColumn>
- <basic:DataGridColumn label="Message" dataField="message">
- <basic:itemRenderer>
+ </js:itemRenderer>
+ </js:DataGridColumn>
+ <js:DataGridColumn label="Message" dataField="message">
+ <js:itemRenderer>
<fx:Component>
- <basic:StringItemRenderer />
+ <js:StringItemRenderer />
</fx:Component>
- </basic:itemRenderer>
- </basic:DataGridColumn>
- </basic:columns>
- </basic:DataGrid>
+ </js:itemRenderer>
+ </js:DataGridColumn>
+ </js:columns>
+ </js:DataGrid>
-</basic:View>
\ No newline at end of file
+</js:View>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bead628e/examples/flexjs/MobileTrader/src/views/AssetsView.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MobileTrader/src/views/AssetsView.mxml b/examples/flexjs/MobileTrader/src/views/AssetsView.mxml
index edf3916..98e57e5 100755
--- a/examples/flexjs/MobileTrader/src/views/AssetsView.mxml
+++ b/examples/flexjs/MobileTrader/src/views/AssetsView.mxml
@@ -17,9 +17,9 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-<basic:View xmlns:fx="http://ns.adobe.com/mxml/2009"
+<js:View xmlns:fx="http://ns.adobe.com/mxml/2009"
title="Assets"
- xmlns:basic="library://ns.apache.org/flexjs/basic"
+ xmlns:js="library://ns.apache.org/flexjs/basic"
xmlns:models="models.*"
xmlns:local="*"
className="AssetsView">
@@ -33,62 +33,57 @@ limitations under the License.
[Event("next")]
</fx:Metadata>
- <basic:beads>
- <basic:BasicLayout />
- </basic:beads>
+ <js:beads>
+ <js:VerticalLayout />
+ </js:beads>
- <basic:model>
+ <js:model>
<models:AssetsModel />
- </basic:model>
+ </js:model>
+
+ <js:Label text="Summary" height="10%" />
- <basic:Container className="AssetsInner" width="480">
- <basic:beads>
- <basic:VerticalLayout />
- </basic:beads>
- <basic:style>
- <basic:SimpleCSSStyles top="0" left="0" right="0" />
- </basic:style>
-
- <basic:Label text="Summary" />
-
- <basic:DataGrid height="200" width="480">
- <basic:style>
- <basic:SimpleCSSStyles top="0" left="0" right="0" />
- </basic:style>
- <basic:beads>
- <basic:ConstantBinding
- sourceID="model"
- sourcePropertyName="assetsData"
- destinationPropertyName="dataProvider" />
- </basic:beads>
- <basic:columns>
- <basic:DataGridColumn label="Type" dataField="label" />
- <basic:DataGridColumn label="Value" dataField="value" />
- <basic:DataGridColumn label="Change" dataField="netChange" />
- </basic:columns>
- </basic:DataGrid>
+ <js:DataGrid height="40%" width="100%">
+ <js:style>
+ <js:SimpleCSSStyles top="0" left="0" right="0" />
+ </js:style>
+ <js:beads>
+ <js:ConstantBinding
+ sourceID="model"
+ sourcePropertyName="assetsData"
+ destinationPropertyName="dataProvider" />
+ </js:beads>
+ <js:columns>
+ <js:DataGridColumn label="Type" dataField="label" />
+ <js:DataGridColumn label="Value" dataField="value" />
+ <js:DataGridColumn label="Change" dataField="netChange" />
+ </js:columns>
+ </js:DataGrid>
- <basic:Label text="Performance History" />
+ <js:Label text="Performance History" height="10%" />
- <!--<basic:BarChart id="barChart" width="320" height="250">
- <basic:beads>
- <basic:ConstantBinding
- sourceID="model"
- sourcePropertyName="assetsData"
- destinationPropertyName="dataProvider" />
- <basic:XAxisBead labelField="title" />
- </basic:beads>
- <basic:series>
- <basic:BarChartSeries yField="value"
- fillColor="0xFF964D">
- <basic:itemRenderer>
- <fx:Component>
- <basic:BoxItemRenderer />
- </fx:Component>
- </basic:itemRenderer>
- </basic:BarChartSeries>
- </basic:series>
- </basic:BarChart>-->
-
- </basic:Container>
-</basic:View>
\ No newline at end of file
+ <js:BarChart id="barChart" width="100%" height="40%">
+ <js:beads>
+ <js:ConstantBinding
+ sourceID="model"
+ sourcePropertyName="assetsData"
+ destinationPropertyName="dataProvider" />
+ <js:VerticalCategoryAxisBead categoryField="label" />
+ <js:HorizontalLinearAxisBead valueField="netChange" />
+ </js:beads>
+ <js:series>
+ <js:BarSeries xField="netChange">
+ <js:itemRenderer>
+ <fx:Component>
+ <js:BoxItemRenderer>
+ <js:fill>
+ <js:SolidColor color="#FF964D" alpha="1.0" />
+ </js:fill>
+ </js:BoxItemRenderer>
+ </fx:Component>
+ </js:itemRenderer>
+ </js:BarSeries>
+ </js:series>
+ </js:BarChart>
+
+</js:View>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bead628e/examples/flexjs/MobileTrader/src/views/SearchView.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MobileTrader/src/views/SearchView.mxml b/examples/flexjs/MobileTrader/src/views/SearchView.mxml
index 6b834d7..6e73d71 100755
--- a/examples/flexjs/MobileTrader/src/views/SearchView.mxml
+++ b/examples/flexjs/MobileTrader/src/views/SearchView.mxml
@@ -17,8 +17,8 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-<basic:View xmlns:fx="http://ns.adobe.com/mxml/2009"
- xmlns:basic="library://ns.apache.org/flexjs/basic"
+<js:View xmlns:fx="http://ns.adobe.com/mxml/2009"
+ xmlns:js="library://ns.apache.org/flexjs/basic"
xmlns:apache="org.apache.flex.html.beads.*"
xmlns:local="*"
className="StockView">
@@ -33,5 +33,5 @@ limitations under the License.
]]>
</fx:Script>
- <basic:Label text="Search View" x="20" y="100" />
-</basic:View>
+ <js:Label text="Search View" x="20" y="100" />
+</js:View>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bead628e/examples/flexjs/MobileTrader/src/views/StockView.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MobileTrader/src/views/StockView.mxml b/examples/flexjs/MobileTrader/src/views/StockView.mxml
index e1dfb24..8cb814e 100755
--- a/examples/flexjs/MobileTrader/src/views/StockView.mxml
+++ b/examples/flexjs/MobileTrader/src/views/StockView.mxml
@@ -17,8 +17,8 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-<basic:View xmlns:fx="http://ns.adobe.com/mxml/2009"
- xmlns:basic="library://ns.apache.org/flexjs/basic"
+<js:View xmlns:fx="http://ns.adobe.com/mxml/2009"
+ xmlns:js="library://ns.apache.org/flexjs/basic"
xmlns:apache="org.apache.flex.html.beads.*"
xmlns:local="*"
className="StockView">
@@ -68,31 +68,31 @@ limitations under the License.
]]>
</fx:Script>
- <basic:Container>
- <basic:beads>
- <basic:VerticalLayout />
- </basic:beads>
- <basic:style>
- <basic:SimpleCSSStyles top="10px" left="10px" />
- </basic:style>
+ <js:Container>
+ <js:beads>
+ <js:VerticalLayout />
+ </js:beads>
+ <js:style>
+ <js:SimpleCSSStyles top="10px" left="10px" />
+ </js:style>
- <basic:Label id="stockSymbol" text="{stock.symbol}" className="ViewTitle" />
- <basic:Label id="stockName" text="{stock.name}" className="StockName" />
+ <js:Label id="stockSymbol" text="{stock.symbol}" className="ViewTitle" />
+ <js:Label id="stockName" text="{stock.name}" className="StockName" />
- <basic:Container className="StockDetailArea">
- <basic:beads>
- <basic:VerticalColumnLayout numColumns="2" />
- </basic:beads>
+ <js:Container className="StockDetailArea">
+ <js:beads>
+ <js:VerticalColumnLayout numColumns="2" />
+ </js:beads>
- <basic:Label text="Last Price:" className="StockLabel" /> <basic:Label id="lastPrice" className="StockValue" />
- <basic:Label text="Open Price:" className="StockLabel" /> <basic:Label id="openPrice" className="StockValue" />
- <basic:Label text="Low Price:" className="StockLabel" /> <basic:Label id="lowPrice" className="StockValue" />
- <basic:Label text="High Price:" className="StockLabel" /> <basic:Label id="highPrice" className="StockValue" />
- <basic:Label text="Change: " className="StockLabel" /> <basic:Label id="changeAmount" className="StockValue" />
- </basic:Container>
+ <js:Label text="Last Price:" className="StockLabel" /> <js:Label id="lastPrice" className="StockValue" />
+ <js:Label text="Open Price:" className="StockLabel" /> <js:Label id="openPrice" className="StockValue" />
+ <js:Label text="Low Price:" className="StockLabel" /> <js:Label id="lowPrice" className="StockValue" />
+ <js:Label text="High Price:" className="StockLabel" /> <js:Label id="highPrice" className="StockValue" />
+ <js:Label text="Change: " className="StockLabel" /> <js:Label id="changeAmount" className="StockValue" />
+ </js:Container>
- <basic:Container className="StockDetailArea">
- <basic:TextButton text="Remove From List" width="200" className="StockRemoveButton" click="removeFromList()" />
- </basic:Container>
- </basic:Container>
-</basic:View>
\ No newline at end of file
+ <js:Container className="StockDetailArea">
+ <js:TextButton text="Remove From List" width="200" className="StockRemoveButton" click="removeFromList()" />
+ </js:Container>
+ </js:Container>
+</js:View>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bead628e/examples/flexjs/MobileTrader/src/views/WatchListView.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MobileTrader/src/views/WatchListView.mxml b/examples/flexjs/MobileTrader/src/views/WatchListView.mxml
index b12fc73..8591aec 100755
--- a/examples/flexjs/MobileTrader/src/views/WatchListView.mxml
+++ b/examples/flexjs/MobileTrader/src/views/WatchListView.mxml
@@ -100,7 +100,7 @@ limitations under the License.
<js:Spacer height="10" />
- <js:DataGrid id="dataGrid" width="50%" height="90%" change="selectRow()" className="WatchListDataGrid">
+ <js:DataGrid id="dataGrid" width="100%" height="85%" change="selectRow()" className="WatchListDataGrid">
<js:beads>
<js:SimpleBinding
eventName="update"