Skip to content

Commit a241931

Browse files
ethansharethanshar
committed
Merge branch 'master' into release
2 parents 2fa50be + e0247b7 commit a241931

File tree

191 files changed

+3499
-1255
lines changed

Some content is hidden

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

191 files changed

+3499
-1255
lines changed

‎.github/pull_request_template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
*Enter description to help the reviewer understand what's the change about...*
33

44
## Changelog
5-
*Add a quick message for our users about this change*
5+
*Add a quick message for our users about this change (include Compoennt name, relevant props and general purpose of the PR)*

‎README.md

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,19 @@
11
<p align="center">
2-
UI Toolset & Components Library for React Native
3-
<img src="https://user-images.githubusercontent.com/1780255/64093084-a11b0300-cd5f-11e9-9175-a7b4d2b717a7.png"/>
2+
<img src="https://user-images.githubusercontent.com/1780255/105469025-56759000-5ca0-11eb-993d-3568c1fd54f4.png" height="250px" style="display:block"/>
3+
</p>
4+
<p align="center">UI Toolset & Components Library for React Native</p>
5+
<p align="center">
6+
<img src="https://user-images.githubusercontent.com/1780255/105469340-bec47180-5ca0-11eb-8986-3eb986f884d9.jpg"/>
47
</p>
58

6-
<table>
7-
<tr>
8-
<td>
9-
<img height="500" src="https://user-images.githubusercontent.com/1780255/72094962-3044b280-3320-11ea-8e41-aa83743bafb9.gif">
10-
</td>
11-
<td>
12-
<img height="500" src="https://user-images.githubusercontent.com/1780255/72094961-3044b280-3320-11ea-95e2-9aa745c8b07d.gif">
13-
</td>
14-
<td>
15-
<img height="500" src="https://user-images.githubusercontent.com/1780255/72094958-2fac1c00-3320-11ea-8f67-9d759cfa4ae1.gif">
16-
</td>
17-
</tr>
18-
</table>
19-
209

