Skip to content

Fix sharing icon #42502

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

Closed
marcoambrosini wants to merge 1 commit into from
Closed

Fix sharing icon #42502

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions apps/files/src/views/FilesList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
type="tertiary"
@click="openSharingSidebar">
<template #icon>
<LinkIcon v-if="shareButtonType === Type.SHARE_TYPE_LINK" />
Copy link
Contributor

@szaimen szaimen Jan 9, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should probably be restored?

Copy link
Member

@skjnldsv skjnldsv Jan 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#42502 (comment)

<ShareVariantIcon v-else :size="20" />
<FolderAccountIcon v-if="shareButtonType !== null" />
Copy link
Member

@skjnldsv skjnldsv Dec 28, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jancborchardt shall we lose the share link icon too?

Copy link
Member

@jancborchardt jancborchardt Jan 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If it’s shared by link, that should be reflected?

Copy link
Member

@skjnldsv skjnldsv Jan 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree, but this PR removes that

Copy link
Member Author

@marcoambrosini marcoambrosini Jan 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jancborchardt we said in yesterday's design review that we're not going to use this icon in iOS in favor of the native one. I think that in line with that, we should use the material folder-shared icon that @szaimen proposed in the issue both in the web interface and in the android apps.

<AccountPlusIcon v-else :size="20" />
</template>
</NcButton>

Expand Down Expand Up @@ -135,15 +135,15 @@ import { UploadPicker } from '@nextcloud/upload'
import { loadState } from '@nextcloud/initial-state'
import { defineComponent } from 'vue'

import LinkIcon from 'vue-material-design-icons/Link.vue'
import FolderAccountIcon from 'vue-material-design-icons/FolderAccount.vue'
import ListViewIcon from 'vue-material-design-icons/FormatListBulletedSquare.vue'
import NcAppContent from '@nextcloud/vue/dist/Components/NcAppContent.js'
import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
import NcIconSvgWrapper from '@nextcloud/vue/dist/Components/NcIconSvgWrapper.js'
import NcLoadingIcon from '@nextcloud/vue/dist/Components/NcLoadingIcon.js'
import PlusIcon from 'vue-material-design-icons/Plus.vue'
import ShareVariantIcon from 'vue-material-design-icons/ShareVariant.vue'
import AccountPlusIcon from 'vue-material-design-icons/AccountPlus.vue'
import ViewGridIcon from 'vue-material-design-icons/ViewGrid.vue'

import { action as sidebarAction } from '../actions/sidebarAction.ts'
Expand All @@ -169,17 +169,17 @@ export default defineComponent({
BreadCrumbs,
DragAndDropNotice,
FilesListVirtual,
LinkIcon,
ListViewIcon,
NcAppContent,
NcButton,
NcEmptyContent,
NcIconSvgWrapper,
NcLoadingIcon,
PlusIcon,
ShareVariantIcon,
AccountPlusIcon,
UploadPicker,
ViewGridIcon,
FolderAccountIcon,
},

mixins: [
Expand Down