Skip to content

Commit 127b02c

Browse files
committed
Merge branch 'master' into feat/WheelPicker
2 parents 5a7dd4d + d9476a2 commit 127b02c

File tree

315 files changed

+9534
-3792
lines changed

Some content is hidden

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

315 files changed

+9534
-3792
lines changed

.eslintignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
/src/style/typography.js
2+
**/*.ts
3+
**/*.tsx

.flowconfig

Lines changed: 39 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,23 @@
55
; Ignore "BUCK" generated dirs
66
<PROJECT_ROOT>/\.buckd/
77

8-
; Ignore unexpected extra "@providesModule"
9-
.*/node_modules/.*/node_modules/fbjs/.*
8+
; Ignore polyfills
9+
node_modules/react-native/Libraries/polyfills/.*
1010

11-
; Ignore duplicate module providers
12-
; For RN Apps installed via npm, "Libraries" folder is inside
13-
; "node_modules/react-native" but in the source repo it is in the root
14-
.*/Libraries/react-native/React.js
11+
; These should not be required directly
12+
; require from fbjs/lib instead: require('fbjs/lib/warning')
13+
node_modules/warning/.*
1514

16-
; Ignore polyfills
17-
.*/Libraries/polyfills/.*
15+
; Flow doesn't support platforms
16+
.*/Libraries/Utilities/LoadingView.js
1817

19-
; Ignore metro
20-
.*/node_modules/metro/.*
18+
[untyped]
19+
.*/node_modules/@react-native-community/cli/.*/.*
2120

2221
[include]
2322

2423
[libs]
25-
node_modules/react-native/Libraries/react-native/react-native-interface.js
24+
node_modules/react-native/interface.js
2625
node_modules/react-native/flow/
2726

2827
[options]
@@ -31,39 +30,44 @@ emoji=true
3130
esproposal.optional_chaining=enable
3231
esproposal.nullish_coalescing=enable
3332

34-
module.system=haste
35-
module.system.haste.use_name_reducers=true
36-
# get basename
37-
module.system.haste.name_reducers='^.*/\([a-zA-Z0-9$_.-]+\.js\(\.flow\)?\)$' -> '\1'
38-
# strip .js or .js.flow suffix
39-
module.system.haste.name_reducers='^\(.*\)\.js\(\.flow\)?$' -> '\1'
40-
# strip .ios suffix
41-
module.system.haste.name_reducers='^\(.*\)\.ios$' -> '\1'
42-
module.system.haste.name_reducers='^\(.*\)\.android$' -> '\1'
43-
module.system.haste.name_reducers='^\(.*\)\.native$' -> '\1'
44-
module.system.haste.paths.blacklist=.*/__tests__/.*
45-
module.system.haste.paths.blacklist=.*/__mocks__/.*
46-
module.system.haste.paths.blacklist=<PROJECT_ROOT>/node_modules/react-native/Libraries/Animated/src/polyfills/.*
47-
module.system.haste.paths.whitelist=<PROJECT_ROOT>/node_modules/react-native/Libraries/.*
33+
module.file_ext=.js
34+
module.file_ext=.json
35+
module.file_ext=.ios.js
4836

4937
munge_underscores=true
5038

51-
module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> 'RelativeImageStub'
52-
53-
module.file_ext=.js
54-
module.file_ext=.jsx
55-
module.file_ext=.json
56-
module.file_ext=.native.js
39+
module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/node_modules/react-native/\1'
40+
module.name_mapper='^@?[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '<PROJECT_ROOT>/node_modules/react-native/Libraries/Image/RelativeImageStub'
5741

5842
suppress_type=$FlowIssue
5943
suppress_type=$FlowFixMe
6044
suppress_type=$FlowFixMeProps
6145
suppress_type=$FlowFixMeState
6246

63-
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
64-
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
65-
suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
47+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)
48+
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)?:? #[0-9]+
6649
suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
6750