2110
---
2211
[![Build Status](https://travis-ci.org/wix/react-native-ui-lib.svg?branch=master)](https://travis-ci.org/wix/react-native-ui-lib)
2312
[![npm](https://img.shields.io/npm/v/react-native-ui-lib.svg)](https://www.npmjs.com/package/react-native-ui-lib)
2413
[![NPM Downloads](https://img.shields.io/npm/dm/react-native-ui-lib.svg?style=flat)](https://www.npmjs.com/package/react-native-ui-lib)
14+
<a href="https://twitter.com/rnuilib"><img src="https://img.shields.io/twitter/follow/rnuilib.svg?style=flat&colorA=1DA1F2&colorB=20303C&label=Follow%20us%20on%20Twitter" alt="Follow on Twitter"></a>
2515

2616

27-
Read more in our [Uncyclo](https://github.com/wix/react-native-ui-lib/wiki). <br>
2817
Check out our [Docs](https://wix.github.io/react-native-ui-lib/). <br>
2918
Our [Discord Channel](https://discord.gg/2eW4g6Z)
3019

@@ -35,10 +24,10 @@ Download our Expo demo app <br>
3524

3625
## Installing
3726

38-
See setup instructions [here](https://github.com/wix/react-native-ui-lib/wiki/SETUP).
27+
See setup instructions [here](https://wix.github.io/react-native-ui-lib/getting-started/setup).
3928

4029
#### New Major Version 5.0
41-
See [breaking changes](https://github.com/wix/react-native-ui-lib/wiki/V5-%5BBreaking-Change%5D)
30+
See [breaking changes](https://wix.github.io/react-native-ui-lib/getting-started/v5)
4231

4332
#### For React Native >= 0.60.0
4433
please use `react-native-ui-lib`
@@ -106,7 +95,7 @@ ThemeManager.setComponentTheme('Button', (props, context) => {
10695

10796
### Step 3
10897
Use it all together.
109-
Your configurations will be applied on uilib components so you can use them easily with [modifiers](https://github.com/wix/react-native-ui-lib/wiki/MODIFIERS).
98+
Your configurations will be applied on uilib components so you can use them easily with [modifiers](https://wix.github.io/react-native-ui-lib/foundation/modifiers).
11099

111100
```
112101
// MyScreen.js
@@ -129,3 +118,4 @@ class MyScreen extends Component {
129118
}
130119
}
131120
```
121+

‎demo/src/screens/MainScreen.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ class MainScreen extends Component {
181181
paddingV-s2
182182
onPress={() => this.openScreen(item)}
183183
onLongPress={() => this.setDefaultScreen(item)}
184-
activeBackgroundColor={Colors.blue40}
184+
activeBackgroundColor={Colors.primary}
185185
activeOpacity={1}
186186
>
187187
<Text style={[item.deprecate && styles.entryTextDeprecated]} dark10 text50>

‎demo/src/screens/SettingsScreen.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ class SettingsScreen extends Component {
3030
};
3131
}
3232

33-
async componentWillMount() {
33+
async UNSAFE_componentWillMount() {
3434
const {screens} = this.state;
3535
const defaultScreenId = await AsyncStorage.getItem('uilib.defaultScreen');
3636
const defaultScreen = _.find(screens, {value: defaultScreenId});
37-
37+
3838
const isRTLString = await AsyncStorage.getItem('uilib.isRTL');
3939
const isRTL = isRTLString === 'true';
40-
40+
4141
this.setState({defaultScreen, isRTL});
4242
}
4343

@@ -63,7 +63,7 @@ class SettingsScreen extends Component {
6363
const {defaultScreen, showRefreshMessage, isRTL, screens} = this.state;
6464
const {extraSettingsUI} = this.props;
6565
const filteredScreens = _.filter(screens, screen => !_.isUndefined(screen.value));
66-
66+
6767
return (
6868
<View flex padding-25 bg-grey80>
6969
<View flex>
@@ -82,7 +82,7 @@ class SettingsScreen extends Component {
8282
<Picker.Item key={screen.value} value={screen}/>
8383
))}
8484
</Picker>
85-
85+
8686
<View style={{borderWidth: 1, borderColor: Colors.dark70, marginTop: 40}}>
8787
<View style={[{padding: 5, borderBottomWidth: 1}, styles.block]}>
8888
<Text text80 dark20>Current layout direction</Text>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export default class ActionBarScreen extends Component {
4545

4646
<View style={styles.page}>
4747
<ActionBar
48-
backgroundColor={Colors.blue30}
48+
backgroundColor={Colors.primary}
4949
actions={[
5050
{label: 'Hide', onPress: () => Alert.alert('hide'), white: true},
5151
{label: 'Add Discount', onPress: () => Alert.alert('add discount'), white: true},

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

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, {Component} from 'react';
22
import {ScrollView, StyleSheet} from 'react-native';
3-
import {Colors, View, Badge, Button, Text} from 'react-native-ui-lib'; //eslint-disable-line
3+
import {Colors, View, Badge, Button, Text, Image} from 'react-native-ui-lib'; //eslint-disable-line
44
const BadgesSpace = 30;
55
const plusIcon = require('../../assets/icons/chevronUp.png');
66
const minusIcon = require('../../assets/icons/chevronDown.png');
@@ -25,6 +25,23 @@ export default class BadgesScreen extends Component {
2525
}
2626

2727
render() {
28+
const customElement1 = (
29+
<View row>
30+
<Image source={bell}/>
31+
<Image source={bell}/>
32+
</View>
33+
);
34+
35+
const customElement2 = (
36+
<View row>
37+
<Image source={bell}/>
38+
<Text white text90>
39+
37
40+
</Text>
41+
<Image source={bell}/>
42+
</View>
43+
);
44+
2845
return (
2946
<ScrollView style={{backgroundColor: Colors.dark70}} contentContainerStyle={styles.container}>
3047
<Text text50 row center marginB-15>
@@ -141,10 +158,17 @@ export default class BadgesScreen extends Component {
141158
Counter Icon Badges
142159
</Text>
143160
<View row paddingH-15>
144-
<Badge marginR-10 label={'9999'} labelFormatterLimit={3} icon={bell} backgroundColor={Colors.red30}/>
145-
<Badge marginR-10 label={'4'} icon={bell} backgroundColor={Colors.red30}/>
161+
<Badge marginR-10 label={'9999'} labelFormatterLimit={3} icon={bell} backgroundColor={Colors.red30}/>
162+
<Badge marginR-10 label={'4'} icon={bell} backgroundColor={Colors.red30}/>
146163
</View>
147164

165+
<Text text50 marginB-10 row center marginT-25>
166+
Custom Element Badges
167+
</Text>
168+
<View row paddingH-15>
169+
<Badge marginR-10 label={'17'} customElement={customElement1}/>
170+
<Badge marginR-10 customElement={customElement2} backgroundColor={Colors.grey30}/>
171+
</View>
148172
</ScrollView>
149173
);
150174
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ export default class ButtonsScreen extends Component {
318318

319319
<Button
320320
style={{marginBottom: ButtonSpace}}
321-
blue30
321+
primary
322322
outline
323323
iconSource={plusIcon}
324324
label="Icon"
@@ -339,7 +339,7 @@ export default class ButtonsScreen extends Component {
339339
style={{marginBottom: ButtonSpace}}
340340
>
341341
<Image source={plusIcon} />
342-
<Text style={{marginLeft: 10, color: Colors.blue30}}>
342+
<Text marginL-10 primary>
343343
Custom Icon
344344
</Text>
345345
</Button>

0 commit comments

Comments
 (0)