You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ca...@apache.org on 2020/01/11 10:10:22 UTC
[royale-asjs] branch develop updated: styleduibased: refactor
IEmphasis constants to StyledUIBase and remove from the rest of classes
This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 4073334 styleduibased: refactor IEmphasis constants to StyledUIBase and remove from the rest of classes
4073334 is described below
commit 407333405951f71a82143a610f5c6fbae4bede89
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Sat Jan 11 11:10:11 2020 +0100
styleduibased: refactor IEmphasis constants to StyledUIBase and remove from the rest of classes
---
.../src/main/royale/AdvancedListPlayGround.mxml | 3 +-
.../src/main/royale/ButtonPlayGround.mxml | 32 ++++++++++++----------
.../royale/org/apache/royale/core/StyledUIBase.as | 4 +++
.../main/royale/org/apache/royale/jewel/Button.as | 4 ---
.../royale/org/apache/royale/jewel/ButtonBar.as | 4 ---
.../org/apache/royale/jewel/IconButtonBar.as | 4 ---
.../org/apache/royale/jewel/ToggleButtonBar.as | 4 ---
.../apache/royale/jewel/beads/views/AlertView.as | 12 ++++----
.../jewel/beads/views/JewelLabelViewBead.mxml | 3 +-
.../jewel/supportClasses/button/SimpleButton.as | 8 ------
10 files changed, 31 insertions(+), 47 deletions(-)
diff --git a/examples/royale/TourDeJewel/src/main/royale/AdvancedListPlayGround.mxml b/examples/royale/TourDeJewel/src/main/royale/AdvancedListPlayGround.mxml
index 86e9b92..409edee 100644
--- a/examples/royale/TourDeJewel/src/main/royale/AdvancedListPlayGround.mxml
+++ b/examples/royale/TourDeJewel/src/main/royale/AdvancedListPlayGround.mxml
@@ -30,6 +30,7 @@ limitations under the License.
import org.apache.royale.collections.ArrayListView;
import org.apache.royale.collections.Sort;
import org.apache.royale.collections.SortField;
+ import org.apache.royale.core.StyledUIBase;
import org.apache.royale.events.Event;
import vos.DetailIconListVO;
@@ -187,7 +188,7 @@ limitations under the License.
<j:Label text="Click on render's icon will toggle 'component set' for that renderer" multiline="true" width="200"/>
</j:VGroup>
<j:VGroup gap="3">
- <j:Button text="Reset data" emphasis="{Button.PRIMARY}" click="resetListData()"/>
+ <j:Button text="Reset data" emphasis="{StyledUIBase.PRIMARY}" click="resetListData()"/>
<j:Button text="Add Random item" click="addItem()"/>
<j:Button text="Remove item" click="removeItemAt()"/>
<j:Button text="Update item" click="updateItem()"/>
diff --git a/examples/royale/TourDeJewel/src/main/royale/ButtonPlayGround.mxml b/examples/royale/TourDeJewel/src/main/royale/ButtonPlayGround.mxml
index e57e608..77163ca 100644
--- a/examples/royale/TourDeJewel/src/main/royale/ButtonPlayGround.mxml
+++ b/examples/royale/TourDeJewel/src/main/royale/ButtonPlayGround.mxml
@@ -25,10 +25,12 @@ limitations under the License.
<fx:Script>
<![CDATA[
+ import org.apache.royale.core.StyledUIBase;
+
private function clickHandler(event:MouseEvent):void {
- event.target.emphasis = event.target.emphasis == Button.PRIMARY ? "" : Button.PRIMARY;
- event.target.width = event.target.emphasis == Button.PRIMARY ? NaN : 250;
- event.target.text = event.target.emphasis == Button.PRIMARY ? "Width 'auto'" : "Width = 250";
+ event.target.emphasis = event.target.emphasis == StyledUIBase.PRIMARY ? "" : StyledUIBase.PRIMARY;
+ event.target.width = event.target.emphasis == StyledUIBase.PRIMARY ? NaN : 250;
+ event.target.text = event.target.emphasis == StyledUIBase.PRIMARY ? "Width 'auto'" : "Width = 250";
}
private function onValueChange(event:Event):void
@@ -61,10 +63,10 @@ limitations under the License.
<j:MultiLine multiline="true"/>
</j:beads>
</j:Button>
- <j:Button text="Primary" emphasis="{Button.PRIMARY}"/>
- <j:Button text="Secondary" emphasis="{Button.SECONDARY}"/>
- <j:Button text="Emphasized" emphasis="{Button.EMPHASIZED}"/>
- <j:Button text="Disabled" emphasis="{Button.PRIMARY}">
+ <j:Button text="Primary" emphasis="{StyledUIBase.PRIMARY}"/>
+ <j:Button text="Secondary" emphasis="{StyledUIBase.SECONDARY}"/>
+ <j:Button text="Emphasized" emphasis="{StyledUIBase.EMPHASIZED}"/>
+ <j:Button text="Disabled" emphasis="{StyledUIBase.PRIMARY}">
<j:beads>
<j:Disabled/>
</j:beads>
@@ -82,17 +84,17 @@ limitations under the License.
<j:SizeControl size="{SizeControl.XSMALL}"/>
</j:beads>
</j:Button>
- <j:Button text="small" emphasis="{Button.PRIMARY}">
+ <j:Button text="small" emphasis="{StyledUIBase.PRIMARY}">
<j:beads>
<j:SizeControl size="{SizeControl.SMALL}"/>
</j:beads>
</j:Button>
- <j:Button text="large" emphasis="{Button.SECONDARY}">
+ <j:Button text="large" emphasis="{StyledUIBase.SECONDARY}">
<j:beads>
<j:SizeControl size="{SizeControl.LARGE}"/>
</j:beads>
</j:Button>
- <j:Button text="xlarge" emphasis="{Button.EMPHASIZED}">
+ <j:Button text="xlarge" emphasis="{StyledUIBase.EMPHASIZED}">
<j:beads>
<j:SizeControl size="{SizeControl.XLARGE}"/>
</j:beads>
@@ -131,7 +133,7 @@ limitations under the License.
<html:H4 text="Button size"/>
<j:HGroup gap="3" itemsVerticalAlign="itemsSameHeight">
- <j:Button id="reizableButton" text="Resize {slider_w.value}x{slider_h.value}" emphasis="{Button.PRIMARY}"/>
+ <j:Button id="reizableButton" text="Resize {slider_w.value}x{slider_h.value}" emphasis="{StyledUIBase.PRIMARY}"/>
<j:Button text="check layout"/>
</j:HGroup>
<j:HSlider id="slider_w" width="350" value="96" minimum="10" maximum="350" valueChange="onValueChange(event)"/>
@@ -156,10 +158,10 @@ limitations under the License.
</j:beads>
</j:ToggleButton>
<j:ToggleButton text="Button With More Text"/>
- <j:ToggleButton text="Primary" emphasis="{Button.PRIMARY}"/>
- <j:ToggleButton text="Secondary" emphasis="{Button.SECONDARY}"/>
- <j:ToggleButton text="Emphasized" emphasis="{Button.EMPHASIZED}"/>
- <j:ToggleButton text="Disabled" emphasis="{Button.PRIMARY}">
+ <j:ToggleButton text="Primary" emphasis="{StyledUIBase.PRIMARY}"/>
+ <j:ToggleButton text="Secondary" emphasis="{StyledUIBase.SECONDARY}"/>
+ <j:ToggleButton text="Emphasized" emphasis="{StyledUIBase.EMPHASIZED}"/>
+ <j:ToggleButton text="Disabled" emphasis="{StyledUIBase.PRIMARY}">
<j:beads>
<j:Disabled/>
</j:beads>
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/StyledUIBase.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/StyledUIBase.as
index 0c8ff74..8dcd32c 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/StyledUIBase.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/StyledUIBase.as
@@ -42,6 +42,10 @@ package org.apache.royale.core
*/
public class StyledUIBase extends UIBase implements IStyledUIBase
{
+ public static const PRIMARY:String = "primary";
+ public static const SECONDARY:String = "secondary";
+ public static const EMPHASIZED:String = "emphasized";
+
/**
* Constructor.
*
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Button.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Button.as
index 8c5693e..afa5328 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Button.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Button.as
@@ -48,10 +48,6 @@ package org.apache.royale.jewel
*/
public class Button extends SimpleButton
{
- public static const PRIMARY:String = "primary";
- public static const SECONDARY:String = "secondary";
- public static const EMPHASIZED:String = "emphasized";
-
/**
* Constructor.
*
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ButtonBar.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ButtonBar.as
index 7d15c30..86b1744 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ButtonBar.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ButtonBar.as
@@ -49,10 +49,6 @@ package org.apache.royale.jewel
*/
public class ButtonBar extends List
{
- public static const PRIMARY:String = "primary";
- public static const SECONDARY:String = "secondary";
- public static const EMPHASIZED:String = "emphasized";
-
/**
* constructor.
*
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/IconButtonBar.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/IconButtonBar.as
index d92ddc6..11835cd 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/IconButtonBar.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/IconButtonBar.as
@@ -41,10 +41,6 @@ package org.apache.royale.jewel
*/
public class IconButtonBar extends ButtonBar
{
- public static const PRIMARY:String = "primary";
- public static const SECONDARY:String = "secondary";
- public static const EMPHASIZED:String = "emphasized";
-
/**
* constructor.
*
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ToggleButtonBar.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ToggleButtonBar.as
index a6f63a9..6481f78 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ToggleButtonBar.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ToggleButtonBar.as
@@ -41,10 +41,6 @@ package org.apache.royale.jewel
*/
public class ToggleButtonBar extends IconButtonBar
{
- public static const PRIMARY:String = "primary";
- public static const SECONDARY:String = "secondary";
- public static const EMPHASIZED:String = "emphasized";
-
/**
* constructor.
*
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/AlertView.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/AlertView.as
index af39803..9b801b7 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/AlertView.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/AlertView.as
@@ -22,8 +22,11 @@ package org.apache.royale.jewel.beads.views
{
import flash.utils.setTimeout;
+ import org.apache.royale.core.IBorderPaddingMarginValuesImpl;
import org.apache.royale.core.IMeasurementBead;
+ import org.apache.royale.core.IUIBase;
import org.apache.royale.core.ValuesManager;
+ import org.apache.royale.core.layout.EdgeData;
import org.apache.royale.html.beads.IBackgroundBead;
import org.apache.royale.html.beads.IBorderBead;
import org.apache.royale.utils.loadBeadFromValuesManager;
@@ -34,14 +37,11 @@ package org.apache.royale.jewel.beads.views
}
import org.apache.royale.core.IAlertModel;
import org.apache.royale.core.IBeadLayout;
- import org.apache.royale.core.IBorderPaddingMarginValuesImpl;
import org.apache.royale.core.IParent;
import org.apache.royale.core.IStrand;
- import org.apache.royale.core.IUIBase;
+ import org.apache.royale.core.StyledUIBase;
import org.apache.royale.core.UIBase;
- import org.apache.royale.core.layout.EdgeData;
import org.apache.royale.events.CloseEvent;
- import org.apache.royale.events.Event;
import org.apache.royale.events.IEventDispatcher;
import org.apache.royale.events.MouseEvent;
import org.apache.royale.html.beads.GroupView;
@@ -221,7 +221,7 @@ package org.apache.royale.jewel.beads.views
{
okButton = new Button();
okButton.width = 100;
- okButton.emphasis = Button.PRIMARY;
+ okButton.emphasis = StyledUIBase.PRIMARY;
okButton.text = alertModel.okLabel;
okButton.addEventListener(MouseEvent.CLICK, handleOK);
@@ -242,7 +242,7 @@ package org.apache.royale.jewel.beads.views
{
yesButton = new Button();
yesButton.width = 100;
- yesButton.emphasis = Button.PRIMARY;
+ yesButton.emphasis = StyledUIBase.PRIMARY;
yesButton.text = alertModel.yesLabel;
yesButton.addEventListener(MouseEvent.CLICK, handleYes);
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/JewelLabelViewBead.mxml b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/JewelLabelViewBead.mxml
index dcac86b..3d9751d 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/JewelLabelViewBead.mxml
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/JewelLabelViewBead.mxml
@@ -24,6 +24,7 @@ limitations under the License.
<fx:Script>
<![CDATA[
import org.apache.royale.jewel.beads.models.TextModel;
+ import org.apache.royale.core.StyledUIBase;
// private function clickHandler():void
// {
@@ -38,7 +39,7 @@ limitations under the License.
<js:MXMLBeadViewDataBinding />
</js:beads>
- <j:Button localId="textButton" text="JewelLabelViewBead" emphasis="{Button.PRIMARY}"/>
+ <j:Button localId="textButton" text="JewelLabelViewBead" emphasis="{StyledUIBase.PRIMARY}"/>
<!--
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/button/SimpleButton.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/button/SimpleButton.as
index b28c173..d4c314d 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/button/SimpleButton.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/button/SimpleButton.as
@@ -159,10 +159,6 @@ package org.apache.royale.jewel.supportClasses.button
COMPILE::SWF
public class SimpleButton extends UIButtonBase implements IStrand, IUIBase, IEventDispatcher, IClassSelectorListSupport, IEmphasis
{
- public static const PRIMARY:String = "primary";
- public static const SECONDARY:String = "secondary";
- public static const EMPHASIZED:String = "emphasized";
-
/**
* Constructor.
*
@@ -298,10 +294,6 @@ package org.apache.royale.jewel.supportClasses.button
COMPILE::JS
public class SimpleButton extends StyledUIBase implements IStrand, IUIBase, IEventDispatcher
{
- public static const PRIMARY:String = "primary";
- public static const SECONDARY:String = "secondary";
- public static const EMPHASIZED:String = "emphasized";
-
/**
* Constructor.
*