51+
[lints]
52+
sketchy-null-number=warn
53+
sketchy-null-mixed=warn
54+
sketchy-number=warn
55+
untyped-type-import=warn
56+
nonstrict-import=warn
57+
deprecated-type=warn
58+
unsafe-getters-setters=warn
59+
unnecessary-invariant=warn
60+
signature-verification-failure=warn
61+
deprecated-utility=error
62+
63+
[strict]
64+
deprecated-type
65+
nonstrict-import
66+
sketchy-null
67+
unclear-type
68+
unsafe-getters-setters
69+
untyped-import
70+
untyped-type-import
71+
6872
[version]
69-
^0.92.0
73+
^0.122.0

.gitattributes

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
*.pbxproj -text
1+
# specific for windows script files
2+
*.bat text eol=crlf

.github/ISSUE_TEMPLATE/bug-report.md

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
---
2+
name: Bug Report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: bug
6+
assignees: ''
7+
8+
---
9+
10+
**Describe the bug**
11+
A clear and concise description of what the bug is.
12+
13+
**To Reproduce**
14+
Steps to reproduce the behavior:
15+
1. Go to '...'
16+
2. Click on '....'
17+
3. Scroll down to '....'
18+
4. See error
19+
20+
**Expected behavior**
21+
A clear and concise description of what you expected to happen.
22+
23+
**Code snippet**
24+
A code snippet that reproduce the issue.
25+
26+
**Screenshots**
27+
If applicable, add screenshots to help explain your problem.
28+
29+
**Device (please complete the following information):**
30+
- Device: [e.g. iPhone6]
31+
- OS: [e.g. iOS8.1]
32+
33+
**Additional context**
34+
Add any other context about the problem here.

.github/ISSUE_TEMPLATE/docs-issue.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
name: Docs Issue
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: docs
6+
assignees: ''
7+
8+
---
9+
10+
**Describe the bug**
11+
A clear and concise description of what the issue with the docs is.
12+
13+
**Component?**
14+
Are there missing docs for a component? Which component?
15+
16+
**Is there a general issue with the docs site?**
17+
18+
**Is there an issue with the Expo snack app?**
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
name: Feature Request
3+
about: Suggest an idea for this project
4+
title: ''
5+
labels: feature request
6+
assignees: ''
7+
8+
---
9+
10+
**Which component?**
11+
12+
**What is the new feature?**
13+
A clear and concise description of what the required feature
14+
15+
**Code snippet**
16+
How you would have use this feature? How the API will look like?

.github/ISSUE_TEMPLATE/question.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
name: Question
3+
about: Ask us anything
4+
title: ''
5+
labels: question
6+
assignees: ''
7+
8+
---
9+
10+
## Ask us any question
11+
12+
<!--
13+
Having trouble with using RNUILIB? Curious about a feature? Wondering about are future plans?
14+
Ask us anything!
15+
-->
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
name: Typescript Issue
3+
about: Let us know there's an issue with a component typings
4+
title: ''
5+
labels: typescript
6+
assignees: ''
7+
8+
---
9+
10+
**Component**
11+
Which component has a missing or invalid typings?
12+
13+
**What's the issue?**

.github/pull_request_template.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
## Description
2+
*Enter description to help the reviewer understand what's the change about...*
3+
4+
## Changelog
5+
*Add a quick message for our users about this change*

