Skip to content

[FIX] Room Info styles #1820

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
diegolmello merged 5 commits into from
Mar 4, 2020
Merged

[FIX] Room Info styles #1820

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
efea589
[FIX] Room Info items colors
djorkaeffalexandre Mar 3, 2020
4170110
[IMPROVEMENT] Code improvement
djorkaeffalexandre Mar 3, 2020
2c6fb6d
[FIX] Remove renderSpecificItem
djorkaeffalexandre Mar 3, 2020
b331cfc
Merge develop
djorkaeffalexandre Mar 3, 2020
a40ce73
Merge branch 'develop' into fix.room-info-colors
diegolmello Mar 4, 2020
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
44 changes: 20 additions & 24 deletions app/views/RoomInfoView/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import { getUserSelector } from '../../selectors/login';
import Markdown from '../../containers/markdown';

const PERMISSION_EDIT_ROOM = 'edit-room';
const camelize = str => str.replace(/^(.)/, (match, chr) => chr.toUpperCase());
const getRoomTitle = (room, type, name, username, theme) => (type === 'd'
? (
<>
Expand Down Expand Up @@ -169,13 +168,15 @@ class RoomInfoView extends React.Component {

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

renderItem = (key, room) => {
renderItem = ({ label, content, testID }) => {
const { theme } = this.props;
return (
<View style={styles.item}>
<Text accessibilityLabel={key} style={[styles.itemLabel, { color: themes[theme].auxiliaryText }]}>{I18n.t(camelize(key))}</Text>
<Text accessibilityLabel={label} style={[styles.itemLabel, { color: themes[theme].titleText }]}>{I18n.t(label)}</Text>
<Markdown
msg={room[key] ? room[key] : `__${ I18n.t(`No_${ key }_provided`) }__`}
testID={testID}
style={[styles.itemContent, { color: themes[theme].auxiliaryText }]}
msg={content || `__${ I18n.t(`No_${ label.toLowerCase() }_provided`) }__`}
theme={theme}
/>
</View>
Expand Down Expand Up @@ -212,20 +213,19 @@ class RoomInfoView extends React.Component {

renderTimezone = () => {
const { roomUser } = this.state;
const { Message_TimeFormat, theme } = this.props;
const { Message_TimeFormat } = this.props;

if (roomUser) {
const { utcOffset } = roomUser;

if (!utcOffset) {
return null;
}
return (
<View style={styles.item}>
<Text style={[styles.itemLabel, { color: themes[theme].titleText }]}>{I18n.t('Timezone')}</Text>
<Text style={[styles.itemContent, { color: themes[theme].auxiliaryText }]}>{moment().utcOffset(utcOffset).format(Message_TimeFormat)} (UTC { utcOffset })</Text>
</View>
);
return this.renderItem({
label: 'Timezone',
content: `${ moment().utcOffset(utcOffset).format(Message_TimeFormat) } (UTC ${ utcOffset })`,
testID: 'room-info-view-timezone'
});
}
return null;
}
Expand All @@ -248,16 +248,11 @@ class RoomInfoView extends React.Component {
);
}

renderBroadcast = () => (
<View style={styles.item}>
<Text style={styles.itemLabel}>{I18n.t('Broadcast_Channel')}</Text>
<Text
style={styles.itemContent}
testID='room-info-view-broadcast'
>{I18n.t('Broadcast_channel_Description')}
</Text>
</View>
)
renderBroadcast = () => this.renderItem({
label: 'Broadcast_Channel',
content: I18n.t('Broadcast_channel_Description'),
testID: 'room-info-view-broadcast'
});

renderCustomFields = () => {
const { roomUser } = this.state;
Expand Down Expand Up @@ -311,11 +306,12 @@ class RoomInfoView extends React.Component {

renderChannel = () => {
const { room } = this.state;
const { description, topic, announcement } = room;
return (
<>
{this.renderItem('description', room)}
{this.renderItem('topic', room)}
{this.renderItem('announcement', room)}
{this.renderItem({ label: 'Description', content: description })}
{this.renderItem({ label: 'Topic', content: topic })}
{this.renderItem({ label: 'Announcement', content: announcement })}
{room.broadcast ? this.renderBroadcast() : null}
</>
);
Expand Down