Skip to content

Commit 08ae3c2

Browse files
committed
update example to rn 44
1 parent fc85f90 commit 08ae3c2

File tree

12 files changed

+179
-157
lines changed

12 files changed

+179
-157
lines changed

.DS_Store

6 KB
Binary file not shown.

examples/FacebookTabsExample/.babelrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"presets": ["react-native"]
3-
}
2+
"presets": ["react-native"]
3+
}

examples/FacebookTabsExample/.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
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.facebooktabsexample',
47+
name = "build_config",
48+
package = "com.facebooktabsexample",
5049
)
5150

5251
android_resource(
53-
name = 'res',
54-
res = 'src/main/res',
55-
package = 'com.facebooktabsexample',
52+
name = "res",
53+
package = "com.facebooktabsexample",
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
)

examples/FacebookTabsExample/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: []

examples/FacebookTabsExample/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
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
)

examples/FacebookTabsExample/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import {
44
Text,
55
View,
66
ScrollView,
7-
Navigator,
87
TouchableOpacity,
98
} from 'react-native';
9+
import { Navigator } from 'react-native-deprecated-custom-components'
1010
import SimpleExample from './SimpleExample';
1111
import ScrollableTabsExample from './ScrollableTabsExample';
1212
import OverlayExample from './OverlayExample';

examples/FacebookTabsExample/ios/FacebookTabsExample.xcodeproj/project.pbxproj

Lines changed: 66 additions & 49 deletions
Large diffs are not rendered by default.
Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,68 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
4-
<dict>
5-
<key>CFBundleDevelopmentRegion</key>
6-
<string>en</string>
7-
<key>CFBundleDisplayName</key>
8-
<string>FacebookTabsExample</string>
9-
<key>CFBundleExecutable</key>
10-
<string>$(EXECUTABLE_NAME)</string>
11-
<key>CFBundleIdentifier</key>
12-
<string>org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)</string>
13-
<key>CFBundleInfoDictionaryVersion</key>
14-
<string>6.0</string>
15-
<key>CFBundleName</key>
16-
<string>$(PRODUCT_NAME)</string>
17-
<key>CFBundlePackageType</key>
18-
<string>APPL</string>
19-
<key>CFBundleShortVersionString</key>
20-
<string>1.0</string>
21-
<key>CFBundleSignature</key>
22-
<string>????</string>
23-
<key>CFBundleVersion</key>
24-
<string>1</string>
25-
<key>LSRequiresIPhoneOS</key>
26-
<true/>
27-
<key>UILaunchStoryboardName</key>
28-
<string>LaunchScreen</string>
29-
<key>UIRequiredDeviceCapabilities</key>
30-
<array>
31-
<string>armv7</string>
32-
</array>
33-
<key>UISupportedInterfaceOrientations</key>
34-
<array>
35-
<string>UIInterfaceOrientationPortrait</string>
36-
<string>UIInterfaceOrientationLandscapeLeft</string>
37-
<string>UIInterfaceOrientationLandscapeRight</string>
38-
</array>
39-
<key>UIViewControllerBasedStatusBarAppearance</key>
40-
<false/>
41-
<key>NSLocationWhenInUseUsageDescription</key>
42-
<string/>
43-
<key>NSAppTransportSecurity</key>
44-
<dict>
45-
<key>NSExceptionDomains</key>
46-
<dict>
47-
<key>localhost</key>
48-
<dict>
49-
<key>NSExceptionAllowsInsecureHTTPLoads</key>
50-
<true/>
51-
</dict>
52-
</dict>
53-
</dict>
54-
<key>UIAppFonts</key>
55-
<array>
56-
<string>Entypo.ttf</string>
57-
<string>EvilIcons.ttf</string>
58-
<string>FontAwesome.ttf</string>
59-
<string>Foundation.ttf</string>
60-
<string>Ionicons.ttf</string>
61-
<string>MaterialIcons.ttf</string>
62-
<string>Octicons.ttf</string>
63-
<string>Zocial.ttf</string>
64-
<string>MaterialCommunityIcons.ttf</string>
65-
<string>SimpleLineIcons.ttf</string>
66-
</array>
67-
</dict>
68-
</plist>
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>en</string>
7+
<key>CFBundleDisplayName</key>
8+
<string>FacebookTabsExample</string>
9+
<key>CFBundleExecutable</key>
10+
<string>$(EXECUTABLE_NAME)</string>
11+
<key>CFBundleIdentifier</key>
12+
<string>org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)</string>
13+
<key>CFBundleInfoDictionaryVersion</key>
14+
<string>6.0</string>
15+
<key>CFBundleName</key>
16+
<string>$(PRODUCT_NAME)</string>
17+
<key>CFBundlePackageType</key>
18+
<string>APPL</string>
19+
<key>CFBundleShortVersionString</key>
20+
<string>1.0</string>
21+
<key>CFBundleSignature</key>
22+
<string>????</string>
23+
<key>CFBundleVersion</key>
24+
<string>1</string>
25+
<key>LSRequiresIPhoneOS</key>
26+
<true/>
27+
<key>UILaunchStoryboardName</key>
28+
<string>LaunchScreen</string>
29+
<key>UIRequiredDeviceCapabilities</key>
30+
<array>
31+
<string>armv7</string>
32+
</array>
33+
<key>UISupportedInterfaceOrientations</key>
34+
<array>
35+
<string>UIInterfaceOrientationPortrait</string>
36+
<string>UIInterfaceOrientationLandscapeLeft</string>
37+
<string>UIInterfaceOrientationLandscapeRight</string>
38+
</array>
39+
<key>UIViewControllerBasedStatusBarAppearance</key>
40+
<false/>
41+
<key>NSLocationWhenInUseUsageDescription</key>
42+
<string/>
43+
<key>NSAppTransportSecurity</key>
44+
<dict>
45+
<key>NSExceptionDomains</key>
46+
<dict>
47+
<key>localhost</key>
48+
<dict>
49+
<key>NSExceptionAllowsInsecureHTTPLoads</key>
50+
<true/>
51+
</dict>
52+
</dict>
53+
</dict>
54+
<key>UIAppFonts</key>
55+
<array>
56+
<string>Entypo.ttf</string>
57+
<string>EvilIcons.ttf</string>
58+
<string>FontAwesome.ttf</string>
59+
<string>Foundation.ttf</string>
60+
<string>Ionicons.ttf</string>
61+
<string>MaterialCommunityIcons.ttf</string>
62+
<string>MaterialIcons.ttf</string>
63+
<string>Octicons.ttf</string>
64+
<string>SimpleLineIcons.ttf</string>
65+
<string>Zocial.ttf</string>
66+
</array>
67+
</dict>
68+
</plist>

0 commit comments

Comments
 (0)