Skip to content

Commit d0affd1

Browse files
wegisweswegiswes
authored
Merge pull request #91 from mendix/develop
Merge develop to release
2 parents 428e26d + 9f3868d commit d0affd1

Some content is hidden

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

48 files changed

+368
-826
lines changed

‎index-phone-preview.html

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎index-rtl.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="utf-8">
55
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
66
<title>Mendix</title>
7-
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1, maximum-scale=1">
7+
<meta name="viewport" content="width=device-width, initial-scale=1">
88
<meta name="apple-mobile-web-app-capable" content="yes">
99

1010
{{themecss}}

‎index-tablet-preview.html

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="utf-8">
55
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
66
<title>Mendix</title>
7-
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1, maximum-scale=1">
7+
<meta name="viewport" content="width=device-width, initial-scale=1">
88
<meta name="apple-mobile-web-app-capable" content="yes">
99

1010
{{themecss}}

‎login-with-sso.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="utf-8" />
55
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
66
<title>Login</title>
7-
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1, maximum-scale=1" />
7+
<meta name="viewport" content="width=device-width, initial-scale=1" />
88
<meta name="apple-mobile-web-app-capable" content="yes" />
99

1010
{{themecss}}

‎login.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="utf-8" />
55
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
66
<title>Login</title>
7-
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1, maximum-scale=1" />
7+
<meta name="viewport" content="width=device-width, initial-scale=1" />
88
<meta name="apple-mobile-web-app-capable" content="yes" />
99

