Skip to content

support RN0.49 #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

support RN0.49 #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c1e0a88
Update RCTCapturePackage.java
windwang Aug 24, 2017
700a666
Update package.json
windwang Aug 25, 2017
58cbb4f
update to RN0.49
windwang Oct 20, 2017
447d5ea
Update package.json
windwang Oct 20, 2017
f14abb9
update ViewPropTypes
windwang Oct 26, 2017
51ce729
Update package.json
windwang Oct 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Barcode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@


import React, {
PropTypes,

Component,
} from 'react'
import {
Expand All @@ -16,7 +16,9 @@ import {
NativeModules,
AppState,
Platform,
ViewPropTypes
} from 'react-native'
import PropTypes from 'prop-types'

const BarcodeManager = Platform.OS == 'ios' ? NativeModules.Barcode : NativeModules.CaptureModule

Expand All @@ -34,7 +36,7 @@ export default class Barcode extends Component {
}

static propTypes = {
...View.propTypes,
...ViewPropTypes,
onBarCodeRead: PropTypes.func.isRequired,
barCodeTypes: PropTypes.array,
scannerRectWidth: PropTypes.number,
Expand Down
3 changes: 1 addition & 2 deletions android/src/main/java/com/reactnativecomponent/barcode/RCTCapturePackage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ public List<NativeModule> createNativeModules(ReactApplicationContext reactAppli
);
}

@Override
public List<Class<? extends JavaScriptModule>> createJSModules() {
public List<Class<? extends JavaScriptModule>> createJSModules() {
return Collections.emptyList();
}

Expand Down
8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "react-native-smart-barcode",
"version": "1.0.6",
"version": "1.0.9",
"description": "A smart barcode scanner component for React Native app",
"main": "Barcode.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"repository": {
"type": "git",
"url": "git+https://github.com/react-native-component/react-native-smart-barcode.git"
"url": "git+https://github.com/windwang/react-native-smart-barcode.git"
},
"keywords": [
"react-native",
Expand All @@ -19,9 +19,9 @@
"author": "HISAME SHIZUMARU",
"license": "MIT",
"bugs": {
"url": "https://github.com/react-native-component/react-native-smart-barcode/issues"
"url": "https://github.com/windwang/react-native-smart-barcode/issues"
},
"homepage": "https://github.com/react-native-component/react-native-smart-barcode#readme",
"homepage": "https://github.com/windwang/react-native-smart-barcode#readme",
"peerDependencies": {
"react-native": ">=0.40.0"
}
Expand Down