Mirrors
/
nextcloud-spreed
mirror of https://github.com/nextcloud/spreed
3
0
Fork 0
Code Releases Activity
Browse Source

feat(icons): add icon for calendar events conversations 

Signed-off-by: Dorra Jaouad <dorra.jaoued7@gmail.com>
pull/15035/head
Dorra Jaouad 8 months ago
committed by backportbot[bot]
parent
c809540d36
commit
78259a72dc
9 changed files with 36 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      REUSE.toml
  2. 12
      css/icons.css
  3. 6
      img/icon-conversation-event-bright.svg
  4. 6
      img/icon-conversation-event-dark.svg
  5. 4
      img/icon-event-white.svg
  6. 3
      lib/Service/AvatarService.php
  7. 2
      src/components/ConversationIcon.vue
  8. 1
      src/constants.ts
  9. 1
      src/types/index.ts

2
REUSE.toml
View File

@ -66,7 +66,7 @@ SPDX-FileCopyrightText = "Nextcloud GmbH <https://nextcloud.com/trademarks/>"
SPDX-License-Identifier = "LicenseRef-NextcloudTrademarks"
[[annotations]]
path = ["img/bridge-bot.png", "img/bridge-services/irc.svg", "img/bridge-services/msteams.svg", "img/bridge-services/slack.svg", "img/bridge-services/steam.svg", "img/bridge-services/xmpp.svg", "img/folder-multiple-image.svg", "img/icon-contacts-white.svg", "img/icon-conversation-federation-bright.svg", "img/icon-conversation-federation-dark.svg", "img/icon-conversation-group-bright.svg", "img/icon-conversation-group-dark.svg", "img/icon-conversation-mail-bright.svg", "img/icon-conversation-mail-dark.svg", "img/icon-conversation-password-bright.svg", "img/icon-conversation-password-dark.svg", "img/icon-conversation-phone-bright.svg", "img/icon-conversation-phone-dark.svg", "img/icon-conversation-public-bright.svg", "img/icon-conversation-public-dark.svg", "img/icon-conversation-text-bright.svg", "img/icon-conversation-text-dark.svg", "img/icon-conversation-user-bright.svg", "img/icon-conversation-user-dark.svg", "img/icon-mail-white.svg", "img/icon-password-white.svg", "img/icon-phone-white.svg", "img/icon-public-white.svg", "img/icon-team-white.svg", "img/icon-text-white.svg", "img/icon-user-white.svg", "img/menu-people.svg", "img/no-password.svg", "img/phone.png", "img/reply.svg"]
path = ["img/bridge-bot.png", "img/bridge-services/irc.svg", "img/bridge-services/msteams.svg", "img/bridge-services/slack.svg", "img/bridge-services/steam.svg", "img/bridge-services/xmpp.svg", "img/folder-multiple-image.svg", "img/icon-contacts-white.svg", "img/icon-conversation-event-bright.svg", "img/icon-conversation-event-dark.svg", "img/icon-conversation-federation-bright.svg", "img/icon-conversation-federation-dark.svg", "img/icon-conversation-group-bright.svg", "img/icon-conversation-group-dark.svg", "img/icon-conversation-mail-bright.svg", "img/icon-conversation-mail-dark.svg", "img/icon-conversation-password-bright.svg", "img/icon-conversation-password-dark.svg", "img/icon-conversation-phone-bright.svg", "img/icon-conversation-phone-dark.svg", "img/icon-conversation-public-bright.svg", "img/icon-conversation-public-dark.svg", "img/icon-conversation-text-bright.svg", "img/icon-conversation-text-dark.svg", "img/icon-conversation-user-bright.svg", "img/icon-conversation-user-dark.svg", "img/icon-event-white.svg", "img/icon-mail-white.svg", "img/icon-password-white.svg", "img/icon-phone-white.svg", "img/icon-public-white.svg", "img/icon-team-white.svg", "img/icon-text-white.svg", "img/icon-user-white.svg", "img/menu-people.svg", "img/no-password.svg", "img/phone.png", "img/reply.svg"]
precedence = "aggregate"
SPDX-FileCopyrightText = "2018-2024 Google LLC"
SPDX-License-Identifier = "Apache-2.0"

12
css/icons.css
View File