.github/stale.yml

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
# Configuration for probot-stale - https://github.com/probot/stale
2+
3+
# Number of days of inactivity before an Issue or Pull Request becomes stale
4+
daysUntilStale: 60
5+
6+
# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
7+
# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
8+
daysUntilClose: 7
9+
10+
# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
11+
onlyLabels: []
12+
13+
# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
14+
exemptLabels:
15+
- pinned
16+
- WIP
17+
- bug
18+
- "feature request"
19+
- "typescript"
20+
21+
# Set to true to ignore issues in a project (defaults to false)
22+
exemptProjects: false
23+
24+
# Set to true to ignore issues in a milestone (defaults to false)
25+
exemptMilestones: false
26+
27+
# Set to true to ignore issues with an assignee (defaults to false)
28+
exemptAssignees: false
29+
30+
# Label to use when marking as stale
31+
staleLabel: wontfix
32+
33+
# Comment to post when marking as stale. Set to `false` to disable
34+
markComment: >
35+
This issue has been automatically marked as stale because it has not had
36+
recent activity. It will be closed if no further activity occurs. Thank you
37+
for your contributions.
38+
39+
# Comment to post when removing the stale label.
40+
# unmarkComment: >
41+
# Your comment here.
42+
43+
# Comment to post when closing a stale Issue or Pull Request.
44+
# closeComment: >
45+
# Your comment here.
46+
47+
# Limit the number of actions per hour, from 1-30. Default is 30
48+
limitPerRun: 30
49+
50+
# Limit to only `issues` or `pulls`
51+
# only: issues
52+
53+
# Optionally, specify configuration settings that are specific to just 'issues' or 'pulls':
54+
# pulls:
55+
# daysUntilStale: 30
56+
# markComment: >
57+
# This pull request has been automatically marked as stale because it has not had
58+
# recent activity. It will be closed if no further activity occurs. Thank you
59+
# for your contributions.
60+
61+
# issues:
62+
# exemptLabels:
63+
# - confirmed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ build/
2929
.gradle
3030
local.properties
3131
*.iml
32+
android/gradlew.bat
33+
expoDemo/android/gradlew.bat
3234

3335
# node.js
3436
#
@@ -65,3 +67,4 @@ package-lock.json
6567
/ios/Pods/
6668
/ios/Podfile.lock
6769
expoDemo/ios/Pods
70+

.prettierrc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,8 @@
22
"trailingComma": "none",
33
"tabWidth": 2,
44
"singleQuote": true,
5-
"bracketSpacing": false
5+
"bracketSpacing": false,
6+
"arrowParens": "avoid",
7+
"jsxBracketSameLine": false,
8+
"printWidth": 120
69
}

android/app/build.gradle

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ android {
2525
applicationId "com.rnuilib"
2626
minSdkVersion rootProject.ext.minSdkVersion
2727
targetSdkVersion rootProject.ext.targetSdkVersion
28-
missingDimensionStrategy "RNN.reactNativeVersion", "reactNative60"
2928
versionCode 1
3029
versionName "1.0"
30+
multiDexEnabled true
3131
}
3232
splits {
3333
abi {
@@ -51,12 +51,13 @@ android {
5151
}
5252
release {
5353
// Caution! In production, you need to generate your own keystore file.
54-
// see https://facebook.github.io/react-native/docs/signed-apk-android.
54+
// see https://reactnative.dev/docs/signed-apk-android.
5555
signingConfig signingConfigs.debug
5656
minifyEnabled enableProguardInReleaseBuilds
5757
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
5858
}
5959
}
60+
6061
// applicationVariants are e.g. debug, release
6162
applicationVariants.all { variant ->
6263
variant.outputs.each { output ->
@@ -75,7 +76,22 @@ android {
7576

7677
dependencies {
7778
implementation fileTree(dir: "libs", include: ["*.jar"])
79+
//noinspection GradleDynamicVersion
7880
implementation "com.facebook.react:react-native:+" // From node_modules
81+
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
82+
83+
debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
84+
exclude group:'com.facebook.fbjni'
85+
}
86+
87+
debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
88+
exclude group:'com.facebook.flipper'
89+
exclude group:'com.squareup.okhttp3', module:'okhttp'
90+
}
91+
92+
debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") {
93+
exclude group:'com.facebook.flipper'
94+
}
7995
implementation project(':react-native-navigation')
8096
implementation project(':react-native-ui-lib')
8197
implementation 'com.facebook.fresco:fresco:2.0.0'

0 commit comments

Comments
 (0)