Refactor MaterialIconsType to MaterialconType
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/1d7e8a9f Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/1d7e8a9f Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/1d7e8a9f Branch: refs/heads/feature/mdl Commit: 1d7e8a9fe9a08a3a656afbc9f4c98a8298319374 Parents: 2da540b Author: Carlos Rovira <[email protected]> Authored: Mon Jan 23 19:47:56 2017 +0100 Committer: Carlos Rovira <[email protected]> Committed: Mon Jan 23 19:47:56 2017 +0100 ---------------------------------------------------------------------- .../flexjs/MDLExample/src/main/flex/Icons.mxml | 6 +-- .../flex/mdl/materialIcons/MaterialIconAdd.as | 2 +- .../mdl/materialIcons/MaterialIconCancel.as | 2 +- .../flex/mdl/materialIcons/MaterialIconEvent.as | 2 +- .../flex/mdl/materialIcons/MaterialIconFace.as | 2 +- .../mdl/materialIcons/MaterialIconFormatBold.as | 2 +- .../materialIcons/MaterialIconFormatItalic.as | 2 +- .../MaterialIconKeyboardArrowDown.as | 2 +- .../flex/mdl/materialIcons/MaterialIconMood.as | 2 +- .../mdl/materialIcons/MaterialIconMoreVert.as | 2 +- .../mdl/materialIcons/MaterialIconPerson.as | 2 +- .../mdl/materialIcons/MaterialIconSearch.as | 2 +- .../flex/mdl/materialIcons/MaterialIconShare.as | 2 +- .../flex/mdl/materialIcons/MaterialIconStar.as | 2 +- .../flex/mdl/materialIcons/MaterialIconType.as | 47 ++++++++++++++++++++ .../flex/mdl/materialIcons/MaterialIconsType.as | 47 -------------------- .../src/main/resources/mdl-manifest.xml | 3 +- 17 files changed, 65 insertions(+), 64 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d7e8a9f/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 021c150..9d1aa72 100644 --- a/examples/flexjs/MDLExample/src/main/flex/Icons.mxml +++ b/examples/flexjs/MDLExample/src/main/flex/Icons.mxml @@ -23,12 +23,12 @@ limitations under the License. <fx:Script> <![CDATA[ - import org.apache.flex.mdl.materialIcons.MaterialIconsType; + import org.apache.flex.mdl.materialIcons.MaterialIconType; ]]> </fx:Script> <mdl:beads> - <js:ViewDataBinding/> + <js:ContainerDataBinding/> </mdl:beads> <mdl:Grid> @@ -45,7 +45,7 @@ limitations under the License. </mdl:MaterialIconAdd> <mdl:MaterialIconAdd className="orange600"/> <mdl:MaterialIcon text="book"/> - <mdl:MaterialIcon text="{MaterialIconsType.FACE}"/> + <mdl:MaterialIcon text="{MaterialIconType.FACE}"/> </mdl:Grid> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d7e8a9f/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 index 083e75c..8164195 100644 --- 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 @@ -54,7 +54,7 @@ package org.apache.flex.mdl.materialIcons */ override protected function get iconText():String { - return MaterialIconsType.ADD; + return MaterialIconType.ADD; } } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d7e8a9f/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 index f0fba1d..4e13acc 100644 --- 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 @@ -54,7 +54,7 @@ package org.apache.flex.mdl.materialIcons */ override protected function get iconText():String { - return MaterialIconsType.CANCEL; + return MaterialIconType.CANCEL; } } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d7e8a9f/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 index 3c27418..c00f79a 100644 --- 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 @@ -54,7 +54,7 @@ package org.apache.flex.mdl.materialIcons */ override protected function get iconText():String { - return MaterialIconsType.EVENT; + return MaterialIconType.EVENT; } } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d7e8a9f/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 index 3f3f97e..2f496a3 100644 --- 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 @@ -54,7 +54,7 @@ package org.apache.flex.mdl.materialIcons */ override protected function get iconText():String { - return MaterialIconsType.FACE; + return MaterialIconType.FACE; } } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d7e8a9f/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 index 8f7afce..30abf13 100644 --- 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 @@ -54,7 +54,7 @@ package org.apache.flex.mdl.materialIcons */ override protected function get iconText():String { - return MaterialIconsType.FORMAT_BOLD; + return MaterialIconType.FORMAT_BOLD; } } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d7e8a9f/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 index b41ad5b..aa93dff 100644 --- 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 @@ -54,7 +54,7 @@ package org.apache.flex.mdl.materialIcons */ override protected function get iconText():String { - return MaterialIconsType.FORMAT_ITALIC; + return MaterialIconType.FORMAT_ITALIC; } } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d7e8a9f/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 index a37f422..f619e5f 100644 --- 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 @@ -54,7 +54,7 @@ package org.apache.flex.mdl.materialIcons */ override protected function get iconText():String { - return MaterialIconsType.KEYBOARD_ARROW_DOWN; + return MaterialIconType.KEYBOARD_ARROW_DOWN; } } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d7e8a9f/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 index 5b146b7..1a96a54 100644 --- 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 @@ -54,7 +54,7 @@ package org.apache.flex.mdl.materialIcons */ override protected function get iconText():String { - return MaterialIconsType.MOOD; + return MaterialIconType.MOOD; } } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d7e8a9f/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 index 294925e..5155651 100644 --- 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 @@ -54,7 +54,7 @@ package org.apache.flex.mdl.materialIcons */ override protected function get iconText():String { - return MaterialIconsType.MORE_VERT; + return MaterialIconType.MORE_VERT; } } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d7e8a9f/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 index 4443ba7..8533930 100644 --- 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 @@ -54,7 +54,7 @@ package org.apache.flex.mdl.materialIcons */ override protected function get iconText():String { - return MaterialIconsType.PERSON; + return MaterialIconType.PERSON; } } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d7e8a9f/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 index f18739d..e92761b 100644 --- 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 @@ -54,7 +54,7 @@ package org.apache.flex.mdl.materialIcons */ override protected function get iconText():String { - return MaterialIconsType.SEARCH; + return MaterialIconType.SEARCH; } } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d7e8a9f/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 index 3a366c0..c44c939 100644 --- 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 @@ -54,7 +54,7 @@ package org.apache.flex.mdl.materialIcons */ override protected function get iconText():String { - return MaterialIconsType.SHARE; + return MaterialIconType.SHARE; } } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d7e8a9f/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 index 9354917..b0ed941 100644 --- 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 @@ -54,7 +54,7 @@ package org.apache.flex.mdl.materialIcons */ override protected function get iconText():String { - return MaterialIconsType.STAR; + return MaterialIconType.STAR; } } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d7e8a9f/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 new file mode 100644 index 0000000..1b6af94 --- /dev/null +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconType.as @@ -0,0 +1,47 @@ +//////////////////////////////////////////////////////////////////////////////// +// +// 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 +{ + /** + * The MaterialIconType class list all possible icons + * found in https://material.io/icons/ to use in its own + * Material Icon class. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public class MaterialIconType + { + public static const CANCEL:String = "cancel"; + public static const ADD:String = "add"; + public static const PERSON:String = "person"; + public static const STAR:String = "star"; + public static const SHARE:String = "share"; + public static const EVENT:String = "event"; + public static const FACE:String = "face"; + public static const MOOD:String = "mood"; + public static const MORE_VERT:String = "more_vert"; + public static const SEARCH:String = "search"; + public static const KEYBOARD_ARROW_DOWN:String = "keyboard_arrow_down"; + public static const FORMAT_BOLD:String = "format_bold"; + public static const FORMAT_ITALIC:String = "format_italic"; + } +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d7e8a9f/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconsType.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconsType.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconsType.as deleted file mode 100644 index 1e7c57f..0000000 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/materialIcons/MaterialIconsType.as +++ /dev/null @@ -1,47 +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 -{ - /** - * The MaterialIconsType class list all possible icons - * found in https://material.io/icons/ to use in its own - * Material Icon class. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public class MaterialIconsType - { - public static const CANCEL:String = "cancel"; - public static const ADD:String = "add"; - public static const PERSON:String = "person"; - public static const STAR:String = "star"; - public static const SHARE:String = "share"; - public static const EVENT:String = "event"; - public static const FACE:String = "face"; - public static const MOOD:String = "mood"; - public static const MORE_VERT:String = "more_vert"; - public static const SEARCH:String = "search"; - public static const KEYBOARD_ARROW_DOWN:String = "keyboard_arrow_down"; - public static const FORMAT_BOLD:String = "format_bold"; - public static const FORMAT_ITALIC:String = "format_italic"; - } -} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d7e8a9f/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 e43c6ca..b18f967 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml +++ b/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml @@ -113,8 +113,9 @@ <component id="TabsView" class="org.apache.flex.mdl.beads.views.TabsView"/> <component id="Tabs" class="org.apache.flex.mdl.Tabs"/> - <component id="MaterialIconsType" class="org.apache.flex.mdl.materialIcons.MaterialIconsType"/> + <component id="MaterialIconType" class="org.apache.flex.mdl.materialIcons.MaterialIconType"/> <component id="MaterialIcon" class="org.apache.flex.mdl.materialIcons.MaterialIcon"/> + <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"/>
