This repository has been archived by the owner on Sep 11, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 833
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into EventBubbleTile
- Loading branch information
Showing
24 changed files
with
494 additions
and
46 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| /* | ||
| Copyright 2022 The Matrix.org Foundation C.I.C. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| .mx_BeaconListItem { | ||
| box-sizing: border-box; | ||
| display: flex; | ||
| flex-direction: row; | ||
| align-items: flex-start; | ||
| padding: $spacing-12 0; | ||
|
|
||
| border-bottom: 1px solid $system; | ||
| } | ||
|
|
||
| .mx_BeaconListItem_avatarIcon { | ||
| flex: 0 0; | ||
| height: 32px; | ||
| width: 32px; | ||
| } | ||
|
|
||
| .mx_BeaconListItem_avatar { | ||
| flex: 0 0; | ||
| box-sizing: border-box; | ||
|
|
||
| margin-right: $spacing-8; | ||
| border: 2px solid $location-live-color; | ||
| } | ||
|
|
||
| .mx_BeaconListItem_info { | ||
| flex: 1 1 0; | ||
| display: flex; | ||
| flex-direction: column; | ||
| align-items: stretch; | ||
| } | ||
|
|
||
| .mx_BeaconListItem_status { | ||
| // override beacon status padding | ||
| padding: 0 !important; | ||
| margin-bottom: $spacing-8; | ||
|
|
||
| .mx_BeaconStatus_label { | ||
| font-weight: $font-semi-bold; | ||
| } | ||
| } | ||
|
|
||
| .mx_BeaconListItem_lastUpdated { | ||
| color: $tertiary-content; | ||
| font-size: $font-10px; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| /* | ||
| Copyright 2022 The Matrix.org Foundation C.I.C. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| import React, { useContext } from 'react'; | ||
| import { Beacon, BeaconEvent } from 'matrix-js-sdk/src/matrix'; | ||
| import { LocationAssetType } from 'matrix-js-sdk/src/@types/location'; | ||
|
|
||
| import MatrixClientContext from '../../../contexts/MatrixClientContext'; | ||
| import { useEventEmitterState } from '../../../hooks/useEventEmitter'; | ||
| import { humanizeTime } from '../../../utils/humanize'; | ||
| import { _t } from '../../../languageHandler'; | ||
| import MemberAvatar from '../avatars/MemberAvatar'; | ||
| import CopyableText from '../elements/CopyableText'; | ||
| import BeaconStatus from './BeaconStatus'; | ||
| import { BeaconDisplayStatus } from './displayStatus'; | ||
| import StyledLiveBeaconIcon from './StyledLiveBeaconIcon'; | ||
|
|
||
| interface Props { | ||
| beacon: Beacon; | ||
| } | ||
|
|
||
| const BeaconListItem: React.FC<Props> = ({ beacon }) => { | ||
| const latestLocationState = useEventEmitterState( | ||
| beacon, | ||
| BeaconEvent.LocationUpdate, | ||
| () => beacon.latestLocationState, | ||
| ); | ||
| const matrixClient = useContext(MatrixClientContext); | ||
| const room = matrixClient.getRoom(beacon.roomId); | ||
|
|
||
| if (!latestLocationState || !beacon.isLive) { | ||
| return null; | ||
| } | ||
|
|
||
| const isSelfLocation = beacon.beaconInfo.assetType === LocationAssetType.Self; | ||
| const beaconMember = isSelfLocation ? | ||
| room.getMember(beacon.beaconInfoOwner) : | ||
| undefined; | ||
|
|
||
| const humanizedUpdateTime = humanizeTime(latestLocationState.timestamp); | ||
|
|
||
| return <li className='mx_BeaconListItem'> | ||
| { isSelfLocation ? | ||
| <MemberAvatar | ||
| className='mx_BeaconListItem_avatar' | ||
| member={beaconMember} | ||
| height={32} | ||
| width={32} | ||
| /> : | ||
| <StyledLiveBeaconIcon className='mx_BeaconListItem_avatarIcon' /> | ||
| } | ||
| <div className='mx_BeaconListItem_info'> | ||
| <BeaconStatus | ||
| className='mx_BeaconListItem_status' | ||
| beacon={beacon} | ||
| label={beaconMember?.name || beacon.beaconInfo.description || beacon.beaconInfoOwner} | ||
| displayStatus={BeaconDisplayStatus.Active} | ||
| > | ||
| <CopyableText | ||
| border={false} | ||
| getTextToCopy={() => latestLocationState?.uri} | ||
| /> | ||
| </BeaconStatus> | ||
| <span className='mx_BeaconListItem_lastUpdated'>{ _t("Updated %(humanizedUpdateTime)s", { humanizedUpdateTime }) }</span> | ||
| </div> | ||
| </li>; | ||
| }; | ||
|
|
||
| export default BeaconListItem; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
87 changes: 87 additions & 0 deletions
87
src/settings/handlers/AbstractLocalStorageSettingsHandler.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| /* | ||
| Copyright 2019 - 2022 The Matrix.org Foundation C.I.C. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| import SettingsHandler from "./SettingsHandler"; | ||
|
|
||
| /** | ||
| * Abstract settings handler wrapping around localStorage making getValue calls cheaper | ||
| * by caching the values and listening for localStorage updates from other tabs. | ||
| */ | ||
| export default abstract class AbstractLocalStorageSettingsHandler extends SettingsHandler { | ||
| private itemCache = new Map<string, any>(); | ||
| private objectCache = new Map<string, object>(); | ||
|
|
||
| protected constructor() { | ||
| super(); | ||
|
|
||
| // Listen for storage changes from other tabs to bust the cache | ||
| window.addEventListener("storage", (e: StorageEvent) => { | ||
| if (e.key === null) { | ||
| this.itemCache.clear(); | ||
| this.objectCache.clear(); | ||
| } else { | ||
| this.itemCache.delete(e.key); | ||
| this.objectCache.delete(e.key); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| protected getItem(key: string): any { | ||
| if (!this.itemCache.has(key)) { | ||
| const value = localStorage.getItem(key); | ||
| this.itemCache.set(key, value); | ||
| return value; | ||
| } | ||
|
|
||
| return this.itemCache.get(key); | ||
| } | ||
|
|
||
| protected getObject<T extends object>(key: string): T | null { | ||
| if (!this.objectCache.has(key)) { | ||
| try { | ||
| const value = JSON.parse(localStorage.getItem(key)); | ||
| this.objectCache.set(key, value); | ||
| return value; | ||
| } catch (err) { | ||
| console.error("Failed to parse localStorage object", err); | ||
| return null; | ||
| } | ||
| } | ||
|
|
||
| return this.objectCache.get(key) as T; | ||
| } | ||
|
|
||
| protected setItem(key: string, value: any): void { | ||
| this.itemCache.set(key, value); | ||
| localStorage.setItem(key, value); | ||
| } | ||
|
|
||
| protected setObject(key: string, value: object): void { | ||
| this.objectCache.set(key, value); | ||
| localStorage.setItem(key, JSON.stringify(value)); | ||
| } | ||
|
|
||
| // handles both items and objects | ||
| protected removeItem(key: string): void { | ||
| localStorage.removeItem(key); | ||
| this.itemCache.delete(key); | ||
| this.objectCache.delete(key); | ||
| } | ||
|
|
||
| public isSupported(): boolean { | ||
| return localStorage !== undefined && localStorage !== null; | ||
| } | ||
| } |
Oops, something went wrong.