Skip to content

Commit 3697dae

Browse files
author
MicroEJ GitHub Delivery
committed
Version 7.2.0
1 parent d4e6461 commit 3697dae

118 files changed

Lines changed: 8883 additions & 387 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CHANGELOG.rst‎

Lines changed: 5 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -1,126 +1,9 @@
1+
.. ReStructuredText
2+
.. Copyright 2020-2021 MicroEJ Corp. All rights reserved.
3+
.. Use of this source code is governed by a BSD-style license that can be found with this software.
4+
15
===========
26
Changelog
37
===========
48

5-
All notable changes to this project will be documented in this file.
6-
7-
The format is based on `Keep a Changelog <https://keepachangelog.com/en/1.0.0/>`_,
8-
and this project adheres to `Semantic Versioning <https://semver.org/spec/v2.0.0.html>`_.
9-
10-
--------------------
11-
7.1.2 - 2020-12-10
12-
--------------------
13-
14-
Changed
15-
=======
16-
17-
- Update demo widget.
18-
19-
--------------------
20-
7.1.1 - 2020-12-04
21-
--------------------
22-
23-
Changed
24-
=======
25-
26-
- Update demo widget.
27-
28-
--------------------
29-
7.1.0 - 2020-11-26
30-
--------------------
31-
32-
Added
33-
=====
34-
35-
- Add CHANGELOG.rst (this file).
36-
37-
Changed
38-
=======
39-
40-
- Update demo widget.
41-
- Update and rename README.rst.
42-
43-
--------------------
44-
7.0.2 - 2020-11-12
45-
--------------------
46-
47-
Changed
48-
=======
49-
50-
- Update demo widget.
51-
52-
--------------------
53-
7.0.1 - 2020-11-03
54-
--------------------
55-
56-
Changed
57-
=======
58-
59-
- Update demo widget.
60-
61-
--------------------
62-
7.0.0 - 2020-09-21
63-
--------------------
64-
65-
Changed
66-
=======
67-
68-
- Update demo widget.
69-
70-
--------------------
71-
6.2.0 - 2019-10-29
72-
--------------------
73-
74-
Changed
75-
=======
76-
77-
- Update demo widget.
78-
79-
--------------------
80-
6.1.1 - 2018-10-22
81-
--------------------
82-
83-
Changed
84-
=======
85-
86-
- Update demo widget.
87-
88-
--------------------
89-
6.1.0 - 2017-12-27
90-
--------------------
91-
92-
Changed
93-
=======
94-
95-
- Update demo widget.
96-
97-
--------------------
98-
6.0.0 - 2017-01-30
99-
--------------------
100-
101-
Changed
102-
=======
103-
104-
- Update demo widget.
105-
106-
--------------------
107-
5.0.1 - 2016-07-01
108-
--------------------
109-
110-
Changed
111-
=======
112-
113-
- Update demo widget.
114-
115-
--------------------
116-
5.0.0 - 2016-06-28
117-
--------------------
118-
119-
Added
120-
=====
121-
122-
- Add demo widget - please refer to its `CHANGELOG.md <com.microej.demo.widget/CHANGELOG.md>`_ for more information.
123-
124-
.. ReStructuredText
125-
.. Copyright 2020 MicroEJ Corp. All rights reserved.
126-
.. Use of this source code is governed by a BSD-style license that can be found with this software.
9+
All notable changes to this project are documented in `com.microej.demo.widget/CHANGELOG.md <com.microej.demo.widget/CHANGELOG.md>`_.

‎README.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
.. ReStructuredText
2+
.. Copyright 2020-2021 MicroEJ Corp. All rights reserved.
3+
.. Use of this source code is governed by a BSD-style license that can be found with this software.
4+
15
==========
26
Overview
37
==========
@@ -7,7 +11,3 @@ Please refer to its `README.md <com.microej.demo.widget/README.md>`_ for more in
711

812
.. image:: demo.gif
913
:align: center
10-
11-
.. ReStructuredText
12-
.. Copyright 2020 MicroEJ Corp. All rights reserved.
13-
.. Use of this source code is governed by a BSD-style license that can be found with this software.

