This is an automated email from the ASF dual-hosted git repository. carlosrovira pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 0a6114def781f7c8320967ccb09e499c5e0e6004 Author: Carlos Rovira <[email protected]> AuthorDate: Mon May 11 19:44:27 2020 +0200 tour-de-jewel: refacotr item renders and even clean checks in bindings not need now --- .../src/main/resources/jewel-example-styles.css | 6 ------ .../itemRenderers/AdvancedIconListItemRenderer.mxml | 14 +++++++------- .../itemRenderers/CheckBoxDataGridItemRenderer.mxml | 2 +- .../itemRenderers/IconDataGridItemRenderer.mxml | 4 ++-- .../royale/itemRenderers/IconListItemRenderer.mxml | 8 ++++---- .../itemRenderers/ImageDataGridItemRenderer.mxml | 2 +- .../NavigationGroupExampleItemRenderer.mxml | 17 ++++++++--------- .../NavigationIconLinkItemRenderer.mxml | 11 ++++++----- .../TabBarHorizontalIconItemRenderer.mxml | 6 +++--- .../TabBarVerticalIconItemRenderer.mxml | 6 +++--- .../itemRenderers/TableStyleListItemRenderer.mxml | 20 +++++++++++--------- 11 files changed, 46 insertions(+), 50 deletions(-) diff --git a/examples/jewel/TourDeJewel/src/main/resources/jewel-example-styles.css b/examples/jewel/TourDeJewel/src/main/resources/jewel-example-styles.css index 3bed732..a1febdb 100644 --- a/examples/jewel/TourDeJewel/src/main/resources/jewel-example-styles.css +++ b/examples/jewel/TourDeJewel/src/main/resources/jewel-example-styles.css @@ -42,8 +42,6 @@ j|IconButtonBar IItemRenderer: ClassReference("itemRenderers.SimpleIconListItemRenderer"); } - - .iconListItemRenderer { IItemRenderer: ClassReference("itemRenderers.IconListItemRenderer"); @@ -53,10 +51,6 @@ j|IconButtonBar { IItemRenderer: ClassReference("itemRenderers.AdvancedIconListItemRenderer"); } -.advancedIconListItemRenderer .fonticon -{ - margin-right: 24px; -} .jewel.item .jewelItem { color: #3cadf1; diff --git a/examples/jewel/TourDeJewel/src/main/royale/itemRenderers/AdvancedIconListItemRenderer.mxml b/examples/jewel/TourDeJewel/src/main/royale/itemRenderers/AdvancedIconListItemRenderer.mxml index 45123c4..7eea4ea 100644 --- a/examples/jewel/TourDeJewel/src/main/royale/itemRenderers/AdvancedIconListItemRenderer.mxml +++ b/examples/jewel/TourDeJewel/src/main/royale/itemRenderers/AdvancedIconListItemRenderer.mxml @@ -83,14 +83,14 @@ limitations under the License. <j:beads> <js:ItemRendererDataBinding/> + <j:HorizontalLayout gap="8" itemsVerticalAlign="itemsCenter"/> </j:beads> - <j:HGroup gap="8" itemsVerticalAlign="itemsCenter"> - <js:MaterialIcon text="{iconListItem ? iconListItem.icon : ''}" - visible="{iconListItem ? iconListItem.icon != null : false}" - className="{colorClass}" - click="clickCloseButton()"/> - <j:Label html="{text}" multiline="true"/> - </j:HGroup> + <js:MaterialIcon text="{iconListItem.icon}" + visible="{iconListItem.icon != null}" + className="{colorClass}" + click="clickCloseButton()"/> + + <j:Label html="{text}" multiline="true"/> </j:ListItemRenderer> diff --git a/examples/jewel/TourDeJewel/src/main/royale/itemRenderers/CheckBoxDataGridItemRenderer.mxml b/examples/jewel/TourDeJewel/src/main/royale/itemRenderers/CheckBoxDataGridItemRenderer.mxml index c65ac99..40a3069 100644 --- a/examples/jewel/TourDeJewel/src/main/royale/itemRenderers/CheckBoxDataGridItemRenderer.mxml +++ b/examples/jewel/TourDeJewel/src/main/royale/itemRenderers/CheckBoxDataGridItemRenderer.mxml @@ -47,7 +47,7 @@ limitations under the License. <j:HorizontalCenteredLayout/> </j:beads> - <j:CheckBox selected="{detailIconList ? detailIconList.componentSet == 'Jewel' : false}"> + <j:CheckBox selected="{detailIconList.componentSet == 'Jewel'}"> <j:beads> <j:Disabled disabled="true"/> </j:beads> diff --git a/examples/jewel/TourDeJewel/src/main/royale/itemRenderers/IconDataGridItemRenderer.mxml b/examples/jewel/TourDeJewel/src/main/royale/itemRenderers/IconDataGridItemRenderer.mxml index 299fe3f..b5e6e78 100644 --- a/examples/jewel/TourDeJewel/src/main/royale/itemRenderers/IconDataGridItemRenderer.mxml +++ b/examples/jewel/TourDeJewel/src/main/royale/itemRenderers/IconDataGridItemRenderer.mxml @@ -50,8 +50,8 @@ limitations under the License. <j:HorizontalCenteredLayout/> </j:beads> - <js:MaterialIcon text="{iconList ? iconList.icon : ''}" - visible="{iconList ? iconList.icon != null : false}" + <js:MaterialIcon text="{iconList.icon}" + visible="{iconList.icon != null}" click="clickCloseButton(event)"/> </j:DataGridItemRenderer> diff --git a/examples/jewel/TourDeJewel/src/main/royale/itemRenderers/IconListItemRenderer.mxml b/examples/jewel/TourDeJewel/src/main/royale/itemRenderers/IconListItemRenderer.mxml index a827384..8f79390 100644 --- a/examples/jewel/TourDeJewel/src/main/royale/itemRenderers/IconListItemRenderer.mxml +++ b/examples/jewel/TourDeJewel/src/main/royale/itemRenderers/IconListItemRenderer.mxml @@ -58,12 +58,12 @@ limitations under the License. <js:ItemRendererDataBinding /> <j:ToolTip localId="tt" toolTip="{getToolTip(text)}"/> <js:ToolTipRemovalWhenItemRemoved tooltip="{tt}"/> + <j:HorizontalLayout gap="8" itemsVerticalAlign="itemsCenter"/> </j:beads> - <j:HGroup gap="8" itemsVerticalAlign="itemsCenter"> - <js:MaterialIcon text="{iconList.icon}" visible="{iconList.icon != null}" click="clickCloseButton()"/> - <j:Label html="{text}" multiline="true"/> - </j:HGroup> + <js:MaterialIcon text="{iconList.icon}" visible="{iconList.icon != null}" click="clickCloseButton()"/> + + <j:Label html="{text}" multiline="true"/> </j:ListItemRenderer> diff --git a/examples/jewel/TourDeJewel/src/main/royale/itemRenderers/ImageDataGridItemRenderer.mxml b/examples/jewel/TourDeJewel/src/main/royale/itemRenderers/ImageDataGridItemRenderer.mxml index bc6be43..83c5f6f 100644 --- a/examples/jewel/TourDeJewel/src/main/royale/itemRenderers/ImageDataGridItemRenderer.mxml +++ b/examples/jewel/TourDeJewel/src/main/royale/itemRenderers/ImageDataGridItemRenderer.mxml @@ -39,7 +39,7 @@ limitations under the License. <j:HorizontalCenteredLayout/> </j:beads> - <j:Image src="{ product ? product.image : '' }"/> + <j:Image src="{product.image}"/> </j:DataGridItemRenderer> diff --git a/examples/jewel/TourDeJewel/src/main/royale/itemRenderers/NavigationGroupExampleItemRenderer.mxml b/examples/jewel/TourDeJewel/src/main/royale/itemRenderers/NavigationGroupExampleItemRenderer.mxml index 5041fd2..e6a02d6 100644 --- a/examples/jewel/TourDeJewel/src/main/royale/itemRenderers/NavigationGroupExampleItemRenderer.mxml +++ b/examples/jewel/TourDeJewel/src/main/royale/itemRenderers/NavigationGroupExampleItemRenderer.mxml @@ -21,8 +21,8 @@ limitations under the License. xmlns:j="library://ns.apache.org/royale/jewel" xmlns:js="library://ns.apache.org/royale/basic" xmlns:html="library://ns.apache.org/royale/html" - className="layout vertical" - sectionClick="handleNavToggle(event)"> + sectionClick="handleNavToggle(event)" + height="48"> <fx:Script> <