Repository: flex-asjs Updated Branches: refs/heads/develop 86dde089e -> d53d002ef
More example separation and organization in tabs Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/d53d002e Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/d53d002e Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/d53d002e Branch: refs/heads/develop Commit: d53d002ef9ba4641540eded7620546f9c902a286 Parents: 86dde08 Author: Carlos Rovira <[email protected]> Authored: Wed Nov 23 11:17:52 2016 +0100 Committer: Carlos Rovira <[email protected]> Committed: Wed Nov 23 11:17:52 2016 +0100 ---------------------------------------------------------------------- .../MDLExample/src/main/flex/Buttons.mxml | 56 ++++++++++++++++++++ .../src/main/flex/MainNavigation.mxml | 56 ++------------------ .../MDLExample/src/main/flex/TextFields.mxml | 43 +++++++++++++++ .../MDLExample/src/main/flex/Toggles.mxml | 40 ++++++++++++++ 4 files changed, 144 insertions(+), 51 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d53d002e/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 new file mode 100644 index 0000000..3232eea --- /dev/null +++ b/examples/flexjs/MDLExample/src/main/flex/Buttons.mxml @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + +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. + +--> +<mdl:TabBarPanel xmlns:fx="http://ns.adobe.com/mxml/2009"; + xmlns:js="library://ns.apache.org/flexjs/basic" + xmlns:local="*" + xmlns:mdl="library://ns.apache.org/flexjs/mdl" + xmlns="http://www.w3.org/1999/xhtml";> + + <mdl:Grid> + + <!-- Buttons https://getmdl.io/components/index.html#buttons-section --> + <mdl:Button className="mdlbtn"/> + + <!-- Fab button --> + <mdl:Button fab="true" colored="true"> + <i class="material-icons">add</i> + </mdl:Button> + + <!-- Fab with Ripple --> + <mdl:Button fab="true" ripple="true"> + <i class="material-icons md-48">face</i> + </mdl:Button> + + <!-- Raised button --> + <mdl:Button text="COLORED" raised="true" colored="true"/> + + <!-- Raised button with ripple --> + <mdl:Button text="ACCENT" raised="true" ripple="true" accent="true"/> + + <!-- Raised disabled button--> + <mdl:Button text="DISABLED" raised="true"> + <js:beads> + <mdl:Disabled/> + </js:beads> + </mdl:Button> + + </mdl:Grid> + +</mdl:TabBarPanel> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d53d002e/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml ---------------------------------------------------------------------- diff --git a/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml b/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml index b09949a..b88ffdf 100644 --- a/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml +++ b/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml @@ -38,7 +38,8 @@ limitations under the License. <mdl:TabBarButton text="Cards" href="#cards_panel" isActive="true"/> <mdl:TabBarButton text="Buttons" href="#buttons_panel" /> <mdl:TabBarButton text="TextFields" href="#textfield_panel"/> - <mdl:TabBarButton text="Others" href="#others_panel"/> + <mdl:TabBarButton text="Toggles" href="#toggles_panel"/> + <mdl:TabBarButton text="Other" href="#others_panel"/> </mdl:TabBar> </mdl:Header> @@ -56,49 +57,11 @@ limitations under the License. <local:Cards id="cards_panel" isActive="true"/> - <mdl:TabBarPanel id="buttons_panel"> - <!-- Buttons https://getmdl.io/components/index.html#buttons-section --> - <mdl:Button className="mdlbtn"/> + <local:Buttons id="buttons_panel"/> - <!-- Fab button --> - <mdl:Button fab="true" colored="true"> - <i class="material-icons">add</i> - </mdl:Button> - - <!-- Fab with Ripple --> - <mdl:Button fab="true" ripple="true"> - <i class="material-icons md-48">face</i> - </mdl:Button> - - <!-- Raised button --> - <mdl:Button text="COLORED" raised="true" colored="true"/> - - <!-- Raised button with ripple --> - <mdl:Button text="ACCENT" raised="true" ripple="true" accent="true"/> + <local:TextFields id="textfield_panel"/> - <!-- Raised disabled button--> - <mdl:Button text="DISABLED" raised="true"> - <js:beads> - <mdl:Disabled/> - </js:beads> - </mdl:Button> - </mdl:TabBarPanel> - - <mdl:TabBarPanel id="textfield_panel"> - <!-- Text Fields :: https://getmdl.io/components/index.html#textfields-section --> - <mdl:TextField id="mdlti" change="mdlchk.text = mdlti.text" className="mdlti_example"> - <js:beads> - <mdl:TextPrompt prompt="Normal Text Field..."/> - </js:beads> - </mdl:TextField> - <mdl:TextField floatingLabel= "true"> - <js:beads> - <mdl:TextPrompt prompt="Floating Label"/> - </js:beads> - </mdl:TextField> - </mdl:TabBarPanel> - - + <local:Toggles id="toggles_panel"/> <mdl:TabBarPanel id="others_panel"> @@ -112,15 +75,6 @@ limitations under the License. </js:dataProvider> </mdl:List> - <!-- Toggles :: https://getmdl.io/components/index.html#toggles-section --> - <mdl:CheckBox id="mdlchk" text="Disabled at start" className="mdlchk_example"/> - <mdl:CheckBox id="mdlchk1" text="Selected and with Ripple" selected="true" ripple="true"/> - - <mdl:RadioButton groupName="g1" text="Black" className="mdlrb_example"/> - <mdl:RadioButton groupName="g1" text="Ripple" ripple="true"/> - <mdl:RadioButton groupName="g1" text="Red"/> - <mdl:Switch text="Switch" ripple="true" selected="true"/> - <js:Div text="account_box" className="material-icons" style="color: rgba(0, 0, 0, 0.24);"> <js:beads> <mdl:Badge dataBadge="1" overlap="true"/> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d53d002e/examples/flexjs/MDLExample/src/main/flex/TextFields.mxml ---------------------------------------------------------------------- diff --git a/examples/flexjs/MDLExample/src/main/flex/TextFields.mxml b/examples/flexjs/MDLExample/src/main/flex/TextFields.mxml new file mode 100644 index 0000000..baaef63 --- /dev/null +++ b/examples/flexjs/MDLExample/src/main/flex/TextFields.mxml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + +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. + +--> +<mdl:TabBarPanel xmlns:fx="http://ns.adobe.com/mxml/2009"; + xmlns:js="library://ns.apache.org/flexjs/basic" + xmlns:local="*" + xmlns:mdl="library://ns.apache.org/flexjs/mdl" + xmlns="http://www.w3.org/1999/xhtml";> + + <mdl:Grid> + + <!-- Text Fields :: https://getmdl.io/components/index.html#textfields-section --> + <mdl:TextField id="mdlti" change="mdlfloatingti.text = mdlti.text" className="mdlti_example"> + <js:beads> + <mdl:TextPrompt prompt="Normal Text Field..."/> + </js:beads> + </mdl:TextField> + + <mdl:TextField id="mdlfloatingti" floatingLabel= "true"> + <js:beads> + <mdl:TextPrompt prompt="Floating Label"/> + </js:beads> + </mdl:TextField> + + </mdl:Grid> + +</mdl:TabBarPanel> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d53d002e/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 new file mode 100644 index 0000000..f88c90d --- /dev/null +++ b/examples/flexjs/MDLExample/src/main/flex/Toggles.mxml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + +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. + +--> +<mdl:TabBarPanel xmlns:fx="http://ns.adobe.com/mxml/2009"; + xmlns:js="library://ns.apache.org/flexjs/basic" + xmlns:local="*" + xmlns:mdl="library://ns.apache.org/flexjs/mdl" + xmlns="http://www.w3.org/1999/xhtml";> + + <mdl:Grid> + + <!-- Toggles :: https://getmdl.io/components/index.html#toggles-section --> + <mdl:CheckBox id="mdlchk" text="Disabled at start" className="mdlchk_example"/> + <mdl:CheckBox id="mdlchk1" text="Selected and with Ripple" selected="true" ripple="true"/> + + <mdl:RadioButton groupName="g1" text="Black" className="mdlrb_example"/> + <mdl:RadioButton groupName="g1" text="Ripple" ripple="true"/> + <mdl:RadioButton groupName="g1" text="Red"/> + + <mdl:Switch text="Switch" ripple="true" selected="true"/> + + </mdl:Grid> + +</mdl:TabBarPanel> \ No newline at end of file
