swap of react and fav

This commit is contained in:
Absturztaube 2021-08-07 15:01:13 +02:00
parent d5e091e9af
commit a0cf440fac
6 changed files with 16 additions and 1 deletions

View file

@ -14,6 +14,7 @@
* optional compact styles provided by craftplacer * optional compact styles provided by craftplacer
* tags as buttons bellow a post * tags as buttons bellow a post
* [pinch and pan media](https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1403) * [pinch and pan media](https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1403)
* swap of react and favorite button in status
# For Translators # For Translators

View file

@ -147,6 +147,11 @@
{{ $t('settings.pad_emoji') }} {{ $t('settings.pad_emoji') }}
</BooleanSetting> </BooleanSetting>
</li> </li>
<li>
<BooleanSetting path="swapReacts">
{{ $t('settings.swap_reacts') }}
</BooleanSetting>
</li>
</ul> </ul>
</div> </div>

View file

@ -96,6 +96,9 @@ const Status = {
} }
}, },
computed: { computed: {
swapReacts () {
return this.mergedConfig.swapReacts
},
muteWords () { muteWords () {
return this.mergedConfig.muteWords return this.mergedConfig.muteWords
}, },

View file

@ -351,12 +351,16 @@
:logged-in="loggedIn" :logged-in="loggedIn"
:status="status" :status="status"
/> />
<ReactButton
v-if="swapReacts && loggedIn"
:status="status"
/>
<favorite-button <favorite-button
:logged-in="loggedIn" :logged-in="loggedIn"
:status="status" :status="status"
/> />
<ReactButton <ReactButton
v-if="loggedIn" v-if="!swapReacts && loggedIn"
:status="status" :status="status"
/> />
<extra-buttons <extra-buttons

View file

@ -328,6 +328,7 @@
"domain_mutes": "Domains", "domain_mutes": "Domains",
"avatar_size_instruction": "The recommended minimum size for avatar images is 150x150 pixels.", "avatar_size_instruction": "The recommended minimum size for avatar images is 150x150 pixels.",
"pad_emoji": "Pad emoji with spaces when adding from picker", "pad_emoji": "Pad emoji with spaces when adding from picker",
"swap_reacts": "Swap Reactions with Favorite Button",
"emoji_reactions_on_timeline": "Show emoji reactions on timeline", "emoji_reactions_on_timeline": "Show emoji reactions on timeline",
"export_theme": "Save preset", "export_theme": "Save preset",
"filtering": "Filtering", "filtering": "Filtering",

View file

@ -29,6 +29,7 @@ export const defaultState = {
hideMutedPosts: undefined, // instance default hideMutedPosts: undefined, // instance default
collapseMessageWithSubject: undefined, // instance default collapseMessageWithSubject: undefined, // instance default
padEmoji: true, padEmoji: true,
swapReacts: true,
hideAttachments: false, hideAttachments: false,
hideAttachmentsInConv: false, hideAttachmentsInConv: false,
maxThumbnails: 16, maxThumbnails: 16,