Skip to content
This repository has been archived by the owner on Jun 27, 2019. It is now read-only.

Commit

Permalink
Merge pull request #93 from ES2-UFPI/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
Mex978 authored May 9, 2019
2 parents 5e2315a + 13799af commit bce0e6c
Show file tree
Hide file tree
Showing 35 changed files with 1,979 additions and 244 deletions.
2 changes: 1 addition & 1 deletion .flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError

[version]
^0.92.0
^0.93.0
29 changes: 29 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
install:
- nvm install 11
- npm install -g "npm@$(jq -r '.engines.npm' package.json)"
- npm ci
matrix:
include:
- os: linux
language: android
jdk: oraclejdk8
android:
components:
- build-tools-28.0.3
- android-28
- extra-google-m2repository
- extra-google-google_play_services
before_install:
- yes | sdkmanager "platforms;android-28"
- yes | sdkmanager "build-tools;28.0.3"
script:
- "./android/gradlew assembleRelease -p android/"
- npm run lint
cache:
directories:
- node_modules
notifications:
slack:
secure: ohnKTmc9Ft2YLx/cH9GL3dbgmiIQkxWSAyZGJZPKS3TW59O2FiqWWL0M1E6Hw6n3DSvtMiD6az2lRXLKAGrZSL10UgW718gyAmGzmpH7wtWwsxT0cAMWZGKLRYumty1PxAuaY3zY3UL+bPkM88Yjsps90hU0YObpuEwMv4sdiMiJcSHVYGCLhbyLHOPaAbRRzehWJRT9vTWJ+KCHv+0/RLZlhuhjzz1kIsRr4YOSPqBm7jVlLb8pRePUgZFMIbI++SIguKKImmI0Qoki1Cnbk3UmJmDpAJ4a157lpTIaNirOAjbQUw0x8WonMCaru0UfLyHU2u23MxTvSQ53LrPOOuyVF7anB4Vf5XkzBxARvnaUI7PoBu0XFhRNG9nvw8nv7lL0kWDbib/6Q4Fp0UtDZGsYM8JQ30JhQLk/+0GkxMLqWgH1Xmpuk0ktvBeLJZqIICuEgomMpTRM/+S4ooeMDTb8o4lyyjb2u0WuXx8JKoZQYJS7rDrL8GE6VyN+I8ZJlXG3Leu00erbdOSmsil/YDdrofOpbzaJ6k2rHQu59BYioZXAnf/x4LVsBb/Ul/DDIPZE2VJBZSzDWjuP/mpQj9XTlSLChlCrUJ6Y0wZ3BsZiLkrUdvBypRLgBw5VWdRu7n2u1QVx+Dcs7qavK7T6mZSDKi6qLPaZXcVFoKWLX+k=
on_success: always
on_failure: always
15 changes: 7 additions & 8 deletions __tests__/App-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@
* @format
*/

import 'react-native';
import React from 'react';
import App from '../App';

import "react-native"
import React from "react"
// Note: test renderer must be required after react-native.
import renderer from 'react-test-renderer';
import renderer from "react-test-renderer"
import App from "../App"

it('renders correctly', () => {
renderer.create(<App />);
});
it("renders correctly", () => {
renderer.create(<App />)
})
17 changes: 17 additions & 0 deletions android/.project
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>Unichat</name>
<comment>Project android created by Buildship.</comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
</natures>
</projectDescription>
2 changes: 2 additions & 0 deletions android/.settings/org.eclipse.buildship.core.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
connection.project.dir=
eclipse.preferences.version=1
6 changes: 6 additions & 0 deletions android/app/.classpath
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
<classpathentry kind="output" path="bin/default"/>
</classpath>
23 changes: 23 additions & 0 deletions android/app/.project
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>app</name>
<comment>Project app created by Buildship.</comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
</natures>
</projectDescription>
2 changes: 2 additions & 0 deletions android/app/.settings/org.eclipse.buildship.core.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
connection.project.dir=..
eclipse.preferences.version=1
6 changes: 5 additions & 1 deletion android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,9 @@ android {
}

