Skip to content

Commit

Permalink
fix firebase
Browse files Browse the repository at this point in the history
  • Loading branch information
lub2code committed Oct 17, 2019
1 parent ec44ec1 commit ac1c8ca
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 24 deletions.
3 changes: 3 additions & 0 deletions .vscode/settings.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"java.configuration.updateBuildConfiguration": "automatic"
}
3 changes: 3 additions & 0 deletions android/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,9 @@ dependencies {
implementation "com.google.firebase:firebase-core:17.2.0"
implementation "com.google.firebase:firebase-messaging:20.0.0"
implementation 'me.leolin:ShortcutBadger:1.1.21@aar'
compile('com.crashlytics.sdk.android:crashlytics:2.7.1@aar') {
transitive = true
}

if (enableHermes) {
def hermesPath = "../../node_modules/hermesvm/android/";
Expand Down
9 changes: 4 additions & 5 deletions android/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,16 @@ buildscript {
repositories {
google()
jcenter()
maven {
url 'https://maven.fabric.io/public'
}
}
dependencies {
classpath("com.android.tools.build:gradle:3.4.1")

classpath 'com.google.gms:google-services:4.3.2'

classpath 'io.fabric.tools:gradle:1.28.1'
classpath 'io.fabric.tools:gradle:1.+'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -37,10 +40,6 @@ allprojects {
url("$rootDir/../node_modules/jsc-android/dist")
}

maven {
url 'https://maven.fabric.io/public'
}

google()
jcenter()
}
Expand Down
2 changes: 0 additions & 2 deletions src/Component/Page/Login.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ export default class Login extends Component {
}

login = () => {
firebase.crashlytics().crash();
return;
if (this.state.email == '') {
this.setState({email_error: true});
}
Expand Down
36 changes: 19 additions & 17 deletions src/Component/Page/RegisterParcel.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ const LATITUDE_DELTA = 0.015;
const LONGITUDE_DELTA = LATITUDE_DELTA * ASPECT_RATIO;
const SPACE = 0.01;

const error_msg = 'It is required.'


class RegisterParcel extends Component {

Expand Down Expand Up @@ -1030,7 +1032,7 @@ class RegisterParcel extends Component {
label='Address Name/ID'
value={this.state.sender_address_name}
errorStyle={{ color: 'red' }}
errorMessage={this.state.sender_address_name == null || this.state.sender_address_name == "" ? 'It is necessary.' : ''}
errorMessage={this.state.sender_address_name == null || this.state.sender_address_name == "" ? error_msg : ''}
onChangeText={(sender_address_name) => this.setState({sender_address_name})}
/>
</View>
Expand All @@ -1042,7 +1044,7 @@ class RegisterParcel extends Component {
keyboardType="email-address"
value={this.state.sender_email}
errorStyle={{ color: 'red' }}
errorMessage={this.state.sender_email == null || this.state.sender_email == "" ? 'It is necessary.' : ''}
errorMessage={this.state.sender_email == null || this.state.sender_email == "" ? error_msg : ''}
onChangeText={(sender_email) => this.setState({sender_email})}
/>
</View>
Expand All @@ -1052,7 +1054,7 @@ class RegisterParcel extends Component {
keyboardType="numeric"
value={this.state.sender_phone}
errorStyle={{ color: 'red' }}
errorMessage={this.state.sender_phone == null || this.state.sender_phone == "" ? 'It is necessary.' : ''}
errorMessage={this.state.sender_phone == null || this.state.sender_phone == "" ? error_msg : ''}
onChangeText={(sender_phone) => this.setState({sender_phone})}
/>
</View>
Expand All @@ -1062,7 +1064,7 @@ class RegisterParcel extends Component {
<Input
label='Street'
value={this.state.sender_street}
errorMessage={this.state.sender_street == null || this.state.sender_street == "" ? 'It is necessary.' : ''}
errorMessage={this.state.sender_street == null || this.state.sender_street == "" ? error_msg : ''}
onChangeText={(sender_street) => this.setState({sender_street})}
/>
</View>
Expand All @@ -1072,7 +1074,7 @@ class RegisterParcel extends Component {
keyboardType="numeric"
value={this.state.sender_street_nr}
errorStyle={{ color: 'red' }}
errorMessage={this.state.sender_street_nr == null || this.state.sender_street_nr == "" ? 'It is necessary.' : ''}
errorMessage={this.state.sender_street_nr == null || this.state.sender_street_nr == "" ? error_msg : ''}
onChangeText={(sender_street_nr) => this.setState({sender_street_nr})}
/>
</View>
Expand All @@ -1083,7 +1085,7 @@ class RegisterParcel extends Component {
label='City'
value={this.state.sender_city}
errorStyle={{ color: 'red' }}
errorMessage={this.state.sender_city == null || this.state.sender_city == "" ? 'It is necessary.' : ''}
errorMessage={this.state.sender_city == null || this.state.sender_city == "" ? error_msg : ''}
onChangeText={(sender_city) => this.setState({sender_city})}
/>
</View>
Expand All @@ -1095,7 +1097,7 @@ class RegisterParcel extends Component {
keyboardType="numeric"
value={this.state.sender_postal_code}
errorStyle={{ color: 'red' }}
errorMessage={this.state.sender_postal_code == null || this.state.sender_postal_code == "" ? 'It is necessary.' : ''}
errorMessage={this.state.sender_postal_code == null || this.state.sender_postal_code == "" ? error_msg : ''}
onChangeText={(sender_postal_code) => this.setState({sender_postal_code})}
/>
</View>
Expand All @@ -1104,7 +1106,7 @@ class RegisterParcel extends Component {
label='Country'
value={this.state.sender_country}
errorStyle={{ color: 'red' }}
errorMessage={this.state.sender_country == null || this.state.sender_country == "" ? 'It is necessary.' : ''}
errorMessage={this.state.sender_country == null || this.state.sender_country == "" ? error_msg : ''}
onChangeText={(sender_country) => this.setState({sender_country})}
/>
</View>
Expand Down Expand Up @@ -1349,7 +1351,7 @@ class RegisterParcel extends Component {
label='Address Name/ID'
value={item.parcel_address_name}
errorStyle={{ color: 'red' }}
errorMessage={item.parcel_address_name == null || item.parcel_address_name == "" ? 'It is necessary.' : ''}
errorMessage={item.parcel_address_name == null || item.parcel_address_name == "" ? error_msg : ''}
onChangeText={(parcel_address_name) => this.setState(state => {
var parcels = this.state.parcels;
parcels[index].parcel_address_name = parcel_address_name;
Expand All @@ -1366,7 +1368,7 @@ class RegisterParcel extends Component {
keyboardType="email-address"
value={item.parcel_email}
errorStyle={{ color: 'red' }}
errorMessage={item.parcel_email == null || item.parcel_email == "" ? 'It is necessary.' : ''}
errorMessage={item.parcel_email == null || item.parcel_email == "" ? error_msg : ''}
onChangeText={(parcel_email) => this.setState(state => {
var parcels = this.state.parcels;
parcels[index].parcel_email = parcel_email;
Expand All @@ -1381,7 +1383,7 @@ class RegisterParcel extends Component {
keyboardType="numeric"
value={item.parcel_phone}
errorStyle={{ color: 'red' }}
errorMessage={item.parcel_phone == null || item.parcel_phone == "" ? 'It is necessary.' : ''}
errorMessage={item.parcel_phone == null || item.parcel_phone == "" ? error_msg : ''}
onChangeText={(parcel_phone) => this.setState(state => {
var parcels = this.state.parcels;
parcels[index].parcel_phone = parcel_phone;
Expand All @@ -1397,7 +1399,7 @@ class RegisterParcel extends Component {
label='Street'
value={item.parcel_street}
errorStyle={{ color: 'red' }}
errorMessage={item.parcel_street == null || item.parcel_street == "" ? 'It is necessary.' : ''}
errorMessage={item.parcel_street == null || item.parcel_street == "" ? error_msg : ''}
onChangeText={(parcel_street) => this.setState(state => {
var parcels = this.state.parcels;
parcels[index].parcel_street = parcel_street;
Expand All @@ -1411,7 +1413,7 @@ class RegisterParcel extends Component {
label='Nr.'
keyboardType="numeric"
value={item.parcel_street_nr}
errorMessage={item.parcel_street_nr == null || item.parcel_street_nr == "" ? 'It is necessary.' : ''}
errorMessage={item.parcel_street_nr == null || item.parcel_street_nr == "" ? error_msg : ''}
onChangeText={(parcel_street_nr) => this.setState(state => {
var parcels = this.state.parcels;
parcels[index].parcel_street_nr = parcel_street_nr;
Expand All @@ -1427,7 +1429,7 @@ class RegisterParcel extends Component {
label='City'
value={item.parcel_city}
errorStyle={{ color: 'red' }}
errorMessage={item.parcel_city == null || item.parcel_city == "" ? 'It is necessary.' : ''}
errorMessage={item.parcel_city == null || item.parcel_city == "" ? error_msg : ''}
onChangeText={(parcel_city) => this.setState(state => {
var parcels = this.state.parcels;
parcels[index].parcel_city = parcel_city;
Expand All @@ -1444,7 +1446,7 @@ class RegisterParcel extends Component {
keyboardType="numeric"
value={item.parcel_postal_code}
errorStyle={{ color: 'red' }}
errorMessage={item.parcel_postal_code == null || item.parcel_postal_code == "" ? 'It is necessary.' : ''}
errorMessage={item.parcel_postal_code == null || item.parcel_postal_code == "" ? error_msg : ''}
onChangeText={(parcel_postal_code) => this.setState(state => {
var parcels = this.state.parcels;
parcels[index].parcel_postal_code = parcel_postal_code;
Expand All @@ -1458,7 +1460,7 @@ class RegisterParcel extends Component {
label='Country'
value={item.parcel_country}
errorStyle={{ color: 'red' }}
errorMessage={item.parcel_country == null || item.parcel_country == "" ? 'It is necessary.' : ''}
errorMessage={item.parcel_country == null || item.parcel_country == "" ? error_msg : ''}
onChangeText={(parcel_country) => this.setState(state => {
var parcels = this.state.parcels;
parcels[index].parcel_country = parcel_country;
Expand Down Expand Up @@ -1678,7 +1680,7 @@ class RegisterParcel extends Component {
keyboardType="numeric"
value={item.parcel_price}
errorStyle={{ color: 'red' }}
errorMessage={item.parcel_price == null || item.parcel_price == "" ? 'It is necessary.' : ''}
errorMessage={item.parcel_price == null || item.parcel_price == "" ? error_msg : ''}
onChangeText={(parcel_price) => this.setState(state => {
var parcels = this.state.parcels;
parcels[index].parcel_price = parcel_price;
Expand Down

0 comments on commit ac1c8ca

Please sign in to comment.