Skip to content

GitLab

Commit 00959407 authored by tejaswi's avatar tejaswi
Browse files

Changes

parent 1f3cdb63
Hide whitespace changes
Inline Side-by-side
Showing
with 133 additions and 15 deletions
+133 -15
package-lock.json
View file @ 00959407
......@@ -13396,6 +13396,11 @@
"resolved": "https://registry.npmjs.org/react-native-image-crop-picker/-/react-native-image-crop-picker-0.37.2.tgz",
"integrity": "sha512-YwZXW21Km8+3tSt0smTaLVgY4398c0/OJcpcH6EP0JDOt1BNNxl/R8m6qdvnwdXdIoa0CCnMVW6TL9IN5ia9OA=="
},
"react-native-image-pan-zoom": {
"version": "2.1.12",
"resolved": "https://registry.npmjs.org/react-native-image-pan-zoom/-/react-native-image-pan-zoom-2.1.12.tgz",
"integrity": "sha512-BF66XeP6dzuANsPmmFsJshM2Jyh/Mo1t8FsGc1L9Q9/sVP8MJULDabB1hms+eAoqgtyhMr5BuXV3E1hJ5U5H6Q=="
},
"react-native-image-picker": {
"version": "4.7.3",
"resolved": "https://registry.npmjs.org/react-native-image-picker/-/react-native-image-picker-4.7.3.tgz",
......
src/CommonComponents/AdminChatUser.js
View file @ 00959407
......@@ -24,7 +24,7 @@ import {
} from 'react-native';
import Icon from 'react-native-vector-icons/FontAwesome';
import AsyncStorage from '@react-native-community/async-storage';
import ImageZoom from 'react-native-image-pan-zoom';
import { Title, Container, Content, Header, Right, Left, Body, Tab, Tabs, TabHeading, Footer, Item, Input, FooterTab, Subtitle } from 'native-base';
import moment from "moment";
import NetInfo from '@react-native-community/netinfo';
......@@ -57,7 +57,7 @@ export default class AdminChatUser extends Component {
player_id:this.props.navigation.state.params.player_id,
name: this.props.navigation.state.params.name,
sno: this.props.navigation.state.params.sno,
itemPressedDisabled: false,
userid: '',
groupName: '',
groupList: '',
......@@ -297,6 +297,7 @@ export default class AdminChatUser extends Component {
const userToken = response[1][1];
AsyncStorage.getItem("projectId", (err, res) => {
const projectId = res;
this.setState({ itemPressedDisabled: true })
// AsyncStorage.getItem("userId", (err, res) => {
// const device_id = res;
//alert(this.state.device_id)
......@@ -326,6 +327,7 @@ export default class AdminChatUser extends Component {
this.setState({
message: '',
handleHover: false,
itemPressedDisabled: false,
// commentDetails:null
});
......@@ -409,7 +411,7 @@ export default class AdminChatUser extends Component {
// alert("images" + JSON.stringify(this.state.images))
}
renderDate = (date) => {
return (
<Text style={styles.time}>
......@@ -505,7 +507,7 @@ export default class AdminChatUser extends Component {
<View style={[styles.itemReply, itemStyleReply]}>
<View style={{ padding: 5, }}>
{itemStyle === styles.itemOut ? <View style={{ flexDirection: 'row' }}><Text style={{ fontSize: 12, color: 'orange' }}>{item.reply_username}</Text></View> : <View style={{ flexDirection: 'row' }}><Text style={{ fontSize: 12, color: 'blue' }}>{item.username}</Text></View>}
{item.reply_path !== null ? <Image source={{ uri: item.reply_path }} style={{ width: 210, height: 50 }} /> : null}
{item.reply_path !== null ? <Image source={{ uri: item.reply_path }} style={{ width: 210, height: 50 }} /> : null}
<Text style={{ width: 210 }} selectable={true} key={Math.random()}>{item.reply_message}</Text>
{!inMessage && this.renderDate(moment(item.messagedTime).format('MM.DD.YYYY hh:mm:ss'))}
......@@ -515,7 +517,7 @@ export default class AdminChatUser extends Component {
<View style={[styles.itemown, itemStyle]}>
<View style={{ padding: 5, }}>
{itemStyle === styles.itemOut ? <View style={{ flexDirection: 'row' }}><Text style={{ fontSize: 12, color: 'orange' }}>{item.username}</Text><TouchableOpacity onPress={() => this.handlecom(item)} ><Icon color={'#C0C0C0'} size={25} style={{ marginLeft: 10 }} name="reply" /></TouchableOpacity></View> : <View style={{ flexDirection: 'row' }}><Text style={{ fontSize: 12, color: 'blue' }}>{item.username}</Text><TouchableOpacity onPress={() => this.handlecom(item)} ><Icon color={'#C0C0C0'} size={25} style={{ marginLeft: 10 }} name="reply" /></TouchableOpacity></View>}
{item.path !== null ? <Image source={{ uri: item.path }} style={styles.imageview} /> : null}
{item.path !== null ? <Image source={{ uri: item.path }} onPress = {this.props.navigation.navigate('ImageShowing',{image:item.path})} style={styles.imageview} /> : null}
<Text style={{ width: 210 }} selectable={true} key={Math.random()}>{item.message}</Text>
{!inMessage && this.renderDate(moment(item.messagedTime).format('MM.DD.YYYY hh:mm:ss'))}
{inMessage && this.renderDate(moment(item.messagedTime).format('MM.DD.YYYY hh:mm:ss'))}
......@@ -526,7 +528,7 @@ export default class AdminChatUser extends Component {
<View style={[styles.itemSingle, itemStyleSingle]}>
<View style={{ padding: 5, }}>
{itemStyle === styles.itemOut ? <View style={{ flexDirection: 'row' }}><Text style={{ fontSize: 12, color: 'orange' }}>{item.username}</Text><TouchableOpacity onPress={() => this.handlecom(item)} ><Icon color={'#C0C0C0'} size={25} style={{ marginLeft: 10 }} name="reply" /></TouchableOpacity></View> : <View style={{ flexDirection: 'row' }}><Text style={{ fontSize: 12, color: 'blue' }}>{item.username}</Text><TouchableOpacity onPress={() => this.handlecom(item)} ><Icon color={'#C0C0C0'} size={25} style={{ marginLeft: 10 }} name="reply" /></TouchableOpacity></View>}
{item.path !== null ? <Image source={{ uri: item.path }} style={styles.imageview} /> : null}
{item.path !== null ? <Image source={{ uri: item.path }} style={styles.imageview} /> : null}
<Text style={{ width: 210 }} selectable={true} key={Math.random()}>{item.message}</Text>
{!inMessage && this.renderDate(moment(item.messagedTime).format('MM.DD.YYYY hh:mm:ss'))}
{inMessage && this.renderDate(moment(item.messagedTime).format('MM.DD.YYYY hh:mm:ss'))}
......
src/CommonComponents/Comments.js
View file @ 00959407
......@@ -309,11 +309,11 @@ export default class AddMainTask extends React.Component {
this.props.navigation.goBack(null)} />
</Left>
<Body style={{ width: wp('80%') }}>
<Title style={{ color: '#fff', fontWeight: '600' }}>UserStory/Backlog History</Title>
{/* <Body style={{ width: wp('100%') }}> */}
<Text style={{ color: '#fff', fontWeight: '600',marginTop:25,marginRight:150 }}>UserStory/Backlog History</Text>
{/* <Subtitle style={{ color: '#fff', fontWeight: '600' }}>{this.state.moduledesc}</Subtitle> */}
</Body>
<Right></Right>
{/* </Body> */}
{/* <Right></Right> */}
</Header>
<View style={styles.MainContainer}>
<NavigationEvents
......
src/CommonComponents/EmployeeInfo.js
View file @ 00959407
......@@ -292,7 +292,7 @@ export default class EmployeeInfo extends Component {
</ View>
</View>
<View style={{ paddingTop: 20 }}>
<View style={{ height: hp('20%') }}>
<View style={{ height: hp('18%') }}>
<View style={{ flexDirection: 'row', justifyContent: 'space-between' }}>
<View style={{ paddingLeft: 20 ,flexDirection:'row'}}>
<TouchableOpacity onPress={() => this.props.navigation.navigate('ManageProjects', { empId: this.props.navigation.state.params.empId, emp_role: this.props.navigation.state.params.role })}>
......@@ -322,7 +322,7 @@ export default class EmployeeInfo extends Component {
</View>
<View style={{ paddingTop: 20 }}>
<View style={{ height: hp('20%') }}>
<View style={{ height: hp('18%') }}>
<View style={{ flexDirection: 'row', justifyContent: 'space-between' }}>
<View style={{ paddingLeft: 20 }}>
<TouchableOpacity onPress={() => this.UserCheck()}>
......@@ -354,7 +354,7 @@ export default class EmployeeInfo extends Component {
</View>
<View style={{ paddingTop: 20 }}>
<View style={{ height: hp('20%') }}>
<View style={{ height: hp('18%') }}>
<View style={{ flexDirection: 'row', justifyContent: 'space-between' }}>
<View style={{ paddingLeft: 20 ,flexDirection:'row'}}>
<TouchableOpacity onPress={() => this.props.navigation.navigate('KudosPoints', { empId: this.props.navigation.state.params.empId, emp_role: this.props.navigation.state.params.role })}>
......
src/CommonComponents/ImageShowing.js 0 → 100644
View file @ 00959407
import React, { Component } from 'react';
import {
AppRegistry,
StyleSheet,
Image,
PixelRatio,
View,
Dimensions,
Platform
} from 'react-native';
import ImageZoom from 'react-native-image-pan-zoom';
import { widthPercentageToDP as wp, heightPercentageToDP as hp } from 'react-native-responsive-screen';
// import {ViewprofileStyles} from '../StyleSheet/Styles1';
export default class ImageShowing extends Component {
//to set state variable and declare state variables
constructor(props) {
super(props);
this.state = {
data: null,
mobilenumber: '',
usertype: '',
showPass: true,
press: false,
ImageSource: this.props.navigation.state.params.image,
}
}
//render all ui components
render() {
alert("Test"+this.state.ImageSource)
return (
<View style={styles.container}>
<View
style={[
styles.avatar,
styles.avatarContainer,
{ borderWidth: 0.7 },
]}
>
<ImageZoom cropWidth={Dimensions.get('window').width}
cropHeight={Dimensions.get('window').height}
imageWidth={300}
imageHeight={300}
>
<Image style={styles.imagestyles} source={{ uri: this.state.ImageSource }}
/>
</ImageZoom>
</View>
</View>
);
}
}
const styles = StyleSheet.create({
container: {
// alignItems: 'center',
justifyContent: 'center',
},
avatarContainer: {
borderWidth: 30 / PixelRatio.get(),
justifyContent: 'center',
alignItems: 'center',
},
avatar: {
borderColor: 'white',
borderWidth: 10,
shadowColor: '#000000',
shadowOffset: {
width: 0,
height: 3
},
},
imagestyles:
{
width: 300,
height: 300
},
})
src/Navigation/NavigationRouter.js
View file @ 00959407
......@@ -120,6 +120,7 @@ import GroupChat from '../CommonComponents/GroupChat';
import AdminChat from '../CommonComponents/AdminChat';
import AdminChatUser from '../CommonComponents/AdminChatUser';
import KudosPoints from '../CommonComponents/KudosPoints';
import ImageShowing from '../CommonComponents/ImageShowing';
......@@ -1022,6 +1023,12 @@ const userAppStack = createStackNavigator({
header: null,
},
},
ImageShowing:{
screen:ImageShowing,
navigationOptions:{
header:null,
},
},
AssignTodo:{
screen:AssignTodo,
navigationOptions:{
......
src/UserComponents/UserProfileKudos.js
View file @ 00959407
......@@ -104,7 +104,7 @@ class ListItem extends React.Component {
<View style={styles.box1}>
<View style={{ flexDirection: 'row', width: wp('70%'), marginRight: 20 }}>
<View style={{ flexDirection: 'row', width: wp('60%'), marginRight: 20 }}>
<Text style={styles.signUpText00} >Kudos Description:</Text>
<Text style={styles.signUpText11} >{item.description}</Text>
</View>
......@@ -617,7 +617,7 @@ export default class UserProfileKudos extends Component {
<Icon style={{ marginRight: 10 }} name="search" size={20} /> */}
</Item>
<View style={{ height: '67%' }}>
<View style={{ height: '88%' }}>
<FlatList
// data={this.props.data}
......
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