Skip to content

Commit

Permalink
Merge branch 'master' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
ethanshar committed Mar 9, 2020
2 parents 714d4e2 + 8ead6d5 commit 5020d0c
Show file tree
Hide file tree
Showing 86 changed files with 4,571 additions and 557 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,4 @@ package-lock.json

# CocoaPods
/ios/Pods/
expoDemo/ios/Pods
1 change: 1 addition & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,7 @@ test/
ios/
android/
demo/
expoDemo/
uilib-docs/
.babelrc
# typings/
Expand Down
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,14 @@ UI Toolset & Components Library for React Native
[![NPM Downloads](https://img.shields.io/npm/dm/react-native-ui-lib.svg?style=flat)](https://www.npmjs.com/package/react-native-ui-lib)



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

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


## Installing

Expand Down
1 change: 0 additions & 1 deletion ReactNativeUiLib.podspec

This file was deleted.

10 changes: 2 additions & 8 deletions android/app/src/main/java/com/rnuilib/MainApplication.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@
import com.reactnativenavigation.NavigationApplication;
import com.reactnativenavigation.react.NavigationReactNativeHost;
import com.reactnativenavigation.react.ReactGateway;
import com.wix.reactnativeuilib.highlighterview.HighlighterViewPackage;
import com.wix.reactnativeuilib.keyboardinput.KeyboardInputPackage;
import com.wix.reactnativeuilib.textinput.TextInputDelKeyHandlerPackage;
import com.wix.reactnativeuilib.wheelpicker.WheelPickerPackage;
import com.wix.reactnativeuilib.UiLibPackageList;

import java.util.Arrays;
import java.util.List;
Expand Down Expand Up @@ -45,10 +42,7 @@ protected List<ReactPackage> getPackages() {
public List<ReactPackage> createAdditionalReactPackages() {
@SuppressWarnings("UnnecessaryLocalVariable")
List<ReactPackage> packages = new PackageList(this).getPackages();
packages.add(new HighlighterViewPackage());
packages.add(new WheelPickerPackage());
packages.add(new TextInputDelKeyHandlerPackage());
packages.add(new KeyboardInputPackage(this));
packages.addAll(new UiLibPackageList(this).getPackageList());
return packages;
}
}
Expand Down
Loading

0 comments on commit 5020d0c

Please sign in to comment.