natty
/
calckey
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request '[PR]: Option to disable swiping' (#10367) from Freeplay/calckey:swiper into develop 

Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10367
This commit is contained in:
Kainoa Kanter 2023-06-27 02:52:35 +00:00
parent e53d1f6bdc 8cb5f581a8
commit 09f70f6d24
16 changed files with 53 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
locales/en-US.yml
View File

@ -1053,6 +1053,7 @@ recommendedInstancesDescription: "Recommended servers separated by line breaks t
caption: "Auto Caption" caption: "Auto Caption"
splash: "Splash Screen" splash: "Splash Screen"
updateAvailable: "There might be an update available!" updateAvailable: "There might be an update available!"
swipeOnMobile: "Allow swiping between pages"
swipeOnDesktop: "Allow mobile-style swiping on desktop" swipeOnDesktop: "Allow mobile-style swiping on desktop"
logoImageUrl: "Logo image URL" logoImageUrl: "Logo image URL"
showAdminUpdates: "Indicate a new Calckey version is avaliable (admin only)" showAdminUpdates: "Indicate a new Calckey version is avaliable (admin only)"

7
packages/client/src/pages/about.vue
View File

@ -16,10 +16,9 @@
:space-between="20" :space-between="20"
:virtual="true" :virtual="true"
:allow-touch-move=" :allow-touch-move="
!( defaultStore.state.swipeOnMobile &&
deviceKind === 'desktop' && (deviceKind !== 'desktop' ||
!defaultStore.state.swipeOnDesktop defaultStore.state.swipeOnDesktop)
)
" "
@swiper="setSwiperRef" @swiper="setSwiperRef"
@slide-change="onSlideChange" @slide-change="onSlideChange"

7
packages/client/src/pages/admin-file.vue
View File

@ -16,10 +16,9 @@
:space-between="20" :space-between="20"
:virtual="true" :virtual="true"
:allow-touch-move=" :allow-touch-move="
!( defaultStore.state.swipeOnMobile &&
deviceKind === 'desktop' && (deviceKind !== 'desktop' ||
!defaultStore.state.swipeOnDesktop defaultStore.state.swipeOnDesktop)
)
" "
@swiper="setSwiperRef" @swiper="setSwiperRef"
@slide-change="onSlideChange" @slide-change="onSlideChange"

7
packages/client/src/pages/channels.vue
View File

@ -19,10 +19,9 @@
:space-between="20" :space-between="20"
:virtual="true" :virtual="true"
:allow-touch-move=" :allow-touch-move="
!( defaultStore.state.swipeOnMobile &&
deviceKind === 'desktop' && (deviceKind !== 'desktop' ||
!defaultStore.state.swipeOnDesktop defaultStore.state.swipeOnDesktop)
)
" "
@swiper="setSwiperRef" @swiper="setSwiperRef"
@slide-change="onSlideChange" @slide-change="onSlideChange"

7
packages/client/src/pages/explore.vue
View File

@ -17,10 +17,9 @@
:space-between="20" :space-between="20"
:virtual="true" :virtual="true"
:allow-touch-move=" :allow-touch-move="
!( defaultStore.state.swipeOnMobile &&
deviceKind === 'desktop' && (deviceKind !== 'desktop' ||
!defaultStore.state.swipeOnDesktop defaultStore.state.swipeOnDesktop)
)
" "
@swiper="setSwiperRef" @swiper="setSwiperRef"
@slide-change="onSlideChange" @slide-change="onSlideChange"

7
packages/client/src/pages/gallery/index.vue
View File

@ -17,10 +17,9 @@
:space-between="20" :space-between="20"
:virtual="true" :virtual="true"
:allow-touch-move=" :allow-touch-move="
!( defaultStore.state.swipeOnMobile &&
deviceKind === 'desktop' && (deviceKind !== 'desktop' ||
!defaultStore.state.swipeOnDesktop defaultStore.state.swipeOnDesktop)
)
" "
@swiper="setSwiperRef" @swiper="setSwiperRef"
@slide-change="onSlideChange" @slide-change="onSlideChange"

7
packages/client/src/pages/instance-info.vue
View File

@ -21,10 +21,9 @@
:space-between="20" :space-between="20"
:virtual="true" :virtual="true"
:allow-touch-move=" :allow-touch-move="
!( defaultStore.state.swipeOnMobile &&
deviceKind === 'desktop' && (deviceKind !== 'desktop' ||
!defaultStore.state.swipeOnDesktop defaultStore.state.swipeOnDesktop)
)
" "
@swiper="setSwiperRef" @swiper="setSwiperRef"
@slide-change="onSlideChange" @slide-change="onSlideChange"

7
packages/client/src/pages/messaging/index.vue
View File

@ -17,10 +17,9 @@
:space-between="20" :space-between="20"
:virtual="true" :virtual="true"
:allow-touch-move=" :allow-touch-move="
!( defaultStore.state.swipeOnMobile &&
deviceKind === 'desktop' && (deviceKind !== 'desktop' ||
!defaultStore.state.swipeOnDesktop defaultStore.state.swipeOnDesktop)
)
" "
@swiper="setSwiperRef" @swiper="setSwiperRef"
@slide-change="onSlideChange" @slide-change="onSlideChange"

7
packages/client/src/pages/notifications.vue
View File

@ -18,10 +18,9 @@
:space-between="20" :space-between="20"
:virtual="true" :virtual="true"
:allow-touch-move=" :allow-touch-move="
!( defaultStore.state.swipeOnMobile &&
deviceKind === 'desktop' && (deviceKind !== 'desktop' ||
!defaultStore.state.swipeOnDesktop defaultStore.state.swipeOnDesktop)
)
" "
@swiper="setSwiperRef" @swiper="setSwiperRef"
@slide-change="onSlideChange" @slide-change="onSlideChange"

7
packages/client/src/pages/pages.vue
View File

@ -16,10 +16,9 @@
:space-between="20" :space-between="20"
:virtual="true" :virtual="true"
:allow-touch-move=" :allow-touch-move="
!( defaultStore.state.swipeOnMobile &&
deviceKind === 'desktop' && (deviceKind !== 'desktop' ||
!defaultStore.state.swipeOnDesktop defaultStore.state.swipeOnDesktop)
)
" "
@swiper="setSwiperRef" @swiper="setSwiperRef"
@slide-change="onSlideChange" @slide-change="onSlideChange"

7
packages/client/src/pages/search.vue
View File

@ -17,10 +17,9 @@
:space-between="20" :space-between="20"
:virtual="true" :virtual="true"
:allow-touch-move=" :allow-touch-move="
!( defaultStore.state.swipeOnMobile &&
deviceKind === 'desktop' && (deviceKind !== 'desktop' ||
!defaultStore.state.swipeOnDesktop defaultStore.state.swipeOnDesktop)
)
" "
@swiper="setSwiperRef" @swiper="setSwiperRef"
@slide-change="onSlideChange" @slide-change="onSlideChange"

12
packages/client/src/pages/settings/general.vue
View File

@ -45,7 +45,10 @@
class="_formBlock" class="_formBlock"
>{{ i18n.ts.useReactionPickerForContextMenu }}</FormSwitch >{{ i18n.ts.useReactionPickerForContextMenu }}</FormSwitch
> >
<FormSwitch v-model="swipeOnDesktop" class="_formBlock">{{ <FormSwitch v-if="deviceKind !== 'desktop'" v-model="swipeOnMobile" class="_formBlock">{{
i18n.ts.swipeOnMobile
}}</FormSwitch>
<FormSwitch v-if="deviceKind === 'desktop'" v-model="swipeOnDesktop" class="_formBlock">{{
i18n.ts.swipeOnDesktop i18n.ts.swipeOnDesktop
}}</FormSwitch> }}</FormSwitch>
<FormSwitch v-model="enterSendsMessage" class="_formBlock">{{ <FormSwitch v-model="enterSendsMessage" class="_formBlock">{{
@ -253,6 +256,7 @@ import * as os from "@/os";
import { unisonReload } from "@/scripts/unison-reload"; import { unisonReload } from "@/scripts/unison-reload";
import { i18n } from "@/i18n"; import { i18n } from "@/i18n";
import { definePageMetadata } from "@/scripts/page-metadata"; import { definePageMetadata } from "@/scripts/page-metadata";
import { deviceKind } from "@/scripts/device-kind";
const lang = ref(localStorage.getItem("lang")); const lang = ref(localStorage.getItem("lang"));
const fontSize = ref(localStorage.getItem("fontSize")); const fontSize = ref(localStorage.getItem("fontSize"));
@ -339,6 +343,7 @@ const showUpdates = computed(defaultStore.makeGetterSetter("showUpdates"));
const swipeOnDesktop = computed( const swipeOnDesktop = computed(
defaultStore.makeGetterSetter("swipeOnDesktop") defaultStore.makeGetterSetter("swipeOnDesktop")
); );
const swipeOnMobile = computed(defaultStore.makeGetterSetter("swipeOnMobile"));
const showAdminUpdates = computed( const showAdminUpdates = computed(
defaultStore.makeGetterSetter("showAdminUpdates") defaultStore.makeGetterSetter("showAdminUpdates")
); );
@ -346,6 +351,10 @@ const showTimelineReplies = computed(
defaultStore.makeGetterSetter("showTimelineReplies") defaultStore.makeGetterSetter("showTimelineReplies")
); );
watch(swipeOnDesktop, () => {
defaultStore.set("swipeOnMobile", true);
});
watch(lang, () => { watch(lang, () => {
localStorage.setItem("lang", lang.value as string); localStorage.setItem("lang", lang.value as string);
localStorage.removeItem("locale"); localStorage.removeItem("locale");
@ -379,6 +388,7 @@ watch(
overridedDeviceKind, overridedDeviceKind,
showAds, showAds,
showUpdates, showUpdates,
swipeOnMobile,
swipeOnDesktop, swipeOnDesktop,
seperateRenoteQuote, seperateRenoteQuote,
showAdminUpdates, showAdminUpdates,

1
packages/client/src/pages/settings/preferences-backups.vue
View File

@ -110,6 +110,7 @@ const defaultStoreSaveKeys: (keyof (typeof defaultStore)["state"])[] = [
"squareAvatars", "squareAvatars",
"numberOfPageCache", "numberOfPageCache",
"showUpdates", "showUpdates",
"swipeOnMobile",
"swipeOnDesktop", "swipeOnDesktop",
"showAdminUpdates", "showAdminUpdates",
"enableCustomKaTeXMacro", "enableCustomKaTeXMacro",

7
packages/client/src/pages/tag.vue
View File

@ -17,10 +17,9 @@
:space-between="20" :space-between="20"
:virtual="true" :virtual="true"
:allow-touch-move=" :allow-touch-move="
!( defaultStore.state.swipeOnMobile &&
deviceKind === 'desktop' && (deviceKind !== 'desktop' ||
!defaultStore.state.swipeOnDesktop defaultStore.state.swipeOnDesktop)
)
" "
@swiper="setSwiperRef" @swiper="setSwiperRef"
@slide-change="onSlideChange" @slide-change="onSlideChange"

7
packages/client/src/pages/timeline.vue
View File

@ -46,10 +46,9 @@
:space-between="20" :space-between="20"
:virtual="true" :virtual="true"
:allow-touch-move=" :allow-touch-move="
!( defaultStore.state.swipeOnMobile &&
deviceKind === 'desktop' && (deviceKind !== 'desktop' ||
!defaultStore.state.swipeOnDesktop defaultStore.state.swipeOnDesktop)
)
" "
@swiper="setSwiperRef" @swiper="setSwiperRef"
@slide-change="onSlideChange" @slide-change="onSlideChange"

4
packages/client/src/store.ts
View File

@ -314,6 +314,10 @@ export const defaultStore = markRaw(
where: "device", where: "device",
default: false, default: false,
}, },
swipeOnMobile: {
where: "device",
default: true,
},
showAdminUpdates: { showAdminUpdates: {
where: "account", where: "account",
default: true, default: true,