You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ca...@apache.org on 2017/01/27 22:14:05 UTC
[24/50] git commit: [flex-asjs] [refs/heads/feature/mdl] - Remove
icon specific classes
Remove icon specific 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/ed8f5b74
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/ed8f5b74
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/ed8f5b74
Branch: refs/heads/feature/mdl
Commit: ed8f5b74eb5bd09d32843683c70c7317705f5b99
Parents: 234d44d
Author: Carlos Rovira <ca...@apache.org>
Authored: Tue Jan 24 00:24:53 2017 +0100
Committer: Carlos Rovira <ca...@apache.org>
Committed: Tue Jan 24 00:24:53 2017 +0100
----------------------------------------------------------------------
.../flexjs/MDLExample/src/main/flex/Badges.mxml | 12 +++-
.../MDLExample/src/main/flex/Buttons.mxml | 25 +++++---
.../flexjs/MDLExample/src/main/flex/Cards.mxml | 16 +++++-
.../flexjs/MDLExample/src/main/flex/Chips.mxml | 20 +++++--
.../flexjs/MDLExample/src/main/flex/Icons.mxml | 34 +++++------
.../flexjs/MDLExample/src/main/flex/Menus.mxml | 15 ++++-
.../MDLExample/src/main/flex/Toggles.mxml | 15 ++++-
.../ActorNameAndIconListItemRenderer.mxml | 3 +-
.../AvatarAndActionListItemRenderer.mxml | 5 +-
...vatarAndActionThreeLineListItemRenderer.mxml | 5 +-
.../AvatarAndActionTwoLineListItemRenderer.mxml | 5 +-
.../TableRowItemRendererWithIcons.mxml | 3 +-
.../apache/flex/mdl/beads/ExpandableSearch.as | 13 ++---
.../flex/mdl/materialIcons/MaterialIconAdd.as | 60 --------------------
.../mdl/materialIcons/MaterialIconCancel.as | 60 --------------------
.../flex/mdl/materialIcons/MaterialIconEvent.as | 60 --------------------
.../flex/mdl/materialIcons/MaterialIconFace.as | 60 --------------------
.../mdl/materialIcons/MaterialIconFormatBold.as | 60 --------------------
.../materialIcons/MaterialIconFormatItalic.as | 60 --------------------
.../MaterialIconKeyboardArrowDown.as | 60 --------------------
.../flex/mdl/materialIcons/MaterialIconMood.as | 60 --------------------
.../mdl/materialIcons/MaterialIconMoreVert.as | 60 --------------------
.../mdl/materialIcons/MaterialIconPerson.as | 60 --------------------
.../mdl/materialIcons/MaterialIconSearch.as | 60 --------------------
.../flex/mdl/materialIcons/MaterialIconShare.as | 60 --------------------
.../flex/mdl/materialIcons/MaterialIconStar.as | 60 --------------------
.../flex/mdl/materialIcons/MaterialIconType.as | 44 +++++++-------
.../src/main/resources/mdl-manifest.xml | 34 +++--------
28 files changed, 152 insertions(+), 877 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ed8f5b74/examples/flexjs/MDLExample/src/main/flex/Badges.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/Badges.mxml b/examples/flexjs/MDLExample/src/main/flex/Badges.mxml
index cfda152..11ee536 100644
--- a/examples/flexjs/MDLExample/src/main/flex/Badges.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/Badges.mxml
@@ -22,8 +22,18 @@ limitations under the License.
xmlns:mdl="library://ns.apache.org/flexjs/mdl"
xmlns="http://www.w3.org/1999/xhtml">
+ <fx:Script>
+ <![CDATA[
+ import org.apache.flex.mdl.materialIcons.MaterialIconType;
+ ]]>
+ </fx:Script>
+
+ <mdl:beads>
+ <js:ContainerDataBinding/>
+ </mdl:beads>
+
<mdl:Grid width="50" style="margin:20px">
- <js:Div text="account_box" style="color: rgba(0, 0, 0, 0.24);" className="material-icons">
+ <js:Div style="color: rgba(0, 0, 0, 0.24);" className="material-icons" text="{MaterialIconType.ACCOUNT_BOX}">
<js:beads>
<mdl:Badge dataBadge="2" overlap="true"/>
</js:beads>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ed8f5b74/examples/flexjs/MDLExample/src/main/flex/Buttons.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/Buttons.mxml b/examples/flexjs/MDLExample/src/main/flex/Buttons.mxml
index e90182c..1f99688 100644
--- a/examples/flexjs/MDLExample/src/main/flex/Buttons.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/Buttons.mxml
@@ -18,9 +18,20 @@ limitations under the License.
-->
<mdl:TabBarPanel xmlns:fx="http://ns.adobe.com/mxml/2009"
+ xmlns:js="library://ns.apache.org/flexjs/basic"
xmlns:mdl="library://ns.apache.org/flexjs/mdl"
xmlns="http://www.w3.org/1999/xhtml">
+ <fx:Script>
+ <![CDATA[
+ import org.apache.flex.mdl.materialIcons.MaterialIconType;
+ ]]>
+ </fx:Script>
+
+ <mdl:beads>
+ <js:ContainerDataBinding/>
+ </mdl:beads>
+
<!-- Buttons https://getmdl.io/components/index.html#buttons-section -->
<mdl:Grid width="100">
@@ -32,20 +43,20 @@ limitations under the License.
<mdl:Tooltip text="A simple tooltip"/>
</mdl:beads>
<mdl:materialIcon>
- <mdl:MaterialIconAdd/>
+ <mdl:MaterialIcon text="{MaterialIconType.ADD}"/>
</mdl:materialIcon>
</mdl:Button>
<mdl:Button fab="true" colored="true">
<mdl:materialIcon>
- <mdl:MaterialIconKeyboardArrowDown/>
+ <mdl:MaterialIcon text="{MaterialIconType.KEYBOARD_ARROW_DOWN}"/>
</mdl:materialIcon>
</mdl:Button>
<!-- Fab with Ripple -->
<mdl:Button fab="true" ripple="true">
<mdl:materialIcon>
- <mdl:MaterialIconFace/>
+ <mdl:MaterialIcon text="{MaterialIconType.FACE}"/>
</mdl:materialIcon>
</mdl:Button>
@@ -84,28 +95,28 @@ limitations under the License.
<!-- Icon button -->
<mdl:Button icon="true">
<mdl:materialIcon>
- <mdl:MaterialIconMood/>
+ <mdl:MaterialIcon text="{MaterialIconType.MOOD}"/>
</mdl:materialIcon>
</mdl:Button>
<!-- Colored icon button -->
<mdl:Button icon="true" colored="true">
<mdl:materialIcon>
- <mdl:MaterialIconMood/>
+ <mdl:MaterialIcon text="{MaterialIconType.MOOD}"/>
</mdl:materialIcon>
</mdl:Button>
<!-- Mini FAB button -->
<mdl:Button fab="true" minifab="true">
<mdl:materialIcon>
- <mdl:MaterialIconAdd/>
+ <mdl:MaterialIcon text="{MaterialIconType.ADD}"/>
</mdl:materialIcon>
</mdl:Button>
<!-- Colored mini FAB button -->
<mdl:Button fab="true" minifab="true" colored="true">
<mdl:materialIcon>
- <mdl:MaterialIconAdd/>
+ <mdl:MaterialIcon text="{MaterialIconType.ADD}"/>
</mdl:materialIcon>
</mdl:Button>
</mdl:Grid>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ed8f5b74/examples/flexjs/MDLExample/src/main/flex/Cards.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/Cards.mxml b/examples/flexjs/MDLExample/src/main/flex/Cards.mxml
index 3d1f82e..151ed99 100644
--- a/examples/flexjs/MDLExample/src/main/flex/Cards.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/Cards.mxml
@@ -21,7 +21,17 @@ limitations under the License.
xmlns:js="library://ns.apache.org/flexjs/basic"
xmlns:mdl="library://ns.apache.org/flexjs/mdl"
xmlns="http://www.w3.org/1999/xhtml">
-
+
+ <fx:Script>
+ <![CDATA[
+ import org.apache.flex.mdl.materialIcons.MaterialIconType;
+ ]]>
+ </fx:Script>
+
+ <mdl:beads>
+ <js:ContainerDataBinding/>
+ </mdl:beads>
+
<mdl:Grid className="center-items">
<mdl:Card id="mycard" shadow="2" className="demo-card-wide">
@@ -41,7 +51,7 @@ limitations under the License.
<mdl:CardMenu>
<mdl:Button icon="true" ripple="true">
<mdl:materialIcon>
- <mdl:MaterialIconShare/>
+ <mdl:MaterialIcon text="{MaterialIconType.SHARE}"/>
</mdl:materialIcon>
</mdl:Button>
</mdl:CardMenu>
@@ -79,7 +89,7 @@ limitations under the License.
<mdl:CardActions border="true">
<mdl:Button colored="true" ripple="true" text="Add to Calendar"/>
<mdl:Spacer/>
- <mdl:MaterialIconEvent/>
+ <mdl:MaterialIcon text="{MaterialIconType.EVENT}"/>
</mdl:CardActions>
</mdl:Card>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ed8f5b74/examples/flexjs/MDLExample/src/main/flex/Chips.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/Chips.mxml b/examples/flexjs/MDLExample/src/main/flex/Chips.mxml
index 19f6b11..287a235 100644
--- a/examples/flexjs/MDLExample/src/main/flex/Chips.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/Chips.mxml
@@ -18,7 +18,19 @@ limitations under the License.
-->
<mdl:TabBarPanel xmlns:fx="http://ns.adobe.com/mxml/2009"
+ xmlns:js="library://ns.apache.org/flexjs/basic"
xmlns:mdl="library://ns.apache.org/flexjs/mdl">
+
+ <fx:Script>
+ <![CDATA[
+ import org.apache.flex.mdl.materialIcons.MaterialIconType;
+ ]]>
+ </fx:Script>
+
+ <mdl:beads>
+ <js:ContainerDataBinding/>
+ </mdl:beads>
+
<mdl:Grid width="120">
<mdl:Chip text="Basic Chip" />
@@ -30,7 +42,7 @@ limitations under the License.
<mdl:DeletableChip />
</mdl:beads>
<mdl:materialIcon>
- <mdl:MaterialIconCancel />
+ <mdl:MaterialIcon text="{MaterialIconType.CANCEL}"/>
</mdl:materialIcon>
</mdl:Chip>
@@ -39,7 +51,7 @@ limitations under the License.
<mdl:DeletableChip />
</mdl:beads>
<mdl:materialIcon>
- <mdl:MaterialIconCancel />
+ <mdl:MaterialIcon text="{MaterialIconType.CANCEL}"/>
</mdl:materialIcon>
</mdl:ButtonChip>
@@ -59,7 +71,7 @@ limitations under the License.
<mdl:DeletableChip />
</mdl:beads>
<mdl:materialIcon>
- <mdl:MaterialIconCancel />
+ <mdl:MaterialIcon text="{MaterialIconType.CANCEL}"/>
</mdl:materialIcon>
</mdl:Chip>
@@ -69,7 +81,7 @@ limitations under the License.
<mdl:DeletableLinkChip href="http://flex.apache.org/"/>
</mdl:beads>
<mdl:materialIcon>
- <mdl:MaterialIconCancel />
+ <mdl:MaterialIcon text="{MaterialIconType.CANCEL}"/>
</mdl:materialIcon>
</mdl:Chip>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ed8f5b74/examples/flexjs/MDLExample/src/main/flex/Icons.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/Icons.mxml b/examples/flexjs/MDLExample/src/main/flex/Icons.mxml
index 9d1aa72..bc67529 100644
--- a/examples/flexjs/MDLExample/src/main/flex/Icons.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/Icons.mxml
@@ -32,33 +32,33 @@ limitations under the License.
</mdl:beads>
<mdl:Grid>
- <mdl:MaterialIconAdd size="18"/>
- <mdl:MaterialIconAdd size="24"/>
- <mdl:MaterialIconAdd size="36"/>
- <mdl:MaterialIconAdd size="48"/>
- <mdl:MaterialIconAdd dark="true"/>
- <mdl:MaterialIconAdd inactive="true"/>
- <mdl:MaterialIconAdd>
+ <mdl:MaterialIcon text="{MaterialIconType.ADD}" size="18"/>
+ <mdl:MaterialIcon text="{MaterialIconType.ADD}" size="24"/>
+ <mdl:MaterialIcon text="{MaterialIconType.ADD}" size="36"/>
+ <mdl:MaterialIcon text="{MaterialIconType.ADD}" size="48"/>
+ <mdl:MaterialIcon text="{MaterialIconType.ADD}" dark="true"/>
+ <mdl:MaterialIcon text="{MaterialIconType.ADD}" inactive="true"/>
+ <mdl:MaterialIcon text="{MaterialIconType.ADD}">
<mdl:beads>
<mdl:MdlTextColor textColor="teal" />
</mdl:beads>
- </mdl:MaterialIconAdd>
- <mdl:MaterialIconAdd className="orange600"/>
- <mdl:MaterialIcon text="book"/>
+ </mdl:MaterialIcon>
+ <mdl:MaterialIcon text="{MaterialIconType.ADD}" className="orange600"/>
+ <mdl:MaterialIcon text="{MaterialIconType.BOOK}"/>
<mdl:MaterialIcon text="{MaterialIconType.FACE}"/>
</mdl:Grid>
<mdl:Grid style="backgroundColor:'#000';">
- <mdl:MaterialIconAdd light="true"/>
- <mdl:MaterialIcon text="accessibility" size="48" light="true"/>
- <mdl:MaterialIconAdd inactive="true" light="true"/>
- <mdl:MaterialIconAdd>
+ <mdl:MaterialIcon text="{MaterialIconType.ADD}" light="true"/>
+ <mdl:MaterialIcon text="{MaterialIconType.ACCESSIBILITY}" size="48" light="true"/>
+ <mdl:MaterialIcon text="{MaterialIconType.ADD}" inactive="true" light="true"/>
+ <mdl:MaterialIcon text="{MaterialIconType.ADD}">
<mdl:beads>
<mdl:MdlTextColor textColor="teal" />
</mdl:beads>
- </mdl:MaterialIconAdd>
- <mdl:MaterialIconAdd className="orange600"/>
- <mdl:MaterialIcon text="book" light="true"/>
+ </mdl:MaterialIcon>
+ <mdl:MaterialIcon text="{MaterialIconType.ADD}" className="orange600"/>
+ <mdl:MaterialIcon text="{MaterialIconType.BOOK}" light="true"/>
</mdl:Grid>
</mdl:TabBarPanel>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ed8f5b74/examples/flexjs/MDLExample/src/main/flex/Menus.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/Menus.mxml b/examples/flexjs/MDLExample/src/main/flex/Menus.mxml
index 50e9735..6f65315 100644
--- a/examples/flexjs/MDLExample/src/main/flex/Menus.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/Menus.mxml
@@ -18,9 +18,20 @@ limitations under the License.
-->
<mdl:TabBarPanel xmlns:fx="http://ns.adobe.com/mxml/2009"
- xmlns:mdl="library://ns.apache.org/flexjs/mdl"
xmlns:js="library://ns.apache.org/flexjs/basic"
+ xmlns:mdl="library://ns.apache.org/flexjs/mdl"
xmlns:models="models.*">
+
+ <fx:Script>
+ <![CDATA[
+ import org.apache.flex.mdl.materialIcons.MaterialIconType;
+ ]]>
+ </fx:Script>
+
+ <mdl:beads>
+ <js:ContainerDataBinding/>
+ </mdl:beads>
+
<mdl:model>
<models:MenuModel id="menuModel"/>
</mdl:model>
@@ -28,7 +39,7 @@ limitations under the License.
<mdl:Grid width="100">
<mdl:Button id="menu_btn" icon="true">
<mdl:materialIcon>
- <mdl:MaterialIconMoreVert/>
+ <mdl:MaterialIcon text="{MaterialIconType.MORE_VERT}"/>
</mdl:materialIcon>
</mdl:Button>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ed8f5b74/examples/flexjs/MDLExample/src/main/flex/Toggles.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/Toggles.mxml b/examples/flexjs/MDLExample/src/main/flex/Toggles.mxml
index 9ecc469..b723abf 100644
--- a/examples/flexjs/MDLExample/src/main/flex/Toggles.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/Toggles.mxml
@@ -18,9 +18,20 @@ limitations under the License.
-->
<mdl:TabBarPanel xmlns:fx="http://ns.adobe.com/mxml/2009"
+ xmlns:js="library://ns.apache.org/flexjs/basic"
xmlns:mdl="library://ns.apache.org/flexjs/mdl"
xmlns="http://www.w3.org/1999/xhtml">
+ <fx:Script>
+ <![CDATA[
+ import org.apache.flex.mdl.materialIcons.MaterialIconType;
+ ]]>
+ </fx:Script>
+
+ <mdl:beads>
+ <js:ContainerDataBinding/>
+ </mdl:beads>
+
<mdl:Grid>
<!-- Toggles :: https://getmdl.io/components/index.html#toggles-section -->
@@ -35,13 +46,13 @@ limitations under the License.
<mdl:IconToggle dataMdlFor="mdlBoldIcon">
<mdl:materialIcon>
- <mdl:MaterialIconFormatBold />
+ <mdl:MaterialIcon text="{MaterialIconType.FORMAT_BOLD}"/>
</mdl:materialIcon>
</mdl:IconToggle>
<mdl:IconToggle dataMdlFor="mdlItalicIcon">
<mdl:materialIcon>
- <mdl:MaterialIconFormatItalic />
+ <mdl:MaterialIcon text="{MaterialIconType.FORMAT_ITALIC}"/>
</mdl:materialIcon>
</mdl:IconToggle>
</mdl:Grid>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ed8f5b74/examples/flexjs/MDLExample/src/main/flex/itemRenderers/ActorNameAndIconListItemRenderer.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/ActorNameAndIconListItemRenderer.mxml b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/ActorNameAndIconListItemRenderer.mxml
index 5d93ae0..d3d4c05 100644
--- a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/ActorNameAndIconListItemRenderer.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/ActorNameAndIconListItemRenderer.mxml
@@ -24,6 +24,7 @@ limitations under the License.
<fx:Script>
<![CDATA[
+ import org.apache.flex.mdl.materialIcons.MaterialIconType;
import vos.ActorVO;
[Bindable("dataChange")]
@@ -42,7 +43,7 @@ limitations under the License.
<js:beads>
<mdl:ListItemPrimaryContent/>
</js:beads>
- <mdl:MaterialIconPerson listItemIcon="true"/>
+ <mdl:MaterialIcon text="{MaterialIconType.PERSON}" listItemIcon="true"/>
</js:Span>
</mdl:ListItemRenderer>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ed8f5b74/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionListItemRenderer.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionListItemRenderer.mxml b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionListItemRenderer.mxml
index 8f39bad..08e45f5 100644
--- a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionListItemRenderer.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionListItemRenderer.mxml
@@ -24,6 +24,7 @@ limitations under the License.
<fx:Script>
<![CDATA[
+ import org.apache.flex.mdl.materialIcons.MaterialIconType;
import vos.ActorVO;
[Bindable("dataChange")]
@@ -42,13 +43,13 @@ limitations under the License.
<js:beads>
<mdl:ListItemPrimaryContent/>
</js:beads>
- <mdl:MaterialIconPerson listItemAvatar="true"/>
+ <mdl:MaterialIcon text="{MaterialIconType.PERSON}" listItemAvatar="true"/>
</js:Span>
<js:A href="#">
<js:beads>
<mdl:ListItemSecondaryAction/>
</js:beads>
- <mdl:MaterialIconStar/>
+ <mdl:MaterialIcon text="{MaterialIconType.STAR}"/>
</js:A>
</mdl:ListItemRenderer>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ed8f5b74/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionThreeLineListItemRenderer.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionThreeLineListItemRenderer.mxml b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionThreeLineListItemRenderer.mxml
index 0c82b89..9bece4f 100644
--- a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionThreeLineListItemRenderer.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionThreeLineListItemRenderer.mxml
@@ -25,6 +25,7 @@ limitations under the License.
<fx:Script>
<![CDATA[
+ import org.apache.flex.mdl.materialIcons.MaterialIconType;
import vos.ActorVO;
[Bindable("dataChange")]
@@ -43,7 +44,7 @@ limitations under the License.
<js:beads>
<mdl:ListItemPrimaryContent/>
</js:beads>
- <mdl:MaterialIconPerson listItemAvatar="true"/>
+ <mdl:MaterialIcon text="{MaterialIconType.PERSON}" listItemAvatar="true"/>
<js:Span text="{actor.actorName}"/>
<js:Span text="{actor.description}">
<js:beads>
@@ -60,7 +61,7 @@ limitations under the License.
<js:beads>
<mdl:ListItemSecondaryAction/>
</js:beads>
- <mdl:MaterialIconStar/>
+ <mdl:MaterialIcon text="{MaterialIconType.STAR}"/>
</js:A>
</js:Span>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ed8f5b74/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionTwoLineListItemRenderer.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionTwoLineListItemRenderer.mxml b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionTwoLineListItemRenderer.mxml
index 40b54f5..409f9ac 100644
--- a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionTwoLineListItemRenderer.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionTwoLineListItemRenderer.mxml
@@ -25,6 +25,7 @@ limitations under the License.
<fx:Script>
<![CDATA[
+ import org.apache.flex.mdl.materialIcons.MaterialIconType;
import vos.ActorVO;
[Bindable("dataChange")]
@@ -49,7 +50,7 @@ limitations under the License.
<js:Span>
<js:beads>
<mdl:ListItemPrimaryContent/>
- <mdl:MaterialIconPerson listItemAvatar="true"/>
+ <mdl:MaterialIcon text="{MaterialIconType.PERSON}" listItemAvatar="true"/>
</js:beads>
<js:Span text="{actor.actorName}"/>
<js:Span text="{actor.episodes}">
@@ -72,7 +73,7 @@ limitations under the License.
<js:beads>
<mdl:ListItemSecondaryAction/>
</js:beads>
- <mdl:MaterialIconStar/>
+ <mdl:MaterialIcon text="{MaterialIconType.STAR}"/>
</js:A>
</js:Span>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ed8f5b74/examples/flexjs/MDLExample/src/main/flex/itemRenderers/TableRowItemRendererWithIcons.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/TableRowItemRendererWithIcons.mxml b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/TableRowItemRendererWithIcons.mxml
index b70f412..50eb298 100644
--- a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/TableRowItemRendererWithIcons.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/TableRowItemRendererWithIcons.mxml
@@ -24,6 +24,7 @@ limitations under the License.
<fx:Script>
<![CDATA[
+ import org.apache.flex.mdl.materialIcons.MaterialIconType;
import vos.MaterialVO;
[Bindable("dataChange")]
@@ -44,7 +45,7 @@ limitations under the License.
<mdl:TableCell>
<mdl:Button icon="true" colored="true">
<mdl:materialIcon>
- <mdl:MaterialIconMood/>
+ <mdl:MaterialIcon text="{MaterialIconType.MOOD}"/>
</mdl:materialIcon>
</mdl:Button>
</mdl:TableCell>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ed8f5b74/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ExpandableSearch.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ExpandableSearch.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ExpandableSearch.as
index ed3293c..3b9ef2e 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ExpandableSearch.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ExpandableSearch.as
@@ -23,7 +23,8 @@ package org.apache.flex.mdl.beads
import org.apache.flex.core.UIBase;
import org.apache.flex.mdl.TextField;
- import org.apache.flex.mdl.materialIcons.MaterialIconSearch;
+ import org.apache.flex.mdl.materialIcons.MaterialIconType;
+ import org.apache.flex.mdl.materialIcons.MaterialIcon;
/**
* The ExpandableSearch bead class is a specialty bead that can be used to decorate a TextField MDL control.
@@ -81,12 +82,10 @@ package org.apache.flex.mdl.beads
label.className = "mdl-button mdl-js-button mdl-button--icon";
label.setAttribute('for', searchId);
- var i:HTMLElement = document.createElement('i') as HTMLElement;
- i.className = "material-icons";
- i.innerHTML = "search";
-
- label.appendChild(i);
-
+ var searchIcon:MaterialIcon = new MaterialIcon();
+ searchIcon.text = MaterialIconType.SEARCH;
+ label.appendChild(searchIcon.element);
+
host.positioner.appendChild(label);
var div:HTMLDivElement = document.createElement('div') as HTMLDivElement;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ed8f5b74/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconAdd.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconAdd.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconAdd.as
deleted file mode 100644
index 8164195..0000000
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconAdd.as
+++ /dev/null
@@ -1,60 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Licensed to the Apache Software Foundation (ASF) under one or more
-// contributor license agreements. See the NOTICE file distributed with
-// this work for additional information regarding copyright ownership.
-// The ASF licenses this file to You under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.mdl.materialIcons
-{
- import org.apache.flex.mdl.supportClasses.MaterialIconBase;
-
- /**
- * The MaterialIconAdd class is a the MDL "add" icon
- * from "material-icons" from https://material.io/icons/
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
- */
- public class MaterialIconAdd extends MaterialIconBase
- {
- /**
- * constructor.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
- */
- public function MaterialIconAdd()
- {
- super();
- }
-
- /**
- * The icon text
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
- */
- override protected function get iconText():String
- {
- return MaterialIconType.ADD;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ed8f5b74/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconCancel.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconCancel.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconCancel.as
deleted file mode 100644
index 4e13acc..0000000
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconCancel.as
+++ /dev/null
@@ -1,60 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Licensed to the Apache Software Foundation (ASF) under one or more
-// contributor license agreements. See the NOTICE file distributed with
-// this work for additional information regarding copyright ownership.
-// The ASF licenses this file to You under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.mdl.materialIcons
-{
- import org.apache.flex.mdl.supportClasses.MaterialIconBase;
-
- /**
- * The MaterialIconAdd class is a the MDL "cancel" icon
- * from "material-icons" from https://material.io/icons/
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
- */
- public class MaterialIconCancel extends MaterialIconBase
- {
- /**
- * constructor.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
- */
- public function MaterialIconCancel()
- {
- super();
- }
-
- /**
- * The icon text
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
- */
- override protected function get iconText():String
- {
- return MaterialIconType.CANCEL;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ed8f5b74/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconEvent.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconEvent.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconEvent.as
deleted file mode 100644
index c00f79a..0000000
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconEvent.as
+++ /dev/null
@@ -1,60 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Licensed to the Apache Software Foundation (ASF) under one or more
-// contributor license agreements. See the NOTICE file distributed with
-// this work for additional information regarding copyright ownership.
-// The ASF licenses this file to You under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.mdl.materialIcons
-{
- import org.apache.flex.mdl.supportClasses.MaterialIconBase;
-
- /**
- * The MaterialIconAdd class is a the MDL "event" icon
- * from "material-icons" from https://material.io/icons/
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
- */
- public class MaterialIconEvent extends MaterialIconBase
- {
- /**
- * constructor.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
- */
- public function MaterialIconEvent()
- {
- super();
- }
-
- /**
- * The icon text
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
- */
- override protected function get iconText():String
- {
- return MaterialIconType.EVENT;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ed8f5b74/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconFace.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconFace.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconFace.as
deleted file mode 100644
index 2f496a3..0000000
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconFace.as
+++ /dev/null
@@ -1,60 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Licensed to the Apache Software Foundation (ASF) under one or more
-// contributor license agreements. See the NOTICE file distributed with
-// this work for additional information regarding copyright ownership.
-// The ASF licenses this file to You under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.mdl.materialIcons
-{
- import org.apache.flex.mdl.supportClasses.MaterialIconBase;
-
- /**
- * The MaterialIconAdd class is a the MDL "face" icon
- * from "material-icons" from https://material.io/icons/
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
- */
- public class MaterialIconFace extends MaterialIconBase
- {
- /**
- * constructor.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
- */
- public function MaterialIconFace()
- {
- super();
- }
-
- /**
- * The icon text
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
- */
- override protected function get iconText():String
- {
- return MaterialIconType.FACE;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ed8f5b74/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconFormatBold.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconFormatBold.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconFormatBold.as
deleted file mode 100644
index 30abf13..0000000
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconFormatBold.as
+++ /dev/null
@@ -1,60 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Licensed to the Apache Software Foundation (ASF) under one or more
-// contributor license agreements. See the NOTICE file distributed with
-// this work for additional information regarding copyright ownership.
-// The ASF licenses this file to You under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.mdl.materialIcons
-{
- import org.apache.flex.mdl.supportClasses.MaterialIconBase;
-
- /**
- * The MaterialIconAdd class is a the MDL "format_bold" icon
- * from "material-icons" from https://material.io/icons/
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
- */
- public class MaterialIconFormatBold extends MaterialIconBase
- {
- /**
- * constructor.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
- */
- public function MaterialIconFormatBold()
- {
- super();
- }
-
- /**
- * The icon text
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
- */
- override protected function get iconText():String
- {
- return MaterialIconType.FORMAT_BOLD;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ed8f5b74/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconFormatItalic.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconFormatItalic.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconFormatItalic.as
deleted file mode 100644
index aa93dff..0000000
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconFormatItalic.as
+++ /dev/null
@@ -1,60 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Licensed to the Apache Software Foundation (ASF) under one or more
-// contributor license agreements. See the NOTICE file distributed with
-// this work for additional information regarding copyright ownership.
-// The ASF licenses this file to You under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.mdl.materialIcons
-{
- import org.apache.flex.mdl.supportClasses.MaterialIconBase;
-
- /**
- * The MaterialIconAdd class is a the MDL "format_italic" icon
- * from "material-icons" from https://material.io/icons/
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
- */
- public class MaterialIconFormatItalic extends MaterialIconBase
- {
- /**
- * constructor.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
- */
- public function MaterialIconFormatItalic()
- {
- super();
- }
-
- /**
- * The icon text
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
- */
- override protected function get iconText():String
- {
- return MaterialIconType.FORMAT_ITALIC;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ed8f5b74/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconKeyboardArrowDown.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconKeyboardArrowDown.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconKeyboardArrowDown.as
deleted file mode 100644
index f619e5f..0000000
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconKeyboardArrowDown.as
+++ /dev/null
@@ -1,60 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Licensed to the Apache Software Foundation (ASF) under one or more
-// contributor license agreements. See the NOTICE file distributed with
-// this work for additional information regarding copyright ownership.
-// The ASF licenses this file to You under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.mdl.materialIcons
-{
- import org.apache.flex.mdl.supportClasses.MaterialIconBase;
-
- /**
- * The MaterialIconAdd class is a the MDL "keyboard_arrow_down" icon
- * from "material-icons" from https://material.io/icons/
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
- */
- public class MaterialIconKeyboardArrowDown extends MaterialIconBase
- {
- /**
- * constructor.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
- */
- public function MaterialIconKeyboardArrowDown()
- {
- super();
- }
-
- /**
- * The icon text
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
- */
- override protected function get iconText():String
- {
- return MaterialIconType.KEYBOARD_ARROW_DOWN;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ed8f5b74/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconMood.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconMood.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconMood.as
deleted file mode 100644
index 1a96a54..0000000
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconMood.as
+++ /dev/null
@@ -1,60 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Licensed to the Apache Software Foundation (ASF) under one or more
-// contributor license agreements. See the NOTICE file distributed with
-// this work for additional information regarding copyright ownership.
-// The ASF licenses this file to You under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.mdl.materialIcons
-{
- import org.apache.flex.mdl.supportClasses.MaterialIconBase;
-
- /**
- * The MaterialIconAdd class is a the MDL "mood" icon
- * from "material-icons" from https://material.io/icons/
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
- */
- public class MaterialIconMood extends MaterialIconBase
- {
- /**
- * constructor.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
- */
- public function MaterialIconMood()
- {
- super();
- }
-
- /**
- * The icon text
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
- */
- override protected function get iconText():String
- {
- return MaterialIconType.MOOD;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ed8f5b74/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconMoreVert.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconMoreVert.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconMoreVert.as
deleted file mode 100644
index 5155651..0000000
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconMoreVert.as
+++ /dev/null
@@ -1,60 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Licensed to the Apache Software Foundation (ASF) under one or more
-// contributor license agreements. See the NOTICE file distributed with
-// this work for additional information regarding copyright ownership.
-// The ASF licenses this file to You under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.mdl.materialIcons
-{
- import org.apache.flex.mdl.supportClasses.MaterialIconBase;
-
- /**
- * The MaterialIconAdd class is a the MDL "move_vert" icon
- * from "material-icons" from https://material.io/icons/
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
- */
- public class MaterialIconMoreVert extends MaterialIconBase
- {
- /**
- * constructor.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
- */
- public function MaterialIconMoreVert()
- {
- super();
- }
-
- /**
- * The icon text
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
- */
- override protected function get iconText():String
- {
- return MaterialIconType.MORE_VERT;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ed8f5b74/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconPerson.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconPerson.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconPerson.as
deleted file mode 100644
index 8533930..0000000
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconPerson.as
+++ /dev/null
@@ -1,60 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Licensed to the Apache Software Foundation (ASF) under one or more
-// contributor license agreements. See the NOTICE file distributed with
-// this work for additional information regarding copyright ownership.
-// The ASF licenses this file to You under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.mdl.materialIcons
-{
- import org.apache.flex.mdl.supportClasses.MaterialIconBase;
-
- /**
- * The MaterialIconAdd class is a the MDL "person" icon
- * from "material-icons" from https://material.io/icons/
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
- */
- public class MaterialIconPerson extends MaterialIconBase
- {
- /**
- * constructor.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
- */
- public function MaterialIconPerson()
- {
- super();
- }
-
- /**
- * The icon text
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
- */
- override protected function get iconText():String
- {
- return MaterialIconType.PERSON;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ed8f5b74/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconSearch.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconSearch.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconSearch.as
deleted file mode 100644
index e92761b..0000000
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconSearch.as
+++ /dev/null
@@ -1,60 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Licensed to the Apache Software Foundation (ASF) under one or more
-// contributor license agreements. See the NOTICE file distributed with
-// this work for additional information regarding copyright ownership.
-// The ASF licenses this file to You under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.mdl.materialIcons
-{
- import org.apache.flex.mdl.supportClasses.MaterialIconBase;
-
- /**
- * The MaterialIconAdd class is a the MDL "search" icon
- * from "material-icons" from https://material.io/icons/
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
- */
- public class MaterialIconSearch extends MaterialIconBase
- {
- /**
- * constructor.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
- */
- public function MaterialIconSearch()
- {
- super();
- }
-
- /**
- * The icon text
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
- */
- override protected function get iconText():String
- {
- return MaterialIconType.SEARCH;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ed8f5b74/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconShare.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconShare.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconShare.as
deleted file mode 100644
index c44c939..0000000
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconShare.as
+++ /dev/null
@@ -1,60 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Licensed to the Apache Software Foundation (ASF) under one or more
-// contributor license agreements. See the NOTICE file distributed with
-// this work for additional information regarding copyright ownership.
-// The ASF licenses this file to You under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.mdl.materialIcons
-{
- import org.apache.flex.mdl.supportClasses.MaterialIconBase;
-
- /**
- * The MaterialIconAdd class is a the MDL "add" icon
- * from "material-icons" from https://material.io/icons/
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
- */
- public class MaterialIconShare extends MaterialIconBase
- {
- /**
- * constructor.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
- */
- public function MaterialIconShare()
- {
- super();
- }
-
- /**
- * The icon text
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
- */
- override protected function get iconText():String
- {
- return MaterialIconType.SHARE;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ed8f5b74/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconStar.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconStar.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconStar.as
deleted file mode 100644
index b0ed941..0000000
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconStar.as
+++ /dev/null
@@ -1,60 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Licensed to the Apache Software Foundation (ASF) under one or more
-// contributor license agreements. See the NOTICE file distributed with
-// this work for additional information regarding copyright ownership.
-// The ASF licenses this file to You under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.mdl.materialIcons
-{
- import org.apache.flex.mdl.supportClasses.MaterialIconBase;
-
- /**
- * The MaterialIconAdd class is a the MDL "star" icon
- * from "material-icons" from https://material.io/icons/
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
- */
- public class MaterialIconStar extends MaterialIconBase
- {
- /**
- * constructor.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
- */
- public function MaterialIconStar()
- {
- super();
- }
-
- /**
- * The icon text
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.8
- */
- override protected function get iconText():String
- {
- return MaterialIconType.STAR;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ed8f5b74/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconType.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconType.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconType.as
index 331063e..f92f635 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconType.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconType.as
@@ -31,7 +31,7 @@ package org.apache.flex.mdl.materialIcons
public class MaterialIconType
{
public static const _3D_ROTATION:String = '3d_rotation';
- public static const ACCESIBILITY:String = 'accessibility';
+ public static const ACCESSIBILITY:String = 'accessibility';
public static const ACCESSIBLE:String = 'accessible';
public static const ACCOUNT_BALANCE:String = 'account_balance';
public static const ACCOUNT_BALANCE_WALLET:String = 'account_balance_wallet';
@@ -63,6 +63,28 @@ package org.apache.flex.mdl.materialIcons
public static const BUG_REPORT:String = 'bug_report';
public static const BUILD:String = 'build';
+ public static const CACHED:String = 'cached';
+ public static const CAMERA_ENHANCE:String = 'camera_enhance';
+ public static const CARD_GIFTCARD:String = 'card_giftcard';
+ public static const CARD_MEMBERSHIP:String = 'card_membership';
+ public static const CARD_TRAVEL:String = 'card_travel';
+ public static const CHANGE_HISTORY:String = 'change_history';
+ public static const CHECK_CIRCLE:String = 'check_circle';
+ public static const CHORME_READER_MODE:String = 'chrome_reader_mode';
+ public static const CLASS:String = 'class';
+ public static const CODE:String = 'code';
+
+ public static const COMPARE_ARROWS:String = 'compare_arrows';
+ public static const COPYRIGHT:String = 'copyright';
+ public static const CREDIT_CARD:String = 'credit_card';
+ public static const DASHBOARD:String = 'dashboard';
+ public static const DATE_RANGE:String = 'date_range';
+ public static const DELETE:String = 'delete';
+ public static const DELETE_FOREVER:String = 'delete_forever';
+ public static const DESCRIPTION:String = 'description';
+ public static const DNS:String = 'dns';
+ public static const DONE:String = 'done';
+
/*
public static const ACCESSIBLE:String = 'XXX';
public static const ACCESSIBLE:String = 'XXX';
@@ -75,26 +97,6 @@ package org.apache.flex.mdl.materialIcons
public static const ACCESSIBLE:String = 'XXX';
public static const ACCESSIBLE:String = 'XXX';
- 'cached',
- 'camera_enhance',
- 'card_giftcard',
- 'card_membership',
- 'card_travel',
- 'change_history',
- 'check_circle',
- 'chrome_reader_mode',
- 'class',
- 'code',
- 'compare_arrows',
- 'copyright',
- 'credit_card',
- 'dashboard',
- 'date_range',
- 'delete',
- 'delete_forever',
- 'description',
- 'dns',
- 'done',
'done_all',
'donut_large',
'donut_small',
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ed8f5b74/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml b/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
index b81f4f9..4ad46b0 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
+++ b/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
@@ -91,17 +91,6 @@
<component id="ProgressBar" class="org.apache.flex.mdl.ProgressBar"/>
<component id="Toast" class="org.apache.flex.mdl.Toast"/>
<component id="Snackbar" class="org.apache.flex.mdl.Snackbar"/>
- <component id="Footer" class="org.apache.flex.mdl.Footer"/>
- <component id="FooterLeftSection" class="org.apache.flex.mdl.FooterLeftSection"/>
- <component id="FooterRightSection" class="org.apache.flex.mdl.FooterRightSection"/>
- <component id="FooterTopSection" class="org.apache.flex.mdl.FooterTopSection"/>
- <component id="FooterBottomSection" class="org.apache.flex.mdl.FooterBottomSection"/>
- <component id="FooterLogo" class="org.apache.flex.mdl.FooterLogo"/>
- <component id="FooterLinkList" class="org.apache.flex.mdl.FooterLinkList"/>
- <component id="FooterLinkItemRenderer" class="org.apache.flex.mdl.itemRenderers.FooterLinkItemRenderer"/>
- <component id="FooterSocialButton" class="org.apache.flex.mdl.FooterSocialButton"/>
-
-
<component id="TabBarView" class="org.apache.flex.mdl.beads.views.TabBarView"/>
<component id="TabBar" class="org.apache.flex.mdl.TabBar"/>
<component id="TabBarButtonTabsItemRenderer" class="org.apache.flex.mdl.itemRenderers.TabBarButtonTabsItemRenderer"/>
@@ -112,20 +101,15 @@
<component id="TabBarPanel" class="org.apache.flex.mdl.TabBarPanel"/>
<component id="TabsView" class="org.apache.flex.mdl.beads.views.TabsView"/>
<component id="Tabs" class="org.apache.flex.mdl.Tabs"/>
-
<component id="MaterialIcon" class="org.apache.flex.mdl.materialIcons.MaterialIcon"/>
+ <component id="Footer" class="org.apache.flex.mdl.Footer"/>
+ <component id="FooterLeftSection" class="org.apache.flex.mdl.FooterLeftSection"/>
+ <component id="FooterRightSection" class="org.apache.flex.mdl.FooterRightSection"/>
+ <component id="FooterTopSection" class="org.apache.flex.mdl.FooterTopSection"/>
+ <component id="FooterBottomSection" class="org.apache.flex.mdl.FooterBottomSection"/>
+ <component id="FooterLogo" class="org.apache.flex.mdl.FooterLogo"/>
+ <component id="FooterLinkList" class="org.apache.flex.mdl.FooterLinkList"/>
+ <component id="FooterLinkItemRenderer" class="org.apache.flex.mdl.itemRenderers.FooterLinkItemRenderer"/>
+ <component id="FooterSocialButton" class="org.apache.flex.mdl.FooterSocialButton"/>
- <component id="MaterialIconCancel" class="org.apache.flex.mdl.materialIcons.MaterialIconCancel"/>
- <component id="MaterialIconAdd" class="org.apache.flex.mdl.materialIcons.MaterialIconAdd"/>
- <component id="MaterialIconPerson" class="org.apache.flex.mdl.materialIcons.MaterialIconPerson"/>
- <component id="MaterialIconStar" class="org.apache.flex.mdl.materialIcons.MaterialIconStar"/>
- <component id="MaterialIconShare" class="org.apache.flex.mdl.materialIcons.MaterialIconShare"/>
- <component id="MaterialIconEvent" class="org.apache.flex.mdl.materialIcons.MaterialIconEvent"/>
- <component id="MaterialIconFace" class="org.apache.flex.mdl.materialIcons.MaterialIconFace"/>
- <component id="MaterialIconMood" class="org.apache.flex.mdl.materialIcons.MaterialIconMood"/>
- <component id="MaterialIconMoreVert" class="org.apache.flex.mdl.materialIcons.MaterialIconMoreVert"/>
- <component id="MaterialIconSearch" class="org.apache.flex.mdl.materialIcons.MaterialIconSearch"/>
- <component id="MaterialIconKeyboardArrowDown" class="org.apache.flex.mdl.materialIcons.MaterialIconKeyboardArrowDown"/>
- <component id="MaterialIconFormatBold" class="org.apache.flex.mdl.materialIcons.MaterialIconFormatBold" />
- <component id="MaterialIconFormatItalic" class="org.apache.flex.mdl.materialIcons.MaterialIconFormatItalic"/>
</componentPackage>