matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-17 17:42:41 +03:00
Code Activity

Merge pull request #3931 from matrix-org/foldleft/12035-room-decoration-design-pass

Browse Source 
Design pass for room icons
This commit is contained in:
Zoe
2020-01-24 13:54:51 +00:00
committed by GitHub
parent cbfde4d78f 75da5b7944
commit 543be90eda
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/views/rooms/RoomList.js
View File

@@ -719,7 +719,7 @@ export default createReactClass({
}, },
{ {
list: this.state.lists['im.vector.fake.direct'], list: this.state.lists['im.vector.fake.direct'],
label: _t('People'), label: _t('Direct Messages'),
tagName: "im.vector.fake.direct", tagName: "im.vector.fake.direct",
order: "recent", order: "recent",
incomingCall: incomingCallIfTaggedAs('im.vector.fake.direct'), incomingCall: incomingCallIfTaggedAs('im.vector.fake.direct'),

6
src/components/views/rooms/RoomTile.js
View File

@@ -478,7 +478,8 @@ export default createReactClass({
let dmIndicator; let dmIndicator;
let dmOnline; let dmOnline;
if (dmUserId) { // If we can place a shield, do that instead
if (dmUserId && !this.state.e2eStatus) {
dmIndicator = <img dmIndicator = <img
src={require("../../../../res/img/icon_person.svg")} src={require("../../../../res/img/icon_person.svg")}
className="mx_RoomTile_dm" className="mx_RoomTile_dm"
@@ -529,8 +530,7 @@ export default createReactClass({
} }
let e2eIcon = null; let e2eIcon = null;
// For now, skip the icon for DMs. Possibly we want to move the DM icon elsewhere? if (this.state.e2eStatus) {
if (!dmUserId && this.state.e2eStatus) {
e2eIcon = <E2EIcon status={this.state.e2eStatus} className="mx_RoomTile_e2eIcon" />; e2eIcon = <E2EIcon status={this.state.e2eStatus} className="mx_RoomTile_e2eIcon" />;
} }

3
src/i18n/strings/en_EN.json
View File

@@ -1016,7 +1016,7 @@
"Community Invites": "Community Invites", "Community Invites": "Community Invites",
"Invites": "Invites", "Invites": "Invites",
"Favourites": "Favourites", "Favourites": "Favourites",
"People": "People", "Direct Messages": "Direct Messages",
"Start chat": "Start chat", "Start chat": "Start chat",
"Rooms": "Rooms", "Rooms": "Rooms",
"Low priority": "Low priority", "Low priority": "Low priority",
@@ -1475,7 +1475,6 @@
"Suggestions": "Suggestions", "Suggestions": "Suggestions",
"Recently Direct Messaged": "Recently Direct Messaged", "Recently Direct Messaged": "Recently Direct Messaged",
"Show more": "Show more", "Show more": "Show more",
"Direct Messages": "Direct Messages",
"If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.": "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.", "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.": "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.",
"Go": "Go", "Go": "Go",
"If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.", "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.",