@ -46,6 +46,18 @@
background-image: url(../img/icon-phone-white.svg);
}
.app-talk .icon-event,
.modal-mask .icon-event,
.v-popper__popper .icon-event,
.talk-sidebar-callview .icon-event,
#talk-panel .icon-event,
#talk-sidebar .icon-event,
#call-container .icon-event,
.talkChatTab .icon-event {
background-image: url(../img/icon-event-white.svg);
}
.app-talk .icon-password,
.modal-mask .icon-password,
.v-popper__popper .icon-password,

6
img/icon-conversation-event-bright.svg
View File

@ -0,0 +1,6 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 44 44" height="22" width="22" version="1.1">
<circle r="22" cx="22" cy="22" fill="#6B6B6B"/>
<g transform="translate(10.000000, 10.000000)">
<path fill="#fff" d="M19,19H5V8H19M16,1V3H8V1H6V3H5C3.89,3 3,3.89 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5C21,3.89 20.1,3 19,3H18V1"/>
</g>
</svg>

6
img/icon-conversation-event-dark.svg
View File

@ -0,0 +1,6 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 44 44" height="22" width="22" version="1.1">
<circle r="22" cx="22" cy="22" fill="#3B3B3B"/>
<g transform="translate(10.000000, 10.000000)">
<path fill="#fff" d="M19,19H5V8H19M16,1V3H8V1H6V3H5C3.89,3 3,3.89 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5C21,3.89 20.1,3 19,3H18V1"/>
</g>
</svg>

4
img/icon-event-white.svg
View File

@ -0,0 +1,4 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" height="24" width="24" version="1.1">
<title>calendar-blank</title>
<path fill="white" d="M19,19H5V8H19M16,1V3H8V1H6V3H5C3.89,3 3,3.89 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5C21,3.89 20.1,3 19,3H18V1" />
</svg>

3
lib/Service/AvatarService.php
View File

@ -270,6 +270,9 @@ class AvatarService {
if (in_array($room->getObjectType(), [Room::OBJECT_TYPE_PHONE_PERSIST, Room::OBJECT_TYPE_PHONE_TEMPORARY, Room::OBJECT_TYPE_PHONE_LEGACY], true)) {
return __DIR__ . '/../../img/icon-conversation-phone-' . $colorTone . '.svg';
}
if ($room->getObjectType() === Room::OBJECT_TYPE_EVENT) {
return __DIR__ . '/../../img/icon-conversation-event-' . $colorTone . '.svg';
}
if ($room->isFederatedConversation()) {
return __DIR__ . '/../../img/icon-conversation-federation-' . $colorTone . '.svg';
}

2
src/components/ConversationIcon.vue
View File

@ -190,6 +190,8 @@ export default {
|| this.item.objectType === CONVERSATION.OBJECT_TYPE.PHONE_PERSISTENT
|| this.item.objectType === CONVERSATION.OBJECT_TYPE.PHONE_TEMPORARY) {
return 'icon-phone'
} else if (this.item.objectType === CONVERSATION.OBJECT_TYPE.EVENT) {
return 'icon-event'
} else if (this.item.objectType === CONVERSATION.OBJECT_TYPE.CIRCLES) {
return 'icon-team'
} else if (this.item.type === CONVERSATION.TYPE.CHANGELOG) {

1
src/constants.ts
View File

@ -98,6 +98,7 @@ export const CONVERSATION = {
OBJECT_TYPE: {
EMAIL: 'emails',
EVENT: 'event',
FILE: 'file',
/** @deprecated */
PHONE_LEGACY: 'phone',

1
src/types/index.ts
View File

@ -119,6 +119,7 @@ export type createConversationParams = Required<operations['room-create-room']>[
export type createConversationResponse = ApiResponse<operations['room-create-room']['responses'][200]['content']['application/json']>
export type legacyCreateConversationParams = Pick<createConversationParams, 'roomType'|'roomName'|'password'|'objectType'|'objectId'|'invite'|'source'>
export type deleteConversationResponse = ApiResponse<operations['room-delete-room']['responses'][200]['content']['application/json']>
export type unbindConversationFromObjectResponse = ApiResponse<operations['room-unbind-room-from-object']['responses'][200]['content']['application/json']>
export type setConversationNameParams = Required<operations['room-rename-room']>['requestBody']['content']['application/json']
export type setConversationNameResponse = ApiResponse<operations['room-rename-room']['responses'][200]['content']['application/json']>

Write Preview
Loading…
Cancel
Save