Skip to content

Commit

Permalink
resolved error
Browse files Browse the repository at this point in the history
  • Loading branch information
Hemant27031999 committed Jan 3, 2020
1 parent a212180 commit 32f7011
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 10 deletions.
7 changes: 5 additions & 2 deletions app.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"expo": {
"name": "Chatter",
"slug": "Chatter-Native",
"slug": "chatter_native",
"icon": "icon.png",
"privacy": "public",
"sdkVersion": "36.0.0",
"platforms": [
Expand All @@ -28,6 +29,8 @@
},
"android": {
"package": "com.chatternative.chatter"
}
},
"description": "This is a Chat App which enables you to do realtime chatting with your friends. We also has the web version of it, which you can see here (https://chatter-fro.herokuapp.com/), so you can enjoy chatting from whichever platform you want.",
"githubUrl": "https://github.com/Hemant27031999/Chatter-Native"
}
}
7 changes: 3 additions & 4 deletions app/components/MainScreen/ChatScreen.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { Component, useState } from "react";
import { FlatList, Text, View, Image, TextInput, StyleSheet,TouchableHighlight, } from "react-native";
import { FlatList, Text, View, Image, TextInput, StyleSheet,TouchableHighlight, KeyboardAvoidingView } from "react-native";
import { AppLoading } from 'expo';
import SignIn from '../SignIn';
import Register from '../Register';
Expand All @@ -10,7 +10,6 @@ import {createAppContainer} from 'react-navigation';
import Pusher from 'pusher-js/react-native';
import Toast, {DURATION} from 'react-native-easy-toast';


export default class ChatScreen extends Component {

static navigationOptions =
Expand Down Expand Up @@ -203,7 +202,7 @@ onClickListener = (viewId) => {
render() {

return (
<View style={{flex: 1, alignItems: 'center', paddingTop: 25, backgroundColor: '#bac4bc'}}>
<KeyboardAvoidingView style={{flex: 1, alignItems: 'center', paddingTop: 25, backgroundColor: '#bac4bc'}} behavior="padding" enabled>
<FlatList
horizontal
data={this.state.friendslist}
Expand Down Expand Up @@ -270,7 +269,7 @@ onClickListener = (viewId) => {
</View>
}
<Toast ref="toast"/>
</View>
</KeyboardAvoidingView>
);
}
}
Expand Down
11 changes: 7 additions & 4 deletions app/components/Register.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { Component } from 'react';
import { ScrollView, StyleSheet, Text, View, Button,TouchableHighlight, Image, Keyboard, ImageBackground, Animated, Dimensions, UIManager} from 'react-native';
import { ScrollView, StyleSheet, Text, View, Button,TouchableHighlight, KeyboardAvoidingView, Image, Keyboard, ImageBackground, Animated, Dimensions, UIManager} from 'react-native';
import FontAwesomeIcon from 'react-native-vector-icons/FontAwesome';
import {Fumi} from 'react-native-textinput-effects';
import * as Font from 'expo-font';
Expand Down Expand Up @@ -55,9 +55,10 @@ export default class Register extends Component {

render() {
return (
<View
<KeyboardAvoidingView
style={styles.container}
contentContainerStyle={styles.content}>
contentContainerStyle={styles.content}
behavior="height" enabled>

<ImageBackground
style={{
Expand Down Expand Up @@ -144,7 +145,8 @@ export default class Register extends Component {
<Toast ref="toast"/>

</ImageBackground>
</View>

</KeyboardAvoidingView>
);
}
}
Expand All @@ -153,6 +155,7 @@ const styles = StyleSheet.create({
container: {
flex: 1,
alignItems: 'center',
justifyContent: 'flex-end',
},
content: {
paddingBottom: 300,
Expand Down
Binary file added icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions package-lock.json

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

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"react-native-gesture-handler": "^1.5.2",
"react-native-improved-text-input": "0.0.1",
"react-native-indicator": "^1.1.0",
"react-native-keyboard-spacer": "^0.4.1",
"react-native-login-screen": "^0.2.1",
"react-native-progress": "^4.0.3",
"react-native-reanimated": "^1.4.0",
Expand Down

0 comments on commit 32f7011

Please sign in to comment.