Skip to content
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 44 additions & 12 deletions app/views/RoomInfoView/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ import { View, Text, ScrollView } from 'react-native';
import { connect } from 'react-redux';
import moment from 'moment';
import { SafeAreaView } from 'react-navigation';

import Separator from '../../containers/Separator';
import ListItem from '../../containers/ListItem';
import { DisclosureImage } from '../../containers/DisclosureIndicator';
import Status from '../../containers/Status';
import Avatar from '../../containers/Avatar';
import styles from './styles';
Expand All @@ -21,7 +23,6 @@ import { withTheme } from '../../theme';
import { themedHeader } from '../../utils/navigation';

const PERMISSION_EDIT_ROOM = 'edit-room';

const camelize = str => str.replace(/^(.)/, (match, chr) => chr.toUpperCase());
const getRoomTitle = (room, type, name, theme) => (type === 'd'
? <Text testID='room-info-view-name' style={[styles.roomTitle, { color: themes[theme].titleText }]}>{name}</Text>
Expand Down Expand Up @@ -142,6 +143,18 @@ class RoomInfoView extends React.Component {
}
}

goRoom = async() => {
const { roomUser } = this.state;
const { username: name } = roomUser;
const { navigation } = this.props;
const result = await RocketChat.createDirectMessage(name);
if (result.success) {
await navigation.navigate('RoomsListView');
const rid = result.room._id;
navigation.navigate('RoomView', { rid, name, t: 'd' });
}
}

isDirect = () => this.t === 'd'

renderItem = (key, room) => {
Expand Down Expand Up @@ -260,6 +273,27 @@ class RoomInfoView extends React.Component {
return null;
}

renderDisclosure = () => {
const { theme } = this.props;
return <DisclosureImage theme={theme} />;
}

Comment thread
Prateek93a marked this conversation as resolved.
Outdated
renderMessageButton = () => {
const { theme } = this.props;
return (
<>
<Separator theme={theme} />
<ListItem
title={I18n.t('Send_message')}
onPress={this.goRoom}
right={this.renderDisclosure}
theme={theme}
/>
<Separator theme={theme} />
</>
);
}

renderChannel = () => {
const { room } = this.state;
return (
Expand All @@ -272,16 +306,14 @@ class RoomInfoView extends React.Component {
);
}

renderDirect = () => {
const { roomUser } = this.state;
return (
<>
{this.renderRoles()}
{this.renderTimezone()}
{this.renderCustomFields(roomUser._id)}
</>
);
}
renderDirect = () => (
<>
{this.renderMessageButton()}
{this.renderRoles()}
{this.renderTimezone()}
{this.renderCustomFields()}
Comment thread
Prateek93a marked this conversation as resolved.
Outdated
</>
)

render() {
const { room, roomUser } = this.state;
Expand Down
6 changes: 3 additions & 3 deletions app/views/RoomInfoView/styles.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ export default StyleSheet.create({
},
scroll: {
flex: 1,
flexDirection: 'column',
padding: 10
flexDirection: 'column'
},
item: {
padding: 10,
paddingVertical: 10,
paddingHorizontal: 20,
justifyContent: 'center'
},
avatarContainer: {
Expand Down