Skip to content

Commit 8424c08

Browse files
M-i-k-e-lM-i-k-e-l
committed
Merge branch 'master' into release
2 parents 999cded + de85ff1 commit 8424c08

File tree

275 files changed

+2974
-2791
lines changed

Some content is hidden

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

275 files changed

+2974
-2791
lines changed

‎src/assets/icons/check.png renamed to ‎demo/src/assets/icons/check.png

File renamed without changes.

‎src/assets/icons/check@1.5x.png renamed to ‎demo/src/assets/icons/check@1.5x.png

File renamed without changes.

‎src/assets/icons/check@2x.png renamed to ‎demo/src/assets/icons/check@2x.png

File renamed without changes.

‎src/assets/icons/check@3x.png renamed to ‎demo/src/assets/icons/check@3x.png

File renamed without changes.

‎src/assets/icons/check@4x.png renamed to ‎demo/src/assets/icons/check@4x.png

File renamed without changes.

‎src/assets/icons/minusSmall.png renamed to ‎demo/src/assets/icons/minusSmall.png

File renamed without changes.

‎src/assets/icons/minusSmall@1.5x.png renamed to ‎demo/src/assets/icons/minusSmall@1.5x.png

File renamed without changes.

‎src/assets/icons/minusSmall@2x.png renamed to ‎demo/src/assets/icons/minusSmall@2x.png

File renamed without changes.

‎src/assets/icons/minusSmall@3x.png renamed to ‎demo/src/assets/icons/minusSmall@3x.png

File renamed without changes.

‎src/assets/icons/minusSmall@4x.png renamed to ‎demo/src/assets/icons/minusSmall@4x.png

File renamed without changes.

‎src/assets/icons/x.png renamed to ‎demo/src/assets/icons/x.png

File renamed without changes.

‎src/assets/icons/x@2x.png renamed to ‎demo/src/assets/icons/x@2x.png

File renamed without changes.

‎src/assets/icons/x@3x.png renamed to ‎demo/src/assets/icons/x@3x.png

File renamed without changes.

‎demo/src/configurations.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ export const loadDemoConfigurations = () => {
1616
settings: require('./assets/icons/settings.png'),
1717
share: require('./assets/icons/share.png'),
1818
info: require('./assets/icons/info.png'),
19-
exclamation: require('./assets/icons/exclamationFillSmall.png')
19+
exclamation: require('./assets/icons/exclamationFillSmall.png'),
20+
check: require('./assets/icons/check.png'),
21+
x: require('./assets/icons/x.png'),
22+
minus: require('./assets/icons/minusSmall.png')
2023
});
2124