dependencies {
implementation project(':@react-native-community_async-storage')
implementation project(':react-native-contacts')
implementation project(':react-native-image-picker')
implementation project(':react-native-text-input-mask')
implementation project(':react-native-linear-gradient')
implementation project(':react-native-vector-icons')
Expand All @@ -153,7 +156,8 @@ dependencies {
implementation 'com.google.firebase:firebase-core:16.0.8'
implementation 'com.google.firebase:firebase-auth:16.2.1'
implementation "com.google.firebase:firebase-firestore:18.2.0"

implementation "com.google.firebase:firebase-storage:16.1.0"
implementation "com.google.firebase:firebase-database:16.1.0"
}

// Run this once to be able to run the application with BUCK
Expand Down
16 changes: 16 additions & 0 deletions android/app/google-services.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,22 @@
"certificate_hash": "56afd0c3a898a23ce8ebb892c6ac2b0a46648163"
}
},
{
"client_id": "393633194087-beneh8861ao3a70kkklet1dkqn0ae03o.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.unichat",
"certificate_hash": "c290c70ae0e03ef3a5607c4ef0c438139e62d2a4"
}
},
{
"client_id": "393633194087-pt8egjp8vkms1s1ao5oi5cmc94p0s5j1.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.unichat",
"certificate_hash": "56801f5171bfce3aaf860539a87fd121c63e2273"
}
},
{
"client_id": "393633194087-k82sibqqeq3rsmc9h6hbmvcme6hqq2qe.apps.googleusercontent.com",
"client_type": 3
Expand Down
6 changes: 6 additions & 0 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
package="com.unichat">

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.READ_CONTACTS" />
<uses-permission android:name="android.permission.WRITE_CONTACTS" />
<uses-permission android:name="android.permission.READ_PROFILE" />
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

<application
android:name=".MainApplication"
Expand Down
12 changes: 11 additions & 1 deletion android/app/src/main/java/com/unichat/MainApplication.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
import android.app.Application;

import com.facebook.react.ReactApplication;
import com.reactnativecommunity.asyncstorage.AsyncStoragePackage;
import com.rt2zz.reactnativecontacts.ReactNativeContacts;
import com.imagepicker.ImagePickerPackage;
import com.RNTextInputMask.RNTextInputMaskPackage;
import com.BV.LinearGradient.LinearGradientPackage;
import com.oblador.vectoricons.VectorIconsPackage;
Expand All @@ -15,6 +18,8 @@
import com.facebook.soloader.SoLoader;
import io.invertase.firebase.auth.RNFirebaseAuthPackage;
import io.invertase.firebase.firestore.RNFirebaseFirestorePackage;
import io.invertase.firebase.storage.RNFirebaseStoragePackage;
import io.invertase.firebase.database.RNFirebaseDatabasePackage;

import java.util.Arrays;
import java.util.List;
Expand All @@ -31,14 +36,19 @@ public boolean getUseDeveloperSupport() {
protected List<ReactPackage> getPackages() {
return Arrays.<ReactPackage>asList(
new MainReactPackage(),
new AsyncStoragePackage(),
new ReactNativeContacts(),
new ImagePickerPackage(),
new RNTextInputMaskPackage(),
new LinearGradientPackage(),
new VectorIconsPackage(),
new RNFirebasePackage(),
new RNFirebaseAuthPackage(),
new RNFirebaseFirestorePackage(),
new SvgPackage(),
new RNGestureHandlerPackage()
new RNGestureHandlerPackage(),
new RNFirebaseStoragePackage(),
new RNFirebaseDatabasePackage()
);
}

Expand Down
16 changes: 16 additions & 0 deletions android/google-services.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,22 @@
"certificate_hash": "56afd0c3a898a23ce8ebb892c6ac2b0a46648163"
}
},
{
"client_id": "393633194087-beneh8861ao3a70kkklet1dkqn0ae03o.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.unichat",
"certificate_hash": "c290c70ae0e03ef3a5607c4ef0c438139e62d2a4"
}
},
{
"client_id": "393633194087-pt8egjp8vkms1s1ao5oi5cmc94p0s5j1.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.unichat",
"certificate_hash": "56801f5171bfce3aaf860539a87fd121c63e2273"
}
},
{
"client_id": "393633194087-k82sibqqeq3rsmc9h6hbmvcme6hqq2qe.apps.googleusercontent.com",
"client_type": 3
Expand Down
9 changes: 8 additions & 1 deletion android/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
rootProject.name = 'Unichat'
include ':@react-native-community_async-storage'
project(':@react-native-community_async-storage').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/async-storage/android')
include ':react-native-contacts'
project(':react-native-contacts').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-contacts/android')
include ':react-native-image-picker'
project(':react-native-image-picker').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-image-picker/android')
include ':react-native-text-input-mask'
project(':react-native-text-input-mask').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-text-input-mask/android')
include ':react-native-linear-gradient'
Expand All @@ -11,5 +17,6 @@ include ':react-native-svg'
project(':react-native-svg').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-svg/android')
include ':react-native-gesture-handler'
project(':react-native-gesture-handler').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-gesture-handler/android')

include ':react-native-contacts'
project(':react-native-contacts').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-contacts/android')
include ':app'
5 changes: 5 additions & 0 deletions ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ target 'Unichat' do

pod 'BVLinearGradient', :path => '../node_modules/react-native-linear-gradient'

pod 'react-native-contacts', :path => '../node_modules/react-native-contacts'

pod 'RNCAsyncStorage', :path => '../node_modules/@react-native-community/async-storage'
pod 'react-native-image-picker', :path => '../node_modules/react-native-image-picker'

target 'UnichatTests' do
inherit! :search_paths
# Pods for testing
Expand Down
34 changes: 34 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 9 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,23 @@
"private": true,
"scripts": {
"start": "node node_modules/react-native/local-cli/cli.js start",
"test": "jest"
"test": "jest",
"lint": "eslint *.js **/*.js"
},
"dependencies": {
"@react-native-community/async-storage": "^1.3.4",
"axios": "^0.18.0",
"eslint-config-prettier": "^4.1.0",
"eslint-plugin-prettier": "^3.0.1",
"prop-types": "^15.7.2",
"react": "16.8.3",
"react-native": "^0.59.6",
"react-native-confirmation-code-input": "^1.0.4",
"react-native-contacts": "^4.0.1",
"react-native-elements": "^1.1.0",
"react-native-firebase": "^5.3.1",
"react-native-gesture-handler": "^1.1.0",
"react-native-image-picker": "^0.28.1",
"react-native-linear-gradient": "^2.5.4",
"react-native-masked-text": "^1.12.2",
"react-native-power-translator": "^1.1.1",
Expand Down Expand Up @@ -53,5 +57,9 @@
"assets": [
"./src/assets/fonts/"
]
},
"engines": {
"node": "11.15.0",
"npm": "6.7.0"
}
}
Loading

0 comments on commit bce0e6c

Please sign in to comment.