Skip to content

Commit aba5c91

Browse files
committed
update example deps
1 parent 5f7f3a0 commit aba5c91

File tree

16 files changed

+180
-133
lines changed

16 files changed

+180
-133
lines changed

examples/FacebookTabsExample/.flowconfig

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
# Ignore react and fbjs where there are overlaps, but don't ignore
1616
# anything that react-native relies on
1717
.*/node_modules/fbjs/lib/Map.js
18-
.*/node_modules/fbjs/lib/fetch.js
19-
.*/node_modules/fbjs/lib/ExecutionEnvironment.js
2018
.*/node_modules/fbjs/lib/ErrorUtils.js
2119

2220
# Flow has a built-in definition for the 'react' module which we prefer to use
@@ -48,6 +46,9 @@
4846
# Ignore BUCK generated folders
4947
.*\.buckd/
5048

49+
# Ignore RNPM
50+
.*/local-cli/rnpm/.*
51+
5152
.*/node_modules/is-my-json-valid/test/.*\.json
5253
.*/node_modules/iconv-lite/encodings/tables/.*\.json
5354
.*/node_modules/y18n/test/.*\.json
@@ -82,15 +83,15 @@ esproposal.class_instance_fields=enable
8283
munge_underscores=true
8384

8485
module.name_mapper='^image![a-zA-Z0-9$_-]+$' -> 'GlobalImageStub'
85-
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\)$' -> 'RelativeImageStub'
86+
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'
8687

8788
suppress_type=$FlowIssue
8889
suppress_type=$FlowFixMe
8990
suppress_type=$FixMe
9091

91-
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(2[0-2]\\|1[0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
92-
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(2[0-2]\\|1[0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
92+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(2[0-5]\\|1[0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
93+
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(2[0-5]\\|1[0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
9394
suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
9495

9596
[version]
96-
^0.22.0
97+
^0.25.0

examples/FacebookTabsExample/FacebookExample.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export default React.createClass({
1818
<Text>News</Text>
1919
</View>
2020
</ScrollView>
21-
<ScrollView tabLabel="person-stalker" style={styles.tabView}>
21+
<ScrollView tabLabel="ios-people" style={styles.tabView}>
2222
<View style={styles.card}>
2323
<Text>Friends</Text>
2424
</View>
@@ -28,12 +28,12 @@ export default React.createClass({
2828
<Text>Messenger</Text>
2929
</View>
3030
</ScrollView>
31-
<ScrollView tabLabel="ios-world" style={styles.tabView}>
31+
<ScrollView tabLabel="ios-notifications" style={styles.tabView}>
3232
<View style={styles.card}>
3333
<Text>Notifications</Text>
3434
</View>
3535
</ScrollView>
36-
<ScrollView tabLabel="navicon-round" style={styles.tabView}>
36+
<ScrollView tabLabel="ios-list" style={styles.tabView}>
3737
<View style={styles.card}>
3838
<Text>Other nav</Text>
3939
</View>

examples/FacebookTabsExample/FacebookTabBar.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import React, {
1+
import React from 'react';
2+
import {
23
StyleSheet,
34
Text,
45
View,

examples/FacebookTabsExample/OverlayExample.js

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,15 @@ export default React.createClass({
1818
tabBarPosition='overlayTop'
1919
>
2020
<ScrollView tabLabel='iOS'>
21-
<Icon name='social-apple' color='#DBDDDE' size={300} style={styles.icon} />
22-
<Icon name='social-apple-outline' color='#DBDDDE' size={300} style={styles.icon} />
23-
<Icon name='ipad' color='#DBDDDE' size={300} style={styles.icon} />
24-
<Icon name='iphone' color='#DBDDDE' size={300} style={styles.icon} />
25-
<Icon name='ipod' color='#DBDDDE' size={300} style={styles.icon} />
21+
<Icon name='logo-apple' color='black' size={300} style={styles.icon} />
22+
<Icon name='ios-phone-portrait' color='black' size={300} style={styles.icon} />
23+
<Icon name='logo-apple' color='#DBDDDE' size={300} style={styles.icon} />
24+
<Icon name='ios-phone-portrait' color='#DBDDDE' size={300} style={styles.icon} />
2625
</ScrollView>
2726
<ScrollView tabLabel='Android'>
28-
<Icon name='social-android' color='#A4C639' size={300} style={styles.icon} />
29-
<Icon name='social-android-outline' color='#A4C639' size={300} style={styles.icon} />
30-
<Icon name='android-playstore' color='#A4C639' size={300} style={styles.icon} />
27+
<Icon name='logo-android' color='#A4C639' size={300} style={styles.icon} />
28+
<Icon name='logo-android' color='black' size={300} style={styles.icon} />
29+
<Icon name='logo-android' color='brown' size={300} style={styles.icon} />
3130
</ScrollView>
3231
</ScrollableTabView>;
3332
},

examples/FacebookTabsExample/android/app/BUCK

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import re
55
# - install Buck
66
# - `npm start` - to start the packager
77
# - `cd android`
8-
# - `cp ~/.android/debug.keystore keystores/debug.keystore`
8+
# - `keytool -genkey -v -keystore keystores/debug.keystore -storepass android -alias androiddebugkey -keypass android -dname "CN=Android Debug,O=Android,C=US`
99
# - `./gradlew :app:copyDownloadableDepsToLibs` - make all Gradle compile dependencies available to Buck
1010
# - `buck install -r android/app` - compile, install and run application
1111
#

examples/FacebookTabsExample/android/app/proguard-rules.pro

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,17 +51,13 @@
5151

5252
-keepattributes Signature
5353
-keepattributes *Annotation*
54-
-keep class com.squareup.okhttp.** { *; }
55-
-keep interface com.squareup.okhttp.** { *; }
56-
-dontwarn com.squareup.okhttp.**
54+
-keep class okhttp3.** { *; }
55+
-keep interface okhttp3.** { *; }
56+
-dontwarn okhttp3.**
5757

5858
# okio
5959

6060
-keep class sun.misc.Unsafe { *; }
6161
-dontwarn java.nio.file.*
6262
-dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
6363
-dontwarn okio.**
64-
65-
# stetho
66-
67-
-dontwarn com.facebook.stetho.**
Binary file not shown.
Binary file not shown.
Binary file not shown.

examples/FacebookTabsExample/android/app/src/main/java/com/facebooktabsexample/MainActivity.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ protected boolean getUseDeveloperSupport() {
2828
return BuildConfig.DEBUG;
2929
}
3030

31-
/**
32-
* A list of packages used by the app. If the app uses additional views
33-
* or modules besides the default ones, add more packages here.
34-
*/
31+
/**
32+
* A list of packages used by the app. If the app uses additional views
33+
* or modules besides the default ones, add more packages here.
34+
*/
3535
@Override
3636
protected List<ReactPackage> getPackages() {
37-
return Arrays.<ReactPackage>asList(
38-
new MainReactPackage(),
39-
new VectorIconsPackage()
40-
);
37+
return Arrays.<ReactPackage>asList(
38+
new MainReactPackage(),
39+
new VectorIconsPackage()
40+
);
4141
}
4242
}

0 commit comments

Comments
 (0)