diff --git a/src/features/settings/gestures/SwipeSettings.tsx b/src/features/settings/gestures/SwipeSettings.tsx index 344ef64fa6..aa5256531d 100644 --- a/src/features/settings/gestures/SwipeSettings.tsx +++ b/src/features/settings/gestures/SwipeSettings.tsx @@ -64,28 +64,28 @@ export default function SwipeSettings() { name="Posts" selector={post} options={OSwipeActionPost} - far_start={setPostSwipeActionFarStart} + farStart={setPostSwipeActionFarStart} start={setPostSwipeActionStart} end={setPostSwipeActionEnd} - far_end={setPostSwipeActionFarEnd} + farEnd={setPostSwipeActionFarEnd} /> <> @@ -158,20 +158,20 @@ interface SwipeListProps { name: string; selector: SwipeActions; options: Dictionary; - far_start: ActionCreatorWithPayload; + farStart: ActionCreatorWithPayload; start: ActionCreatorWithPayload; end: ActionCreatorWithPayload; - far_end: ActionCreatorWithPayload; + farEnd: ActionCreatorWithPayload; } function SwipeList({ name, selector, options, - far_start, + farStart, start, end, - far_end, + farEnd, }: SwipeListProps) { const Selector = SettingSelector; @@ -200,8 +200,8 @@ function SwipeList({ ) { - state.swipe.post.far_start = action.payload; + state.swipe.post.farStart = action.payload; db.setSetting("gesture_swipe_post", { ...state.swipe.post }); }, setPostSwipeActionStart(state, action: PayloadAction) { @@ -51,11 +72,11 @@ export const gestureSlice = createSlice({ db.setSetting("gesture_swipe_post", { ...state.swipe.post }); }, setPostSwipeActionFarEnd(state, action: PayloadAction) { - state.swipe.post.far_end = action.payload; + state.swipe.post.farEnd = action.payload; db.setSetting("gesture_swipe_post", { ...state.swipe.post }); }, setCommentSwipeActionFarStart(state, action: PayloadAction) { - state.swipe.comment.far_start = action.payload; + state.swipe.comment.farStart = action.payload; db.setSetting("gesture_swipe_comment", { ...state.swipe.comment }); }, setCommentSwipeActionStart(state, action: PayloadAction) { @@ -67,11 +88,11 @@ export const gestureSlice = createSlice({ db.setSetting("gesture_swipe_comment", { ...state.swipe.comment }); }, setCommentSwipeActionFarEnd(state, action: PayloadAction) { - state.swipe.comment.far_end = action.payload; + state.swipe.comment.farEnd = action.payload; db.setSetting("gesture_swipe_comment", { ...state.swipe.comment }); }, setInboxSwipeActionFarStart(state, action: PayloadAction) { - state.swipe.inbox.far_start = action.payload; + state.swipe.inbox.farStart = action.payload; db.setSetting("gesture_swipe_inbox", { ...state.swipe.inbox }); }, setInboxSwipeActionStart(state, action: PayloadAction) { @@ -83,7 +104,7 @@ export const gestureSlice = createSlice({ db.setSetting("gesture_swipe_inbox", { ...state.swipe.inbox }); }, setInboxSwipeActionFarEnd(state, action: PayloadAction) { - state.swipe.inbox.far_end = action.payload; + state.swipe.inbox.farEnd = action.payload; db.setSetting("gesture_swipe_inbox", { ...state.swipe.inbox }); }, setDisableLeftSwipes(state, action: PayloadAction) { @@ -95,9 +116,9 @@ export const gestureSlice = createSlice({ db.setSetting("disable_right_swipes", action.payload); }, setAllSwipesToDefault(state) { - state.swipe.post = default_swipe_actions_post; - state.swipe.comment = default_swipe_actions_comment; - state.swipe.inbox = default_swipe_actions_inbox; + state.swipe.post = defaultSwipeActionsPost; + state.swipe.comment = defaultSwipeActionsComment; + state.swipe.inbox = defaultSwipeActionsInbox; db.setSetting("gesture_swipe_post", { ...state.swipe.post }); db.setSetting("gesture_swipe_comment", { ...state.swipe.comment }); db.setSetting("gesture_swipe_inbox", { ...state.swipe.inbox }); diff --git a/src/features/shared/sliding/BaseSlidingVote.tsx b/src/features/shared/sliding/BaseSlidingVote.tsx index f07f55238e..937266d9d1 100644 --- a/src/features/shared/sliding/BaseSlidingVote.tsx +++ b/src/features/shared/sliding/BaseSlidingVote.tsx @@ -3,7 +3,7 @@ import { arrowDownSharp, arrowUndo, arrowUpSharp, - bookmarkOutline, + bookmark, chevronCollapse, chevronExpand, eyeOffOutline, @@ -110,7 +110,7 @@ function BaseSlidingVoteInternal({ (state) => state.gestures.swipe.disableRightSwipes ); - const vote = useCallback( + const onVote = useCallback( async (score: 1 | -1 | 0) => { if (presentLoginIfNeeded()) return; @@ -163,7 +163,7 @@ function BaseSlidingVoteInternal({ const saveAction = useMemo(() => { return { - icon: bookmarkOutline, + icon: bookmark, trigger: save, bgColor: "success", slash: isSaved, @@ -224,7 +224,7 @@ function BaseSlidingVoteInternal({ }; }, [markUnread, isRead]); - const all_actions: { + const allActions: { [id in SwipeAction]: SlidingItemAction | undefined; } = useMemo(() => { return { @@ -232,7 +232,7 @@ function BaseSlidingVoteInternal({ upvote: { icon: arrowUpSharp, trigger: () => { - vote(currentVote === 1 ? 0 : 1); + onVote(currentVote === 1 ? 0 : 1); }, bgColor: "primary", slash: currentVote === 1, @@ -240,7 +240,7 @@ function BaseSlidingVoteInternal({ downvote: { icon: arrowDownSharp, trigger: () => { - vote(currentVote === -1 ? 0 : -1); + onVote(currentVote === -1 ? 0 : -1); }, bgColor: "danger", slash: currentVote === -1, @@ -262,23 +262,23 @@ function BaseSlidingVoteInternal({ hideAction, collapseAction, markUnreadAction, - vote, + onVote, ]); const startActions: ActionList = useMemo( () => !disableLeftSwipes - ? [all_actions[actions["start"]], all_actions[actions["far_start"]]] + ? [allActions[actions.start], allActions[actions.farStart]] : [undefined, undefined], - [disableLeftSwipes, all_actions, actions] + [disableLeftSwipes, allActions, actions] ); const endActions: ActionList = useMemo( () => !disableRightSwipes - ? [all_actions[actions["end"]], all_actions[actions["far_end"]]] + ? [allActions[actions.end], allActions[actions.farEnd]] : [undefined, undefined], - [disableRightSwipes, all_actions, actions] + [disableRightSwipes, allActions, actions] ); return ( diff --git a/src/features/shared/sliding/SlidingItem.tsx b/src/features/shared/sliding/SlidingItem.tsx index c6f9d20a00..2e6603ce75 100644 --- a/src/features/shared/sliding/SlidingItem.tsx +++ b/src/features/shared/sliding/SlidingItem.tsx @@ -8,7 +8,7 @@ import { IonItemSliding, } from "@ionic/react"; import { Dictionary } from "@reduxjs/toolkit"; -import { bookmarkOutline, mailUnread } from "ionicons/icons"; +import { bookmark, mailUnread } from "ionicons/icons"; import React, { useMemo, useRef, useState } from "react"; import { bounceAnimation } from "../animations"; @@ -48,7 +48,7 @@ const OptionContainer = styled.div<{ active: boolean }>` `; const custom_slash_lengths: Dictionary = { - [bookmarkOutline]: 35, + [bookmark]: 35, [mailUnread]: 40, }; diff --git a/src/pages/settings/SettingsPage.tsx b/src/pages/settings/SettingsPage.tsx index 7f288a1cc0..783ee5ea2e 100644 --- a/src/pages/settings/SettingsPage.tsx +++ b/src/pages/settings/SettingsPage.tsx @@ -102,6 +102,7 @@ export default function SettingsPage() { General + @@ -109,13 +110,6 @@ export default function SettingsPage() { Appearance - - - - - Gestures - - {currentHandle && ( @@ -124,6 +118,13 @@ export default function SettingsPage() { Filters & Blocks )} + + + + + + Gestures + diff --git a/src/services/db.ts b/src/services/db.ts index 17bb47fcb3..410165d310 100644 --- a/src/services/db.ts +++ b/src/services/db.ts @@ -109,30 +109,9 @@ export const OSwipeActionAll = { export type SwipeAction = (typeof OSwipeActionAll)[keyof typeof OSwipeActionAll]; -export type SwipeDirection = "far_start" | "start" | "end" | "far_end"; +export type SwipeDirection = "farStart" | "start" | "end" | "farEnd"; export type SwipeActions = { [id in SwipeDirection]: SwipeAction }; -export const default_swipe_actions_post: SwipeActions = { - far_start: OSwipeActionPost.Downvote, - start: OSwipeActionPost.Upvote, - end: OSwipeActionPost.Reply, - far_end: OSwipeActionPost.Hide, -} as const; - -export const default_swipe_actions_comment: SwipeActions = { - far_start: OSwipeActionComment.Downvote, - start: OSwipeActionComment.Upvote, - end: OSwipeActionComment.Collapse, - far_end: OSwipeActionComment.Reply, -} as const; - -export const default_swipe_actions_inbox: SwipeActions = { - far_start: OSwipeActionInbox.Downvote, - start: OSwipeActionInbox.Upvote, - end: OSwipeActionInbox.MarkUnread, - far_end: OSwipeActionInbox.Reply, -} as const; - export type SettingValueTypes = { collapse_comment_threads: CommentThreadCollapse; user_instance_url_display: InstanceUrlDisplayMode;