Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions lib/Controller/PageController.php
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ public function index(): TemplateResponse {
'start-mailbox-id' => $this->preferences->getPreference($this->currentUserId, 'start-mailbox-id'),
'follow-up-reminders' => $this->preferences->getPreference($this->currentUserId, 'follow-up-reminders', 'true'),
'sort-favorites' => $this->preferences->getPreference($this->currentUserId, 'sort-favorites', 'false'),
'compact-mode' => $this->preferences->getPreference($this->currentUserId, 'compact-mode', 'false'),
]);
$this->initialStateService->provideInitialState(
'prefill_displayName',
Expand Down
28 changes: 28 additions & 0 deletions src/components/AppSettingsMenu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,13 @@
</NcRadioGroupButton>
</NcRadioGroup>

<NcFormBox>
<NcFormBoxSwitch
v-model="compactMode"
:label="t('mail', 'Set compact mode')"
@update:modelValue="compactMode = $event" />
</NcFormBox>

<NcRadioGroup :model-value="sortOrder" :label="t('mail', 'Sorting')" @update:modelValue="onSortByDate">
<NcRadioGroupButton :label="t('mail', 'Newest first')" value="newest" />
<NcRadioGroupButton :label="t('mail', 'Oldest first')" value="oldest" />
Expand Down Expand Up @@ -462,6 +469,16 @@ export default {
},
},

compactMode: {
get() {
return this.mainStore.getPreference('compact-mode', 'false') === 'true'
},

set(value) {
this.setCompactMode(value)
},
},

layoutMessageView: {
get() {
const preference = this.mainStore.getPreference('layout-message-view')
Expand Down Expand Up @@ -526,6 +543,17 @@ export default {
}
},

async setCompactMode(value) {
try {
await this.mainStore.savePreference({
key: 'compact-mode',
value: value ? 'true' : 'false',
})
} catch (error) {
Logger.error('Could not save preferences', { error })
}
},

async setLayoutMessageView(value) {
try {
await this.mainStore.savePreference({
Expand Down
61 changes: 48 additions & 13 deletions src/components/Envelope.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
:name="addresses"
:details="formatted()"
:one-line="oneLineLayout"
:compact="compactMode"
:is-read="showImportantIconVariant"
:is-important="isImportant"
@click.exact="onClick"
Expand Down Expand Up @@ -53,20 +54,41 @@
@click.prevent="hasWriteAcl ? onToggleJunk() : false" />
<div
class="hovering-status"
:class="{ 'hover-active': hoveringAvatar && !selected }"
:class="{ 'hover-active': hoveringAvatar && !selected && !compactMode }"
@mouseenter="hoveringAvatar = true"
@mouseleave="hoveringAvatar = false"
@click.stop.exact.prevent="toggleSelected"
@click.shift.exact.prevent="onSelectMultiple">
<template v-if="hoveringAvatar || selected">
<CheckIcon :size="28" class="check-icon" :class="{ 'app-content-list-item-avatar-selected': selected }" />
@mouseleave="hoveringAvatar = false">
<template v-if="compactMode">
<div
class="compact-checkbox-wrapper"
@mousedown.stop.prevent
@click.stop.prevent>
<NcCheckboxRadioSwitch
type="checkbox"
class="compact-checkbox"
:checked="selected"
@update:checked="toggleSelected" />
</div>
</template>

<template v-else>
<Avatar
:display-name="addresses"
:email="avatarEmail"
:fetch-avatar="data.fetchAvatarFromClient"
:avatar="data.avatar" />
<div
@click.stop.exact.prevent="toggleSelected"
@click.shift.exact.prevent="onSelectMultiple">
<template v-if="hoveringAvatar || selected">
<CheckIcon
:size="28"
class="check-icon"
:class="{ 'app-content-list-item-avatar-selected': selected }" />
</template>

<template v-else>
<Avatar
:display-name="addresses"
:email="avatarEmail"
:fetch-avatar="data.fetchAvatarFromClient"
:avatar="data.avatar" />
</template>
</div>
</template>
</div>
</template>
Expand All @@ -91,7 +113,7 @@
</span>
</div>
<div
v-if="data.encrypted || data.previewText"
v-if="!compactMode && (data.encrypted || data.previewText)"
class="envelope__preview-text"
:title="data.summary ? t('mail', 'This summary was AI generated') : null">
<NcAssistantIcon v-if="data.summary" :size="15" class="envelope__preview-text__icon" />
Expand Down Expand Up @@ -433,7 +455,7 @@ import {
NcActionLink as ActionLink,
NcActionText as ActionText,
NcActionInput,
NcActionSeparator, NcAssistantIcon,
NcActionSeparator, NcAssistantIcon, NcCheckboxRadioSwitch,
} from '@nextcloud/vue'
import escapeHtml from 'escape-html'
import { mapState, mapStores } from 'pinia'
Expand Down Expand Up @@ -506,6 +528,7 @@ export default {
EnvelopeSkeleton,
JunkIcon,
ActionButton,
NcCheckboxRadioSwitch,
MoveModal,
OpenInNewIcon,
PlusIcon,
Expand Down Expand Up @@ -614,6 +637,10 @@ export default {
return this.mainStore.getPreference('layout-message-view', 'threaded') === 'threaded'
},

compactMode() {
return this.mainStore.getPreference('compact-mode', 'false') === 'true'
},

hasMultipleRecipients() {
if (!this.account) {
console.error('account is undefined', {
Expand Down Expand Up @@ -871,6 +898,14 @@ export default {
},
},

watch: {
compactMode(enabled) {
if (enabled) {
this.hoveringAvatar = false
}
},
},

mounted() {
this.onWindowResize()
window.addEventListener('resize', this.onWindowResize)
Expand Down
6 changes: 6 additions & 0 deletions src/components/EnvelopeList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@
:select-mode="selectMode"
:has-multiple-accounts="hasMultipleAccounts"
:selected-envelopes="selectedEnvelopes"
:compact-mode="compactMode"
@delete="$emit('delete', env.databaseId)"
@update:selected="onEnvelopeSelectToggle(env, index, $event)"
@select-multiple="onEnvelopeSelectMultiple(env, index)"
Expand Down Expand Up @@ -257,6 +258,11 @@ export default {
type: Boolean,
default: false,
},

compactMode: {
type: Boolean,
default: false,
},
},

data() {
Expand Down
10 changes: 9 additions & 1 deletion src/components/EnvelopeSkeleton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -616,14 +616,22 @@ export default {
flex-direction: row;
align-content: center;
align-items: center;
min-width: 0;

&__name {
flex: 0 0 auto;
min-width: 0;
max-width: 40%;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
align-self: center;
min-width: 300px;
padding-inline-end: calc(var(--default-grid-baseline) * 2);
}

&__inner {
flex: 1 1 auto;
min-width: 0;
overflow-y: hidden;
}

Expand Down
4 changes: 4 additions & 0 deletions src/init.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,10 @@ export default function initAfterAppCreation() {
key: 'smime-sign-aliases',
value: loadState('mail', 'smime-sign-aliases', []),
})
mainStore.savePreferenceMutation({
key: 'compact-mode',
value: preferences['compact-mode'],
})

mainStore.setQuickActions(loadState('mail', 'quick-actions', []))

Expand Down
Loading