2225
Assets.loadAssetsGroup('images.demo', {

‎demo/src/screens/__tests__/__snapshots__/AvatarScreen.spec.js.snap

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ exports[`AvatarScreen renders screen 1`] = `
121121
"bottom": 0,
122122
"justifyContent": "center",
123123
"left": 0,
124+
"overflow": "hidden",
124125
"position": "absolute",
125126
"right": 0,
126127
"top": 0,
@@ -247,6 +248,7 @@ exports[`AvatarScreen renders screen 1`] = `
247248
"bottom": 0,
248249
"justifyContent": "center",
249250
"left": 0,
251+
"overflow": "hidden",
250252
"position": "absolute",
251253
"right": 0,
252254
"top": 0,
@@ -434,6 +436,7 @@ exports[`AvatarScreen renders screen 1`] = `
434436
"bottom": 0,
435437
"justifyContent": "center",
436438
"left": 0,
439+
"overflow": "hidden",
437440
"position": "absolute",
438441
"right": 0,
439442
"top": 0,
@@ -448,6 +451,7 @@ exports[`AvatarScreen renders screen 1`] = `
448451
testID="undefined.container"
449452
>
450453
<Text
454+
ellipsizeMode="clip"
451455
numberOfLines={1}
452456
style={
453457
[
@@ -663,6 +667,7 @@ exports[`AvatarScreen renders screen 1`] = `
663667
"bottom": 0,
664668
"justifyContent": "center",
665669
"left": 0,
670+
"overflow": "hidden",
666671
"position": "absolute",
667672
"right": 0,
668673
"top": 0,
@@ -677,6 +682,7 @@ exports[`AvatarScreen renders screen 1`] = `
677682
testID="undefined.container"
678683
>
679684
<Text
685+
ellipsizeMode="clip"
680686
numberOfLines={1}
681687
style={
682688
[
@@ -898,6 +904,7 @@ exports[`AvatarScreen renders screen 1`] = `
898904
"bottom": 0,
899905
"justifyContent": "center",
900906
"left": 0,
907+
"overflow": "hidden",
901908
"position": "absolute",
902909
"right": 0,
903910
"top": 0,
@@ -1155,6 +1162,7 @@ exports[`AvatarScreen renders screen 1`] = `
11551162
"bottom": 0,
11561163
"justifyContent": "center",
11571164
"left": 0,
1165+
"overflow": "hidden",
11581166
"position": "absolute",
11591167
"right": 0,
11601168
"top": 0,
@@ -1412,6 +1420,7 @@ exports[`AvatarScreen renders screen 1`] = `
14121420
"bottom": 0,
14131421
"justifyContent": "center",
14141422
"left": 0,
1423+
"overflow": "hidden",
14151424
"position": "absolute",
14161425
"right": 0,
14171426
"top": 0,
@@ -1620,6 +1629,7 @@ exports[`AvatarScreen renders screen 1`] = `
16201629
"bottom": 0,
16211630
"justifyContent": "center",
16221631
"left": 0,
1632+
"overflow": "hidden",
16231633
"position": "absolute",
16241634
"right": 0,
16251635
"top": 0,
@@ -1877,6 +1887,7 @@ exports[`AvatarScreen renders screen 1`] = `
18771887
"bottom": 0,
18781888
"justifyContent": "center",
18791889
"left": 0,
1890+
"overflow": "hidden",
18801891
"position": "absolute",
18811892
"right": 0,
18821893
"top": 0,
@@ -2179,6 +2190,7 @@ exports[`AvatarScreen renders screen 1`] = `
21792190
"bottom": 0,
21802191
"justifyContent": "center",
21812192
"left": 0,
2193+
"overflow": "hidden",
21822194
"position": "absolute",
21832195
"right": 0,
21842196
"top": 0,
@@ -2367,6 +2379,7 @@ exports[`AvatarScreen renders screen 1`] = `
23672379
"bottom": 0,
23682380
"justifyContent": "center",
23692381
"left": 0,
2382+
"overflow": "hidden",
23702383
"position": "absolute",
23712384
"right": 0,
23722385
"top": 0,
@@ -2386,6 +2399,7 @@ exports[`AvatarScreen renders screen 1`] = `
23862399
testID="undefined.container"
23872400
>
23882401
<Text
2402+
ellipsizeMode="clip"
23892403
numberOfLines={1}
23902404
style={
23912405
[
@@ -2597,6 +2611,7 @@ exports[`AvatarScreen renders screen 1`] = `
25972611
"bottom": 0,
25982612
"justifyContent": "center",
25992613
"left": 0,
2614+
"overflow": "hidden",
26002615
"position": "absolute",
26012616
"right": 0,
26022617
"top": 0,
@@ -2616,6 +2631,7 @@ exports[`AvatarScreen renders screen 1`] = `
26162631
testID="undefined.container"
26172632
>
26182633
<Text
2634+
ellipsizeMode="clip"
26192635
numberOfLines={1}
26202636
style={
26212637
[
@@ -2827,6 +2843,7 @@ exports[`AvatarScreen renders screen 1`] = `
28272843
"bottom": 0,
28282844
"justifyContent": "center",
28292845
"left": 0,
2846+
"overflow": "hidden",
28302847
"position": "absolute",
28312848
"right": 0,
28322849
"top": 0,
@@ -3015,6 +3032,7 @@ exports[`AvatarScreen renders screen 1`] = `
30153032
"bottom": 0,
30163033
"justifyContent": "center",
30173034
"left": 0,
3035+
"overflow": "hidden",
30183036
"position": "absolute",
30193037
"right": 0,
30203038
"top": 0,
@@ -3029,6 +3047,7 @@ exports[`AvatarScreen renders screen 1`] = `
30293047
testID="undefined.container"
30303048
>
30313049
<Text
3050+
ellipsizeMode="clip"
30323051
numberOfLines={1}
30333052
style={
30343053
[

‎demo/src/screens/__tests__/__snapshots__/TextFieldScreen.spec.js.snap

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ exports[`TextField Screen renders screen 1`] = `
193193
"flexGrow": 1,
194194
"paddingBottom": 0,
195195
"paddingTop": 0,
196-
"textAlign": "left",
196+
"textAlign": undefined,
197197
},
198198
{
199199
"color": "#20303C",
@@ -655,7 +655,7 @@ exports[`TextField Screen renders screen 1`] = `
655655
"flexGrow": 1,
656656
"paddingBottom": 0,
657657
"paddingTop": 0,
658-
"textAlign": "left",
658+
"textAlign": undefined,
659659
},
660660
{
661661
"color": "#20303C",
@@ -1196,7 +1196,7 @@ exports[`TextField Screen renders screen 1`] = `
11961196
"flexGrow": 1,
11971197
"paddingBottom": 0,
11981198
"paddingTop": 0,
1199-
"textAlign": "left",
1199+
"textAlign": undefined,
12001200
},
12011201
{
12021202
"color": "#D2D6D8",
@@ -1562,7 +1562,7 @@ exports[`TextField Screen renders screen 1`] = `
15621562
"flexGrow": 1,
15631563
"paddingBottom": 0,
15641564
"paddingTop": 0,
1565-
"textAlign": "left",
1565+
"textAlign": undefined,
15661566
},
15671567
{
15681568
"color": "#20303C",
@@ -1793,7 +1793,7 @@ exports[`TextField Screen renders screen 1`] = `
17931793
"flexGrow": 1,
17941794
"paddingBottom": 0,
17951795
"paddingTop": 0,
1796-
"textAlign": "left",
1796+
"textAlign": undefined,
17971797
},
17981798
{
17991799
"color": "#20303C",
@@ -2158,7 +2158,7 @@ exports[`TextField Screen renders screen 1`] = `
21582158
"flexGrow": 1,
21592159
"paddingBottom": 0,
21602160
"paddingTop": 0,
2161-
"textAlign": "left",
2161+
"textAlign": undefined,
21622162
},
21632163
{
21642164
"color": "#20303C",
@@ -2473,7 +2473,7 @@ exports[`TextField Screen renders screen 1`] = `
24732473
"flexGrow": 1,
24742474
"paddingBottom": 0,
24752475
"paddingTop": 0,
2476-
"textAlign": "left",
2476+
"textAlign": undefined,
24772477
},
24782478
{
24792479
"color": "#20303C",
@@ -3039,7 +3039,7 @@ exports[`TextField Screen renders screen 1`] = `
30393039
"flexGrow": 1,
30403040
"paddingBottom": 0,
30413041
"paddingTop": 0,
3042-
"textAlign": "left",
3042+
"textAlign": undefined,
30433043
},
30443044
{
30453045
"color": "#20303C",
@@ -3383,7 +3383,7 @@ exports[`TextField Screen renders screen 1`] = `
33833383
"flexGrow": 1,
33843384
"paddingBottom": 0,
33853385
"paddingTop": 0,
3386-
"textAlign": "left",
3386+
"textAlign": undefined,
33873387
},
33883388
{
33893389
"color": "#20303C",
@@ -3818,7 +3818,7 @@ exports[`TextField Screen renders screen 1`] = `
38183818
"flexGrow": 1,
38193819
"paddingBottom": 0,
38203820
"paddingTop": 0,
3821-
"textAlign": "left",
3821+
"textAlign": undefined,
38223822
},
38233823
{
38243824
"color": "#20303C",
@@ -3933,7 +3933,7 @@ exports[`TextField Screen renders screen 1`] = `
39333933
accessible={false}
39343934
source={
39353935
{
3936-
"testUri": "../../../src/assets/icons/xFlat.png",
3936+
"testUri": "../../../src/assets/internal/icons/xFlat.png",
39373937
}
39383938
}
39393939
style={
@@ -4248,7 +4248,7 @@ exports[`TextField Screen renders screen 1`] = `
42484248
"flexGrow": 1,
42494249
"paddingBottom": 0,
42504250
"paddingTop": 0,
4251-
"textAlign": "left",
4251+
"textAlign": undefined,
42524252
},
42534253
{
42544254
"color": "#20303C",
@@ -4575,7 +4575,7 @@ exports[`TextField Screen renders screen 1`] = `
45754575
"flexGrow": 1,
45764576
"paddingBottom": 0,
45774577
"paddingTop": 0,
4578-
"textAlign": "left",
4578+
"textAlign": undefined,
45794579
},
45804580
{
45814581
"color": "#20303C",
@@ -4882,7 +4882,7 @@ exports[`TextField Screen renders screen 1`] = `
48824882
"flexGrow": 1,
48834883
"paddingBottom": 0,
48844884
"paddingTop": 0,
4885-
"textAlign": "left",
4885+
"textAlign": undefined,
48864886
},
48874887
{
48884888
"color": "#20303C",
@@ -5203,7 +5203,7 @@ exports[`TextField Screen renders screen 1`] = `
52035203
"flexGrow": 1,
52045204
"paddingBottom": 0,
52055205
"paddingTop": 0,
5206-
"textAlign": "left",
5206+
"textAlign": undefined,
52075207
},
52085208
{
52095209
"color": "#20303C",
@@ -5942,7 +5942,7 @@ exports[`TextField Screen renders screen 1`] = `
59425942
"flexGrow": 1,
59435943
"paddingBottom": 0,
59445944
"paddingTop": 0,
5945-
"textAlign": "left",
5945+
"textAlign": undefined,
59465946
},
59475947
{
59485948
"color": "#20303C",
@@ -6242,7 +6242,7 @@ exports[`TextField Screen renders screen 1`] = `
62426242
"flexGrow": 1,
62436243
"paddingBottom": 0,
62446244
"paddingTop": 0,
6245-
"textAlign": "left",
6245+
"textAlign": undefined,
62466246
},
62476247
{
62486248
"color": "#20303C",
@@ -6571,7 +6571,7 @@ exports[`TextField Screen renders screen 1`] = `
65716571
"flexGrow": 1,
65726572
"paddingBottom": 0,
65736573
"paddingTop": 0,
6574-
"textAlign": "left",
6574+
"textAlign": undefined,
65756575
},
65766576
{
65776577
"color": "#20303C",
@@ -6946,7 +6946,7 @@ exports[`TextField Screen renders screen 1`] = `
69466946
"flexGrow": 1,
69476947
"paddingBottom": 0,
69486948
"paddingTop": 0,
6949-
"textAlign": "left",
6949+
"textAlign": undefined,
69506950
},
69516951
{
69526952
"color": "#20303C",
@@ -7226,7 +7226,7 @@ exports[`TextField Screen renders screen 1`] = `
72267226
"flexGrow": 1,
72277227
"paddingBottom": 0,
72287228
"paddingTop": 0,
7229-
"textAlign": "left",
7229+
"textAlign": undefined,
72307230
},
72317231
{
72327232
"color": "#20303C",
@@ -7481,7 +7481,7 @@ exports[`TextField Screen renders screen 1`] = `
74817481
"flexGrow": 1,
74827482
"paddingBottom": 0,
74837483
"paddingTop": 0,
7484-
"textAlign": "left",
7484+
"textAlign": undefined,
74857485
},
74867486
{
74877487
"color": "#20303C",
@@ -7752,7 +7752,7 @@ exports[`TextField Screen renders screen 1`] = `
77527752
"flexGrow": 1,
77537753
"paddingBottom": 0,
77547754
"paddingTop": 0,
7755-
"textAlign": "left",
7755+
"textAlign": undefined,
77567756
},
77577757
{
77587758
"color": "#20303C",

‎demo/src/screens/componentScreens/CheckboxScreen.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export default class CheckboxScreen extends Component {
5151
borderRadius={2}
5252
size={30}
5353
color={Colors.purple30}
54-
selectedIcon={Assets.icons.x}
54+
selectedIcon={Assets.icons.demo.x}
5555
marginL-s5
5656
/>
5757

‎demo/src/screens/componentScreens/IconScreen.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const IconScreen = () => {
2424
<Icon
2525
size={customSize ? size : undefined}
2626
tintColor={customColor ? (color as string) : undefined}
27-
source={Assets.icons.search}
27+
source={Assets.icons.demo.search}
2828
badgeProps={
2929
useBadge
3030
? {

‎demo/src/screens/componentScreens/ModalScreen.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ export default class ModalScreen extends Component<ModalScreenProps, State> {
123123
]}
124124
leftButtons={[
125125
{
126-
icon: Assets.icons.x,
126+
icon: Assets.icons.demo.x,
127127
onPress: () => Alert.alert('back'),
128128
buttonProps: {hitSlop: BUTTONS_HIT_SLOP, iconStyle: {tintColor: Colors.yellow10}}
129129
}

‎demo/src/screens/componentScreens/PickerScreen.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ const renderContact = (contactValue: any, props: any) => {
5656
{contact?.name}
5757
</Text>
5858
</View>
59-
{props.isSelected && <Icon source={Assets.icons.check} tintColor={Colors.$iconDefault}/>}
59+
{props.isSelected && <Icon source={Assets.icons.demo.check} tintColor={Colors.$iconDefault}/>}
6060
</View>
6161
);
6262
};

0 commit comments

Comments
 (0)