1010
{{themecss}}

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "atlas-ui-framework",
3-
"version": "2.6.1",
3+
"version": "2.6.2",
44
"description": "Mendix Atlas UI is the foundation of making beautiful apps with Mendix. For more information about the framework go to https://atlas.mendix.com.",
55
"main": "",
66
"scripts": {

‎resources/phone.png

-20 KB
Binary file not shown.

‎resources/tablet.png

-10.1 KB
Binary file not shown.

‎styles/native/js/app/custom-variables.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ export const font = {
7272
sizeH5: adjustFont(14),
7373
sizeH6: adjustFont(12),
7474
color: setColorBasedOnBackground(background.primary),
75+
colorDisabled: "#9DA1A8",
76+
labelColorDisabled: "#474E5C",
7577
weightLight: "100",
7678
weightNormal: "normal",
7779
weightSemiBold: "600",
@@ -111,8 +113,11 @@ export const button = {
111113
},
112114
primary: {
113115
color: "#FFF",
116+
colorDisabled: font.colorDisabled,
114117
borderColor: brand.primary,
118+
borderColorDisabled: border.color,
115119
backgroundColor: brand.primary,
120+
backgroundColorDisabled: border.color,
116121
},
117122
secondary: {
118123
color: brand.primary,
@@ -141,11 +146,13 @@ export const button = {
141146
export const input = {
142147
// Colors
143148
color: font.color,
149+
colorDisabled: font.colorDisabled,
144150
errorColor: brand.danger,
145151
labelColor: font.color,
152+
labelColorDisabled: font.labelColorDisabled,
146153
borderColor: contrast.lower,
147154
backgroundColor: background.primary,
148-
disabledBackgroundColor: contrast.lowest,
155+
backgroundColorDisabled: background.secondary,
149156
selectionColor: contrast.lower,
150157
placeholderTextColor: contrast.regular,
151158
underlineColorAndroid: "transparent",

‎styles/native/js/core/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"name": "Atlas-UI-Framework",
3-
"version": "2.6.1"
3+
"version": "2.6.2"
44
}

‎styles/native/js/core/variables.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ let font = {
6969
sizeH5: adjustFont(14),
7070
sizeH6: adjustFont(12),
7171
color: setColorBasedOnBackground(background.primary),
72+
colorDisabled: "#9DA1A8",
73+
labelColorDisabled: "#474E5C",
7274
weightLight: "100",
7375
weightNormal: "normal",
7476
weightSemiBold: "600",
@@ -110,8 +112,11 @@ let button = {
110112
},
111113
primary: {
112114
color: "#FFF",
115+
colorDisabled: font.colorDisabled,
113116
borderColor: brand.primary,
117+
borderColorDisabled: border.color,
114118
backgroundColor: brand.primary,
119+
backgroundColorDisabled: border.color,
115120
},
116121
secondary: {
117122
color: brand.primary,
@@ -141,11 +146,13 @@ button = merge(button, custom.button || {});
141146
let input = {
142147
// Colors
143148
color: font.color,
149+
colorDisabled: font.colorDisabled,
144150
errorColor: brand.danger,
145151
labelColor: font.color,
152+
labelColorDisabled: font.labelColorDisabled,
146153
borderColor: contrast.lower,
147154
backgroundColor: background.primary,
148-
disabledBackgroundColor: contrast.lowest,
155+
backgroundColorDisabled: background.secondary,
149156
selectionColor: contrast.lower,
150157
placeholderTextColor: contrast.regular,
151158
underlineColorAndroid: "transparent",

‎styles/native/js/core/widgets/buttons.js

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,31 @@ export const ActionButton = {
2525
paddingVertical: button.paddingVertical,
2626
paddingHorizontal: button.paddingHorizontal,
2727
},
28+
containerDisabled: {
29+
// All ViewStyle properties are allowed
30+
borderColor: button.primary.borderColorDisabled,
31+
backgroundColor: button.primary.backgroundColorDisabled,
32+
},
2833
icon: {
29-
// Size and color are allowed
34+
// size and color are allowed
3035
color: button.primary.color,
3136
size: button.fontSizeIcon,
3237
},
38+
iconDisabled: {
39+
// size and color are allowed
40+
color: button.primary.colorDisabled,
41+
},
3342
caption: {
3443
// All TextStyle properties are allowed
3544
color: button.primary.color,
3645
fontSize: button.fontSize,
3746
fontFamily: font.family,
3847
fontWeight: button.fontWeight,
3948
},
49+
captionDisabled: {
50+
// All TextStyle properties are allowed
51+
color: button.primary.colorDisabled,
52+
},
4053
};
4154
//
4255
// Default style for button inside a header

‎styles/native/js/core/widgets/checkbox.js

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Platform } from "react-native";
2-
import { background, brand, contrast, spacing } from "../variables";
2+
import { background, border, brand, contrast, font, spacing } from "../variables";
33
import { TextBox, TextBoxVertical } from "./textbox";
44
/*
55
@@ -20,10 +20,18 @@ export const CheckBox = {
2020
paddingVertical: spacing.smallest,
2121
justifyContent: "center",
2222
},
23+
containerDisabled: {
24+
// All ViewStyle properties are allowed
25+
...TextBox.containerDisabled
26+
},
2327
label: {
2428
// numberOfLines and all TextStyle properties are allowed
2529
...TextBox.label,
2630
},
31+
labelDisabled: {
32+
// All TextStyle properties are allowed
33+
...TextBox.labelDisabled
34+
},
2735
input: {
2836
// thumbColorOn, thumbColorOff, trackColorOn, trackColorOff and all TextStyle properties are allowed
2937
backgroundColor: "transparent",
@@ -35,7 +43,10 @@ export const CheckBox = {
3543
},
3644
inputDisabled: {
3745
// thumbColorOn, thumbColorOff, trackColorOn, trackColorOff and all TextStyle properties are allowed
38-
opacity: Platform.select({ android: 0.5 }),
46+
thumbColorOn: background.secondary,
47+
trackColorOn: font.colorDisabled,
48+
thumbColorOff: background.secondary,
49+
trackColorOff: border.color,
3950
},
4051
inputError: {
4152
// thumbColorOn, thumbColorOff, trackColorOn, trackColorOff and all TextStyle properties are allowed
@@ -53,9 +64,9 @@ export const CheckBox = {
5364
};
5465
export const CheckBoxVertical = {
5566
container: TextBoxVertical.container,
56-
label: {
57-
...TextBoxVertical.label,
58-
},
67+
containerDisabled: TextBoxVertical.containerDisabled,
68+
label: TextBoxVertical.label,
69+
labelDisabled: TextBoxVertical.labelDisabled,
5970
input: {
6071
...CheckBox.input,
6172
alignSelf: "flex-start",

‎styles/native/js/core/widgets/container.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,12 @@ To customize any core styling, copy the part you want to customize to styles/nat
1212
========================================================================== */
1313
export const Container = {
1414
container: {
15-
// All ViewStyle properties are allowed
15+
// rippleColor & all ViewStyle properties are allowed
1616
},
17+
containerDisabled: {
18+
// All ViewStyle properties are allowed
19+
opacity: 0.6
20+
}
1721
};
1822
export const ScrollContainer = {
1923
container: {

‎styles/native/js/core/widgets/datepicker.js

Lines changed: 23 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
import { NativeModules } from "react-native";
2-
import { darkMode } from "../../app/custom-variables";
3-
import { font, input } from "../variables";
1+
import { background, font, input } from "../variables";
42
import { TextBox, TextBoxVertical } from "./textbox";
53
/*
64
@@ -14,32 +12,34 @@ To customize any core styling, copy the part you want to customize to styles/nat
1412
1513
Default Class For Mendix Date Picker Widget
1614
========================================================================== */
17-
// Font color of native iOS datepicker can not be changed.
18-
// To fix this we change the background color of the picker if OS theme is dark and app theme is light (And the other way around).
19-
const isOSDarkMode = NativeModules && NativeModules.RNDarkMode && NativeModules.RNDarkMode.initialMode && NativeModules.RNDarkMode.initialMode === "dark";
20-
const pickerBackgroundColor = !darkMode && isOSDarkMode ?
21-
"rgba(0, 0, 0, 1)" :
22-
darkMode && !isOSDarkMode ? "rgba(255, 255, 255, 1)" : input.backgroundColor;
23-
//
2415
export const DatePicker = {
2516
container: {
2617
// All ViewStyle properties are allowed
2718
...TextBox.container,
2819
},
20+
containerDisabled: {
21+
// All ViewStyle properties are allowed
22+
...TextBox.containerDisabled
23+
},
2924
label: {
3025
// numberOfLines and all TextStyle properties are allowed
3126
...TextBox.label,
3227
},
28+
labelDisabled: {
29+
// All TextStyle properties are allowed
30+
...TextBox.labelDisabled
31+
},
3332
pickerIOS: {
34-
// All ViewStyle properties are allowed
35-
backgroundColor: pickerBackgroundColor,
33+
// All ViewStyle properties & "color" (type: string) are allowed
34+
backgroundColor: background.primary,
35+
color: font.color,
3636
},
3737
pickerBackdropIOS: {
3838
// All ViewStyle properties are allowed
3939
},
4040
pickerTopIOS: {
4141
// All ViewStyle properties are allowed
42-
backgroundColor: pickerBackgroundColor,
42+
backgroundColor: background.primary,
4343
},
4444
value: {
4545
// All TextStyle properties are allowed
@@ -55,14 +55,16 @@ export const DatePicker = {
5555
},
5656
valueDisabled: {
5757
// All TextStyle properties are allowed
58-
backgroundColor: input.disabledBackgroundColor,
58+
backgroundColor: input.backgroundColorDisabled,
59+
color: input.colorDisabled
5960
},
6061
placeholder: {
6162
// All TextStyle properties are allowed
6263
color: input.placeholderTextColor,
6364
},
6465
placeholderDisabled: {
65-
// All TextStyle properties are allowed
66+
// All TextStyle properties are allowed
67+
color: input.colorDisabled
6668
},
6769
validationMessage: {
6870
// All TextStyle properties are allowed
@@ -71,20 +73,12 @@ export const DatePicker = {
7173
};
7274
export const DatePickerVertical = {
7375
container: TextBoxVertical.container,
76+
containerDisabled: TextBoxVertical.containerDisabled,
7477
label: TextBoxVertical.label,
75-
value: {
76-
color: input.color,
77-
borderColor: input.borderColor,
78-
backgroundColor: input.backgroundColor,
79-
fontSize: input.fontSize,
80-
fontFamily: font.family,
81-
borderRadius: input.borderRadius,
82-
borderWidth: input.borderWidth,
83-
paddingHorizontal: input.paddingHorizontal,
84-
paddingVertical: input.paddingVertical,
85-
},
86-
placeholder: {
87-
color: input.placeholderTextColor,
88-
},
78+
labelDisabled: TextBoxVertical.labelDisabled,
79+
value: DatePicker.value,
80+
valueDisabled: DatePicker.valueDisabled,
81+
placeholder: DatePicker.placeholder,
82+
placeholderDisabled: DatePicker.placeholderDisabled,
8983
validationMessage: TextBoxVertical.validationMessage,
9084
};

0 commit comments

Comments
 (0)