‎com.microej.demo.widget/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@
1010
/com.*
1111
/launchers/*.properties
1212
/bin-test/
13+
/.scannerwork

‎com.microej.demo.widget/CHANGELOG.md‎

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,35 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## 7.2.0 - 2021-05-10
9+
10+
### Added
11+
12+
- Add ImageWidget page.
13+
- Add Carousel widget and page.
14+
- Add SliderWithValue widget and page.
15+
- Add SliderWithProgress widget and page.
16+
- Add Wheel widget and page.
17+
- Add CircularIndeterminateProgress widget and page.
18+
- Add CircularDottedProgress widget and page.
19+
- Add CircularProgress widget and page.
20+
- Add LineWrappingLabel widget in the ScrollableText page.
21+
- Add LineChart widget and page.
22+
- Add BarChart widget and page.
23+
- Add AutoscrollLabel widget and page.
24+
- Add Keyboard widget and page.
25+
26+
### Fixed
27+
28+
- Update MWT, Widget and Motion dependencies.
29+
- Use desktop animator.
30+
- Fix title bar on big displays.
31+
832
## 7.0.5 - 2020-12-10
933

1034
### Fixed
1135

12-
- Cleaned up dependencies.
36+
- Clean-up dependencies.
1337

1438
## 7.0.4 - 2020-12-04
1539

@@ -112,5 +136,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
112136

113137
---
114138
_Markdown_
115-
_Copyright 2016-2020 MicroEJ Corp. All rights reserved._
139+
_Copyright 2016-2021 MicroEJ Corp. All rights reserved._
116140
_Use of this source code is governed by a BSD-style license that can be found with this software._

‎com.microej.demo.widget/README.md‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Overview
22

3-
This demo illustrates the widgets and containers available in the widget library: `ej.library.ui#widget-3.1.0 <https://repository.microej.com/artifacts/ej/library/ui/widget/3.1.0/>`_.
3+
This demo illustrates the widgets and containers available in the widget library: [ej.library.ui#widget-3.1.0](https://repository.microej.com/modules/ej/library/ui/widget/3.1.0/).
44

55
At startup, it shows a list of items.
66
Clicking on an item opens a new page showing a widget or a set of widgets.
@@ -18,17 +18,31 @@ Each page class contains 2 methods:
1818
Here are the pages:
1919

2020
- `Label`: demonstrates the simple `Label` widget from the widget library.
21+
- `AutoscrollLabel`: demonstrates a label which autoscroll when the label text is longer than label length.
22+
- `Image Widget` : demonstrates how to display an image using `ImageWidget` from the widget library.
23+
- `Slider with value` : demonstrate a Slider with displayed value.
24+
- `Slider with progress` : demonstrate a Slider with progress.
2125
- `Button`: demonstrates different styles of the simple `Button` widget from the widget library.
2226
- `Checkbox`: demonstrates a `Checkbox` widget.
2327
- `Radio Button`: demonstrates a `RadioButton` widget.
2428
- `Toggle`: demonstrates a `Toggle` widget animated when its state changes.
2529
- `Progress Bar`: demonstrates a `ProgressBar` widget.
2630
- `Indeterminate Progress Bar`: demonstrates an `IndeterminateProgressBar` widget.
31+
- `Keyboard`: demonstrates a keyboard widget.
32+
- `Circular Indeterminate Progress`: demonstrates a `CircularIndeterminateProgress` widget.
33+
- `Circular Dotted Progress`: demonstrates a `CircularDottedProgress` widget.
34+
- `Circular Progress`: demonstrates a `CircularProgress` widget.
35+
- `Wheel` : demonstrates a `Wheel` widget.
36+
- `Carousel`: demonstrates a `Carousel` widget.
2737
- `List`: demonstrates the `List` container from the widget library.
2838
- `Grid`: demonstrates the `Grid` container from the widget library.
2939
- `Dock`: demonstrates the `Dock` container from the widget library.
3040
- `Split`: demonstrates a `Split` container.
3141
- `Scrollable List`: demonstrates a `Scrollable List` container.
42+
- `Scrollable Text`: demonstrates displaying a long, scrollable text.
43+
- `Line Chart`: demonstrates a `LineChart` widget.
44+
- `Bar Chart`: demonstrates a `BarChart` widget.
45+
3246

3347
# Usage
3448

@@ -59,5 +73,5 @@ N/A
5973
None.
6074

6175
---
62-
_Copyright 2020 MicroEJ Corp. All rights reserved._
76+
_Copyright 2020-2021 MicroEJ Corp. All rights reserved._
6377
_Use of this source code is governed by a BSD-style license that can be found with this software._

‎com.microej.demo.widget/build/common.properties‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2020 MicroEJ Corp. All rights reserved.
1+
# Copyright 2020-2021 MicroEJ Corp. All rights reserved.
22
# Use of this source code is governed by a BSD-style license that can be found with this software.
33

44
ej.microui.fontConverter.useIt=true
@@ -11,18 +11,18 @@ com.microej.library.edc.securitymanager.enabled=false
1111
com.microej.library.edc.tostring.included=false
1212

1313
# Java heap size
14-
core.memory.javaheap.size=9216
15-
core.memory.javaheapsum.size=9216
14+
core.memory.javaheap.size=15500
15+
core.memory.javaheapsum.size=15500
1616
# immortal heap size
1717
core.memory.immortal.size=256
1818

1919
# max number of monitors
2020
core.memory.thread.max.nb.monitors=3
2121
# max number of threads
22-
core.memory.threads.size=2
22+
core.memory.threads.size=3
2323
# maximum size of thread stack (in blocks)
24-
core.memory.thread.max.size=3
24+
core.memory.thread.max.size=4
2525
# block size (in bytes)
2626
core.memory.thread.block.size=512
2727
# number of blocks in pool
28-
core.memory.threads.pool.size=3
28+
core.memory.threads.pool.size=7

‎com.microej.demo.widget/module.ivy‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<!--
2-
Copyright 2014-2020 MicroEJ Corp. All rights reserved.
2+
Copyright 2014-2021 MicroEJ Corp. All rights reserved.
33
Use of this source code is governed by a BSD-style license that can be found with this software.
44
-->
55
<ivy-module version="2.0" xmlns:ea="http://www.easyant.org" xmlns:ej="https://developer.microej.com" ej:version="2.0.0">
6-
<info organisation="com.microej.demo" module="widget" status="integration" revision="7.0.5">
6+
<info organisation="com.microej.demo" module="widget" status="integration" revision="7.2.0">
77
<ea:build organisation="com.is2t.easyant.buildtypes" module="build-firmware-singleapp" revision="1.+"/>
88
<ea:property name="application.main.class" value="com.microej.demo.widget.common.Navigation"/>
99
<ea:property name="virtual.device.sim.only" value="set"/>
@@ -29,7 +29,9 @@
2929
<dependency org="ej.api" name="microui" rev="3.0.3"/>
3030
<dependency org="ej.api" name="drawing" rev="1.0.2"/>
3131

32-
<dependency org="ej.library.ui" name="mwt" rev="3.1.1"/>
33-
<dependency org="ej.library.ui" name="widget" rev="3.1.0"/>
32+
<dependency org="ej.library.ui" name="mwt" rev="3.2.1"/>
33+
<dependency org="ej.library.ui" name="widget" rev="4.0.0"/>
34+
<dependency org="ej.library.ui" name="motion" rev="4.0.0"/>
35+
<dependency org="ej.library.runtime" name="service" rev="1.1.1"/>
3436
</dependencies>
3537
</ivy-module>

‎com.microej.demo.widget/src/main/java/com/microej/demo/widget/autoscrolllabel/AutoscrollLabelPage.java‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
/*
2+
* Copyright 2020-2021 MicroEJ Corp. All rights reserved.
3+
* Use of this source code is governed by a BSD-style license that can be found with this software.
4+
*/
5+
package com.microej.demo.widget.autoscrolllabel;
6+
7+
import com.microej.demo.widget.autoscrolllabel.widget.AutoscrollLabel;
8+
import com.microej.demo.widget.common.DemoColors;
9+
import com.microej.demo.widget.common.Fonts;
10+
import com.microej.demo.widget.common.Page;
11+
12+
import ej.mwt.Widget;
13+
import ej.mwt.style.EditableStyle;
14+
import ej.mwt.style.dimension.FixedDimension;
15+
import ej.mwt.style.outline.UniformOutline;
16+
import ej.mwt.style.outline.border.FlexibleRectangularBorder;
17+
import ej.mwt.stylesheet.cascading.CascadingStylesheet;
18+
import ej.mwt.stylesheet.selector.ClassSelector;
19+
import ej.mwt.util.Alignment;
20+
21+
/**
22+
* Page showing an autoscroll label.
23+
*/
24+
public class AutoscrollLabelPage implements Page {
25+
26+
private static final int AUTOSCROLL_LABEL = 601;
27+
28+
private static final int MARGIN = 10;
29+
private static final int HEIGHT = 30;
30+
31+
@Override
32+
public String getName() {
33+
return "Autoscroll Label"; //$NON-NLS-1$
34+
}
35+
36+
@Override
37+
public void populateStylesheet(CascadingStylesheet stylesheet) {
38+
EditableStyle style = stylesheet.getSelectorStyle(new ClassSelector(AUTOSCROLL_LABEL));
39+
style.setDimension(new FixedDimension(Widget.NO_CONSTRAINT, HEIGHT));
40+
style.setMargin(new UniformOutline(MARGIN));
41+
style.setBorder(new FlexibleRectangularBorder(DemoColors.DEFAULT_BORDER, 0, 1, 0, 1));
42+
style.setFont(Fonts.getBoldFont());
43+
style.setHorizontalAlignment(Alignment.LEFT);
44+
}
45+
46+
@Override
47+
public Widget getContentWidget() {
48+
AutoscrollLabel label = new AutoscrollLabel(
49+
"Lorem ipsum dolor sit amet, consectetur adipiscing elit. In tincidunt est nec sagittis tincidunt."); // //$NON-NLS-1$
50+
label.addClassSelector(AUTOSCROLL_LABEL);
51+
return label;
52+
}
53+
54+
}

‎com.microej.demo.widget/src/main/java/com/microej/demo/widget/autoscrolllabel/package-info.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
/*
2+
* Copyright 2015-2021 MicroEJ Corp. All rights reserved.
3+
* Use of this source code is governed by a BSD-style license that can be found with this software.
4+
*/
5+
6+
/**
7+
* Contains the autoscroll label page.
8+
*/
9+
@ej.annotation.NonNullByDefault
10+
package com.microej.demo.widget.autoscrolllabel;

0 commit comments

Comments
 (0)