Skip to content

Commit 5020d0c

Browse files
committed
Merge branch 'master' into release
2 parents 714d4e2 + 8ead6d5 commit 5020d0c

File tree

86 files changed

+4571
-557
lines changed

Some content is hidden

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

86 files changed

+4571
-557
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,3 +63,4 @@ package-lock.json
6363

6464
# CocoaPods
6565
/ios/Pods/
66+
expoDemo/ios/Pods

.npmignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,7 @@ test/
230230
ios/
231231
android/
232232
demo/
233+
expoDemo/
233234
uilib-docs/
234235
.babelrc
235236
# typings/

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,14 @@ UI Toolset & Components Library for React Native
2424
[![NPM Downloads](https://img.shields.io/npm/dm/react-native-ui-lib.svg?style=flat)](https://www.npmjs.com/package/react-native-ui-lib)
2525

2626

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

31+
Download our Expo demo app <br>
32+
<img height="120" src="https://user-images.githubusercontent.com/1780255/76164023-f2171400-6153-11ea-962d-d57b64a08a80.png"> <br>
33+
(You will need the Expo App)
34+
3235

3336
## Installing
3437

ReactNativeUiLib.podspec

Lines changed: 0 additions & 1 deletion
This file was deleted.

android/app/src/main/java/com/rnuilib/MainApplication.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@
66
import com.reactnativenavigation.NavigationApplication;
77
import com.reactnativenavigation.react.NavigationReactNativeHost;
88
import com.reactnativenavigation.react.ReactGateway;
9-
import com.wix.reactnativeuilib.highlighterview.HighlighterViewPackage;
10-
import com.wix.reactnativeuilib.keyboardinput.KeyboardInputPackage;
11-
import com.wix.reactnativeuilib.textinput.TextInputDelKeyHandlerPackage;
12-
import com.wix.reactnativeuilib.wheelpicker.WheelPickerPackage;
9+
import com.wix.reactnativeuilib.UiLibPackageList;
1310

1411
import java.util.Arrays;
1512
import java.util.List;
@@ -45,10 +42,7 @@ protected List<ReactPackage> getPackages() {
4542
public List<ReactPackage> createAdditionalReactPackages() {
4643
@SuppressWarnings("UnnecessaryLocalVariable")
4744
List<ReactPackage> packages = new PackageList(this).getPackages();
48-
packages.add(new HighlighterViewPackage());
49-
packages.add(new WheelPickerPackage());
50-
packages.add(new TextInputDelKeyHandlerPackage());
51-
packages.add(new KeyboardInputPackage(this));
45+
packages.addAll(new UiLibPackageList(this).getPackageList());
5246
return packages;
5347
}
5448
}

0 commit comments

Comments
 (0)