Skip to content

2
2021-160
Commit ab7241c8 authored by PMGurusinghe's avatar PMGurusinghe
Browse files
Options

style add

parent 9127e1e0
Hide whitespace changes
Inline Side-by-side
Showing with 12405 additions and 67 deletions
package-lock.json
View file @ ab7241c8
This source diff could not be displayed because it is too large. You can view the blob instead.
screen/ChatScreen.js
View file @ ab7241c8
...@@ -73,13 +73,13 @@ const ChatScreen = ({ navigation, route }) => { ...@@ -73,13 +73,13 @@ const ChatScreen = ({ navigation, route }) => {
marginRight: 20, marginRight: 20,
}} }}
> >
<TouchableOpacity> {/* <TouchableOpacity>
<FontAwesome name="video-camera" size={23} color="white" /> <FontAwesome name="video-camera" size={23} color="white" />
</TouchableOpacity> </TouchableOpacity>
<TouchableOpacity> <TouchableOpacity>
<Ionicons name="call" size={23} color="white" /> <Ionicons name="call" size={23} color="white" />
</TouchableOpacity> </TouchableOpacity> */}
</View> </View>
), ),
}); });
...@@ -196,16 +196,20 @@ const ChatScreen = ({ navigation, route }) => { ...@@ -196,16 +196,20 @@ const ChatScreen = ({ navigation, route }) => {
<View style={styles.footer}> <View style={styles.footer}>
<View style={styles.buttonrow}> <View style={styles.buttonrow}>
<TouchableOpacity style={styles.icon} activeOpacity={0.5} onPress={() => navigation.navigate("Camera")}> <TouchableOpacity style={styles.icon} activeOpacity={0.5} onPress={() => navigation.navigate("Camera")}>
<Ionicons name="recording" size={23} color="#be0c57" /> <Ionicons name="recording" size={25} color="#be0c57" />
<Text style={styles.iconText}>Lip</Text>
</TouchableOpacity> </TouchableOpacity>
<TouchableOpacity style={styles.icon} activeOpacity={0.5}> <TouchableOpacity style={styles.icon} activeOpacity={0.5} onPress={() => navigation.navigate("Camera")}>
<Ionicons name="hand-right" size={23} color="#be0c57" /> <Ionicons name="hand-right" size={25} color="#be0c57" />
<Text style={styles.iconText}>BSL</Text>
</TouchableOpacity> </TouchableOpacity>
<TouchableOpacity style={styles.icon} activeOpacity={0.5}> <TouchableOpacity style={styles.icon} activeOpacity={0.5} onPress={() => navigation.navigate("Camera")}>
<Ionicons name="mic" size={23} color="#be0c57" /> <Ionicons name="thumbs-up" size={25} color="#be0c57" />
<Text style={styles.iconTextMakaton}>Makaton</Text>
</TouchableOpacity> </TouchableOpacity>
<TouchableOpacity style={styles.icon} activeOpacity={0.5}> <TouchableOpacity style={styles.icon} activeOpacity={0.5}>
<Ionicons name="thumbs-up" size={23} color="#be0c57" /> <Ionicons name="mic" size={25} color="#be0c57" />
<Text style={styles.iconTextVoice}>Voice</Text>
</TouchableOpacity> </TouchableOpacity>
</View> </View>
<View style={styles.chatRow}> <View style={styles.chatRow}>
...@@ -218,7 +222,8 @@ const ChatScreen = ({ navigation, route }) => { ...@@ -218,7 +222,8 @@ const ChatScreen = ({ navigation, route }) => {
/> />
<TouchableOpacity onPress={sendMessage} activeOpacity={0.5}> <TouchableOpacity onPress={sendMessage} activeOpacity={0.5}>
<Ionicons name="send" size={23} color="#43E68D" /> <Ionicons name="send" size={23} color="#FF6464" />
</TouchableOpacity> </TouchableOpacity>
</View> </View>
</View> </View>
...@@ -243,17 +248,33 @@ const styles = StyleSheet.create({ ...@@ -243,17 +248,33 @@ const styles = StyleSheet.create({
}, },
icon:{ icon:{
margin:3, margin:3,
marginLeft:20, marginLeft:38,
padding:1, padding:1,
}, },
iconText:{
color: "black",
fontWeight: "500",
marginLeft: 2,
marginBottom: 2,
},
iconTextMakaton:{
color: "black",
fontWeight: "500",
marginLeft: -10,
marginBottom: 2,
},
iconTextVoice:{
color: "black",
fontWeight: "500",
marginLeft: -4,
marginBottom: 2,
},
buttonrow:{ buttonrow:{
display:'flex', display:'flex',
flexDirection:'row', flexDirection:'row',
width:'100%', width:'100%',
marginBottom:5, marginBottom:5,
}, },
reciever: { reciever: {
padding: 15, padding: 15,
......
screen/HomeScreen.js
View file @ ab7241c8
...@@ -54,11 +54,11 @@ const HomeScreen = ({ navigation }) => { ...@@ -54,11 +54,11 @@ const HomeScreen = ({ navigation }) => {
width: 80, width: 80,
marginRight: 20, marginRight: 20,
}}> }}>
<TouchableOpacity activeOpacity={0.5}> {/* <TouchableOpacity activeOpacity={0.5}>
<AntDesign name="camerao" size={24} color="black" /> <AntDesign name="camerao" size={24} color="black" />
</TouchableOpacity> </TouchableOpacity> */}
<TouchableOpacity <TouchableOpacity style={styles.icon}
onPress={() => navigation.navigate("AddChat")} onPress={() => navigation.navigate("AddChat")}
activeOpacity={0.5}> activeOpacity={0.5}>
<SimpleLineIcons name="pencil" size={24} color="black" /> <SimpleLineIcons name="pencil" size={24} color="black" />
...@@ -98,5 +98,13 @@ const styles = StyleSheet.create({ ...@@ -98,5 +98,13 @@ const styles = StyleSheet.create({
container: { container: {
height: "100%", height: "100%",
// backgroundColor: "white" // backgroundColor: "white"
} },
icon:{
margin:3,
marginLeft:50,
padding:1,
},
}) })
screen/LoginScreen.js
View file @ ab7241c8
...@@ -31,13 +31,12 @@ const LoginScreen = ({ navigation }) => { ...@@ -31,13 +31,12 @@ const LoginScreen = ({ navigation }) => {
return ( return (
<KeyboardAvoidingView behavior="padding" style={styles.container}> <KeyboardAvoidingView behavior="padding" style={styles.container}>
<StatusBar style='light' /> <StatusBar style='light' />
<SafeAreaView>
<ScrollView >
<Text style={styles.LoginTitle}>Easy Chat</Text> <Text style={styles.LoginTitle}>Easy Chat</Text>
<Image source={ loginImage} <Image source={require('../screen/images/login-image1.png')}
style={{ width: 250, height: 200 }} />
style={{ width: 200, height: 200 }} />
<View style={styles.inputContainer}> <View style={styles.inputContainer}>
<TextInput <TextInput
...@@ -73,8 +72,7 @@ const LoginScreen = ({ navigation }) => { ...@@ -73,8 +72,7 @@ const LoginScreen = ({ navigation }) => {
<View style={{ height: 50 }} /> <View style={{ height: 50 }} />
</ScrollView>
</SafeAreaView>
</KeyboardAvoidingView>) </KeyboardAvoidingView>)
} }
...@@ -108,12 +106,13 @@ const styles = StyleSheet.create({ ...@@ -108,12 +106,13 @@ const styles = StyleSheet.create({
}, },
LoginTitle:{ LoginTitle:{
marginTop:20,
height: 66, height: 66,
alignItems: "center", alignItems: "center",
fontSize:46, fontSize:46,
fontWeight:'400', fontWeight:'400',
left:55, left:10,
color: '#227721', color: 'black',
bottom:10, bottom:10,
}, },
...@@ -122,7 +121,7 @@ const styles = StyleSheet.create({ ...@@ -122,7 +121,7 @@ const styles = StyleSheet.create({
fontSize:18, fontSize:18,
lineHeight:22, lineHeight:22,
width:250, width:250,
color:'#333FA7', color:'black',
left:20, left:20,
top:30 top:30
}, },
......
screen/RegisterScreen.js
View file @ ab7241c8
...@@ -8,7 +8,7 @@ import { getAuth, createUserWithEmailAndPassword } from "firebase/auth"; ...@@ -8,7 +8,7 @@ import { getAuth, createUserWithEmailAndPassword } from "firebase/auth";
import Firebase from 'firebase'; import Firebase from 'firebase';
import { ToastProvider, useToasts } from 'react-toast-notifications'; import { ToastProvider, useToasts } from 'react-toast-notifications';
import loginImage from'./images/login-image.png' import loginImage from'../screen/images/Sign_in.png'
const RegisterScreen = ({ navigation }) => { const RegisterScreen = ({ navigation }) => {
...@@ -78,21 +78,13 @@ const RegisterScreen = ({ navigation }) => { ...@@ -78,21 +78,13 @@ const RegisterScreen = ({ navigation }) => {
<KeyboardAvoidingView behavior='padding' style={styles.container}> <KeyboardAvoidingView behavior='padding' style={styles.container}>
<StatusBar style="light" /> <StatusBar style="light" />
<Text style={styles.LoginTitle}>Easy Chat</Text>
<SafeAreaView> <Text h4 style={{ marginBottom: 10 }}>
<ScrollView >
<Text style={styles.LoginTitle}>Easy Chat</Text>
<Text h4 style={{ marginBottom: 50 }}>
Create a EasyChat account Create a EasyChat account
</Text> </Text>
<Image source={ loginImage <Image source={loginImage}
}
style={{ width: 200, height: 200 }} /> style={{ width: 200, height: 200 }} />
<View style={styles.inputContainer}> <View style={styles.inputContainer}>
<Input <Input
...@@ -141,8 +133,7 @@ const RegisterScreen = ({ navigation }) => { ...@@ -141,8 +133,7 @@ const RegisterScreen = ({ navigation }) => {
</TouchableOpacity> </TouchableOpacity>
<View style={{ height: 100 }} /> <View style={{ height: 100 }} />
</ScrollView>
</SafeAreaView>
</KeyboardAvoidingView> </KeyboardAvoidingView>
) )
} }
...@@ -167,10 +158,13 @@ const styles = StyleSheet.create({ ...@@ -167,10 +158,13 @@ const styles = StyleSheet.create({
}, },
LoginTitle:{ LoginTitle:{
height: 66, marginTop:20,
height: 66,
alignItems: "center",
fontSize:46, fontSize:46,
fontWeight:'400', fontWeight:'400',
color: '#227721', left:10,
color: 'black',
bottom:10, bottom:10,
}, },
...@@ -179,7 +173,7 @@ const styles = StyleSheet.create({ ...@@ -179,7 +173,7 @@ const styles = StyleSheet.create({
fontSize:18, fontSize:18,
lineHeight:22, lineHeight:22,
width:280, width:280,
color:'#333FA7', color:'black',
left:10, left:10,
top:20, top:20,
marginTop:15, marginTop:15,
......
yarn.lock
View file @ ab7241c8
...@@ -2370,6 +2370,13 @@ ...@@ -2370,6 +2370,13 @@
"resolved" "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz" "resolved" "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz"
"version" "2.1.2" "version" "2.1.2"
"axios@^0.24.0":
"integrity" "sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA=="
"resolved" "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz"
"version" "0.24.0"
dependencies:
"follow-redirects" "^1.14.4"
"babel-plugin-dynamic-import-node@^2.3.3": "babel-plugin-dynamic-import-node@^2.3.3":
"integrity" "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==" "integrity" "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ=="
"resolved" "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz" "resolved" "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz"
...@@ -3742,6 +3749,11 @@ ...@@ -3742,6 +3749,11 @@
"@firebase/storage" "0.4.2" "@firebase/storage" "0.4.2"
"@firebase/util" "0.3.4" "@firebase/util" "0.3.4"
"follow-redirects@^1.14.4":
"integrity" "sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA=="
"resolved" "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz"
"version" "1.14.5"
"fontfaceobserver@^2.1.0": "fontfaceobserver@^2.1.0":
"integrity" "sha512-ReOsO2F66jUa0jmv2nlM/s1MiutJx/srhAe2+TE8dJCMi02ZZOcCTxTCQFr3Yet+uODUtnr4Mewg+tNQ+4V1Ng==" "integrity" "sha512-ReOsO2F66jUa0jmv2nlM/s1MiutJx/srhAe2+TE8dJCMi02ZZOcCTxTCQFr3Yet+uODUtnr4Mewg+tNQ+4V1Ng=="
"resolved" "https://registry.npmjs.org/fontfaceobserver/-/fontfaceobserver-2.1.0.tgz" "resolved" "https://registry.npmjs.org/fontfaceobserver/-/fontfaceobserver-2.1.0.tgz"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment