@wiztivi/dana-templates 0.0.20 → 0.0.21
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/app-template/scripts/app/theme/AppTheme.js +7 -2
- package/components/ScrollItemView.js.hbs +1 -1
- package/modules/fip/scripts/ui/screens/FipScreen.js +2 -4
- package/modules/home/scripts/ui/screens/HomeScreen.js +8 -8
- package/modules/home/scripts/ui/views/highlight/HighlightContentDescriptionView.js +2 -0
- package/modules/home/scripts/ui/views/highlight/HighlightRailItemView.js +1 -0
- package/modules/home/scripts/ui/views/scrollview/HomeMockTileListItemView.js +31 -17
- package/modules/home/scripts/ui/views/scrollview/HomeRailScrollItemView.js +1 -1
- package/modules/home/scripts/ui/views/scrollview/HomeScrollView.js +1 -1
- package/modules/menu/scripts/ui/views/MenuButtonView.js +9 -7
- package/modules/menu/scripts/ui/views/MenuView.js +1 -1
- package/modules/search/scripts/ui/screens/SearchScreen.js +14 -13
- package/modules/search/scripts/ui/views/rail/SearchScrollItemView.js +2 -1
- package/modules/search/scripts/ui/views/rail/SearchScrollView.js +1 -1
- package/modules/search/scripts/ui/views/rail/SearchTileListItemView.js +40 -29
- package/modules/settings/scripts/ui/screens/SettingsScreen.js +6 -7
- package/modules/vod/scripts/ui/views/MockTileListItemView.js +30 -17
- package/modules/vod/scripts/ui/views/RailScrollItemView.js +2 -1
- package/modules/vod/scripts/ui/views/VodScrollView.js +1 -1
- package/package.json +1 -1
|
@@ -13,6 +13,8 @@ export default $AbstractTheme.declare("AppTheme", {
|
|
|
13
13
|
statics: /** @lends AppTheme */ {
|
|
14
14
|
FULL_SCREEN_WIDTH: 1920,
|
|
15
15
|
FULL_SCREEN_HEIGHT: 1080,
|
|
16
|
+
SCREEN_TOP_MARGIN: 60,
|
|
17
|
+
SCREEN_LEFT_MARGIN: 108,
|
|
16
18
|
APP_LOGO_URL: "dana_logo_light",
|
|
17
19
|
|
|
18
20
|
///////////////////////////////////////////////////////////////////////
|
|
@@ -22,11 +24,14 @@ export default $AbstractTheme.declare("AppTheme", {
|
|
|
22
24
|
RobotoBold: "RobotoBold",
|
|
23
25
|
MockIcons: "",
|
|
24
26
|
|
|
27
|
+
H1_SIZE: 48,
|
|
28
|
+
H2_SIZE: 30,
|
|
29
|
+
|
|
25
30
|
///////////////////////////////////////////////////////////////////////
|
|
26
31
|
// COLORS
|
|
27
32
|
///////////////////////////////////////////////////////////////////////
|
|
28
|
-
COLOR_BACKGROUND: "#
|
|
29
|
-
COLOR_BACKGROUND_LIGHT: "#
|
|
33
|
+
COLOR_BACKGROUND: "#17191C",
|
|
34
|
+
COLOR_BACKGROUND_LIGHT: "#22262A",
|
|
30
35
|
COLOR_ACCENT: "#A070FF",
|
|
31
36
|
COLOR_MUTED: "#575757",
|
|
32
37
|
COLOR_TEXT: "#FFFFFF"
|
|
@@ -21,7 +21,6 @@ import $Theme from "@Theme";
|
|
|
21
21
|
export default $AppScreen.declare("FipScreen", {
|
|
22
22
|
statics: /** @lends FipScreen */ {
|
|
23
23
|
COLOR_TRANSPARENT: "#00000000",
|
|
24
|
-
SCREEN_HORIZONTAL_MARGIN: 50,
|
|
25
24
|
},
|
|
26
25
|
|
|
27
26
|
children: /** @lends FipScreen.prototype */ {
|
|
@@ -160,13 +159,12 @@ export default $AppScreen.declare("FipScreen", {
|
|
|
160
159
|
gradientColorEnd: ({parent}) => parent.statics.COLOR_TRANSPARENT
|
|
161
160
|
},
|
|
162
161
|
contentInfo: {
|
|
163
|
-
x:
|
|
162
|
+
x: $Theme.SCREEN_LEFT_MARGIN,
|
|
164
163
|
y: 630
|
|
165
164
|
},
|
|
166
165
|
playButton: {
|
|
167
|
-
x:
|
|
166
|
+
x: $Theme.SCREEN_LEFT_MARGIN,
|
|
168
167
|
y: ({parent}) => parent.contentInfo.y + parent.contentInfo.height + 50
|
|
169
168
|
}
|
|
170
169
|
}
|
|
171
170
|
});
|
|
172
|
-
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
|
|
1
2
|
import $AppScreen from "@AppScreen";
|
|
2
3
|
import $ImagePrimitive from "@ImagePrimitive";
|
|
3
4
|
import $RectanglePrimitive from "@RectanglePrimitive";
|
|
@@ -22,8 +23,7 @@ import menuMock from "menuMock.json!";
|
|
|
22
23
|
*/
|
|
23
24
|
export default $AppScreen.declare("HomeScreen", {
|
|
24
25
|
statics: /** @lends HomeScreen */ {
|
|
25
|
-
|
|
26
|
-
MARGIN_LEFT: 108,
|
|
26
|
+
MENU_HEIGHT: 60,
|
|
27
27
|
LOGO_WIDTH: 183,
|
|
28
28
|
LOGO_HEIGHT: 60,
|
|
29
29
|
LOGO_X: 1642,
|
|
@@ -229,7 +229,7 @@ export default $AppScreen.declare("HomeScreen", {
|
|
|
229
229
|
"logo.opacity": 0,
|
|
230
230
|
"highlight.opacity": 0,
|
|
231
231
|
"highlight.height": 0
|
|
232
|
-
}
|
|
232
|
+
}
|
|
233
233
|
},
|
|
234
234
|
|
|
235
235
|
style: {
|
|
@@ -239,15 +239,15 @@ export default $AppScreen.declare("HomeScreen", {
|
|
|
239
239
|
fillColor: $Theme.COLOR_BACKGROUND
|
|
240
240
|
},
|
|
241
241
|
menu: {
|
|
242
|
-
x:
|
|
243
|
-
y:
|
|
244
|
-
height:({parent}) => parent.statics.
|
|
242
|
+
x: $Theme.SCREEN_LEFT_MARGIN,
|
|
243
|
+
y: $Theme.SCREEN_TOP_MARGIN,
|
|
244
|
+
height: ({parent}) => parent.statics.MENU_HEIGHT
|
|
245
245
|
},
|
|
246
246
|
logo: {
|
|
247
247
|
width: ({parent}) => parent.statics.LOGO_WIDTH,
|
|
248
248
|
height: ({parent}) => parent.statics.LOGO_HEIGHT,
|
|
249
249
|
x: ({parent}) => parent.statics.LOGO_X,
|
|
250
|
-
y:
|
|
250
|
+
y: $Theme.SCREEN_TOP_MARGIN
|
|
251
251
|
},
|
|
252
252
|
highlight: {
|
|
253
253
|
height: 668,
|
|
@@ -255,7 +255,7 @@ export default $AppScreen.declare("HomeScreen", {
|
|
|
255
255
|
y: ({parent}) => parent.menu.y + 120
|
|
256
256
|
},
|
|
257
257
|
scrollView: {
|
|
258
|
-
x:
|
|
258
|
+
x: $Theme.SCREEN_LEFT_MARGIN,
|
|
259
259
|
y: ({parent}) => parent.highlight.y + parent.highlight.height + 100
|
|
260
260
|
}
|
|
261
261
|
}
|
|
@@ -86,12 +86,14 @@ export default $View.declare("HighlightContentDescriptionView", {
|
|
|
86
86
|
height: ({parent}) => parent.statics.CONTENT_TITLE_SIZE + 10,
|
|
87
87
|
size: ({parent}) => parent.statics.CONTENT_TITLE_SIZE,
|
|
88
88
|
x: ({parent}) => parent.statics.SCREEN_HORIZONTAL_MARGIN,
|
|
89
|
+
x: $Theme.SCREEN_LEFT_MARGIN,
|
|
89
90
|
y: ({parent, height}) => (parent.height - height) / 2 + 100,
|
|
90
91
|
family: $Theme.RobotoBold,
|
|
91
92
|
color: $Theme.COLOR_TEXT
|
|
92
93
|
},
|
|
93
94
|
playButton: {
|
|
94
95
|
x: ({parent}) => parent.statics.SCREEN_HORIZONTAL_MARGIN,
|
|
96
|
+
x: $Theme.SCREEN_LEFT_MARGIN,
|
|
95
97
|
y: ({parent}) => parent.title.y + 100,
|
|
96
98
|
size: 30
|
|
97
99
|
}
|
|
@@ -1,21 +1,25 @@
|
|
|
1
|
+
|
|
2
|
+
|
|
1
3
|
import $AbstractTileView from "@AbstractTileView";
|
|
4
|
+
import $RectanglePrimitive from "@RectanglePrimitive";
|
|
2
5
|
import $ContainImagePrimitive from "@ContainImagePrimitive";
|
|
6
|
+
import $Theme from "@Theme";
|
|
3
7
|
import $Easing from "@Easing";
|
|
4
8
|
|
|
5
|
-
|
|
9
|
+
/*** Basic Tile item *
|
|
6
10
|
* @name MockTileListItemView
|
|
7
11
|
* @class
|
|
8
12
|
* @extends AbstractTileView
|
|
9
13
|
*/
|
|
10
|
-
|
|
11
14
|
export default $AbstractTileView.declare("MockTileListItemView", {
|
|
12
15
|
statics: {
|
|
13
|
-
ITEM_WIDTH:
|
|
14
|
-
ITEM_HEIGHT:
|
|
16
|
+
ITEM_WIDTH: 216,
|
|
17
|
+
ITEM_HEIGHT: 324,
|
|
15
18
|
SCALE_FOCUS: 1.1
|
|
16
19
|
},
|
|
17
20
|
children: {
|
|
18
|
-
imageView: {class: $ContainImagePrimitive},
|
|
21
|
+
imageView: { class: $ContainImagePrimitive },
|
|
22
|
+
focusRectangleView: { class: $RectanglePrimitive }
|
|
19
23
|
},
|
|
20
24
|
methods: {
|
|
21
25
|
/** * @override */
|
|
@@ -23,19 +27,12 @@ export default $AbstractTileView.declare("MockTileListItemView", {
|
|
|
23
27
|
this.imageView.url = this.data ? this.data.imageUrl : "";
|
|
24
28
|
}
|
|
25
29
|
},
|
|
26
|
-
|
|
27
|
-
y: 0, width: ({statics}) => statics.ITEM_WIDTH,
|
|
28
|
-
height: ({statics}) => statics.ITEM_HEIGHT,
|
|
29
|
-
scale: 1,
|
|
30
|
-
imageView: {
|
|
31
|
-
width: ({parent}) => parent.width,
|
|
32
|
-
height: ({parent}) => parent.height
|
|
33
|
-
},
|
|
34
|
-
opacity: ({data}) => data ? 1 : 0
|
|
35
|
-
},
|
|
30
|
+
|
|
36
31
|
states: {
|
|
37
32
|
focused: {
|
|
38
33
|
scale: ({statics}) => statics.SCALE_FOCUS,
|
|
34
|
+
"focusRectangleView.borderColor": $Theme.COLOR_ACCENT,
|
|
35
|
+
"focusRectangleView.borderWidth": 6
|
|
39
36
|
}
|
|
40
37
|
},
|
|
41
38
|
transitions: {
|
|
@@ -43,13 +40,30 @@ export default $AbstractTileView.declare("MockTileListItemView", {
|
|
|
43
40
|
scale: {
|
|
44
41
|
duration: 250,
|
|
45
42
|
easing: $Easing.linear
|
|
46
|
-
}
|
|
43
|
+
}
|
|
47
44
|
},
|
|
48
45
|
focused: {
|
|
49
46
|
scale: {
|
|
50
47
|
duration: 250,
|
|
51
48
|
easing: $Easing.linear
|
|
52
|
-
}
|
|
49
|
+
}
|
|
53
50
|
}
|
|
51
|
+
},
|
|
52
|
+
style: {
|
|
53
|
+
y: 0, width: ({statics}) => statics.ITEM_WIDTH,
|
|
54
|
+
height: ({statics}) => statics.ITEM_HEIGHT,
|
|
55
|
+
scale: 1,
|
|
56
|
+
imageView: {
|
|
57
|
+
width: ({parent}) => parent.width,
|
|
58
|
+
height: ({parent}) => parent.height,
|
|
59
|
+
borderRadius: 12
|
|
60
|
+
},
|
|
61
|
+
focusRectangleView: {
|
|
62
|
+
width: ({parent}) => parent.width,
|
|
63
|
+
height: ({ parent }) => parent.height,
|
|
64
|
+
borderRadius: 12,
|
|
65
|
+
borderWidth: 0
|
|
66
|
+
},
|
|
67
|
+
opacity: ({data}) => data ? 1 : 0
|
|
54
68
|
}
|
|
55
69
|
});
|
|
@@ -15,7 +15,7 @@ import $HomeRailScrollItemView from "@HomeRailScrollItemView";
|
|
|
15
15
|
export default $ScrollView.declare("HomeScrollView", {
|
|
16
16
|
properties: /** @lends HomeScrollView.prototype */ {
|
|
17
17
|
itemViewClass: () => $HomeRailScrollItemView,
|
|
18
|
-
itemMargin:
|
|
18
|
+
itemMargin: 503
|
|
19
19
|
},
|
|
20
20
|
|
|
21
21
|
methods: /** @lends HomeScrollView.prototype */ {}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
|
|
1
2
|
import $MRecyclingItem from "@MRecyclingItem";
|
|
2
3
|
import $View from "@View";
|
|
3
4
|
// PRIMITIVE
|
|
@@ -57,7 +58,7 @@ export default $View.declare("MenuButtonView", {
|
|
|
57
58
|
},
|
|
58
59
|
|
|
59
60
|
style: /** @lends ButtonView.prototype */ {
|
|
60
|
-
width: ({iconText, text}) => text === "" ? iconText.width : (iconText.width + text.width) +
|
|
61
|
+
width: ({iconText, text, data}) => text === "" ? iconText.width : (iconText.width + text.width) + (data.text !== "" ? 15 : 0),
|
|
61
62
|
height: ({statics}) => statics.MENU_BUTTON_HEIGHT,
|
|
62
63
|
|
|
63
64
|
button: {
|
|
@@ -70,7 +71,7 @@ export default $View.declare("MenuButtonView", {
|
|
|
70
71
|
focusBar: {
|
|
71
72
|
fillColor: $Theme.COLOR_BACKGROUND_LIGHT,
|
|
72
73
|
width: ({parent}) =>parent.width,
|
|
73
|
-
y: ({parent}) => parent.statics.MENU_BUTTON_MARGIN_TOP -
|
|
74
|
+
y: ({parent}) => parent.statics.MENU_BUTTON_MARGIN_TOP - 14,
|
|
74
75
|
height: 6,
|
|
75
76
|
borderRadius: 12
|
|
76
77
|
},
|
|
@@ -78,10 +79,11 @@ export default $View.declare("MenuButtonView", {
|
|
|
78
79
|
text: {
|
|
79
80
|
color: $Theme.COLOR_MUTED,
|
|
80
81
|
height: 24,
|
|
82
|
+
size: 24,
|
|
81
83
|
lineHeight: 24,
|
|
82
|
-
x: ({parent}) => parent.iconText.width +
|
|
84
|
+
x: ({parent}) => parent.iconText.width + (parent.data.text !== "" ? 15 : 0),
|
|
83
85
|
y: ({parent}) => parent.statics.MENU_BUTTON_MARGIN_TOP - 50,
|
|
84
|
-
family: $Theme.
|
|
86
|
+
family: $Theme.RobotoRegular,
|
|
85
87
|
// eslint-disable-next-line @dana/no-use-width-height-auto
|
|
86
88
|
isAuto_width: true
|
|
87
89
|
},
|
|
@@ -89,10 +91,10 @@ export default $View.declare("MenuButtonView", {
|
|
|
89
91
|
iconText: {
|
|
90
92
|
color: $Theme.COLOR_MUTED,
|
|
91
93
|
align: $TextAlign.CENTER,
|
|
92
|
-
size:
|
|
94
|
+
size: 24,
|
|
93
95
|
y: ({parent}) => parent.statics.MENU_BUTTON_MARGIN_TOP - 50,
|
|
94
|
-
height:
|
|
95
|
-
width:
|
|
96
|
+
height: 28,
|
|
97
|
+
width: 28,
|
|
96
98
|
family: $Theme.MockIcons
|
|
97
99
|
}
|
|
98
100
|
}
|
|
@@ -18,7 +18,7 @@ import menuMock from "menuMock.json!";
|
|
|
18
18
|
export default $View.declare("MenuView", {
|
|
19
19
|
traits: [$MRecyclingItem],
|
|
20
20
|
statics: /** @lends MenuView */ {
|
|
21
|
-
MENU_CONTAINER_WIDTH:
|
|
21
|
+
MENU_CONTAINER_WIDTH: 400,
|
|
22
22
|
MENU_CONTAINER_HEIGHT: 60,
|
|
23
23
|
GAP_BETWEEN_BUTTON: 10,
|
|
24
24
|
BUTTON_LIST_HEIGHT: 36
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
|
|
1
2
|
import $AppScreen from "@AppScreen";
|
|
2
3
|
|
|
3
4
|
import $RectanglePrimitive from "@RectanglePrimitive";
|
|
@@ -197,39 +198,39 @@ export default $AppScreen.declare("SearchScreen", {
|
|
|
197
198
|
updateRail: function (searchData) {
|
|
198
199
|
this.data.searchData = searchData;
|
|
199
200
|
this.scrollView.setData(this.data.searchData);
|
|
200
|
-
}
|
|
201
|
+
}
|
|
201
202
|
},
|
|
202
203
|
|
|
203
204
|
style: {
|
|
204
205
|
background: {
|
|
205
206
|
width: $Theme.FULL_SCREEN_WIDTH,
|
|
206
207
|
height: $Theme.FULL_SCREEN_HEIGHT,
|
|
207
|
-
fillColor: $Theme.COLOR_BACKGROUND
|
|
208
|
+
fillColor: $Theme.COLOR_BACKGROUND
|
|
208
209
|
},
|
|
209
210
|
inputView: {
|
|
210
|
-
x:
|
|
211
|
-
y:
|
|
211
|
+
x: $Theme.SCREEN_LEFT_MARGIN,
|
|
212
|
+
y: $Theme.SCREEN_TOP_MARGIN
|
|
212
213
|
},
|
|
213
214
|
keyboardView: {
|
|
214
|
-
x:
|
|
215
|
-
y: ({
|
|
215
|
+
x: $Theme.SCREEN_LEFT_MARGIN,
|
|
216
|
+
y: ({parent}) => parent.inputView.y + parent.inputView.height + parent.statics.VERTICAL_MARGIN
|
|
216
217
|
},
|
|
217
218
|
scrollView: {
|
|
218
|
-
x:
|
|
219
|
-
y: ({
|
|
219
|
+
x: $Theme.SCREEN_LEFT_MARGIN,
|
|
220
|
+
y: ({parent}) => parent.keyboardView.y + parent.keyboardView.height + parent.statics.VERTICAL_MARGIN
|
|
220
221
|
},
|
|
221
222
|
cacheScroll: {
|
|
222
223
|
width: $Theme.FULL_SCREEN_WIDTH,
|
|
223
|
-
height: ({
|
|
224
|
-
fillColor: $Theme.COLOR_BACKGROUND
|
|
224
|
+
height: ({parent}) => parent.keyboardView.x + parent.keyboardView.height + parent.statics.VERTICAL_MARGIN * 2,
|
|
225
|
+
fillColor: $Theme.COLOR_BACKGROUND
|
|
225
226
|
},
|
|
226
227
|
noResultText: {
|
|
227
|
-
x:
|
|
228
|
+
x: $Theme.SCREEN_LEFT_MARGIN,
|
|
228
229
|
y:({parent}) => parent.scrollView.y,
|
|
229
230
|
width: $Theme.FULL_SCREEN_WIDTH,
|
|
230
|
-
size: ({
|
|
231
|
+
size: ({parent}) => parent.statics.DEFAULT_TEXT_FONT_SIZE,
|
|
231
232
|
height:({parent}) => parent.statics.DEFAULT_TEXT_FONT_SIZE + 3,
|
|
232
233
|
color: $Theme.COLOR_TEXT
|
|
233
234
|
}
|
|
234
|
-
}
|
|
235
|
+
}
|
|
235
236
|
});
|
|
@@ -45,7 +45,8 @@ export default $AbstractRailView.declare("SearchScrollItemView", {
|
|
|
45
45
|
title: {
|
|
46
46
|
height: 40,
|
|
47
47
|
width: 300,
|
|
48
|
-
y: -
|
|
48
|
+
y: -60,
|
|
49
|
+
size: $Theme.H2_SIZE,
|
|
49
50
|
family: $Theme.RobotoBold,
|
|
50
51
|
color: ({ parent }) => (parent.isFocused ? $Theme.COLOR_ACCENT : $Theme.COLOR_TEXT),
|
|
51
52
|
},
|
|
@@ -15,7 +15,7 @@ import $SearchScrollItemView from "@SearchScrollItemView";
|
|
|
15
15
|
export default $ScrollView.declare("SearchScrollView", {
|
|
16
16
|
properties: /** @lends SearchScrollView.prototype */ {
|
|
17
17
|
itemViewClass: () => $SearchScrollItemView,
|
|
18
|
-
itemMargin:
|
|
18
|
+
itemMargin: 503,
|
|
19
19
|
},
|
|
20
20
|
|
|
21
21
|
methods: /** @lends SearchScrollItemView.prototype */ {},
|
|
@@ -1,56 +1,67 @@
|
|
|
1
1
|
import $AbstractTileView from "@AbstractTileView";
|
|
2
|
+
import $RectanglePrimitive from "@RectanglePrimitive";
|
|
2
3
|
import $ContainImagePrimitive from "@ContainImagePrimitive";
|
|
4
|
+
import $Theme from "@Theme";
|
|
3
5
|
import $Easing from "@Easing";
|
|
4
6
|
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
export default $AbstractTileView.declare("SearchTileListItemView", {
|
|
7
|
+
/*** Basic Tile item *
|
|
8
|
+
* @name MockTileListItemView
|
|
9
|
+
* @class
|
|
10
|
+
* @extends AbstractTileView
|
|
11
|
+
*/
|
|
12
|
+
export default $AbstractTileView.declare("MockTileListItemView", {
|
|
12
13
|
statics: {
|
|
13
|
-
ITEM_WIDTH:
|
|
14
|
-
ITEM_HEIGHT:
|
|
15
|
-
SCALE_FOCUS: 1.1
|
|
14
|
+
ITEM_WIDTH: 216,
|
|
15
|
+
ITEM_HEIGHT: 324,
|
|
16
|
+
SCALE_FOCUS: 1.1
|
|
16
17
|
},
|
|
17
18
|
children: {
|
|
18
19
|
imageView: { class: $ContainImagePrimitive },
|
|
20
|
+
focusRectangleView: { class: $RectanglePrimitive }
|
|
19
21
|
},
|
|
20
22
|
methods: {
|
|
21
23
|
/** * @override */
|
|
22
24
|
_setData: function () {
|
|
23
25
|
this.imageView.url = this.data ? this.data.imageUrl : "";
|
|
24
|
-
}
|
|
25
|
-
},
|
|
26
|
-
style: {
|
|
27
|
-
y: 0,
|
|
28
|
-
width: ({ statics }) => statics.ITEM_WIDTH,
|
|
29
|
-
height: ({ statics }) => statics.ITEM_HEIGHT,
|
|
30
|
-
scale: 1,
|
|
31
|
-
imageView: {
|
|
32
|
-
width: ({ parent }) => parent.width,
|
|
33
|
-
height: ({ parent }) => parent.height,
|
|
34
|
-
},
|
|
35
|
-
opacity: ({ data }) => (data ? 1 : 0),
|
|
26
|
+
}
|
|
36
27
|
},
|
|
28
|
+
|
|
37
29
|
states: {
|
|
38
30
|
focused: {
|
|
39
|
-
scale: ({
|
|
40
|
-
|
|
31
|
+
scale: ({statics}) => statics.SCALE_FOCUS,
|
|
32
|
+
"focusRectangleView.borderColor": $Theme.COLOR_ACCENT,
|
|
33
|
+
"focusRectangleView.borderWidth": 6
|
|
34
|
+
}
|
|
41
35
|
},
|
|
42
36
|
transitions: {
|
|
43
37
|
default: {
|
|
44
38
|
scale: {
|
|
45
39
|
duration: 250,
|
|
46
|
-
easing: $Easing.linear
|
|
47
|
-
}
|
|
40
|
+
easing: $Easing.linear
|
|
41
|
+
}
|
|
48
42
|
},
|
|
49
43
|
focused: {
|
|
50
44
|
scale: {
|
|
51
45
|
duration: 250,
|
|
52
|
-
easing: $Easing.linear
|
|
53
|
-
}
|
|
54
|
-
}
|
|
46
|
+
easing: $Easing.linear
|
|
47
|
+
}
|
|
48
|
+
}
|
|
55
49
|
},
|
|
50
|
+
style: {
|
|
51
|
+
y: 0, width: ({statics}) => statics.ITEM_WIDTH,
|
|
52
|
+
height: ({statics}) => statics.ITEM_HEIGHT,
|
|
53
|
+
scale: 1,
|
|
54
|
+
imageView: {
|
|
55
|
+
width: ({parent}) => parent.width,
|
|
56
|
+
height: ({parent}) => parent.height,
|
|
57
|
+
borderRadius: 12
|
|
58
|
+
},
|
|
59
|
+
focusRectangleView: {
|
|
60
|
+
width: ({parent}) => parent.width,
|
|
61
|
+
height: ({ parent }) => parent.height,
|
|
62
|
+
borderRadius: 12,
|
|
63
|
+
borderWidth: 0
|
|
64
|
+
},
|
|
65
|
+
opacity: ({data}) => data ? 1 : 0
|
|
66
|
+
}
|
|
56
67
|
});
|
|
@@ -17,7 +17,7 @@ import $Theme from "@Theme";
|
|
|
17
17
|
*/
|
|
18
18
|
export default $AppScreen.declare("SettingsScreen", {
|
|
19
19
|
statics: /** @lends SettingsScreen */ {
|
|
20
|
-
SETTINGS_TITLE: "
|
|
20
|
+
SETTINGS_TITLE: "Settings",
|
|
21
21
|
SERIAL_NUMBER: "Serial number",
|
|
22
22
|
HARDWARE_VERSION: "Hardware version",
|
|
23
23
|
SOFTWARE_VERSION: "Software version",
|
|
@@ -26,7 +26,6 @@ export default $AppScreen.declare("SettingsScreen", {
|
|
|
26
26
|
SYSTEM_LANGUAGE: "System language",
|
|
27
27
|
UNKNOWN_SYSTEM_INFO: "N/A",
|
|
28
28
|
TITLE_X_POSITION: 252,
|
|
29
|
-
TITLE_Y_POSITION: 128
|
|
30
29
|
},
|
|
31
30
|
properties: {
|
|
32
31
|
systemInfoService: {class: $SystemInfoService}
|
|
@@ -188,15 +187,15 @@ export default $AppScreen.declare("SettingsScreen", {
|
|
|
188
187
|
settingTitleView: {
|
|
189
188
|
width: 360,
|
|
190
189
|
height: 60,
|
|
191
|
-
|
|
192
|
-
|
|
190
|
+
x: $Theme.SCREEN_LEFT_MARGIN,
|
|
191
|
+
y: $Theme.SCREEN_TOP_MARGIN,
|
|
193
192
|
family: $Theme.RobotoBold,
|
|
194
193
|
color: $Theme.COLOR_ACCENT,
|
|
195
|
-
size:
|
|
194
|
+
size: $Theme.H1_SIZE
|
|
196
195
|
},
|
|
197
196
|
settingsList: {
|
|
198
|
-
|
|
199
|
-
|
|
197
|
+
x: $Theme.SCREEN_LEFT_MARGIN,
|
|
198
|
+
y: $Theme.SCREEN_TOP_MARGIN + 100
|
|
200
199
|
}
|
|
201
200
|
}
|
|
202
201
|
});
|
|
@@ -1,21 +1,24 @@
|
|
|
1
|
+
|
|
1
2
|
import $AbstractTileView from "@AbstractTileView";
|
|
3
|
+
import $RectanglePrimitive from "@RectanglePrimitive";
|
|
2
4
|
import $ContainImagePrimitive from "@ContainImagePrimitive";
|
|
5
|
+
import $Theme from "@Theme";
|
|
3
6
|
import $Easing from "@Easing";
|
|
4
7
|
|
|
5
|
-
|
|
8
|
+
/*** Basic Tile item *
|
|
6
9
|
* @name MockTileListItemView
|
|
7
10
|
* @class
|
|
8
11
|
* @extends AbstractTileView
|
|
9
12
|
*/
|
|
10
|
-
|
|
11
13
|
export default $AbstractTileView.declare("MockTileListItemView", {
|
|
12
14
|
statics: {
|
|
13
|
-
ITEM_WIDTH:
|
|
14
|
-
ITEM_HEIGHT:
|
|
15
|
+
ITEM_WIDTH: 216,
|
|
16
|
+
ITEM_HEIGHT: 324,
|
|
15
17
|
SCALE_FOCUS: 1.1
|
|
16
18
|
},
|
|
17
19
|
children: {
|
|
18
|
-
imageView: {class: $ContainImagePrimitive},
|
|
20
|
+
imageView: { class: $ContainImagePrimitive },
|
|
21
|
+
focusRectangleView: { class: $RectanglePrimitive }
|
|
19
22
|
},
|
|
20
23
|
methods: {
|
|
21
24
|
/** * @override */
|
|
@@ -23,19 +26,12 @@ export default $AbstractTileView.declare("MockTileListItemView", {
|
|
|
23
26
|
this.imageView.url = this.data ? this.data.imageUrl : "";
|
|
24
27
|
}
|
|
25
28
|
},
|
|
26
|
-
|
|
27
|
-
y: 0, width: ({statics}) => statics.ITEM_WIDTH,
|
|
28
|
-
height: ({statics}) => statics.ITEM_HEIGHT,
|
|
29
|
-
scale: 1,
|
|
30
|
-
imageView: {
|
|
31
|
-
width: ({parent}) => parent.width,
|
|
32
|
-
height: ({parent}) => parent.height
|
|
33
|
-
},
|
|
34
|
-
opacity: ({data}) => data ? 1 : 0
|
|
35
|
-
},
|
|
29
|
+
|
|
36
30
|
states: {
|
|
37
31
|
focused: {
|
|
38
32
|
scale: ({statics}) => statics.SCALE_FOCUS,
|
|
33
|
+
"focusRectangleView.borderColor": $Theme.COLOR_ACCENT,
|
|
34
|
+
"focusRectangleView.borderWidth": 6
|
|
39
35
|
}
|
|
40
36
|
},
|
|
41
37
|
transitions: {
|
|
@@ -43,13 +39,30 @@ export default $AbstractTileView.declare("MockTileListItemView", {
|
|
|
43
39
|
scale: {
|
|
44
40
|
duration: 250,
|
|
45
41
|
easing: $Easing.linear
|
|
46
|
-
}
|
|
42
|
+
}
|
|
47
43
|
},
|
|
48
44
|
focused: {
|
|
49
45
|
scale: {
|
|
50
46
|
duration: 250,
|
|
51
47
|
easing: $Easing.linear
|
|
52
|
-
}
|
|
48
|
+
}
|
|
53
49
|
}
|
|
50
|
+
},
|
|
51
|
+
style: {
|
|
52
|
+
y: 0, width: ({statics}) => statics.ITEM_WIDTH,
|
|
53
|
+
height: ({statics}) => statics.ITEM_HEIGHT,
|
|
54
|
+
scale: 1,
|
|
55
|
+
imageView: {
|
|
56
|
+
width: ({parent}) => parent.width,
|
|
57
|
+
height: ({parent}) => parent.height,
|
|
58
|
+
borderRadius: 12
|
|
59
|
+
},
|
|
60
|
+
focusRectangleView: {
|
|
61
|
+
width: ({parent}) => parent.width,
|
|
62
|
+
height: ({ parent }) => parent.height,
|
|
63
|
+
borderRadius: 12,
|
|
64
|
+
borderWidth: 0
|
|
65
|
+
},
|
|
66
|
+
opacity: ({data}) => data ? 1 : 0
|
|
54
67
|
}
|
|
55
68
|
});
|
|
@@ -45,7 +45,8 @@ export default $AbstractRailView.declare("RailScrollItemView", {
|
|
|
45
45
|
title: {
|
|
46
46
|
height: 40,
|
|
47
47
|
width: 300,
|
|
48
|
-
|
|
48
|
+
size: $Theme.H2_SIZE,
|
|
49
|
+
y:-60,
|
|
49
50
|
family: $Theme.RobotoBold,
|
|
50
51
|
color: ({parent}) => parent.isFocused? $Theme.COLOR_ACCENT : $Theme.COLOR_TEXT,
|
|
51
52
|
}
|
|
@@ -15,7 +15,7 @@ import $RailScrollItemView from "@RailScrollItemView";
|
|
|
15
15
|
export default $ScrollView.declare("VodScrollView", {
|
|
16
16
|
properties: /** @lends VodScrollView.prototype */ {
|
|
17
17
|
itemViewClass: () => $RailScrollItemView,
|
|
18
|
-
itemMargin:
|
|
18
|
+
itemMargin: 503,
|
|
19
19
|
},
|
|
20
20
|
|
|
21
21
|
methods: /** @lends VodScrollView.prototype */ {},
|