michael/cinny
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity

Improved room list avatar code

Browse source
This commit is contained in:
Ayes 2022-11-19 00:25:36 +02:00
parent dd22a92e33
commit 079c5d77e9
2 changed files with 11 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/app/molecules/room-selector/RoomSelector.jsx
View file

@ -5,12 +5,10 @@ import './RoomSelector.scss';
import { twemojify } from '../../../util/twemojify'; import { twemojify } from '../../../util/twemojify';
import colorMXID from '../../../util/colorMXID'; import colorMXID from '../../../util/colorMXID';
import initMatrix from '../../../client/initMatrix';
import Text from '../../atoms/text/Text'; import Text from '../../atoms/text/Text';
import Avatar from '../../atoms/avatar/Avatar'; import Avatar from '../../atoms/avatar/Avatar';
import NotificationBadge from '../../atoms/badge/NotificationBadge'; import NotificationBadge from '../../atoms/badge/NotificationBadge';
import { blurOnBubbling } from '../../atoms/button/script'; import { blurOnBubbling } from '../../atoms/button/script';
import settings from '../../../client/state/settings';
function RoomSelectorWrapper({ function RoomSelectorWrapper({
isSelected, isMuted, isUnread, onClick, isSelected, isMuted, isUnread, onClick,
@ -56,13 +54,6 @@ function RoomSelector({
isSelected, isMuted, isUnread, notificationCount, isAlert, isSelected, isMuted, isUnread, notificationCount, isAlert,
options, onClick, onContextMenu, options, onClick, onContextMenu,
}) { }) {
let avatarSrc;
if (settings.showRoomListAvatar) {
const mx = initMatrix.matrixClient;
const room = mx.getRoom(roomId);
avatarSrc = room.getAvatarUrl(mx.baseUrl, 24, 24, 'crop');
}
return ( return (
<RoomSelectorWrapper <RoomSelectorWrapper
isSelected={isSelected} isSelected={isSelected}
@ -70,23 +61,14 @@ function RoomSelector({
isUnread={isUnread} isUnread={isUnread}
content={( content={(
<> <>
{settings.showRoomListAvatar ? ( <Avatar
<Avatar text={name}
text={name} bgColor={colorMXID(roomId)}
bgColor={colorMXID(roomId)} imageSrc={imageSrc}
imageSrc={avatarSrc} iconColor="var(--ic-surface-low)"
size="extra-small" iconSrc={iconSrc}
/> size="extra-small"
) : ( />
<Avatar
text={name}
bgColor={colorMXID(roomId)}
imageSrc={imageSrc}
iconColor="var(--ic-surface-low)"
iconSrc={iconSrc}
size="extra-small"
/>
)}
<Text variant="b1" weight={isUnread ? 'medium' : 'normal'}> <Text variant="b1" weight={isUnread ? 'medium' : 'normal'}>
{twemojify(name)} {twemojify(name)}
{parentName && ( {parentName && (

5
src/app/organisms/navigation/Selector.jsx
View file

@ -17,6 +17,7 @@ import SpaceOptions from '../../molecules/space-options/SpaceOptions';
import VerticalMenuIC from '../../../../public/res/ic/outlined/vertical-menu.svg'; import VerticalMenuIC from '../../../../public/res/ic/outlined/vertical-menu.svg';
import { useForceUpdate } from '../../hooks/useForceUpdate'; import { useForceUpdate } from '../../hooks/useForceUpdate';
import settings from '../../../client/state/settings';
function Selector({ function Selector({
roomId, isDM, drawerPostie, onClick, roomId, isDM, drawerPostie, onClick,
@ -57,8 +58,8 @@ function Selector({
key={roomId} key={roomId}
name={room.name} name={room.name}
roomId={roomId} roomId={roomId}
imageSrc={isDM ? imageSrc : null} imageSrc={isDM || settings.showRoomListAvatar ? imageSrc : null}
iconSrc={isDM ? null : joinRuleToIconSrc(room.getJoinRule(), room.isSpaceRoom())} iconSrc={isDM || settings.showRoomListAvatar ? null : joinRuleToIconSrc(room.getJoinRule(), room.isSpaceRoom())}
isSelected={navigation.selectedRoomId === roomId} isSelected={navigation.selectedRoomId === roomId}
isMuted={isMuted} isMuted={isMuted}
isUnread={!isMuted && noti.hasNoti(roomId)} isUnread={!isMuted && noti.hasNoti(roomId)}