Skip to content

Commit 0631c67

Browse files
bhavik66bhavik66
committed
Fix code style
1 parent 9f8d2ce commit 0631c67

File tree

14 files changed

+26
-202
lines changed

14 files changed

+26
-202
lines changed

‎android/app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.f
3-
4-
5-
irebase_chat">
2+
package="com.firebase_chat">
63

74
<uses-permission android:name="android.permission.INTERNET" />
85
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />

‎src/components/chatHeader.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { Component } from 'react'
1+
import React from 'react'
22
import { View, Text, TouchableOpacity } from 'react-native'
33
import Icon from 'react-native-vector-icons/MaterialIcons'
44

‎src/components/header.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { Component } from 'react'
1+
import React from 'react'
22
import { View, Text, ImageBackground, Dimensions } from 'react-native'
33

44
import colors from '../theme/colors'

‎src/components/headerIcon.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react'
2-
import { View, Text, TouchableOpacity } from 'react-native'
2+
import { View, TouchableOpacity } from 'react-native'
33
import Icon from 'react-native-vector-icons/MaterialIcons'
44
import colors from '../theme/colors'
55

‎src/components/message.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import { moderateScale } from 'react-native-size-matters'
66
import { inject } from 'mobx-react'
77

88
import styles from '../theme/component/message'
9-
import colors from '../theme/colors'
109

1110
@inject('Chat')
1211
export default class Message extends Component {

‎src/layout/index.js‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import React from 'react'
22
import { createStackNavigator, createAppContainer } from 'react-navigation'
33
import { fromRight, fromTop } from 'react-navigation-transitions'
44

5-
import Test from '../screens/test'
65
import Splash from '../screens/splash'
76
import Register from '../screens/register'
87
import Verify from '../screens/verify'
@@ -13,11 +12,15 @@ import Chat from '../screens/chat'
1312
import { Header } from '../components/header'
1413
import { ChatHeader } from '../components/chatHeader'
1514

15+
const handleCustomTransition = ({ scenes }) => {
16+
if (scenes[scenes.length - 1].route.routeName === 'Contact') return null
17+
if (scenes[scenes.length - 1].route.routeName === 'Profile')
18+
return fromTop(800)
19+
return fromRight(500)
20+
}
21+
1622
const AppNavigator = createStackNavigator(
1723
{
18-
// Test: {
19-
// screen: Test
20-
// },
2124
Splash: {
2225
screen: Splash,
2326
navigationOptions: {
@@ -87,11 +90,4 @@ const AppNavigator = createStackNavigator(
8790
}
8891
)
8992

90-
const handleCustomTransition = ({ scenes }) => {
91-
if (scenes[scenes.length - 1].route.routeName === 'Contact') return null
92-
if (scenes[scenes.length - 1].route.routeName === 'Profile')
93-
return fromTop(800)
94-
return fromRight(500)
95-
}
96-
9793
export default createAppContainer(AppNavigator)

‎src/screens/chat.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import React, { Component } from 'react'
2-
import { View, FlatList, Image, Dimensions } from 'react-native'
2+
import { View, FlatList } from 'react-native'
33

44
import MsgBar from '../components/msgbar'
55
import Message from '../components/message'
66
import { observer, inject } from 'mobx-react'
7-
import { Header } from '../components/header'
87

98
@inject('Chat')
109
@observer

‎src/screens/profile.js‎

Lines changed: 4 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ import {
44
Text,
55
TouchableOpacity,
66
TextInput,
7-
Animated,
8-
Keyboard,
97
ActivityIndicator,
108
StyleSheet
119
} from 'react-native'
@@ -26,43 +24,12 @@ export default class Profile extends Component {
2624
isLoading: false,
2725
isFromFile: false
2826
}
29-
// this.size = new Animated.Value(150)
3027
}
3128

32-
// componentWillMount() {
33-
// this.keyboardWillShowSub = Keyboard.addListener(
34-
// 'keyboardDidShow',
35-
// this.keyboardWillShow
36-
// )
37-
// this.keyboardWillHideSub = Keyboard.addListener(
38-
// 'keyboardDidHide',
39-
// this.keyboardWillHide
40-
// )
41-
// }
42-
43-
// componentWillUnmount() {
44-
// this.keyboardWillShowSub.remove()
45-
// this.keyboardWillHideSub.remove()
46-
// }
47-
4829
componentDidMount() {
4930
this.props.User.getCurrentUser()
5031
}
5132

52-
// keyboardWillShow = event => {
53-
// Animated.timing(this.size, {
54-
// duration: 100,
55-
// toValue: 75
56-
// }).start()
57-
// }
58-
59-
// keyboardWillHide = event => {
60-
// Animated.timing(this.size, {
61-
// duration: 100,
62-
// toValue: 150
63-
// }).start()
64-
// }
65-
6633
render() {
6734
return (
6835
<View style={[style.container, _style.container]}>
@@ -128,7 +95,7 @@ export default class Profile extends Component {
12895
})
12996
})
13097
} else {
131-
this.props.User.update().then(data => {
98+
this.props.User.update().then(() => {
13299
saveKey(this.props.User.key).then(() => {
133100
this.props.navigation.replace('Splash')
134101
})
@@ -139,11 +106,11 @@ export default class Profile extends Component {
139106
selectAvatar = () => {
140107
ImagePicker.showImagePicker(null, response => {
141108
if (response.didCancel) {
142-
console.log('User cancelled image picker')
109+
// console.log('User cancelled image picker')
143110
} else if (response.error) {
144-
console.log('ImagePicker Error: ', response.error)
111+
// console.log('ImagePicker Error: ', response.error)
145112
} else if (response.customButton) {
146-
console.log('User tapped custom button: ', response.customButton)
113+
// console.log('User tapped custom button: ', response.customButton)
147114
} else {
148115
this.props.User.avatarSource = response.path
149116
this.props.User.fileName = response.fileName

‎src/screens/register.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export default class Register extends Component {
3939
animation={'flipInX'}
4040
>
4141
<Text style={style.verifyText}>Verify your number</Text>
42-
<Text style={style.smsText}>You'll get a code via SMS</Text>
42+
<Text style={style.smsText}>{"You'll get a code via SMS"}</Text>
4343
<PhoneInput
4444
ref={instance => (this.phone = instance)}
4545
style={{
@@ -59,7 +59,7 @@ export default class Register extends Component {
5959
textProps={{
6060
value: this.state.phoneNumber
6161
}}
62-
onSelectCountry={country =>
62+
onSelectCountry={() =>
6363
this.setState({ countryCode: this.phone.getCountryCode() })
6464
}
6565
/>
@@ -79,7 +79,7 @@ export default class Register extends Component {
7979
}
8080

8181
sendOTP() {
82-
this.content.flipOutX(400).then(async endState => {
82+
this.content.flipOutX(400).then(async () => {
8383
const _phoneNumber = '+' + this.state.countryCode + this.state.phoneNumber
8484
const isConfirm = await this.props.User.auth(_phoneNumber)
8585
if (isConfirm) {

‎src/screens/test.js‎

Lines changed: 0 additions & 133 deletions
This file was deleted.

0 commit comments

Comments
 (0)