Skip to content

Commit 024d288

Browse files
author
aksonov
committed
fix: backTitle was not diplayed
fix: tintColor doesn't work for back/left button
1 parent f7c45b5 commit 024d288

File tree

15 files changed

+81
-83
lines changed

15 files changed

+81
-83
lines changed

Example/.babelrc

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
11
{
2-
"presets": ["react-native-stage-0/decorator-support"]
2+
"presets": [
3+
"react-native"
4+
],
5+
"plugins": [
6+
"transform-decorators-legacy"
7+
]
38
}

Example/.flowconfig

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,12 @@ suppress_type=$FlowIssue
3636
suppress_type=$FlowFixMe
3737
suppress_type=$FixMe
3838

39-
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(3[0-8]\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
40-
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(3[0-8]\\|1[0-9]\\|[1-2][0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
39+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(4[0-2]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
40+
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(4[0-2]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
4141
suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
42+
suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
4243

4344
unsafe.enable_getters_and_setters=true
4445

4546
[version]
46-
^0.38.0
47+
^0.42.0

Example/Example.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ const reducerCreate = params => {
4949
class Example extends Component {
5050
render() {
5151
return (
52-
<Router createReducer={reducerCreate}>
52+
<Router createReducer={reducerCreate} tintColor='red'>
5353
<Scene key="lightbox" lightbox leftButtonTextStyle={{ color: 'green' }} backButtonTextStyle={{ color:'red' }} >
5454
<Scene key="modal" modal hideNavBar>
5555
<Scene key="drawer" drawer contentComponent={TabView} >

Example/android/app/BUCK

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import re
2-
31
# To learn about Buck see [Docs](https://buckbuild.com/).
42
# To run your application with Buck:
53
# - install Buck
@@ -11,56 +9,57 @@ import re
119
#
1210

1311
lib_deps = []
12+
1413
for jarfile in glob(['libs/*.jar']):
15-
name = 'jars__' + re.sub(r'^.*/([^/]+)\.jar$', r'\1', jarfile)
14+
name = 'jars__' + jarfile[jarfile.rindex('/') + 1: jarfile.rindex('.jar')]
1615
lib_deps.append(':' + name)
1716
prebuilt_jar(
1817
name = name,
1918
binary_jar = jarfile,
2019
)
2120

2221
for aarfile in glob(['libs/*.aar']):
23-
name = 'aars__' + re.sub(r'^.*/([^/]+)\.aar$', r'\1', aarfile)
22+
name = 'aars__' + aarfile[aarfile.rindex('/') + 1: aarfile.rindex('.aar')]
2423
lib_deps.append(':' + name)
2524
android_prebuilt_aar(
2625
name = name,
2726
aar = aarfile,
2827
)
2928

3029
android_library(
31-
name = 'all-libs',
32-
exported_deps = lib_deps
30+
name = "all-libs",
31+
exported_deps = lib_deps,
3332
)
3433

3534
android_library(
36-
name = 'app-code',
37-
srcs = glob([
38-
'src/main/java/**/*.java',
39-
]),
40-
deps = [
41-
':all-libs',
42-
':build_config',
43-
':res',
44-
],
35+
name = "app-code",
36+
srcs = glob([
37+
"src/main/java/**/*.java",
38+
]),
39+
deps = [
40+
":all-libs",
41+
":build_config",
42+
":res",
43+
],
4544
)
4645

4746
android_build_config(
48-
name = 'build_config',
49-
package = 'com.example',
47+
name = "build_config",
48+
package = "com.example",
5049
)
5150

5251
android_resource(
53-
name = 'res',
54-
res = 'src/main/res',
55-
package = 'com.example',
52+
name = "res",
53+
package = "com.example",
54+
res = "src/main/res",
5655
)
5756

5857
android_binary(
59-
name = 'app',
60-
package_type = 'debug',
61-
manifest = 'src/main/AndroidManifest.xml',
62-
keystore = '//android/keystores:debug',
63-
deps = [
64-
':app-code',
65-
],
58+
name = "app",
59+
keystore = "//android/keystores:debug",
60+
manifest = "src/main/AndroidManifest.xml",
61+
package_type = "debug",
62+
deps = [
63+
":app-code",
64+
],
6665
)

Example/android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ import com.android.build.OutputFile
5858
* inputExcludes: ["android/**", "ios/**"],
5959
*
6060
* // override which node gets called and with what additional arguments
61-
* nodeExecutableAndArgs: ["node"]
61+
* nodeExecutableAndArgs: ["node"],
6262
*
6363
* // supply additional arguments to the packager
6464
* extraPackagerArgs: []

Example/android/app/proguard-rules.pro

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@
5050

5151
-dontwarn com.facebook.react.**
5252

53+
# TextLayoutBuilder uses a non-public Android constructor within StaticLayout.
54+
# See libs/proxy/src/main/java/com/facebook/fbui/textlayoutbuilder/proxy for details.
55+
-dontwarn android.text.StaticLayout
56+
5357
# okhttp
5458

5559
-keepattributes Signature

Example/android/keystores/BUCK

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
keystore(
2-
name = 'debug',
3-
store = 'debug.keystore',
4-
properties = 'debug.keystore.properties',
5-
visibility = [
6-
'PUBLIC',
7-
],
2+
name = "debug",
3+
properties = "debug.keystore.properties",
4+
store = "debug.keystore",
5+
visibility = [
6+
"PUBLIC",
7+
],
88
)

Example/ios/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,6 @@
9999
ReferencedContainer = "container:Example.xcodeproj">
100100
</BuildableReference>
101101
</BuildableProductRunnable>
102-
<EnvironmentVariables>
103-
<EnvironmentVariable
104-
key = "OS_ACTIVITY_MODE"
105-
value = "disable"
106-
isEnabled = "YES">
107-
</EnvironmentVariable>
108-
</EnvironmentVariables>
109102
<AdditionalOptions>
110103
</AdditionalOptions>
111104
</LaunchAction>

Example/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"react": "16.0.0-alpha.6",
1414
"react-native": "0.44.0",
1515
"react-native-button": "^2.0.0",
16-
"react-native-router-flux": "^4.0.0-beta.8",
16+
"react-native-router-flux": "4.0.0-beta.10",
1717
"react-navigation": "^1.0.0-beta.11"
1818
},
1919
"devDependencies": {

Example/yarn.lock

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3233,20 +3233,9 @@ [email protected]:
32333233
dependencies:
32343234
react-native-dismiss-keyboard "1.0.0"
32353235

3236-
react-native-router-flux@../:
3236+
react-native-router-flux@4.0.0-beta.9:
32373237
version "4.0.0-beta.9"
3238-
dependencies:
3239-
mobx "^3.1.16"
3240-
mobx-react "^4.2.1"
3241-
opencollective "^1.0.3"
3242-
prop-types "^15.5.10"
3243-
react-native-button "^2.0.0"
3244-
react-native-router-flux "4.0.0-beta.7"
3245-
react-navigation "^1.0.0-beta.11"
3246-
3247-
3248-
version "4.0.0-beta.7"
3249-
resolved "https://registry.yarnpkg.com/react-native-router-flux/-/react-native-router-flux-4.0.0-beta.7.tgz#51d61dfe6b70df7da97bf96d38b8b13d7ba1c52d"
3238+
resolved "https://registry.yarnpkg.com/react-native-router-flux/-/react-native-router-flux-4.0.0-beta.9.tgz#8fc90189b254467a2e673ccafebb62e20c966b79"
32503239
dependencies:
32513240
mobx "^3.1.16"
32523241
mobx-react "^4.2.1"

0 commit comments

Comments
 (0)