Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Commit

Permalink
Rename Thread Activity Centre to Threads Activity Centre
Browse files Browse the repository at this point in the history
  • Loading branch information
@florianduros
florianduros committed Jan 15, 2024
1 parent 94ace6f commit fdf3843
Show file tree
Hide file tree
Showing 8 changed files with 42 additions and 42 deletions.
2 changes: 1 addition & 1 deletion res/css/_components.pcss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
@import "./structures/_SpaceRoomView.pcss";
@import "./structures/_SplashPage.pcss";
@import "./structures/_TabbedView.pcss";
@import "./structures/_ThreadActivityCentre.pcss";
@import "structures/_ThreadsActivityCentre.pcss";
@import "./structures/_ToastContainer.pcss";
@import "./structures/_UploadBar.pcss";
@import "./structures/_UserMenu.pcss";
Expand Down
18 changes: 9 additions & 9 deletions ...css/structures/_ThreadActivityCentre.pcss → ...ss/structures/_ThreadsActivityCentre.pcss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* /
*/

.mx_ThreadActivityCentreButton {
.mx_ThreadsActivityCentreButton {
color: $secondary-content;
height: 32px;
display: flex;
Expand All @@ -29,7 +29,7 @@
/* align with settings icon */
margin-left: 20px;

.mx_ThreadActivityCentreButton_Icon {
.mx_ThreadsActivityCentreButton_Icon {
/* align with settings label */
margin-right: 12px;
}
Expand All @@ -41,20 +41,20 @@
}
}

.mx_ThreadActivityCentreButton_Icon {
.mx_ThreadsActivityCentreButton_Icon {
height: 24px;
width: 24px;
padding: 4px;
}
}

.mx_ThreadActivityRows {
.mx_ThreadsActivityRows {
width: 300px;
display: flex;
flex-direction: column;
gap: 24px;

.mx_ThreadActivityRow {
.mx_ThreadsActivityRow {
/* remove button style */
background-color: transparent;
border: none;
Expand All @@ -67,23 +67,23 @@
margin: 0 16px;
gap: 12px;

.mx_ThreadActivityRow_room {
.mx_ThreadsActivityRow_room {
flex: 1 auto;
}
}
}

.mx_ThreadActivityCentreBadge {
.mx_ThreadsActivityCentreBadge {
background-color: $primary-content;
width: 8px;
height: 8px;
border-radius: 8px;

&.mx_ThreadActivityCentreBadge_alert {
&.mx_ThreadsActivityCentreBadge_alert {
background-color: $alert;
}

&.mx_ThreadActivityCentreBadge_highlight {
&.mx_ThreadsActivityCentreBadge_highlight {
background-color: var(--cpd-color-icon-accent-tertiary);
}
}
8 changes: 4 additions & 4 deletions src/components/views/spaces/SpacePanel.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ import { NotificationState } from "../../../stores/notifications/NotificationSta
import { ALTERNATE_KEY_NAME } from "../../../accessibility/KeyboardShortcuts";
import { shouldShowComponent } from "../../../customisations/helpers/UIComponents";
import { UIComponent } from "../../../settings/UIFeature";
import { ThreadActivityCentre } from "./thread-activity-centre/";
import { ThreadsActivityCentre } from "./threads-activity-centre/";

const useSpaces = (): [Room[], MetaSpace[], Room[], SpaceKey] => {
const invites = useEventEmitterState<Room[]>(SpaceStore.instance, UPDATE_INVITED_SPACES, () => {
Expand Down Expand Up @@ -351,7 +351,7 @@ const SpacePanel: React.FC = () => {
}
});

const isThreadActivityCentreEnabled = useSettingValue<boolean>("threadActivityCentre");
const isThreadsActivityCentreEnabled = useSettingValue<boolean>("threadsActivityCentre");

return (
<RovingTabIndexProvider handleHomeEnd handleUpDown={!dragging}>
Expand Down Expand Up @@ -409,8 +409,8 @@ const SpacePanel: React.FC = () => {
)}
</Droppable>

{isThreadActivityCentreEnabled && (
<ThreadActivityCentre displayButtonLabel={!isPanelCollapsed} />
{isThreadsActivityCentreEnabled && (
<ThreadsActivityCentre displayButtonLabel={!isPanelCollapsed} />
)}
<QuickSettingsButton isPanelCollapsed={isPanelCollapsed} />
</nav>
Expand Down
26 changes: 13 additions & 13 deletions ...-activity-centre/ThreadActivityCentre.tsx → ...activity-centre/ThreadsActivityCentre.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import React, { JSX, useMemo, useState } from "react";
import { Menu, Text } from "@vector-im/compound-web";
import { Room } from "matrix-js-sdk/src/matrix";

import { ThreadActivityCentreButton } from "./ThreadActivityCentreButton";
import { ThreadsActivityCentreButton } from "./ThreadsActivityCentreButton";
import { _t } from "../../../../languageHandler";
import RoomListStore from "../../../../stores/room-list/RoomListStore";
import DecoratedRoomAvatar from "../../avatars/DecoratedRoomAvatar";
Expand All @@ -29,9 +29,9 @@ import { showThreadPanel } from "../../../../dispatcher/dispatch-actions/threads
import { Action } from "../../../../dispatcher/actions";
import defaultDispatcher from "../../../../dispatcher/dispatcher";
import { ViewRoomPayload } from "../../../../dispatcher/payloads/ViewRoomPayload";
import { ThreadActivityCentreBadge } from "./ThreadActivityCentreBadge";
import { ThreadsActivityCentreBadge } from "./ThreadsActivityCentreBadge";

interface ThreadActivityCentreProps {
interface ThreadsActivityCentreProps {
/**
* Display the `Treads` label next to the icon.
*/
Expand All @@ -42,7 +42,7 @@ interface ThreadActivityCentreProps {
* Display in a popup the list of rooms with unread threads.
* The popup is displayed when the user clicks on the `Threads` button.
*/
export function ThreadActivityCentre({ displayButtonLabel }: ThreadActivityCentreProps): JSX.Element {
export function ThreadsActivityCentre({ displayButtonLabel }: ThreadsActivityCentreProps): JSX.Element {
const [open, setOpen] = useState(false);
const rooms = useUnreadThreadRooms(open);

Expand All @@ -52,20 +52,20 @@ export function ThreadActivityCentre({ displayButtonLabel }: ThreadActivityCentr
open={open}
onOpenChange={setOpen}
side="right"
title={_t("thread_activity_centre|header")}
trigger={<ThreadActivityCentreButton displayLabel={displayButtonLabel} />}
title={_t("threads_activity_centre|header")}
trigger={<ThreadsActivityCentreButton displayLabel={displayButtonLabel} />}
>
<div className="mx_ThreadActivityRows">
<div className="mx_ThreadsActivityRows">
{rooms.map((room) => (
<ThreadActivityRow key={room.roomId} room={room} onClick={() => setOpen(false)} />
<ThreadsActivityRow key={room.roomId} room={room} onClick={() => setOpen(false)} />
))}
</div>
{/*<MenuItem Icon={Icon} label="Profile" onSelect={function io() {}} />*/}
</Menu>
);
}

interface ThreadActivityRow {
interface ThreadsActivityRow {
/**
* The room with unread threads.
*/
Expand All @@ -79,10 +79,10 @@ interface ThreadActivityRow {
/**
* Display a room with unread threads.
*/
function ThreadActivityRow({ room, onClick }: ThreadActivityRow): JSX.Element {
function ThreadsActivityRow({ room, onClick }: ThreadsActivityRow): JSX.Element {
return (
<AccessibleButton
className="mx_ThreadActivityRow"
className="mx_ThreadsActivityRow"
element="button"
onClick={(event) => {
onClick();
Expand All @@ -105,11 +105,11 @@ function ThreadActivityRow({ room, onClick }: ThreadActivityRow): JSX.Element {
}}
>
<DecoratedRoomAvatar room={room} size="32px" />
<Text as="span" size="sm" weight="semibold" className="mx_ThreadActivityRow_room">
<Text as="span" size="sm" weight="semibold" className="mx_ThreadsActivityRow_room">
{room.name}
</Text>
{/* TODO set the unread state of the room threads */}
<ThreadActivityCentreBadge state="highlight" />
<ThreadsActivityCentreBadge state="highlight" />
</AccessibleButton>
);
}
Expand Down
12 changes: 6 additions & 6 deletions ...vity-centre/ThreadActivityCentreBadge.tsx → ...ity-centre/ThreadsActivityCentreBadge.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,20 @@
import React, { JSX } from "react";
import classNames from "classnames";

interface ThreadActivityCentreBadgeProps {
interface ThreadsActivityCentreBadgeProps {
/**
* The state of the badge.
*/
state: "normal" | "highlight" | "alert";
}

/**
* A badge to show the unread state of the room in the ThreadActivityCentre.
* A badge to show the unread state of the room in the ThreadsActivityCentre.
*/
export function ThreadActivityCentreBadge({ state }: ThreadActivityCentreBadgeProps): JSX.Element {
const className = classNames("mx_ThreadActivityCentreBadge", {
mx_ThreadActivityCentreBadge_highlight: state === "highlight",
mx_ThreadActivityCentreBadge_alert: state === "alert",
export function ThreadsActivityCentreBadge({ state }: ThreadsActivityCentreBadgeProps): JSX.Element {
const className = classNames("mx_ThreadsActivityCentreBadge", {
mx_ThreadsActivityCentreBadge_highlight: state === "highlight",
mx_ThreadsActivityCentreBadge_alert: state === "alert",
});

return <div className={className} />;
Expand Down
10 changes: 5 additions & 5 deletions ...ity-centre/ThreadActivityCentreButton.tsx → ...ty-centre/ThreadsActivityCentreButton.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import classNames from "classnames";
import { _t } from "../../../../languageHandler";
import AccessibleTooltipButton from "../../elements/AccessibleTooltipButton";

interface ThreadActivityCentreButtonProps extends HTMLProps<HTMLDivElement> {
interface ThreadsActivityCentreButtonProps extends HTMLProps<HTMLDivElement> {
/**
* Display the `Treads` label next to the icon.
*/
Expand All @@ -33,11 +33,11 @@ interface ThreadActivityCentreButtonProps extends HTMLProps<HTMLDivElement> {
/**
* A button to open the thread activity centre.
*/
export const ThreadActivityCentreButton = forwardRef<HTMLDivElement, ThreadActivityCentreButtonProps>(
function ThreadActivityCentreButton({ displayLabel, ...props }, ref): React.JSX.Element {
export const ThreadsActivityCentreButton = forwardRef<HTMLDivElement, ThreadsActivityCentreButtonProps>(
function ThreadsActivityCentreButton({ displayLabel, ...props }, ref): React.JSX.Element {
return (
<AccessibleTooltipButton
className={classNames("mx_ThreadActivityCentreButton", { expanded: displayLabel })}
className={classNames("mx_ThreadsActivityCentreButton", { expanded: displayLabel })}
title={_t("common|threads")}
// @ts-ignore
// ref nightmare...
Expand All @@ -46,7 +46,7 @@ export const ThreadActivityCentreButton = forwardRef<HTMLDivElement, ThreadActiv
aria-expanded={displayLabel}
{...props}
>
<Icon className="mx_ThreadActivityCentreButton_Icon" />
<Icon className="mx_ThreadsActivityCentreButton_Icon" />
{displayLabel && _t("common|threads")}
</AccessibleTooltipButton>
);
Expand Down
2 changes: 1 addition & 1 deletion ...ws/spaces/thread-activity-centre/index.ts → ...s/spaces/threads-activity-centre/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
* /
*/

export { ThreadActivityCentre } from "./ThreadActivityCentre";
export { ThreadsActivityCentre } from "./ThreadsActivityCentre";
6 changes: 3 additions & 3 deletions src/i18n/strings/en_EN.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3139,9 +3139,6 @@
"light_high_contrast": "Light high contrast",
"match_system": "Match system"
},
"thread_activity_centre": {
"header": "Threads activity"
},
"thread_view_back_action_label": "Back to thread",
"threads": {
"all_threads": "All threads",
Expand All @@ -3162,6 +3159,9 @@
"show_thread_filter": "Show:",
"unable_to_decrypt": "Unable to decrypt message"
},
"threads_activity_centre": {
"header": "Threads activity"
},
"time": {
"about_day_ago": "about a day ago",
"about_hour_ago": "about an hour ago",
Expand Down

0 comments on commit fdf3843

Please sign in to comment.