Skip to content

Commit f2a37fb

Browse files
committed
Merge branch 'master' into release
2 parents 92d241b + 4bf83f3 commit f2a37fb

File tree

77 files changed

+475
-265
lines changed

Some content is hidden

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

77 files changed

+475
-265
lines changed

ReactNativeUiLib.podspec

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
require 'json'
2+
3+
package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
4+
5+
Pod::Spec.new do |s|
6+
s.name = "ReactNativeUiLib"
7+
s.version = package['version']
8+
s.summary = "React Native UI Library"
9+
10+
s.authors = "Wix.com"
11+
s.homepage = package['homepage']
12+
s.license = package['license']
13+
s.platforms = { :ios => "9.0", :tvos => "9.2" }
14+
15+
s.module_name = 'ReactNativeUiLib'
16+
17+
s.source = { :git => "https://github.com/wix/react-native-ui-lib.git", :tag => "#{s.version}" }
18+
s.source_files = "ios/**/*.{h,m}"
19+
20+
s.dependency 'React'
21+
s.frameworks = 'UIKit'
22+
end

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -1796,7 +1796,9 @@ exports[`AvatarScreen renders screen 1`] = `
17961796
}
17971797
style={
17981798
Array [
1799-
undefined,
1799+
Object {
1800+
"tintColor": "#FFFFFF",
1801+
},
18001802
undefined,
18011803
undefined,
18021804
undefined,

demo/src/screens/componentScreens/BadgesScreen.tsx

+6-6
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,18 @@ export default class BadgesScreen extends Component {
2121

2222
customElement1 = (
2323
<View row>
24-
<Image source={bell}/>
25-
<Image source={bell}/>
24+
<Image tintColor={Colors.$iconDefaultLight} source={bell}/>
25+
<Image tintColor={Colors.$iconDefaultLight} source={bell}/>
2626
</View>
2727
);
2828

2929
customElement2 = (
3030
<View row>
31-
<Image source={bell}/>
32-
<Text white text90>
31+
<Image tintColor={Colors.$iconSuccessLight} source={bell}/>
32+
<Text $textSuccessLight text90>
3333
37
3434
</Text>
35-
<Image source={bell}/>
35+
<Image tintColor={Colors.$iconSuccessLight} source={bell}/>
3636
</View>
3737
);
3838

@@ -152,7 +152,7 @@ export default class BadgesScreen extends Component {
152152
</Text>
153153
<View row spread marginH-50>
154154
<Badge marginR-10 label={'17'} customElement={this.customElement1}/>
155-
<Badge marginR-10 customElement={this.customElement2} backgroundColor={Colors.$backgroundNeutralHeavy}/>
155+
<Badge marginR-10 customElement={this.customElement2} backgroundColor={Colors.$backgroundDisabled}/>
156156
</View>
157157
</ScrollView>
158158
</View>

docuilib/sidebars.js

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
const componentsCategories = {
1313
// foundation: 'Foundation',
1414
// assets: 'Assets',
15+
basic: 'Basic',
1516
navigation: 'Navigation',
1617
layout: 'Layout',
1718
controls: 'Controls',

extensions/rnuilib-snippets/CHANGELOG.md

+9-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,14 @@
22

33
All notable changes to the "rnuilib-snippets" extension will be documented in this file.
44

5+
## [1.0.3]
6+
- Updating snippets and README file.
57

6-
## [1.0.0]
8+
## [1.0.2]
9+
- Updating snippets.
10+
11+
## [1.0.1]
12+
- Updating snippets.
713

8-
- Initial release of rnuilib-snippets extension.
14+
## [1.0.0]
15+
- Initial release of rnuilib-snippets extension.

extensions/rnuilib-snippets/README.md

+9-6
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,25 @@
11
# rnuilib-snippets
2+
-------------------
23

3-
This extension provides code snippets for `react-native-ui-lib`'s components for Vs Code editor.
4-
It supports JavaScript and TypeScript, ReactJavaScript and ReactTypeScript.
4+
This extension provides code snippets for `react-native-ui-lib`'s components for VS Code editor.
5+
The extension supports JavaScript and TypeScript, ReactJavaScript and ReactTypeScript.
56

67
## How to use
78

8-
After installing this extension you can generate a code snippet by simply typing a component's name (camelCase) and see the option in the suggestion tooltip.
9-
Using the tab key you can navigate through the fields to enter your values.
9+
After installing the extension you can generate a code snippet by simply typing a component's name (camelCase) and see the option in the suggestions tooltip.
10+
⚠️ Make sure the 'snippet suggestion' option in your user settings is set to 'top' for better visibility.
1011

11-
Also, type `rnuilib` and get the uilib import - `import {} from 'react-native-ui-lib'` - to import the components.
12+
Using the 'tab' key you can navigate through the component's fields to enter your own values.
13+
14+
Also, type 'rnuilib' and get the rnuilib import - `import {} from 'react-native-ui-lib'` - necessary to import the rnuilib components.
1215

1316
See video:
1417

1518
![Extension usage](./assets/usage.gif)
1619

1720
## Requirements
1821

19-
This extension generate code for `react-native-ui-lib`'s components. `react-native-ui-lib` should be installed as a dependency to your projects. See: https://github.com/wix/react-native-ui-lib#installing
22+
This extension generate code for `react-native-ui-lib`'s components. `react-native-ui-lib` should be installed as a dependency to your projects. See: https://wix.github.io/react-native-ui-lib/docs/getting-started/setup
2023

2124

2225
**Enjoy!**

extensions/rnuilib-snippets/package.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,14 @@
1010
"url": "https://github.com/wix/react-native-ui-lib"
1111
},
1212
"icon": "assets/icon.png",
13-
"version": "1.0.2",
13+
"version": "1.0.3",
1414
"engines": {
1515
"vscode": "^1.64.0"
1616
},
1717
"keywords": [
1818
"react-native",
19+
"ui",
20+
"components",
1921
"snippets",
2022
"javascript",
2123
"typescript"

0 commit comments

Comments
 (0)