Skip to content

Commit

Permalink
Merge branch 'master' into feature/hubble-capture
Browse files Browse the repository at this point in the history
* master: (188 commits)
  1.1.5
  build(change-log): v1.1.5-2
  Mock module and test a custom component using Jest (react-native-camera#1635)
  fix(rn-camera): fix codec backwards compat
  update zxing lib version
  [BUG, ANDROID] width prop not works correctly when fixOrientation is enabled (react-native-camera#1629)
  Update GradleUpgradeGuide.md (react-native-camera#1625)
  Docs around pause/resume preview (react-native-camera#1623)
  Added pause/resume preview functions to RNCamera (react-native-camera#1622)
  fix(picture-size): create None default value
  fix(rn-camera): fix types, conversions and casts
  WIP: Implement video stabilization mode property for ios (react-native-camera#1606)
  fix(picture-size): export method and change default value
  docs(expo): explain how to migrate to and from expo camera module (react-native-camera#1605)
  feat(preview): add android code
  feat(preview): add new props to JS
  ios-get-video-orientation-from-device-2
  feat(preview): add preview methods and more fixes
  Update index.d.ts
  Bug/save to capture when app goes on pause (react-native-camera#1578)
  ...
  • Loading branch information
luugiathuy committed Jun 17, 2018
2 parents ed95a4a + 5130aa4 commit fb11550
Show file tree
Hide file tree
Showing 161 changed files with 18,017 additions and 8,702 deletions.
51 changes: 37 additions & 14 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,45 +1,68 @@
{
"parser": "babel-eslint",
"env": {
"browser": true,
"node": true,
"jest": true,
"es6": true
"es6": true,
},
"parser": "babel-eslint",
"plugins": [
"react",
"react-native",
"flowtype",
"import"
],
"parserOptions": {
"ecmaVersion": 6,
"sourceType": "module",
"ecmaFeatures": {
"modules": true
}
},
"plugins": [
"react",
"react-native",
],
"extends": [
"eslint:recommended",
"plugin:react/recommended",
"plugin:import/errors"
],
"rules": {
"comma-dangle": [2, "always-multiline"],
"quotes": [2, "single", { "allowTemplateLiterals": true }],
"react/prop-types": 0,
"no-case-declarations": 0,
"react/jsx-no-bind": 0,
"react/display-name": 0,
"new-cap": 0,
"react-native/no-unused-styles": 2,
"react-native/no-inline-styles": 1,
"react-native/split-platform-components": 0,
"react-native/no-inline-styles": 0,
"react-native/no-color-literals": 0,
"no-unexpected-multiline": 0,
"no-class-assign": 1,
"no-console": 1,
"no-console": 2,
"object-curly-spacing": [1, "always"],
"no-unused-vars": ["error", { "ignoreRestSiblings": true }]
"flowtype/define-flow-type": 1,
"flowtype/use-flow-type": 1,
"import/first": 2,
"import/default": 0,
"no-unused-vars": ["error", { "ignoreRestSiblings": true }],
"import/named": 0,
"import/namespace": [2, { "allowComputed": true }],
"no-extra-boolean-cast": 0,
"import/no-duplicates": 2
},
"settings": {
"import/resolver": {
"node": {
"extensions":[
".js",
".android.js",
".ios.js",
".json"
]
}
}
},
"globals": {
"__DEV__": true,
"device": true,
"element": true,
"by": true,
"__DEV__": true
}
}
}
12 changes: 12 additions & 0 deletions .flowconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[ignore]
.*/node_modules/.*

[include]

[libs]

[lints]

[options]

[strict]
7 changes: 5 additions & 2 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
### Warning
RCTCamera is **DEPRECATED** on v1.0.0 follow our migration guide here https://github.com/react-native-community/react-native-camera/blob/master/docs/migration.md
RCTCamera is **DEPRECATED** on v1.0.0 follow our [Migration guide](https://github.com/react-native-community/react-native-camera/blob/master/docs/migration.md)

### Which implementation are you using

Expand All @@ -10,14 +10,17 @@ RCTCamera is **DEPRECATED** on v1.0.0 follow our migration guide here https://gi
2.
3.

### Does it work with Expo Camera?
Check usage with Expo - https://github.com/react-native-community/react-native-camera/blob/master/docs/Expo_Usage.md
You should open an issue there as well, so we can cooperate in a solution.

### Expected behaviour
Tell us what should happen

### Actual behaviour
Tell us what happens instead

### Environment
- **Node.js version**:
- **React Native version**:
- **React Native platform + platform version**: iOS 9.0, Android 5.0, etc

Expand Down
214 changes: 214 additions & 0 deletions CHANGELOG.md

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions Example/.babelrc

This file was deleted.

6 changes: 0 additions & 6 deletions Example/.buckconfig

This file was deleted.

48 changes: 0 additions & 48 deletions Example/.flowconfig

This file was deleted.

1 change: 0 additions & 1 deletion Example/.gitattributes

This file was deleted.

53 changes: 0 additions & 53 deletions Example/.gitignore

This file was deleted.

1 change: 0 additions & 1 deletion Example/.watchmanconfig

This file was deleted.

Loading

0 comments on commit fb11550

Please sign in to comment.