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 849f79f jewel: add new IEmphasis interface
849f79f is described below
commit 849f79f247e8eaf99f2ae4dc5c92959da1c0c837
Author: Carlos Rovira <[email protected]>
AuthorDate: Sat Dec 14 19:26:32 2019 +0100
jewel: add new IEmphasis interface
---
.../royale/org/apache/royale/jewel/ButtonBar.as | 3 +-
.../royale/org/apache/royale/jewel/DataGrid.as | 5 +--
.../royale/org/apache/royale/jewel/Snackbar.as | 17 +++++----
.../apache/royale/jewel/beads/controls/Badge.as | 3 +-
.../apache/royale/jewel/beads/views/SpinnerView.as | 1 -
.../{datagrid/IDataGrid.as => IEmphasis.as} | 40 +++++++++++++---------
.../jewel/supportClasses/button/SimpleButton.as | 5 +--
7 files changed, 42 insertions(+), 32 deletions(-)
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 cc0119f..cf5b984 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
@@ -24,6 +24,7 @@ package org.apache.royale.jewel
import org.apache.royale.html.util.addElementToWrapper;
}
import org.apache.royale.html.beads.models.ButtonBarModel;
+ import org.apache.royale.jewel.supportClasses.IEmphasis;
/**
* The Jewel ButtonBar class is a component that displays a set of
Buttons. The ButtonBar
@@ -47,7 +48,7 @@ package org.apache.royale.jewel
* @playerversion AIR 2.6
* @productversion Royale 0.9.7
*/
- public class ButtonBar extends List
+ public class ButtonBar extends List implements IEmphasis
{
public static const PRIMARY:String = "primary";
public static const SECONDARY:String = "secondary";
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/DataGrid.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/DataGrid.as
index 43682ea..85136f5 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/DataGrid.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/DataGrid.as
@@ -19,10 +19,11 @@
package org.apache.royale.jewel
{
import org.apache.royale.core.IBead;
+ import org.apache.royale.core.IDataGrid;
import org.apache.royale.core.IDataGridModel;
import org.apache.royale.core.IDataGridPresentationModel;
import org.apache.royale.core.ValuesManager;
- import org.apache.royale.jewel.supportClasses.datagrid.IDataGrid;
+ import org.apache.royale.jewel.supportClasses.IEmphasis;
[Event(name="change", type="org.apache.royale.events.Event")]
@@ -40,7 +41,7 @@ package org.apache.royale.jewel
* @playerversion AIR 2.6
* @productversion Royale 0.9.7
*/
- public class DataGrid extends Group implements IDataGrid
+ public class DataGrid extends Group implements IDataGrid, IEmphasis
{
/**
* constructor.
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Snackbar.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Snackbar.as
index 6833af2..1685c31 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Snackbar.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Snackbar.as
@@ -18,17 +18,16 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.jewel
{
- import org.apache.royale.core.IPopUp;
- import org.apache.royale.core.StyledUIBase;
- import org.apache.royale.core.UIBase;
- import org.apache.royale.events.Event;
- import org.apache.royale.jewel.beads.models.SnackbarModel;
-
COMPILE::JS
{
- import org.apache.royale.core.WrappedHTMLElement;
- import org.apache.royale.html.util.addElementToWrapper;
+ import org.apache.royale.core.WrappedHTMLElement;
+ import org.apache.royale.html.util.addElementToWrapper;
}
+ import org.apache.royale.core.IPopUp;
+ import org.apache.royale.core.StyledUIBase;
+ import org.apache.royale.events.Event;
+ import org.apache.royale.jewel.beads.models.SnackbarModel;
+ import org.apache.royale.jewel.supportClasses.IEmphasis;
[Event(name="action", type="org.apache.royale.events.Event")]
/**
@@ -49,7 +48,7 @@ package org.apache.royale.jewel
* @playerversion AIR 2.6
* @productversion Royale 0.9.4
*/
- public class Snackbar extends StyledUIBase implements IPopUp
+ public class Snackbar extends StyledUIBase implements IPopUp, IEmphasis
{
/**
* constructor.
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/Badge.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/Badge.as
index f99ce31..6c0f8a0 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/Badge.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/Badge.as
@@ -22,6 +22,7 @@ package org.apache.royale.jewel.beads.controls
import org.apache.royale.core.IStrand;
import org.apache.royale.core.UIBase;
import org.apache.royale.jewel.Label;
+ import org.apache.royale.jewel.supportClasses.IEmphasis;
/**
* The Badge class provides a small status descriptors for UI elements.
@@ -35,7 +36,7 @@ package org.apache.royale.jewel.beads.controls
* @playerversion AIR 2.6
* @productversion Royale 0.9.6
*/
- public class Badge implements IBead
+ public class Badge implements IBead, IEmphasis
{
/**
* constructor.
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/SpinnerView.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/SpinnerView.as
index e57cef9..7afe231 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/SpinnerView.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/SpinnerView.as
@@ -36,7 +36,6 @@ package org.apache.royale.jewel.beads.views
import org.apache.royale.jewel.Button;
import org.apache.royale.jewel.beads.controls.spinner.ISpinnerView;
-
/**
* The SpinnerView class creates the visual elements of the
org.apache.royale.jewel.Spinner
* component.
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/datagrid/IDataGrid.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/IEmphasis.as
similarity index 53%
rename from
frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/datagrid/IDataGrid.as
rename to
frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/IEmphasis.as
index ed04f42..b369c69 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/datagrid/IDataGrid.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/IEmphasis.as
@@ -16,23 +16,31 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.jewel.supportClasses.datagrid
+package org.apache.royale.jewel.supportClasses
{
- import org.apache.royale.core.IDataGrid;
-
+ /**
+ * The IEmphasis is the interface a jewel control implements to get
diferent jewel
+ * look and feels. Jewel has PRIMARY, SECONDARY and EMPHASIZED emphasis
look and feels.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.9.7
+ */
+ public interface IEmphasis
+ {
/**
- * The Jewel IDataGrid interface is implemented by any component that
supports being
- * a "DataGrid" which means its content is generated by a factory and
whose
- * children are item renderers (IItemRenderer).
+ * Applies emphasis color display. Possible constant values
are: PRIMARY, SECONDARY, EMPHASIZED.
+ * Colors are defined in royale jewel theme CSS.
*
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.7
- */
- public interface IDataGrid extends org.apache.royale.core.IDataGrid
- {
- function get emphasis():String;
- function set emphasis(value:String):void;
- }
+ * Left without value to get the default look (light or dark).
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.9.7
+ */
+ function get emphasis():String;
+ function set emphasis(value:String):void;
+ }
}
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 a9c8999..d5e2043 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
@@ -35,6 +35,7 @@ package org.apache.royale.jewel.supportClasses.button
import org.apache.royale.events.IEventDispatcher;
import org.apache.royale.utils.ClassSelectorList;
import org.apache.royale.utils.IClassSelectorListSupport;
+ import org.apache.royale.jewel.supportClasses.IEmphasis;
//--------------------------------------
// Events
@@ -158,7 +159,7 @@ package org.apache.royale.jewel.supportClasses.button
* @productversion Royale 0.9.6
*/
COMPILE::SWF
- public class SimpleButton extends UIButtonBase implements IStrand,
IUIBase, IEventDispatcher, IClassSelectorListSupport
+ public class SimpleButton extends UIButtonBase implements IStrand,
IUIBase, IEventDispatcher, IClassSelectorListSupport, IEmphasis
{
public static const PRIMARY:String = "primary";
public static const SECONDARY:String = "secondary";
@@ -297,7 +298,7 @@ package org.apache.royale.jewel.supportClasses.button
* @productversion Royale 0.9.6
*/
COMPILE::JS
- public class SimpleButton extends StyledUIBase implements IStrand,
IUIBase, IEventDispatcher, IClassSelectorListSupport
+ public class SimpleButton extends StyledUIBase implements IStrand,
IUIBase, IEventDispatcher, IClassSelectorListSupport, IEmphasis
{
public static const PRIMARY:String = "primary";
public static const SECONDARY:String = "secondary";
