Skip to content

Commit 0a095e7

Browse files
committed
Merge branch 'master' into release
2 parents 7770877 + d4e69bd commit 0a095e7

Some content is hidden

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

56 files changed

+766
-678
lines changed

demo/src/assets/Assets.ts

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

demo/src/configurations.js

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,32 @@
1-
import {Colors, Typography, Spacings, TextField} from 'react-native-ui-lib'; // eslint-disable-line
1+
import {Assets, Colors, Typography, Spacings, TextField} from 'react-native-ui-lib'; // eslint-disable-line
22

33
export const loadDemoConfigurations = () => {
4-
require('./assets/Assets');
4+
Assets.loadAssetsGroup('icons.demo', {
5+
chevronDown: require('./assets/icons/chevronDown.png'),
6+
chevronRight: require('./assets/icons/chevronRight.png'),
7+
add: require('./assets/icons/add.png'),
8+
camera: require('./assets/icons/cameraSelected.png'),
9+
close: require('./assets/icons/close.png'),
10+
dashboard: require('./assets/icons/dashboard.png'),
11+
drag: require('./assets/icons/drag.png'),
12+
image: require('./assets/icons/image.png'),
13+
plus: require('./assets/icons/plus.png'),
14+
refresh: require('./assets/icons/refresh.png'),
15+
search: require('./assets/icons/search.png'),
16+
settings: require('./assets/icons/settings.png'),
17+
share: require('./assets/icons/share.png'),
18+
info: require('./assets/icons/info.png'),
19+
exclamation: require('./assets/icons/exclamationFillSmall.png')
20+
});
21+
22+
Assets.loadAssetsGroup('images.demo', {
23+
brokenImage: require('./assets/images/placeholderMissingImage.png')
24+
});
25+
26+
Assets.loadAssetsGroup('svgs.demo', {
27+
logo: require('./assets/svgs/headerLogo.svg').default
28+
});
29+
530
Typography.loadTypographies({
631
h1: {...Typography.text40},
732
h2: {...Typography.text50},

demo/src/demoApp.js

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,6 @@ import Storage, {DEFAULT_SCREEN} from './storage';
1414
// gold: '#FFD700',
1515
// });
1616

17-
// ThemeManager.setComponentTheme('Picker', (props) => {
18-
// if (props.useNativePicker) {
19-
// return {
20-
// topBarProps: {
21-
// doneLabel: Constants.isIOS ? 'Done2' : 'OK2',
22-
// cancelLabel: Constants.isIOS ? 'Cancel2' : 'CANCEL2',
23-
// },
24-
// };
25-
// }
26-
// });
27-
2817
// const customAnimationsDefinitions = {
2918
// customAnimation1: {
3019
// from: {opacity: 0, translateY: 20},

demo/src/screens/componentScreens/ChipsInputScreen.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@ export default class ChipsInputScreen extends Component {
4545

4646
this.setState({chips: newChips});
4747
}}
48+
validate={'required'}
49+
validateOnChange
50+
validationMessage={'You must add at least one chip'}
51+
marginB-10
4852
/>
4953

5054
<ChipsInput

demo/src/screens/componentScreens/DrawerScreen.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import React, {Component} from 'react';
22
import {StyleSheet, ScrollView, LayoutAnimation} from 'react-native';
3-
import {Colors, Typography, View, Drawer, Text, Button, Avatar, Badge, DrawerProps} from 'react-native-ui-lib';
3+
import {Assets, Colors, Typography, View, Drawer, Text, Button, Avatar, Badge, DrawerProps} from 'react-native-ui-lib';
44
import {gestureHandlerRootHOC} from 'react-native-gesture-handler';
55
import conversations from '../../data/conversations';
6-
import Assets from '../../assets/Assets';
76

87
import {renderBooleanOption, renderSliderOption, renderColorOption} from '../ExampleScreenPresenter';
98

demo/src/screens/componentScreens/HintsScreen.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import _ from 'lodash';
22
import React, {Component} from 'react';
33
import {Alert, ViewStyle} from 'react-native';
4-
import {Colors, View, Text, Hint, Button, Incubator} from 'react-native-ui-lib';
4+
import {Colors, View, Text, Hint, Button, Assets, Incubator} from 'react-native-ui-lib';
55
import {renderMultipleSegmentOptions, renderBooleanOption} from '../ExampleScreenPresenter';
6-
import Assets from '../../assets/Assets';
76

87
const settingsIcon = require('../../assets/icons/settings.png');
98
const reactions = ['❤️', '😮', '😔', '😂', '😡'];

demo/src/screens/componentScreens/ImageScreen.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import React, {Component} from 'react';
22
import {ScrollView} from 'react-native';
3-
import {View, Text, Icon, Image, Colors, OverlayTypes} from 'react-native-ui-lib';
3+
import {View, Text, Icon, Image, Colors, Assets, OverlayTypes} from 'react-native-ui-lib';
44
import {renderBooleanOption, renderRadioGroup, renderSliderOption} from '../ExampleScreenPresenter';
5-
import Assets from '../../assets/Assets';
65

76
const IMAGE_URL =
87
'https://images.pexels.com/photos/748837/pexels-photo-748837.jpeg?auto=compress&cs=tinysrgb&dpr=2&h=750&w=1260';

demo/src/screens/componentScreens/ModalScreen.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import React, {Component} from 'react';
22
import {Alert, StyleSheet} from 'react-native';
33
import {Navigation} from 'react-native-navigation';
4-
import {Colors, Carousel, PageControl, Modal, View, Text} from 'react-native-ui-lib'; // eslint-disable-line
5-
import Assets from '../../assets/Assets';
4+
import {Colors, Carousel, PageControl, Modal, View, Text, Assets} from 'react-native-ui-lib'; // eslint-disable-line
65

76
const BUTTONS_HIT_SLOP = {right: 5, left: 5, top: 10, bottom: 10};
87
interface ModalScreenProps {

demo/src/screens/componentScreens/PickerScreen.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ export default class PickerScreen extends Component {
9191
language2: options[2].value,
9292
languages: [],
9393
option: undefined,
94-
nativePickerValue: 'java',
94+
wheelPickerValue: 'java',
9595
dialogPickerValue: 'java',
9696
customModalValues: [],
9797
filter: filters[0].value,
@@ -157,8 +157,8 @@ export default class PickerScreen extends Component {
157157
label="Wheel Picker"
158158
placeholder="Pick a Language"
159159
useWheelPicker
160-
value={this.state.nativePickerValue}
161-
onChange={nativePickerValue => this.setState({nativePickerValue})}
160+
value={this.state.wheelPickerValue}
161+
onChange={wheelPickerValue => this.setState({wheelPickerValue})}
162162
trailingAccessory={<Icon source={dropdown}/>}
163163
items={options}
164164
/>

demo/src/screens/componentScreens/SortableListScreen.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import {
88
TouchableOpacity,
99
Text,
1010
Icon,
11+
Assets,
1112
Colors,
1213
Button
1314
} from 'react-native-ui-lib';
14-
import Assets from '../../assets/Assets';
1515
import {renderHeader} from '../ExampleScreenPresenter';
1616

1717
interface Item extends SortableListItemProps {

0 commit comments

Comments
 (0)