Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update from source repository #32

Merged
merged 187 commits into from
Oct 23, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
187 commits
Select commit Hold shift + click to select a range
1b27a2f
[Request] Add prop for tintColor for ActionSheet in Actions #185
brianinator Aug 15, 2016
3dda3ec
Update default optionTintColor to native color
brianinator Aug 16, 2016
a566ee6
Merge branch 'release/v0.0.9' into develop
FaridSafi Aug 19, 2016
0100070
Initial support tick messages
jeromegrosse Sep 7, 2016
940af36
The message sent and delivered props have been removed from GiftedCha…
jeromegrosse Sep 8, 2016
2bfc151
Added possibility to override the behaviour of renderTicks, deleted n…
jeromegrosse Sep 9, 2016
06c9581
Updated example and ticks on the right the time and ticks only appear…
jeromegrosse Sep 10, 2016
8bf17b4
renderTick: Move the constant declaration to the top of the function
jeromegrosse Sep 11, 2016
03f199c
Expose GiftedAvatar
jeromegrosse Oct 4, 2016
a7643a9
renderTick: Possibility to change style of the ticks passing the para…
jeromegrosse Oct 5, 2016
df5be9d
Change the new messages' ids
dgdavid Oct 9, 2016
14b7ca9
fixed chat height bug
Nov 4, 2016
ca44247
Refactor utils into stand-alone functions
scarmuega Nov 28, 2016
13cee86
Improve readability of utils
scarmuega Dec 2, 2016
e8f85b1
Keep improving readability of utils
scarmuega Dec 3, 2016
042e320
Add utils to root exports
scarmuega Dec 8, 2016
c4bb53b
Add prop onInputTextChanged on GiftedChat API and help fix #286
jayshah123 Dec 12, 2016
2223828
Maintain backward compatibility with deprecation warning
scarmuega Dec 17, 2016
2fe34a8
Merge pull request #292 from scarmuega/refactor-utils
kfiroo Dec 18, 2016
3078e40
Merge pull request #197 from devbriguy/patch-1
kfiroo Dec 18, 2016
829a7aa
Add eslint script (extends airbnb + react + react-native)
cooperka Dec 21, 2016
0e80f8a
Upgrade to eslint config v0.2.3
cooperka Dec 22, 2016
7ac0ceb
Merge pull request #317 from cooperka/add-eslint
kfiroo Dec 22, 2016
e84de91
Add react-native-lightbox for enlarging chat images
cooperka Dec 12, 2016
370d031
Add navigator to propTypes
cooperka Dec 13, 2016
330b18f
Use a commit hash to fix Lightbox warning [Android]
cooperka Jan 2, 2017
af89b5e
Merge branch 'master' into feature-expose-giftedavatar
jeromegrosse Jan 4, 2017
f9b8342
Remove touch events and external keyboard dependency
tafelito Jan 4, 2017
002221d
Bump RN version
tafelito Jan 4, 2017
9b30f8c
Remove commented code
tafelito Jan 4, 2017
d1ca46c
Downgrade RN version
tafelito Jan 4, 2017
fd6afd7
Enabling access to Library
vgorte Jan 4, 2017
57fd416
Remove dependency from package.json
tafelito Jan 5, 2017
134faf6
Update property
charlle Jan 9, 2017
55447ae
Update property for Gifted Chat
charlle Jan 9, 2017
6ba3d59
Add 'onPressActionButton' prop
cooperka Jan 9, 2017
270de9b
Merge pull request #333 from cribspot/on-press-action-button
kfiroo Jan 10, 2017
8e87bc4
Add 'imageProps' prop, passed through to <Image>
cooperka Jan 10, 2017
c73fa48
Use 'lightboxProps' instead of just 'navigator'
cooperka Jan 10, 2017
2d7963f
Merge pull request #332 from charlle/bug-fix/update-keyboard-property
kfiroo Jan 10, 2017
9d7ca0b
Merge pull request #304 from cooperka/lightbox
kfiroo Jan 10, 2017
78e1701
Merge pull request #226 from jeromegrosse/feature-tick-delivery-read
kfiroo Jan 12, 2017
d4dd5f7
config ListView props support
luhui Jan 18, 2017
41a072a
fix warning for Avatar
melihmucuk Jan 18, 2017
72cdf40
Merge pull request #336 from melihmucuk/patch-1
kfiroo Jan 18, 2017
ebc2c9b
avoid listViewProps to override render methd and datasources
luhui Jan 18, 2017
aa64680
Add listViewPoprs description to README
luhui Jan 18, 2017
b5d27a8
Merge branch 'master' of https://github.com/FaridSafi/react-native-gi…
tafelito Jan 18, 2017
6152dca
add listViewProps to default props and propTypes
luhui Jan 18, 2017
dde45b3
Downgrade RN version to original
tafelito Jan 18, 2017
5a231ee
Merge pull request #335 from luhui/master
kfiroo Jan 18, 2017
bc820fa
Merge branch 'master' into master
tafelito Jan 18, 2017
a848484
Merge pull request #337 from tafelito/master
kfiroo Jan 18, 2017
0849fca
Update prop validation for keyboardShouldPersistTaps
tafelito Jan 18, 2017
8dbb7b9
Merge branch 'master' of https://github.com/tafelito/react-native-gif…
tafelito Jan 18, 2017
c76e56e
Update Readme
tafelito Jan 18, 2017
d93b352
Update RN version to 0.40
tafelito Jan 18, 2017
f9fca62
Merge pull request #339 from tafelito/keyboard
kfiroo Jan 18, 2017
0c3460c
Merge pull request #328 from vgorte/master
kfiroo Jan 23, 2017
7b967da
Merge branch 'master' into master
tafelito Jan 23, 2017
e862846
Merge pull request #340 from tafelito/master
kfiroo Jan 24, 2017
f5a8fd1
Merge pull request #254 from jeromegrosse/feature-expose-giftedavatar
kfiroo Jan 25, 2017
2a40add
Merge master branch and resolve merge conflicts in README.md
jayshah123 Jan 28, 2017
985b768
Merge pull request #277 from gwendall/master
kfiroo Jan 29, 2017
d3387e2
Merge pull request #303 from jayshah123/upstreamPR
kfiroo Jan 29, 2017
fbf6256
readme for 0.1.0
kfiroo Jan 29, 2017
709678c
bump npm versions
kfiroo Jan 29, 2017
3680691
Improve send message performance
kfiroo Jan 29, 2017
b8f2191
add missing props to inner message components
kfiroo Jan 29, 2017
54cb6ce
v0.1.0
kfiroo Jan 29, 2017
67011fa
fix for npm dependency
kirillpisarev Jan 30, 2017
7ba41ea
Merge pull request #354 from MaFiaaaaAxD/master
kfiroo Jan 30, 2017
33daf8d
Merge pull request #259 from dgdavid/feature/message-id-generator-prop
kfiroo Jan 30, 2017
5d2f2c6
Merge remote-tracking branch 'origin/develop'
kfiroo Jan 30, 2017
24d09a5
node-uuid -> uuid
kfiroo Jan 30, 2017
c63a3ae
v0.1.1
kfiroo Jan 30, 2017
30e31e8
Create GiftedChatInteractionManager.js
Jan 30, 2017
b43cd7c
Update GiftedChat.js
Jan 30, 2017
9c1f59d
v0.1.2
kfiroo Feb 8, 2017
9dc8eba
v0.1.3
kfiroo Feb 8, 2017
fa05f6c
render avatar on top
gperdomor Feb 10, 2017
6672d11
Merge pull request #369 from gperdomor/feature/avatar-on-top
kfiroo Feb 12, 2017
f6d8956
Remove duplicated enableEmptySections
yoniji Feb 23, 2017
7de1c1c
Merge pull request #378 from yoniji/patch-1
kfiroo Feb 23, 2017
b6e4208
If the keyboard has been dismissed and the user sends a message, the …
erenn16 Feb 24, 2017
87a37a0
Allow minimum input tool bar height to be configurable in properties
erenn16 Mar 1, 2017
9d56c4a
Update Bubble.js
brendan-rius Mar 3, 2017
ddb6510
Export MessageContainer in GiftedChat
brendan-rius Mar 7, 2017
d73284b
fix for _messageContainerRef === null
scott-laursen Mar 17, 2017
4406a55
Merge pull request #382 from erenn16/fix-reset-input-toolbar
kfiroo Mar 26, 2017
30e90c8
Merge pull request #387 from brendan-rius/patch-1
kfiroo Mar 26, 2017
a8fe499
Merge pull request #402 from scott-laursen/master
kfiroo Mar 26, 2017
2914239
Merge pull request #355 from razvanpaul/master
kfiroo Mar 26, 2017
e3a320e
Bubble.js: Default value for prop bottomContainerStyle
jeromegrosse Mar 26, 2017
ec3cba0
Merge pull request #408 from jeromegrosse/bug-undefined-not-function-…
kfiroo Mar 26, 2017
41f64f8
Applying fixes per comments
erenn16 Mar 26, 2017
4e9a4aa
Merge pull request #392 from brendan-rius/patch-2
kfiroo Mar 27, 2017
f14f5c4
Merge pull request #386 from erenn16/fix-tool-bar-constant-height
kfiroo Mar 27, 2017
07c6d0e
rename @exponent to @expo
kfiroo Mar 27, 2017
3c891df
v0.1.4
kfiroo Mar 27, 2017
f7c5f4e
image source add number type
Mar 30, 2017
69cff36
formatting
kfiroo Mar 30, 2017
1d675aa
Merge pull request #412 from shadowcz007/patch-1
kfiroo Mar 30, 2017
5563264
Bump react-native-communications version to 2.2.1
michaelkitson Apr 7, 2017
d320f11
Merge pull request #418 from michaelkitson/updateReactNativeCommunica…
kfiroo Apr 10, 2017
cdbabd1
Support for orientation changes.
Nov 10, 2016
d1dbac4
Fix messagesContainerHeight resetting on orientation change
cooperka Apr 14, 2017
bc7752c
Factor out repeated math into getBasicMessagesContainerHeight()
cooperka Apr 14, 2017
2dfe704
Factor out repeated math into getMessagesContainerHeightWithKeyboard()
cooperka Apr 14, 2017
96e6194
Add onPressAvatar prop
SunnyGurnani Oct 18, 2016
d2332f7
Pass currentMessage to onLongPress callback
SunnyGurnani Oct 26, 2016
c0cbd25
Merge pull request #425 from cribspot/fix-orientation-change
kfiroo Apr 16, 2017
c1c6a2d
Merge pull request #427 from cribspot/avatar-on-press-2
kfiroo Apr 16, 2017
ba3b19e
Add maxLength parameter for Composer input
andypmw Apr 17, 2017
29ed613
Merge pull request #433 from andypmw/master
kfiroo Apr 21, 2017
3955514
fix-extra spacing shown when avatar is not rendered
May 1, 2017
531e71c
fix isSameDay function
May 4, 2017
80e66a3
Update @expo/react-native-action-sheet
May 4, 2017
f8e5483
incorporate review and documentation
May 5, 2017
37b9716
incorporate review
May 5, 2017
e2ddbfa
Merge pull request #454 from brunsy/updateReactNativeActionSheet
kfiroo May 14, 2017
aa53c50
Merge pull request #453 from varungupta85/fix-isSameDay
kfiroo May 14, 2017
75b7467
Merge pull request #447 from varungupta85/fix-avatar
kfiroo May 14, 2017
af2819e
Fix default rendering of avatars (#479)
cooperka Jul 8, 2017
f2df670
Commit yarn.lock files
cooperka Jul 8, 2017
713b458
Remove `runAfterInteractions` during init (#380)
iclems Jul 8, 2017
facb3ad
0.1.5
cooperka Jul 9, 2017
1647554
Upgrade all dependencies to latest
cooperka Jul 10, 2017
5520ac8
Temporarily fork shallowequal to get rid of babel config
cooperka Jul 10, 2017
360b071
[Example] Remove extraneous files when installing
cooperka Jul 10, 2017
d870767
Upgrade shallowequal now that PR is merged
cooperka Jul 10, 2017
3f75044
Change deprecated View.propTypes to ViewPropTypes (#478)
mgustin12 Jul 10, 2017
cd70add
[Example] Migrate to react-native-maps (MapView was deprecated)
cooperka Jul 10, 2017
3dce878
[Example] Temporarily fork react-native-nav to update ViewPropTypes
cooperka Jul 10, 2017
f1dbfe9
Temporarily fork RN-action-sheet for deprecated React.PropTypes
cooperka Jul 10, 2017
6029e94
Update README with new RN dependency requirements
cooperka Jul 10, 2017
68b0609
Clean up README
cooperka Jul 10, 2017
24c2fd4
0.2.0
cooperka Jul 10, 2017
8ec2bd0
[Example] Run react-native upgrade for RN v0.45
cooperka Jul 10, 2017
5d36dca
[Example] Add back RCTCameraRoll.xcodeproj for camera roll picker
cooperka Jul 10, 2017
632c456
Replace deprecated `onChange` with `onContentSizeChange` (#500)
devjaw Jul 10, 2017
b6e98c4
Migrate from deprecated React.PropTypes to prop-types (#508)
wsabransky Jul 16, 2017
c13edf4
Commit new prop-types dependency in yarn.lock
cooperka Jul 16, 2017
f9ecf23
Fix URLs that get linkified but are missing a scheme (#506)
bencollab Jul 16, 2017
9028534
Add code comment and error logging for MessageText.onUrlPress
cooperka Jul 16, 2017
f6c5482
Clarify Android installation steps for CRNA/Expo (#482)
brentvatne Jul 16, 2017
1e79078
Fix janky fullscreen Lightbox images by using flex: 1 (#467)
stokesbga Jul 16, 2017
187cf52
Add `timeFormat` prop (#273)
yosmanyga Jul 16, 2017
8d5010f
Add `dateFormat` prop
cooperka Jul 16, 2017
08cc6fc
Add .watchmanconfig and README notes for local development
cooperka Jul 16, 2017
5428469
[Example] Upgrade to RN v0.46 to verify compatibility
cooperka Jul 16, 2017
234ab96
0.2.1
cooperka Jul 16, 2017
730bab3
Add some README badges
cooperka Jul 16, 2017
4992256
0.2.2
cooperka Jul 17, 2017
dfc4767
Remove dead code introduced by #467 (#509)
Jul 19, 2017
f97abc5
Add 'showUserAvatar' prop; don't render null avatars (#511)
Jul 24, 2017
a2799a4
Rearrange existing propTypes to match the README
cooperka Jul 24, 2017
4602622
Add missing props to GiftedChat root component
cooperka Jul 24, 2017
ff31065
0.2.3
cooperka Jul 24, 2017
c44dbb4
Accept a 'text' prop to override the internal state (e.g. redux)
cooperka Jul 25, 2017
e28127e
Add Redux notes to the README
cooperka Jul 25, 2017
0af24d0
0.2.4
cooperka Jul 25, 2017
84acb3e
Use both onChange and onContentSizeChange to support Android RN <0.46
cooperka Jul 25, 2017
4d11276
0.2.5
cooperka Jul 25, 2017
2972ccf
Fix call/text onPhonePress actions ordering (#521)
retdop Aug 28, 2017
cd72f86
Fix email sending recipient array (#522)
retdop Aug 28, 2017
7b4fa89
Fix minor typo in README (#517)
kkjdaniel Aug 28, 2017
7c3fc48
Fix `Linking.canOpenURL` usage (#516)
bencollab Aug 28, 2017
6be3db1
Add children props to Send component (#487)
sf27 Aug 28, 2017
b669f3b
Simplify logic for Send component children
cooperka Aug 28, 2017
013b310
Add imperative focusTextInput() method
cooperka Aug 28, 2017
fe0f43b
0.2.6
cooperka Aug 28, 2017
9f86d78
0.2.7
cooperka Aug 28, 2017
7f91f32
Add `parsePatterns` prop for custom message links (#551)
ianlin Aug 29, 2017
ce8d5c5
[Example] Don't remove extraneous git dir
cooperka Sep 11, 2017
c2e8df3
[Example] Update path to scripts/react-native-xcode.sh for RN v0.46
cooperka Sep 12, 2017
b12d426
Use better doc link for onLongPress (#573)
nonotest Sep 26, 2017
0eee60f
Merge branch 'master' into upgrade
kennethlynne Oct 11, 2017
4b6d220
rm test command
kennethlynne Oct 11, 2017
8b687f7
clean up
kennethlynne Oct 11, 2017
ede2d34
fix: use newer version of parsed-text which has fixed propTypes
sondremare Oct 23, 2017
a0abb92
fix: use newer version of lightbox which has fixed propTypes
sondremare Oct 23, 2017
7de6387
fix: use newer invertible-scroll-view that has fixed propTypes for re…
sondremare Oct 23, 2017
bc55609
fix: do not account for keyboard here, as we have our own component i…
sondremare Oct 23, 2017
a5d81c9
reimplement inputToolbar ref
sondremare Oct 23, 2017
d4ae0e5
reimplement listview ref
sondremare Oct 23, 2017
cd8a472
add proptype for renderSuggestions
sondremare Oct 23, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ node_modules/
npm-debug.log
.idea/
TODO.md

.idea
7 changes: 7 additions & 0 deletions .watchmanconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"ignore_dirs": [
".git",
"node_modules",
"example"
]
}
238 changes: 155 additions & 83 deletions README.md

Large diffs are not rendered by default.

34 changes: 19 additions & 15 deletions example/.flowconfig
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
[ignore]
; We fork some components by platform
.*/*[.]android.js

# We fork some components by platform.
.*/*.android.js
; Ignore "BUCK" generated dirs
<PROJECT_ROOT>/\.buckd/

# Ignore templates with `@flow` in header
.*/local-cli/generator.*
; Ignore unexpected extra "@providesModule"
.*/node_modules/.*/node_modules/fbjs/.*

# Ignore malformed json
.*/node_modules/y18n/test/.*\.json
; Ignore duplicate module providers
; For RN Apps installed via npm, "Libraries" folder is inside
; "node_modules/react-native" but in the source repo it is in the root
.*/Libraries/react-native/React.js
.*/Libraries/react-native/ReactNative.js

[include]

Expand All @@ -17,25 +22,24 @@ node_modules/react-native/flow
flow/

[options]
module.system=haste

esproposal.class_static_fields=enable
esproposal.class_instance_fields=enable
emoji=true

experimental.strict_type_args=true
module.system=haste

munge_underscores=true

module.name_mapper='^image![a-zA-Z0-9$_-]+$' -> 'GlobalImageStub'
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'

suppress_type=$FlowIssue
suppress_type=$FlowFixMe
suppress_type=$FixMe

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

unsafe.enable_getters_and_setters=true

[version]
^0.27.0
^0.47.0
1 change: 1 addition & 0 deletions example/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.pbxproj -text
20 changes: 16 additions & 4 deletions example/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,32 @@ DerivedData
*.xcuserstate
project.xcworkspace

# Android/IJ
# Android/IntelliJ
#
*.iml
build/
.idea
.gradle
local.properties
*.iml

# node.js
#
node_modules/
npm-debug.log
yarn-error.log

# BUCK
buck-out/
\.buckd/
android/app/libs
android/keystores/debug.keystore
*.keystore

# fastlane
#
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
# screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md

fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots
9 changes: 5 additions & 4 deletions example/CustomActions.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import React from 'react';
import PropTypes from 'prop-types';
import React from 'react';
import {
Modal,
StyleSheet,
TouchableOpacity,
View,
ViewPropTypes,
Text,
} from 'react-native';

Expand Down Expand Up @@ -170,7 +171,7 @@ const styles = StyleSheet.create({
borderRadius: 13,
borderColor: '#b2b2b2',
borderWidth: 2,
flexGrow: 1,
flex: 1,
},
iconText: {
color: '#b2b2b2',
Expand Down Expand Up @@ -198,7 +199,7 @@ CustomActions.propTypes = {
onSend: PropTypes.func,
options: PropTypes.object,
icon: PropTypes.func,
containerStyle: View.propTypes.style,
wrapperStyle: View.propTypes.style,
containerStyle: ViewPropTypes.style,
wrapperStyle: ViewPropTypes.style,
iconTextStyle: Text.propTypes.style,
};
16 changes: 7 additions & 9 deletions example/CustomView.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import React from 'react';
import PropTypes from 'prop-types';
import React from 'react';
import {
Linking,
MapView,
Platform,
StyleSheet,
TouchableOpacity,
View,
ViewPropTypes,
} from 'react-native';
import MapView from 'react-native-maps';

export default class CustomView extends React.Component {
render() {
Expand All @@ -31,11 +31,9 @@ export default class CustomView extends React.Component {
region={{
latitude: this.props.currentMessage.location.latitude,
longitude: this.props.currentMessage.location.longitude,
latitudeDelta: 0.0922,
longitudeDelta: 0.0421,
}}
annotations={[{
latitude: this.props.currentMessage.location.latitude,
longitude: this.props.currentMessage.location.longitude,
}]}
scrollEnabled={false}
zoomEnabled={false}
/>
Expand Down Expand Up @@ -65,6 +63,6 @@ CustomView.defaultProps = {

CustomView.propTypes = {
currentMessage: PropTypes.object,
containerStyle: View.propTypes.style,
mapViewStyle: View.propTypes.style,
containerStyle: ViewPropTypes.style,
mapViewStyle: ViewPropTypes.style,
};
53 changes: 26 additions & 27 deletions example/android/app/BUCK
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import re

# To learn about Buck see [Docs](https://buckbuild.com/).
# To run your application with Buck:
# - install Buck
Expand All @@ -11,56 +9,57 @@ import re
#

lib_deps = []

for jarfile in glob(['libs/*.jar']):
name = 'jars__' + re.sub(r'^.*/([^/]+)\.jar$', r'\1', jarfile)
name = 'jars__' + jarfile[jarfile.rindex('/') + 1: jarfile.rindex('.jar')]
lib_deps.append(':' + name)
prebuilt_jar(
name = name,
binary_jar = jarfile,
)

for aarfile in glob(['libs/*.aar']):
name = 'aars__' + re.sub(r'^.*/([^/]+)\.aar$', r'\1', aarfile)
name = 'aars__' + aarfile[aarfile.rindex('/') + 1: aarfile.rindex('.aar')]
lib_deps.append(':' + name)
android_prebuilt_aar(
name = name,
aar = aarfile,
)

android_library(
name = 'all-libs',
exported_deps = lib_deps
name = "all-libs",
exported_deps = lib_deps,
)

android_library(
name = 'app-code',
srcs = glob([
'src/main/java/**/*.java',
]),
deps = [
':all-libs',
':build_config',
':res',
],
name = "app-code",
srcs = glob([
"src/main/java/**/*.java",
]),
deps = [
":all-libs",
":build_config",
":res",
],
)

android_build_config(
name = 'build_config',
package = 'com.giftedchat',
name = "build_config",
package = "com.giftedchat",
)

android_resource(
name = 'res',
res = 'src/main/res',
package = 'com.giftedchat',
name = "res",
package = "com.giftedchat",
res = "src/main/res",
)

android_binary(
name = 'app',
package_type = 'debug',
manifest = 'src/main/AndroidManifest.xml',
keystore = '//android/keystores:debug',
deps = [
':app-code',
],
name = "app",
keystore = "//android/keystores:debug",
manifest = "src/main/AndroidManifest.xml",
package_type = "debug",
deps = [
":app-code",
],
)
14 changes: 11 additions & 3 deletions example/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,13 @@ import com.android.build.OutputFile
* // bundleInPaidRelease: true,
* // bundleInBeta: true,
*
* // whether to disable dev mode in custom build variants (by default only disabled in release)
* // for example: to disable dev mode in the staging build type (if configured)
* devDisabledInStaging: true,
* // The configuration property can be in the following formats
* // 'devDisabledIn${productFlavor}${buildType}'
* // 'devDisabledIn${buildType}'
*
* // the root of your project, i.e. where "package.json" lives
* root: "../../",
*
Expand All @@ -58,7 +65,7 @@ import com.android.build.OutputFile
* inputExcludes: ["android/**", "ios/**"],
*
* // override which node gets called and with what additional arguments
* nodeExecutableAndArgs: ["node"]
* nodeExecutableAndArgs: ["node"],
*
* // supply additional arguments to the packager
* extraPackagerArgs: []
Expand Down Expand Up @@ -126,6 +133,7 @@ android {
}

dependencies {
compile project(':react-native-maps')
compile fileTree(dir: "libs", include: ["*.jar"])
compile "com.android.support:appcompat-v7:23.0.1"
compile "com.facebook.react:react-native:+" // From node_modules
Expand All @@ -134,6 +142,6 @@ dependencies {
// Run this once to be able to run the application with BUCK
// puts all compile dependencies into folder libs for BUCK to use
task copyDownloadableDepsToLibs(type: Copy) {
from configurations.compile
into 'libs'
from configurations.compile
into 'libs'
}
4 changes: 4 additions & 0 deletions example/android/app/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@

-dontwarn com.facebook.react.**

# TextLayoutBuilder uses a non-public Android constructor within StaticLayout.
# See libs/proxy/src/main/java/com/facebook/fbui/textlayoutbuilder/proxy for details.
-dontwarn android.text.StaticLayout

# okhttp

-keepattributes Signature
Expand Down
4 changes: 2 additions & 2 deletions example/android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
<activity
android:name=".MainActivity"
android:label="@string/app_name"
android:windowSoftInputMode="adjustResize"
android:configChanges="keyboard|keyboardHidden|orientation|screenSize">
android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
android:windowSoftInputMode="adjustResize">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package com.giftedchat;

import android.app.Application;
import android.util.Log;

import com.facebook.react.ReactApplication;
import com.facebook.react.ReactInstanceManager;
import com.airbnb.android.react.maps.MapsPackage;
import com.facebook.react.ReactNativeHost;
import com.facebook.react.ReactPackage;
import com.facebook.react.shell.MainReactPackage;
import com.facebook.soloader.SoLoader;

import java.util.Arrays;
import java.util.List;
Expand All @@ -16,20 +16,27 @@ public class MainApplication extends Application implements ReactApplication {

private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {
@Override
protected boolean getUseDeveloperSupport() {
public boolean getUseDeveloperSupport() {
return BuildConfig.DEBUG;
}

@Override
protected List<ReactPackage> getPackages() {
return Arrays.<ReactPackage>asList(
new MainReactPackage()
new MainReactPackage(),
new MapsPackage()
);
}
};

@Override
public ReactNativeHost getReactNativeHost() {
return mReactNativeHost;
return mReactNativeHost;
}

@Override
public void onCreate() {
super.onCreate();
SoLoader.init(this, /* native exopackage */ false);
}
}
2 changes: 1 addition & 1 deletion example/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.3.1'
classpath 'com.android.tools.build:gradle:2.2.3'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
2 changes: 1 addition & 1 deletion example/android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
Loading