Skip to content

fix(CallButton): replace video icon with phone #12927

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ShGKme merged 2 commits into from
Aug 12, 2024
Merged

fix(CallButton): replace video icon with phone #12927

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0280b7c
fix(CallButton): use phone icon instead of video
ShGKme Aug 8, 2024
5d81785
refactor(CallButton): rename icons with Icon* prefix
ShGKme Aug 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 22 additions & 24 deletions src/components/TopBar/CallButton.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
:type="startCallButtonType"
@click="handleClick">
<template #icon>
<PhoneIcon v-if="isPhoneRoom" :size="20" />
<VideoOutlineIcon v-else-if="silentCall" :size="20" />
<VideoIcon v-else :size="20" />
<IconPhoneDial v-if="isPhoneRoom" :size="20" />
<IconPhoneOutline v-else-if="silentCall" :size="20" />
<IconPhone v-else :size="20" />
</template>
<template v-if="showButtonText" #default>
{{ startCallLabel }}
Expand All @@ -34,7 +34,7 @@
:disabled="loading"
@click="leaveCall(true)">
<template #icon>
<PhoneHangup :size="20" />
<IconPhoneHangup :size="20" /> <!-- here -->
</template>
<template v-if="showButtonText" #default>
{{ endCallLabel }}
Expand All @@ -47,7 +47,7 @@
:disabled="loading"
@click="leaveCall(false)">
<template #icon>
<VideoOff :size="20" />
<IconPhoneHangup :size="20" />
</template>
<template v-if="showButtonText" #default>
{{ leaveCallLabel }}
Expand All @@ -61,25 +61,25 @@
:container="container"
:type="isScreensharing ? 'tertiary' : 'error'">
<template #icon>
<VideoOff v-if="!isBreakoutRoom" :size="20" />
<ArrowLeft v-else :size="20" />
<IconPhoneHangup v-if="!isBreakoutRoom" :size="20" />
<IconArrowLeft v-else :size="20" />
</template>
<NcActionButton v-if="isBreakoutRoom"
@click="switchToParentRoom">
<template #icon>
<ArrowLeft :size="20" />
<IconArrowLeft :size="20" />
</template>
{{ backToMainRoomLabel }}
</NcActionButton>
<NcActionButton @click="leaveCall(false)">
<template #icon>
<VideoOff :size="20" />
<IconPhoneHangup :size="20" />
</template>
{{ leaveCallLabel }}
</NcActionButton>
<NcActionButton v-if="canEndForAll" @click="leaveCall(true)">
<template #icon>
<VideoBoxOff :size="20" />
<IconPhoneOff :size="20" />
</template>
{{ t('spreed', 'End call for everyone') }}
</NcActionButton>
Expand All @@ -88,13 +88,12 @@
</template>

<script>
import ArrowLeft from 'vue-material-design-icons/ArrowLeft.vue'
import PhoneIcon from 'vue-material-design-icons/Phone.vue'
import PhoneHangup from 'vue-material-design-icons/PhoneHangup.vue'
import VideoIcon from 'vue-material-design-icons/Video.vue'
import VideoBoxOff from 'vue-material-design-icons/VideoBoxOff.vue'
import VideoOff from 'vue-material-design-icons/VideoOff.vue'
import VideoOutlineIcon from 'vue-material-design-icons/VideoOutline.vue'
import IconArrowLeft from 'vue-material-design-icons/ArrowLeft.vue'
import IconPhone from 'vue-material-design-icons/Phone.vue'
import IconPhoneDial from 'vue-material-design-icons/PhoneDial.vue'
import IconPhoneHangup from 'vue-material-design-icons/PhoneHangup.vue'
import IconPhoneOff from 'vue-material-design-icons/PhoneOff.vue'
import IconPhoneOutline from 'vue-material-design-icons/PhoneOutline.vue'

import { showError } from '@nextcloud/dialogs'
import { emit } from '@nextcloud/event-bus'
Expand Down Expand Up @@ -129,13 +128,12 @@ export default {
NcActionButton,
NcButton,
// Icons
ArrowLeft,
PhoneHangup,
PhoneIcon,
VideoBoxOff,
VideoIcon,
VideoOff,
VideoOutlineIcon,
IconArrowLeft,
IconPhone,
IconPhoneDial,
IconPhoneHangup,
IconPhoneOff,
IconPhoneOutline,
},

props: {
Expand Down