mirror of
https://github.com/tooot-app/app
synced 2025-03-12 01:20:06 +01:00
New context menu largely working
This commit is contained in:
parent
c0d2da3f65
commit
faebd555e8
@ -412,6 +412,8 @@ PODS:
|
|||||||
- React-Core
|
- React-Core
|
||||||
- react-native-cameraroll (4.1.2):
|
- react-native-cameraroll (4.1.2):
|
||||||
- React-Core
|
- React-Core
|
||||||
|
- react-native-context-menu-view (1.5.4):
|
||||||
|
- React
|
||||||
- react-native-netinfo (9.0.0):
|
- react-native-netinfo (9.0.0):
|
||||||
- React-Core
|
- React-Core
|
||||||
- react-native-pager-view (5.4.11):
|
- react-native-pager-view (5.4.11):
|
||||||
@ -646,6 +648,7 @@ DEPENDENCIES:
|
|||||||
- "react-native-blur (from `../node_modules/@react-native-community/blur`)"
|
- "react-native-blur (from `../node_modules/@react-native-community/blur`)"
|
||||||
- react-native-blurhash (from `../node_modules/react-native-blurhash`)
|
- react-native-blurhash (from `../node_modules/react-native-blurhash`)
|
||||||
- "react-native-cameraroll (from `../node_modules/@react-native-community/cameraroll`)"
|
- "react-native-cameraroll (from `../node_modules/@react-native-community/cameraroll`)"
|
||||||
|
- react-native-context-menu-view (from `../node_modules/react-native-context-menu-view`)
|
||||||
- "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
|
- "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
|
||||||
- react-native-pager-view (from `../node_modules/react-native-pager-view`)
|
- react-native-pager-view (from `../node_modules/react-native-pager-view`)
|
||||||
- "react-native-paste-input (from `../node_modules/@mattermost/react-native-paste-input`)"
|
- "react-native-paste-input (from `../node_modules/@mattermost/react-native-paste-input`)"
|
||||||
@ -804,6 +807,8 @@ EXTERNAL SOURCES:
|
|||||||
:path: "../node_modules/react-native-blurhash"
|
:path: "../node_modules/react-native-blurhash"
|
||||||
react-native-cameraroll:
|
react-native-cameraroll:
|
||||||
:path: "../node_modules/@react-native-community/cameraroll"
|
:path: "../node_modules/@react-native-community/cameraroll"
|
||||||
|
react-native-context-menu-view:
|
||||||
|
:path: "../node_modules/react-native-context-menu-view"
|
||||||
react-native-netinfo:
|
react-native-netinfo:
|
||||||
:path: "../node_modules/@react-native-community/netinfo"
|
:path: "../node_modules/@react-native-community/netinfo"
|
||||||
react-native-pager-view:
|
react-native-pager-view:
|
||||||
@ -928,6 +933,7 @@ SPEC CHECKSUMS:
|
|||||||
react-native-blur: cad4d93b364f91e7b7931b3fa935455487e5c33c
|
react-native-blur: cad4d93b364f91e7b7931b3fa935455487e5c33c
|
||||||
react-native-blurhash: add4df9a937b4e021a24bc67a0714f13e0bd40b7
|
react-native-blurhash: add4df9a937b4e021a24bc67a0714f13e0bd40b7
|
||||||
react-native-cameraroll: 2957f2bce63ae896a848fbe0d5352c1bd4d20866
|
react-native-cameraroll: 2957f2bce63ae896a848fbe0d5352c1bd4d20866
|
||||||
|
react-native-context-menu-view: b0beca02aad4bd9f9d7d932bf437e0a03baa69ef
|
||||||
react-native-netinfo: 5b664b2945a8f02102b296f0f812bddd6827ed9c
|
react-native-netinfo: 5b664b2945a8f02102b296f0f812bddd6827ed9c
|
||||||
react-native-pager-view: 7f00d63688f7df9fad86dfb0154814419cc5eb8d
|
react-native-pager-view: 7f00d63688f7df9fad86dfb0154814419cc5eb8d
|
||||||
react-native-paste-input: efbf0b08fa1673f0e3131da6ea01678c1bb8003e
|
react-native-paste-input: efbf0b08fa1673f0e3131da6ea01678c1bb8003e
|
||||||
|
@ -79,6 +79,7 @@
|
|||||||
"react-native-animated-spinkit": "1.5.2",
|
"react-native-animated-spinkit": "1.5.2",
|
||||||
"react-native-base64": "^0.2.1",
|
"react-native-base64": "^0.2.1",
|
||||||
"react-native-blurhash": "1.1.10",
|
"react-native-blurhash": "1.1.10",
|
||||||
|
"react-native-context-menu-view": "xmflsct/react-native-context-menu-view",
|
||||||
"react-native-fast-image": "8.5.11",
|
"react-native-fast-image": "8.5.11",
|
||||||
"react-native-feather": "1.1.2",
|
"react-native-feather": "1.1.2",
|
||||||
"react-native-flash-message": "0.2.1",
|
"react-native-flash-message": "0.2.1",
|
||||||
@ -151,4 +152,4 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -18,6 +18,7 @@ import { uniqBy } from 'lodash'
|
|||||||
import React, { useCallback } from 'react'
|
import React, { useCallback } from 'react'
|
||||||
import { Pressable, View } from 'react-native'
|
import { Pressable, View } from 'react-native'
|
||||||
import { useSelector } from 'react-redux'
|
import { useSelector } from 'react-redux'
|
||||||
|
import TimelineContextMenu from './Shared/ContextMenu'
|
||||||
import TimelineFeedback from './Shared/Feedback'
|
import TimelineFeedback from './Shared/Feedback'
|
||||||
import TimelineFiltered, { shouldFilter } from './Shared/Filtered'
|
import TimelineFiltered, { shouldFilter } from './Shared/Filtered'
|
||||||
import TimelineFullConversation from './Shared/FullConversation'
|
import TimelineFullConversation from './Shared/FullConversation'
|
||||||
@ -73,96 +74,108 @@ const TimelineDefault: React.FC<Props> = ({
|
|||||||
}, [])
|
}, [])
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Pressable
|
<TimelineContextMenu
|
||||||
accessible={highlighted ? false : true}
|
status={actualStatus}
|
||||||
style={{
|
queryKey={queryKey}
|
||||||
padding: StyleConstants.Spacing.Global.PagePadding,
|
rootQueryKey={rootQueryKey}
|
||||||
backgroundColor: colors.backgroundDefault,
|
|
||||||
paddingBottom:
|
|
||||||
disableDetails && disableOnPress
|
|
||||||
? StyleConstants.Spacing.Global.PagePadding
|
|
||||||
: 0
|
|
||||||
}}
|
|
||||||
onPress={onPress}
|
|
||||||
>
|
>
|
||||||
{item.reblog ? (
|
<Pressable
|
||||||
<TimelineActioned action='reblog' account={item.account} />
|
accessible={highlighted ? false : true}
|
||||||
) : item._pinned ? (
|
|
||||||
<TimelineActioned action='pinned' account={item.account} />
|
|
||||||
) : null}
|
|
||||||
|
|
||||||
<View style={{ flex: 1, width: '100%', flexDirection: 'row' }}>
|
|
||||||
<TimelineAvatar
|
|
||||||
queryKey={disableOnPress ? undefined : queryKey}
|
|
||||||
account={actualStatus.account}
|
|
||||||
highlighted={highlighted}
|
|
||||||
/>
|
|
||||||
<TimelineHeaderDefault
|
|
||||||
queryKey={disableOnPress ? undefined : queryKey}
|
|
||||||
rootQueryKey={disableOnPress ? undefined : rootQueryKey}
|
|
||||||
status={actualStatus}
|
|
||||||
highlighted={highlighted}
|
|
||||||
/>
|
|
||||||
</View>
|
|
||||||
|
|
||||||
<View
|
|
||||||
style={{
|
style={{
|
||||||
paddingTop: highlighted ? StyleConstants.Spacing.S : 0,
|
padding: StyleConstants.Spacing.Global.PagePadding,
|
||||||
paddingLeft: highlighted
|
backgroundColor: colors.backgroundDefault,
|
||||||
? 0
|
paddingBottom:
|
||||||
: StyleConstants.Avatar.M + StyleConstants.Spacing.S
|
disableDetails && disableOnPress
|
||||||
|
? StyleConstants.Spacing.Global.PagePadding
|
||||||
|
: 0
|
||||||
}}
|
}}
|
||||||
|
onPress={onPress}
|
||||||
|
onLongPress={() => {}}
|
||||||
>
|
>
|
||||||
{typeof actualStatus.content === 'string' &&
|
{item.reblog ? (
|
||||||
actualStatus.content.length > 0 ? (
|
<TimelineActioned action='reblog' account={item.account} />
|
||||||
<TimelineContent
|
) : item._pinned ? (
|
||||||
|
<TimelineActioned action='pinned' account={item.account} />
|
||||||
|
) : null}
|
||||||
|
|
||||||
|
<View style={{ flex: 1, width: '100%', flexDirection: 'row' }}>
|
||||||
|
<TimelineAvatar
|
||||||
|
queryKey={disableOnPress ? undefined : queryKey}
|
||||||
|
account={actualStatus.account}
|
||||||
|
highlighted={highlighted}
|
||||||
|
/>
|
||||||
|
<TimelineHeaderDefault
|
||||||
|
queryKey={disableOnPress ? undefined : queryKey}
|
||||||
status={actualStatus}
|
status={actualStatus}
|
||||||
highlighted={highlighted}
|
highlighted={highlighted}
|
||||||
disableDetails={disableDetails}
|
|
||||||
/>
|
/>
|
||||||
) : null}
|
</View>
|
||||||
{queryKey && actualStatus.poll ? (
|
|
||||||
<TimelinePoll
|
<View
|
||||||
|
style={{
|
||||||
|
paddingTop: highlighted ? StyleConstants.Spacing.S : 0,
|
||||||
|
paddingLeft: highlighted
|
||||||
|
? 0
|
||||||
|
: StyleConstants.Avatar.M + StyleConstants.Spacing.S
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{typeof actualStatus.content === 'string' &&
|
||||||
|
actualStatus.content.length > 0 ? (
|
||||||
|
<TimelineContent
|
||||||
|
status={actualStatus}
|
||||||
|
highlighted={highlighted}
|
||||||
|
disableDetails={disableDetails}
|
||||||
|
/>
|
||||||
|
) : null}
|
||||||
|
{queryKey && actualStatus.poll ? (
|
||||||
|
<TimelinePoll
|
||||||
|
queryKey={queryKey}
|
||||||
|
rootQueryKey={rootQueryKey}
|
||||||
|
statusId={actualStatus.id}
|
||||||
|
poll={actualStatus.poll}
|
||||||
|
reblog={item.reblog ? true : false}
|
||||||
|
sameAccount={ownAccount}
|
||||||
|
/>
|
||||||
|
) : null}
|
||||||
|
{!disableDetails &&
|
||||||
|
Array.isArray(actualStatus.media_attachments) &&
|
||||||
|
actualStatus.media_attachments.length ? (
|
||||||
|
<TimelineAttachment status={actualStatus} />
|
||||||
|
) : null}
|
||||||
|
{!disableDetails && actualStatus.card ? (
|
||||||
|
<TimelineCard card={actualStatus.card} />
|
||||||
|
) : null}
|
||||||
|
{!disableDetails ? (
|
||||||
|
<TimelineFullConversation
|
||||||
|
queryKey={queryKey}
|
||||||
|
status={actualStatus}
|
||||||
|
/>
|
||||||
|
) : null}
|
||||||
|
<TimelineTranslate status={actualStatus} highlighted={highlighted} />
|
||||||
|
<TimelineFeedback status={actualStatus} highlighted={highlighted} />
|
||||||
|
</View>
|
||||||
|
|
||||||
|
{queryKey && !disableDetails ? (
|
||||||
|
<TimelineActions
|
||||||
queryKey={queryKey}
|
queryKey={queryKey}
|
||||||
rootQueryKey={rootQueryKey}
|
rootQueryKey={rootQueryKey}
|
||||||
statusId={actualStatus.id}
|
highlighted={highlighted}
|
||||||
poll={actualStatus.poll}
|
status={actualStatus}
|
||||||
|
ownAccount={ownAccount}
|
||||||
|
accts={uniqBy(
|
||||||
|
(
|
||||||
|
[actualStatus.account] as Mastodon.Account[] &
|
||||||
|
Mastodon.Mention[]
|
||||||
|
)
|
||||||
|
.concat(actualStatus.mentions)
|
||||||
|
.filter(d => d?.id !== instanceAccount?.id),
|
||||||
|
d => d?.id
|
||||||
|
).map(d => d?.acct)}
|
||||||
reblog={item.reblog ? true : false}
|
reblog={item.reblog ? true : false}
|
||||||
sameAccount={ownAccount}
|
|
||||||
/>
|
/>
|
||||||
) : null}
|
) : null}
|
||||||
{!disableDetails &&
|
</Pressable>
|
||||||
Array.isArray(actualStatus.media_attachments) &&
|
</TimelineContextMenu>
|
||||||
actualStatus.media_attachments.length ? (
|
|
||||||
<TimelineAttachment status={actualStatus} />
|
|
||||||
) : null}
|
|
||||||
{!disableDetails && actualStatus.card ? (
|
|
||||||
<TimelineCard card={actualStatus.card} />
|
|
||||||
) : null}
|
|
||||||
{!disableDetails ? (
|
|
||||||
<TimelineFullConversation queryKey={queryKey} status={actualStatus} />
|
|
||||||
) : null}
|
|
||||||
<TimelineTranslate status={actualStatus} highlighted={highlighted} />
|
|
||||||
<TimelineFeedback status={actualStatus} highlighted={highlighted} />
|
|
||||||
</View>
|
|
||||||
|
|
||||||
{queryKey && !disableDetails ? (
|
|
||||||
<TimelineActions
|
|
||||||
queryKey={queryKey}
|
|
||||||
rootQueryKey={rootQueryKey}
|
|
||||||
highlighted={highlighted}
|
|
||||||
status={actualStatus}
|
|
||||||
ownAccount={ownAccount}
|
|
||||||
accts={uniqBy(
|
|
||||||
([actualStatus.account] as Mastodon.Account[] & Mastodon.Mention[])
|
|
||||||
.concat(actualStatus.mentions)
|
|
||||||
.filter(d => d?.id !== instanceAccount?.id),
|
|
||||||
d => d?.id
|
|
||||||
).map(d => d?.acct)}
|
|
||||||
reblog={item.reblog ? true : false}
|
|
||||||
/>
|
|
||||||
) : null}
|
|
||||||
</Pressable>
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
65
src/components/Timeline/Shared/ContextMenu.tsx
Normal file
65
src/components/Timeline/Shared/ContextMenu.tsx
Normal file
@ -0,0 +1,65 @@
|
|||||||
|
import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
|
||||||
|
import { createContext } from 'react'
|
||||||
|
import ContextMenu, { ContextMenuAction } from 'react-native-context-menu-view'
|
||||||
|
import contextMenuAccount from './ContextMenu/account'
|
||||||
|
import contextMenuInstance from './ContextMenu/instance'
|
||||||
|
import contextMenuShare from './ContextMenu/share'
|
||||||
|
import contextMenuStatus from './ContextMenu/status'
|
||||||
|
|
||||||
|
export interface Props {
|
||||||
|
status: Mastodon.Status
|
||||||
|
queryKey?: QueryKeyTimeline
|
||||||
|
rootQueryKey?: QueryKeyTimeline
|
||||||
|
}
|
||||||
|
|
||||||
|
export const ContextMenuContext = createContext<ContextMenuAction[]>([])
|
||||||
|
|
||||||
|
const TimelineContextMenu: React.FC<Props> = ({
|
||||||
|
children,
|
||||||
|
status,
|
||||||
|
queryKey,
|
||||||
|
rootQueryKey
|
||||||
|
}) => {
|
||||||
|
if (!queryKey) {
|
||||||
|
return <>{children}</>
|
||||||
|
}
|
||||||
|
|
||||||
|
const menuItems: ContextMenuAction[] = []
|
||||||
|
|
||||||
|
const shareOnPress = contextMenuShare({ menuItems, status })
|
||||||
|
const statusOnPress = contextMenuStatus({
|
||||||
|
menuItems,
|
||||||
|
status,
|
||||||
|
queryKey,
|
||||||
|
rootQueryKey
|
||||||
|
})
|
||||||
|
const accountOnPress = contextMenuAccount({
|
||||||
|
menuItems,
|
||||||
|
status,
|
||||||
|
queryKey,
|
||||||
|
rootQueryKey
|
||||||
|
})
|
||||||
|
const instanceOnPress = contextMenuInstance({
|
||||||
|
menuItems,
|
||||||
|
status,
|
||||||
|
queryKey,
|
||||||
|
rootQueryKey
|
||||||
|
})
|
||||||
|
|
||||||
|
return (
|
||||||
|
<ContextMenuContext.Provider value={menuItems}>
|
||||||
|
<ContextMenu
|
||||||
|
actions={menuItems}
|
||||||
|
onPress={({ nativeEvent: { id } }) => {
|
||||||
|
shareOnPress(id)
|
||||||
|
statusOnPress(id)
|
||||||
|
accountOnPress(id)
|
||||||
|
instanceOnPress(id)
|
||||||
|
}}
|
||||||
|
children={children}
|
||||||
|
/>
|
||||||
|
</ContextMenuContext.Provider>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export default TimelineContextMenu
|
165
src/components/Timeline/Shared/ContextMenu/account.ts
Normal file
165
src/components/Timeline/Shared/ContextMenu/account.ts
Normal file
@ -0,0 +1,165 @@
|
|||||||
|
import analytics from '@components/analytics'
|
||||||
|
import { displayMessage } from '@components/Message'
|
||||||
|
import {
|
||||||
|
MutationVarsTimelineUpdateAccountProperty,
|
||||||
|
QueryKeyTimeline,
|
||||||
|
useTimelineMutation
|
||||||
|
} from '@utils/queryHooks/timeline'
|
||||||
|
import { getInstanceAccount } from '@utils/slices/instancesSlice'
|
||||||
|
import { useTheme } from '@utils/styles/ThemeManager'
|
||||||
|
import { useTranslation } from 'react-i18next'
|
||||||
|
import { Platform } from 'react-native'
|
||||||
|
import { ContextMenuAction } from 'react-native-context-menu-view'
|
||||||
|
import { useQueryClient } from 'react-query'
|
||||||
|
import { useSelector } from 'react-redux'
|
||||||
|
|
||||||
|
export interface Props {
|
||||||
|
menuItems: ContextMenuAction[]
|
||||||
|
status: Mastodon.Status
|
||||||
|
queryKey: QueryKeyTimeline
|
||||||
|
rootQueryKey?: QueryKeyTimeline
|
||||||
|
}
|
||||||
|
|
||||||
|
const contextMenuAccount = ({
|
||||||
|
menuItems,
|
||||||
|
status,
|
||||||
|
queryKey,
|
||||||
|
rootQueryKey
|
||||||
|
}: Props) => {
|
||||||
|
const { theme } = useTheme()
|
||||||
|
const { t } = useTranslation('componentContextMenu')
|
||||||
|
|
||||||
|
const queryClient = useQueryClient()
|
||||||
|
const mutateion = useTimelineMutation({
|
||||||
|
onSuccess: (_, params) => {
|
||||||
|
const theParams = params as MutationVarsTimelineUpdateAccountProperty
|
||||||
|
displayMessage({
|
||||||
|
theme,
|
||||||
|
type: 'success',
|
||||||
|
message: t('common:message.success.message', {
|
||||||
|
function: t(`account.${theParams.payload.property}.action`)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
},
|
||||||
|
onError: (err: any, params) => {
|
||||||
|
const theParams = params as MutationVarsTimelineUpdateAccountProperty
|
||||||
|
displayMessage({
|
||||||
|
theme,
|
||||||
|
type: 'error',
|
||||||
|
message: t('common:message.error.message', {
|
||||||
|
function: t(`account.${theParams.payload.property}.action`)
|
||||||
|
}),
|
||||||
|
...(err.status &&
|
||||||
|
typeof err.status === 'number' &&
|
||||||
|
err.data &&
|
||||||
|
err.data.error &&
|
||||||
|
typeof err.data.error === 'string' && {
|
||||||
|
description: err.data.error
|
||||||
|
})
|
||||||
|
})
|
||||||
|
},
|
||||||
|
onSettled: () => {
|
||||||
|
queryKey && queryClient.invalidateQueries(queryKey)
|
||||||
|
rootQueryKey && queryClient.invalidateQueries(rootQueryKey)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
const instanceAccount = useSelector(
|
||||||
|
getInstanceAccount,
|
||||||
|
(prev, next) => prev.id === next.id
|
||||||
|
)
|
||||||
|
const ownAccount = instanceAccount?.id === status.account.id
|
||||||
|
|
||||||
|
if (!ownAccount) {
|
||||||
|
switch (Platform.OS) {
|
||||||
|
case 'ios':
|
||||||
|
menuItems.push({
|
||||||
|
id: 'account',
|
||||||
|
title: t('account.title'),
|
||||||
|
inlineChildren: true,
|
||||||
|
actions: [
|
||||||
|
{
|
||||||
|
id: 'account-mute',
|
||||||
|
title: t('account.mute.action'),
|
||||||
|
systemIcon: 'eye.slash'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'account-block',
|
||||||
|
title: t('account.block.action'),
|
||||||
|
systemIcon: 'xmark.circle',
|
||||||
|
destructive: true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'account-reports',
|
||||||
|
title: t('account.reports.action'),
|
||||||
|
systemIcon: 'flag',
|
||||||
|
destructive: true
|
||||||
|
}
|
||||||
|
]
|
||||||
|
})
|
||||||
|
break
|
||||||
|
default:
|
||||||
|
menuItems.push(
|
||||||
|
{
|
||||||
|
id: 'account-mute',
|
||||||
|
title: t('account.mute.action'),
|
||||||
|
systemIcon: 'eye.slash'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'account-block',
|
||||||
|
title: t('account.block.action'),
|
||||||
|
systemIcon: 'xmark.circle',
|
||||||
|
destructive: true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'account-reports',
|
||||||
|
title: t('account.reports.action'),
|
||||||
|
systemIcon: 'flag',
|
||||||
|
destructive: true
|
||||||
|
}
|
||||||
|
)
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (id: string) => {
|
||||||
|
const url = status.url || status.uri
|
||||||
|
switch (id) {
|
||||||
|
case 'account-mute':
|
||||||
|
analytics('timeline_shared_headeractions_account_mute_press', {
|
||||||
|
page: queryKey && queryKey[1].page
|
||||||
|
})
|
||||||
|
mutateion.mutate({
|
||||||
|
type: 'updateAccountProperty',
|
||||||
|
queryKey,
|
||||||
|
id: status.account.id,
|
||||||
|
payload: { property: 'mute' }
|
||||||
|
})
|
||||||
|
break
|
||||||
|
case 'account-block':
|
||||||
|
analytics('timeline_shared_headeractions_account_block_press', {
|
||||||
|
page: queryKey && queryKey[1].page
|
||||||
|
})
|
||||||
|
mutateion.mutate({
|
||||||
|
type: 'updateAccountProperty',
|
||||||
|
queryKey,
|
||||||
|
id: status.account.id,
|
||||||
|
payload: { property: 'block' }
|
||||||
|
})
|
||||||
|
break
|
||||||
|
case 'account-report':
|
||||||
|
analytics('timeline_shared_headeractions_account_reports_press', {
|
||||||
|
page: queryKey && queryKey[1].page
|
||||||
|
})
|
||||||
|
mutateion.mutate({
|
||||||
|
type: 'updateAccountProperty',
|
||||||
|
queryKey,
|
||||||
|
id: status.account.id,
|
||||||
|
payload: { property: 'reports' }
|
||||||
|
})
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export default contextMenuAccount
|
108
src/components/Timeline/Shared/ContextMenu/instance.ts
Normal file
108
src/components/Timeline/Shared/ContextMenu/instance.ts
Normal file
@ -0,0 +1,108 @@
|
|||||||
|
import analytics from '@components/analytics'
|
||||||
|
import { displayMessage } from '@components/Message'
|
||||||
|
import {
|
||||||
|
QueryKeyTimeline,
|
||||||
|
useTimelineMutation
|
||||||
|
} from '@utils/queryHooks/timeline'
|
||||||
|
import { getInstanceUrl } from '@utils/slices/instancesSlice'
|
||||||
|
import { useTheme } from '@utils/styles/ThemeManager'
|
||||||
|
import { useTranslation } from 'react-i18next'
|
||||||
|
import { Alert, Platform } from 'react-native'
|
||||||
|
import { ContextMenuAction } from 'react-native-context-menu-view'
|
||||||
|
import { useQueryClient } from 'react-query'
|
||||||
|
import { useSelector } from 'react-redux'
|
||||||
|
|
||||||
|
export interface Props {
|
||||||
|
menuItems: ContextMenuAction[]
|
||||||
|
status: Mastodon.Status
|
||||||
|
queryKey: QueryKeyTimeline
|
||||||
|
rootQueryKey?: QueryKeyTimeline
|
||||||
|
}
|
||||||
|
|
||||||
|
const contextMenuInstance = ({
|
||||||
|
menuItems,
|
||||||
|
status,
|
||||||
|
queryKey,
|
||||||
|
rootQueryKey
|
||||||
|
}: Props) => {
|
||||||
|
const { t } = useTranslation('componentContextMenu')
|
||||||
|
const { theme } = useTheme()
|
||||||
|
|
||||||
|
const currentInstance = useSelector(getInstanceUrl)
|
||||||
|
const instance = status.uri && status.uri.split(new RegExp(/\/\/(.*?)\//))[1]
|
||||||
|
|
||||||
|
const queryClient = useQueryClient()
|
||||||
|
const mutation = useTimelineMutation({
|
||||||
|
onSettled: () => {
|
||||||
|
displayMessage({
|
||||||
|
theme,
|
||||||
|
type: 'success',
|
||||||
|
message: t('common:message.success.message', {
|
||||||
|
function: t(`instance.block.action`, { instance })
|
||||||
|
})
|
||||||
|
})
|
||||||
|
queryClient.invalidateQueries(queryKey)
|
||||||
|
rootQueryKey && queryClient.invalidateQueries(rootQueryKey)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
if (currentInstance !== instance && instance) {
|
||||||
|
switch (Platform.OS) {
|
||||||
|
case 'ios':
|
||||||
|
menuItems.push({
|
||||||
|
id: 'instance',
|
||||||
|
title: t('instance.title'),
|
||||||
|
actions: [
|
||||||
|
{
|
||||||
|
id: 'instance-block',
|
||||||
|
title: t('instance.block.action', { instance }),
|
||||||
|
destructive: true
|
||||||
|
}
|
||||||
|
]
|
||||||
|
})
|
||||||
|
break
|
||||||
|
default:
|
||||||
|
menuItems.push({
|
||||||
|
id: 'instance-block',
|
||||||
|
title: t('instance.block.action', { instance }),
|
||||||
|
destructive: true
|
||||||
|
})
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (id: string) => {
|
||||||
|
switch (id) {
|
||||||
|
case 'instance-block':
|
||||||
|
analytics('timeline_shared_headeractions_domain_block_press', {
|
||||||
|
page: queryKey[1].page
|
||||||
|
})
|
||||||
|
Alert.alert(
|
||||||
|
t('instance.block.alert.title', { instance }),
|
||||||
|
t('instance.block.alert.message'),
|
||||||
|
[
|
||||||
|
{
|
||||||
|
text: t('instance.block.alert.buttons.confirm'),
|
||||||
|
style: 'destructive',
|
||||||
|
onPress: () => {
|
||||||
|
analytics(
|
||||||
|
'timeline_shared_headeractions_domain_block_confirm',
|
||||||
|
{ page: queryKey && queryKey[1].page }
|
||||||
|
)
|
||||||
|
mutation.mutate({
|
||||||
|
type: 'domainBlock',
|
||||||
|
queryKey,
|
||||||
|
domain: instance
|
||||||
|
})
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
text: t('common:buttons.cancel')
|
||||||
|
}
|
||||||
|
]
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export default contextMenuInstance
|
40
src/components/Timeline/Shared/ContextMenu/share.ts
Normal file
40
src/components/Timeline/Shared/ContextMenu/share.ts
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
import analytics from '@components/analytics'
|
||||||
|
import { useTranslation } from 'react-i18next'
|
||||||
|
import { Platform, Share } from 'react-native'
|
||||||
|
import { ContextMenuAction } from 'react-native-context-menu-view'
|
||||||
|
|
||||||
|
export interface Props {
|
||||||
|
menuItems: ContextMenuAction[]
|
||||||
|
status: Mastodon.Status
|
||||||
|
}
|
||||||
|
|
||||||
|
const contextMenuShare = ({ menuItems, status }: Props) => {
|
||||||
|
const { t } = useTranslation('componentContextMenu')
|
||||||
|
|
||||||
|
if (status.visibility !== 'direct') {
|
||||||
|
menuItems.push({
|
||||||
|
id: 'share',
|
||||||
|
title: t(`share.status.action`),
|
||||||
|
systemIcon: 'square.and.arrow.up'
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
return (id: string) => {
|
||||||
|
const url = status.url || status.uri
|
||||||
|
switch (id) {
|
||||||
|
case 'share':
|
||||||
|
analytics('timeline_shared_headeractions_share_press')
|
||||||
|
switch (Platform.OS) {
|
||||||
|
case 'ios':
|
||||||
|
Share.share({ url })
|
||||||
|
break
|
||||||
|
case 'android':
|
||||||
|
Share.share({ message: url })
|
||||||
|
break
|
||||||
|
}
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export default contextMenuShare
|
286
src/components/Timeline/Shared/ContextMenu/status.ts
Normal file
286
src/components/Timeline/Shared/ContextMenu/status.ts
Normal file
@ -0,0 +1,286 @@
|
|||||||
|
import apiInstance from '@api/instance'
|
||||||
|
import analytics from '@components/analytics'
|
||||||
|
import { displayMessage } from '@components/Message'
|
||||||
|
import { useNavigation } from '@react-navigation/native'
|
||||||
|
import { NativeStackNavigationProp } from '@react-navigation/native-stack'
|
||||||
|
import { RootStackParamList } from '@utils/navigation/navigators'
|
||||||
|
import {
|
||||||
|
MutationVarsTimelineUpdateStatusProperty,
|
||||||
|
QueryKeyTimeline,
|
||||||
|
useTimelineMutation
|
||||||
|
} from '@utils/queryHooks/timeline'
|
||||||
|
import {
|
||||||
|
checkInstanceFeature,
|
||||||
|
getInstanceAccount
|
||||||
|
} from '@utils/slices/instancesSlice'
|
||||||
|
import { useTheme } from '@utils/styles/ThemeManager'
|
||||||
|
import { useTranslation } from 'react-i18next'
|
||||||
|
import { Alert, Platform } from 'react-native'
|
||||||
|
import { ContextMenuAction } from 'react-native-context-menu-view'
|
||||||
|
import { useQueryClient } from 'react-query'
|
||||||
|
import { useSelector } from 'react-redux'
|
||||||
|
|
||||||
|
export interface Props {
|
||||||
|
menuItems: ContextMenuAction[]
|
||||||
|
status: Mastodon.Status
|
||||||
|
queryKey: QueryKeyTimeline
|
||||||
|
rootQueryKey?: QueryKeyTimeline
|
||||||
|
}
|
||||||
|
|
||||||
|
const contextMenuStatus = ({
|
||||||
|
menuItems,
|
||||||
|
status,
|
||||||
|
queryKey,
|
||||||
|
rootQueryKey
|
||||||
|
}: Props) => {
|
||||||
|
const navigation =
|
||||||
|
useNavigation<
|
||||||
|
NativeStackNavigationProp<RootStackParamList, 'Screen-Tabs'>
|
||||||
|
>()
|
||||||
|
const { theme } = useTheme()
|
||||||
|
const { t } = useTranslation('componentContextMenu')
|
||||||
|
|
||||||
|
const queryClient = useQueryClient()
|
||||||
|
const mutation = useTimelineMutation({
|
||||||
|
onMutate: true,
|
||||||
|
onError: (err: any, params, oldData) => {
|
||||||
|
const theFunction = (params as MutationVarsTimelineUpdateStatusProperty)
|
||||||
|
.payload
|
||||||
|
? (params as MutationVarsTimelineUpdateStatusProperty).payload.property
|
||||||
|
: 'delete'
|
||||||
|
displayMessage({
|
||||||
|
theme,
|
||||||
|
type: 'error',
|
||||||
|
message: t('common:message.error.message', {
|
||||||
|
function: t(`status.${theFunction}.action`)
|
||||||
|
}),
|
||||||
|
...(err.status &&
|
||||||
|
typeof err.status === 'number' &&
|
||||||
|
err.data &&
|
||||||
|
err.data.error &&
|
||||||
|
typeof err.data.error === 'string' && {
|
||||||
|
description: err.data.error
|
||||||
|
})
|
||||||
|
})
|
||||||
|
queryClient.setQueryData(queryKey, oldData)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
const instanceAccount = useSelector(
|
||||||
|
getInstanceAccount,
|
||||||
|
(prev, next) => prev.id === next.id
|
||||||
|
)
|
||||||
|
const ownAccount = instanceAccount?.id === status.account.id
|
||||||
|
|
||||||
|
if (ownAccount) {
|
||||||
|
const accountMenuItems: ContextMenuAction[] = [
|
||||||
|
{
|
||||||
|
id: 'status-delete',
|
||||||
|
title: t('status.delete.action'),
|
||||||
|
systemIcon: 'trash',
|
||||||
|
destructive: true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'status-delete-edit',
|
||||||
|
title: t('status.deleteEdit.action'),
|
||||||
|
systemIcon: 'pencil.and.outline',
|
||||||
|
destructive: true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'status-mute',
|
||||||
|
title: t('status.mute.action-muted', {
|
||||||
|
context: status.muted.toString()
|
||||||
|
}),
|
||||||
|
systemIcon: status.muted ? 'speaker' : 'speaker.slash'
|
||||||
|
}
|
||||||
|
]
|
||||||
|
|
||||||
|
const canEditPost = useSelector(checkInstanceFeature('edit_post'))
|
||||||
|
if (canEditPost) {
|
||||||
|
accountMenuItems.unshift({
|
||||||
|
id: 'status-edit',
|
||||||
|
title: t('status.edit.action'),
|
||||||
|
systemIcon: 'square.and.pencil'
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
if (status.visibility === 'public' || status.visibility === 'unlisted') {
|
||||||
|
accountMenuItems.push({
|
||||||
|
id: 'status-pin',
|
||||||
|
title: t('status.pin.action-pinned', {
|
||||||
|
context: status.pinned.toString()
|
||||||
|
}),
|
||||||
|
systemIcon: status.pinned ? 'pin.slash' : 'pin'
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
switch (Platform.OS) {
|
||||||
|
case 'ios':
|
||||||
|
menuItems.push({
|
||||||
|
id: 'status',
|
||||||
|
title: t('status.title'),
|
||||||
|
inlineChildren: true,
|
||||||
|
actions: accountMenuItems
|
||||||
|
})
|
||||||
|
break
|
||||||
|
default:
|
||||||
|
menuItems.push(...accountMenuItems)
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return async (id: string) => {
|
||||||
|
switch (id) {
|
||||||
|
case 'status-delete':
|
||||||
|
analytics('timeline_shared_headeractions_status_delete_press', {
|
||||||
|
page: queryKey && queryKey[1].page
|
||||||
|
})
|
||||||
|
Alert.alert(
|
||||||
|
t('status.delete.alert.title'),
|
||||||
|
t('status.delete.alert.message'),
|
||||||
|
[
|
||||||
|
{
|
||||||
|
text: t('status.delete.alert.buttons.confirm'),
|
||||||
|
style: 'destructive',
|
||||||
|
onPress: async () => {
|
||||||
|
analytics(
|
||||||
|
'timeline_shared_headeractions_status_delete_confirm',
|
||||||
|
{
|
||||||
|
page: queryKey && queryKey[1].page
|
||||||
|
}
|
||||||
|
)
|
||||||
|
mutation.mutate({
|
||||||
|
type: 'deleteItem',
|
||||||
|
source: 'statuses',
|
||||||
|
queryKey,
|
||||||
|
rootQueryKey,
|
||||||
|
id: status.id
|
||||||
|
})
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
text: t('common:buttons.cancel')
|
||||||
|
}
|
||||||
|
]
|
||||||
|
)
|
||||||
|
break
|
||||||
|
case 'status-delete-edit':
|
||||||
|
analytics('timeline_shared_headeractions_status_deleteedit_press', {
|
||||||
|
page: queryKey && queryKey[1].page
|
||||||
|
})
|
||||||
|
Alert.alert(
|
||||||
|
t('status.deleteEdit.alert.title'),
|
||||||
|
t('status.deleteEdit.alert.message'),
|
||||||
|
[
|
||||||
|
{
|
||||||
|
text: t('status.deleteEdit.alert.buttons.confirm'),
|
||||||
|
style: 'destructive',
|
||||||
|
onPress: async () => {
|
||||||
|
analytics(
|
||||||
|
'timeline_shared_headeractions_status_deleteedit_confirm',
|
||||||
|
{
|
||||||
|
page: queryKey && queryKey[1].page
|
||||||
|
}
|
||||||
|
)
|
||||||
|
let replyToStatus: Mastodon.Status | undefined = undefined
|
||||||
|
if (status.in_reply_to_id) {
|
||||||
|
replyToStatus = await apiInstance<Mastodon.Status>({
|
||||||
|
method: 'get',
|
||||||
|
url: `statuses/${status.in_reply_to_id}`
|
||||||
|
}).then(res => res.body)
|
||||||
|
}
|
||||||
|
mutation
|
||||||
|
.mutateAsync({
|
||||||
|
type: 'deleteItem',
|
||||||
|
source: 'statuses',
|
||||||
|
queryKey,
|
||||||
|
id: status.id
|
||||||
|
})
|
||||||
|
.then(res => {
|
||||||
|
navigation.navigate('Screen-Compose', {
|
||||||
|
type: 'deleteEdit',
|
||||||
|
incomingStatus: res.body as Mastodon.Status,
|
||||||
|
...(replyToStatus && { replyToStatus }),
|
||||||
|
queryKey
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
text: t('common:buttons.cancel')
|
||||||
|
}
|
||||||
|
]
|
||||||
|
)
|
||||||
|
break
|
||||||
|
case 'status-mute':
|
||||||
|
analytics('timeline_shared_headeractions_status_mute_press', {
|
||||||
|
page: queryKey && queryKey[1].page
|
||||||
|
})
|
||||||
|
mutation.mutate({
|
||||||
|
type: 'updateStatusProperty',
|
||||||
|
queryKey,
|
||||||
|
rootQueryKey,
|
||||||
|
id: status.id,
|
||||||
|
payload: {
|
||||||
|
property: 'muted',
|
||||||
|
currentValue: status.muted,
|
||||||
|
propertyCount: undefined,
|
||||||
|
countValue: undefined
|
||||||
|
}
|
||||||
|
})
|
||||||
|
break
|
||||||
|
case 'status-edit':
|
||||||
|
analytics('timeline_shared_headeractions_status_edit_press', {
|
||||||
|
page: queryKey && queryKey[1].page
|
||||||
|
})
|
||||||
|
let replyToStatus: Mastodon.Status | undefined = undefined
|
||||||
|
if (status.in_reply_to_id) {
|
||||||
|
replyToStatus = await apiInstance<Mastodon.Status>({
|
||||||
|
method: 'get',
|
||||||
|
url: `statuses/${status.in_reply_to_id}`
|
||||||
|
}).then(res => res.body)
|
||||||
|
}
|
||||||
|
apiInstance<{
|
||||||
|
id: Mastodon.Status['id']
|
||||||
|
text: NonNullable<Mastodon.Status['text']>
|
||||||
|
spoiler_text: Mastodon.Status['spoiler_text']
|
||||||
|
}>({
|
||||||
|
method: 'get',
|
||||||
|
url: `statuses/${status.id}/source`
|
||||||
|
}).then(res => {
|
||||||
|
navigation.navigate('Screen-Compose', {
|
||||||
|
type: 'edit',
|
||||||
|
incomingStatus: {
|
||||||
|
...status,
|
||||||
|
text: res.body.text,
|
||||||
|
spoiler_text: res.body.spoiler_text
|
||||||
|
},
|
||||||
|
...(replyToStatus && { replyToStatus }),
|
||||||
|
queryKey,
|
||||||
|
rootQueryKey
|
||||||
|
})
|
||||||
|
})
|
||||||
|
break
|
||||||
|
case 'status-pin':
|
||||||
|
// Also note that reblogs cannot be pinned.
|
||||||
|
analytics('timeline_shared_headeractions_status_pin_press', {
|
||||||
|
page: queryKey && queryKey[1].page
|
||||||
|
})
|
||||||
|
mutation.mutate({
|
||||||
|
type: 'updateStatusProperty',
|
||||||
|
queryKey,
|
||||||
|
rootQueryKey,
|
||||||
|
id: status.id,
|
||||||
|
payload: {
|
||||||
|
property: 'pinned',
|
||||||
|
currentValue: status.pinned,
|
||||||
|
propertyCount: undefined,
|
||||||
|
countValue: undefined
|
||||||
|
}
|
||||||
|
})
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export default contextMenuStatus
|
@ -1,13 +1,13 @@
|
|||||||
import Icon from '@components/Icon'
|
import Icon from '@components/Icon'
|
||||||
import { useNavigation } from '@react-navigation/native'
|
|
||||||
import { StackNavigationProp } from '@react-navigation/stack'
|
|
||||||
import { RootStackParamList } from '@utils/navigation/navigators'
|
|
||||||
import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
|
import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
|
||||||
import { StyleConstants } from '@utils/styles/constants'
|
import { StyleConstants } from '@utils/styles/constants'
|
||||||
import { useTheme } from '@utils/styles/ThemeManager'
|
import { useTheme } from '@utils/styles/ThemeManager'
|
||||||
import React from 'react'
|
import React, { useContext, useRef } from 'react'
|
||||||
import { useTranslation } from 'react-i18next'
|
import { useTranslation } from 'react-i18next'
|
||||||
import { Pressable, View } from 'react-native'
|
import { Pressable, View } from 'react-native'
|
||||||
|
import ContextMenu from 'react-native-context-menu-view'
|
||||||
|
import { TouchableWithoutFeedback } from 'react-native-gesture-handler'
|
||||||
|
import { ContextMenuContext } from './ContextMenu'
|
||||||
import HeaderSharedAccount from './HeaderShared/Account'
|
import HeaderSharedAccount from './HeaderShared/Account'
|
||||||
import HeaderSharedApplication from './HeaderShared/Application'
|
import HeaderSharedApplication from './HeaderShared/Application'
|
||||||
import HeaderSharedCreated from './HeaderShared/Created'
|
import HeaderSharedCreated from './HeaderShared/Created'
|
||||||
@ -16,24 +16,19 @@ import HeaderSharedVisibility from './HeaderShared/Visibility'
|
|||||||
|
|
||||||
export interface Props {
|
export interface Props {
|
||||||
queryKey?: QueryKeyTimeline
|
queryKey?: QueryKeyTimeline
|
||||||
rootQueryKey?: QueryKeyTimeline
|
|
||||||
status: Mastodon.Status
|
status: Mastodon.Status
|
||||||
highlighted: boolean
|
highlighted: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
const TimelineHeaderDefault = ({
|
const TimelineHeaderDefault = ({ queryKey, status, highlighted }: Props) => {
|
||||||
queryKey,
|
const { t } = useTranslation('componentContextMenu')
|
||||||
rootQueryKey,
|
|
||||||
status,
|
|
||||||
highlighted
|
|
||||||
}: Props) => {
|
|
||||||
const { t } = useTranslation('componentTimeline')
|
|
||||||
const navigation = useNavigation<StackNavigationProp<RootStackParamList>>()
|
|
||||||
const { colors } = useTheme()
|
const { colors } = useTheme()
|
||||||
|
|
||||||
|
const contextMenuItems = useContext(ContextMenuContext)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<View style={{ flex: 1, flexDirection: 'row' }}>
|
<View style={{ flex: 1, flexDirection: 'row' }}>
|
||||||
<View style={{ flex: 5 }}>
|
<View style={{ flex: 7 }}>
|
||||||
<HeaderSharedAccount account={status.account} />
|
<HeaderSharedAccount account={status.account} />
|
||||||
<View
|
<View
|
||||||
style={{
|
style={{
|
||||||
@ -56,29 +51,34 @@ const TimelineHeaderDefault = ({
|
|||||||
|
|
||||||
{queryKey ? (
|
{queryKey ? (
|
||||||
<Pressable
|
<Pressable
|
||||||
accessibilityHint={t('shared.header.actions.accessibilityHint')}
|
accessibilityHint={t('accessibilityHint')}
|
||||||
style={{
|
style={{
|
||||||
flex: 1,
|
flex: 1,
|
||||||
flexDirection: 'row',
|
flexDirection: 'row',
|
||||||
justifyContent: 'center',
|
justifyContent: 'center',
|
||||||
paddingBottom: StyleConstants.Spacing.S
|
marginBottom: StyleConstants.Spacing.L
|
||||||
}}
|
}}
|
||||||
onPress={() =>
|
>
|
||||||
navigation.navigate('Screen-Actions', {
|
<ContextMenu
|
||||||
queryKey,
|
dropdownMenuMode={true}
|
||||||
rootQueryKey,
|
actions={contextMenuItems}
|
||||||
status,
|
// onPress={({ nativeEvent: { index, name } }) => {
|
||||||
type: 'status'
|
// console.log('index', index)
|
||||||
})
|
// console.log('name', name)
|
||||||
}
|
// // shareOnPress(name)
|
||||||
children={
|
// // statusOnPress(name)
|
||||||
<Icon
|
// accountOnPress(name)
|
||||||
name='MoreHorizontal'
|
// // instanceOnPress(name)
|
||||||
color={colors.secondary}
|
// }}
|
||||||
size={StyleConstants.Font.Size.L}
|
children={
|
||||||
/>
|
<Icon
|
||||||
}
|
name='MoreHorizontal'
|
||||||
/>
|
color={colors.secondary}
|
||||||
|
size={StyleConstants.Font.Size.L}
|
||||||
|
/>
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
</Pressable>
|
||||||
) : null}
|
) : null}
|
||||||
</View>
|
</View>
|
||||||
)
|
)
|
||||||
|
@ -8,6 +8,7 @@ export default {
|
|||||||
screenImageViewer: require('./screens/imageViewer'),
|
screenImageViewer: require('./screens/imageViewer'),
|
||||||
screenTabs: require('./screens/tabs'),
|
screenTabs: require('./screens/tabs'),
|
||||||
|
|
||||||
|
componentContextMenu: require('./components/contextMenu'),
|
||||||
componentEmojis: require('./components/emojis'),
|
componentEmojis: require('./components/emojis'),
|
||||||
componentInstance: require('./components/instance'),
|
componentInstance: require('./components/instance'),
|
||||||
componentMediaSelector: require('./components/mediaSelector'),
|
componentMediaSelector: require('./components/mediaSelector'),
|
||||||
|
70
src/i18n/en/components/contextMenu.json
Normal file
70
src/i18n/en/components/contextMenu.json
Normal file
@ -0,0 +1,70 @@
|
|||||||
|
{
|
||||||
|
"accessibilityHint": "Actions for this toot, such as its posted user, toot itself",
|
||||||
|
"account": {
|
||||||
|
"title": "User actions",
|
||||||
|
"mute": {
|
||||||
|
"action": "Mute user"
|
||||||
|
},
|
||||||
|
"block": {
|
||||||
|
"action": "Block user"
|
||||||
|
},
|
||||||
|
"reports": {
|
||||||
|
"action": "Report user"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"instance": {
|
||||||
|
"title": "Instance action",
|
||||||
|
"block": {
|
||||||
|
"action": "Block instance {{instance}}",
|
||||||
|
"alert": {
|
||||||
|
"title": "Confirm blocking instance {{instance}} ?",
|
||||||
|
"message": "Mostly you can mute or block certain user.\n\nAfter blocking instance, all its content including followers from this instance will be removed!",
|
||||||
|
"buttons": {
|
||||||
|
"confirm": "Confirm"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"share": {
|
||||||
|
"status": {
|
||||||
|
"action": "Share toot"
|
||||||
|
},
|
||||||
|
"account": {
|
||||||
|
"action": "Share user"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"status": {
|
||||||
|
"title": "Toot actions",
|
||||||
|
"edit": {
|
||||||
|
"action": "Edit toot"
|
||||||
|
},
|
||||||
|
"delete": {
|
||||||
|
"action": "Delete toot",
|
||||||
|
"alert": {
|
||||||
|
"title": "Confirm deleting?",
|
||||||
|
"message": "All boosts and favourites will be cleared, including all replies.",
|
||||||
|
"buttons": {
|
||||||
|
"confirm": "Confirm"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"deleteEdit": {
|
||||||
|
"action": "Delete toot and repost",
|
||||||
|
"alert": {
|
||||||
|
"title": "Confirm deleting and repost?",
|
||||||
|
"message": "All boosts and favourites will be cleared, including all replies.",
|
||||||
|
"buttons": {
|
||||||
|
"confirm": "Confirm"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"mute": {
|
||||||
|
"action-muted_false": "Mute toot and replies",
|
||||||
|
"action-muted_true": "Unmute toot and replies"
|
||||||
|
},
|
||||||
|
"pin": {
|
||||||
|
"action-pinned_false": "Pin toot",
|
||||||
|
"action-pinned_true": "Unpin toot"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -123,94 +123,6 @@
|
|||||||
"delete": {
|
"delete": {
|
||||||
"function": "Delete direct message"
|
"function": "Delete direct message"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"actions": {
|
|
||||||
"accessibilityHint": "Actions for this toot, such as its posted user, toot itself",
|
|
||||||
"account": {
|
|
||||||
"heading": "About user",
|
|
||||||
"mute": {
|
|
||||||
"function": "Mute user",
|
|
||||||
"button": "Mute @{{acct}}"
|
|
||||||
},
|
|
||||||
"block": {
|
|
||||||
"function": "Block user",
|
|
||||||
"button": "Block @{{acct}}"
|
|
||||||
},
|
|
||||||
"reports": {
|
|
||||||
"function": "Report user",
|
|
||||||
"button": "Report @{{acct}}"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"domain": {
|
|
||||||
"heading": "About instance",
|
|
||||||
"block": {
|
|
||||||
"function": "Block instance",
|
|
||||||
"button": "Block instance {{domain}}"
|
|
||||||
},
|
|
||||||
"alert": {
|
|
||||||
"title": "Confirm blocking {{domain}} ?",
|
|
||||||
"message": "Mostly you can mute or block certain user.\n\nAfter blocking instance, all its content including followers from this instance will be removed!",
|
|
||||||
"buttons": {
|
|
||||||
"confirm": "Confirm blocking",
|
|
||||||
"cancel": "$t(common:buttons.cancel)"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"share": {
|
|
||||||
"status": {
|
|
||||||
"heading": "Share toot",
|
|
||||||
"button": "Share link to this toot"
|
|
||||||
},
|
|
||||||
"account": {
|
|
||||||
"heading": "Share user",
|
|
||||||
"button": "Share link to this user"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"status": {
|
|
||||||
"heading": "About toot",
|
|
||||||
"edit": {
|
|
||||||
"function": "Edit toot",
|
|
||||||
"button": "Edit this toot"
|
|
||||||
},
|
|
||||||
"delete": {
|
|
||||||
"function": "Delete toot",
|
|
||||||
"button": "Delete this toot",
|
|
||||||
"alert": {
|
|
||||||
"title": "Confirm deleting toot?",
|
|
||||||
"message": "Are you sure to delete this toot? All boosts and favourites will be cleared, including all replies.",
|
|
||||||
"buttons": {
|
|
||||||
"confirm": "Confirm deleting",
|
|
||||||
"cancel": "$t(common:buttons.cancel)"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"deleteEdit": {
|
|
||||||
"function": "Delete toot",
|
|
||||||
"button": "Delete and re-draft",
|
|
||||||
"alert": {
|
|
||||||
"title": "Confirm deleting toot?",
|
|
||||||
"message": "Are you sure to delete and re-draft this toot? All boosts and favourites will be cleared, including all replies.",
|
|
||||||
"buttons": {
|
|
||||||
"confirm": "Confirm deleting",
|
|
||||||
"cancel": "$t(common:buttons.cancel)"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"mute": {
|
|
||||||
"function": "Mute toot",
|
|
||||||
"button": {
|
|
||||||
"positive": "Mute this toot and replies",
|
|
||||||
"negative": "Unmute this toot and replies"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"pin": {
|
|
||||||
"function": "Pin",
|
|
||||||
"button": {
|
|
||||||
"positive": "Pin this toot",
|
|
||||||
"negative": "Unpin this toot"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"poll": {
|
"poll": {
|
||||||
|
@ -60,8 +60,8 @@ i18n.use(initReactI18next).init({
|
|||||||
returnEmptyString: false,
|
returnEmptyString: false,
|
||||||
|
|
||||||
saveMissing: true,
|
saveMissing: true,
|
||||||
missingKeyHandler: (ns, key) => {
|
missingKeyHandler: (_, ns, key) => {
|
||||||
console.log('i18n missing: ' + ns + ' : ' + key)
|
console.log('i18n missing', ns, key)
|
||||||
},
|
},
|
||||||
|
|
||||||
interpolation: {
|
interpolation: {
|
||||||
|
@ -49,7 +49,6 @@ const ScreenActions = ({
|
|||||||
let sameAccount = false
|
let sameAccount = false
|
||||||
switch (params.type) {
|
switch (params.type) {
|
||||||
case 'status':
|
case 'status':
|
||||||
console.log('media length', params.status.media_attachments.length)
|
|
||||||
sameAccount = instanceAccount?.id === params.status.account.id
|
sameAccount = instanceAccount?.id === params.status.account.id
|
||||||
break
|
break
|
||||||
case 'account':
|
case 'account':
|
||||||
@ -117,38 +116,6 @@ const ScreenActions = ({
|
|||||||
dismiss={dismiss}
|
dismiss={dismiss}
|
||||||
/>
|
/>
|
||||||
) : null}
|
) : null}
|
||||||
{sameAccount && params.status ? (
|
|
||||||
<ActionsStatus
|
|
||||||
navigation={navigation}
|
|
||||||
queryKey={params.queryKey}
|
|
||||||
rootQueryKey={params.rootQueryKey}
|
|
||||||
status={params.status}
|
|
||||||
dismiss={dismiss}
|
|
||||||
/>
|
|
||||||
) : null}
|
|
||||||
{!sameDomain && statusDomain ? (
|
|
||||||
<ActionsDomain
|
|
||||||
queryKey={params.queryKey}
|
|
||||||
rootQueryKey={params.rootQueryKey}
|
|
||||||
domain={statusDomain}
|
|
||||||
dismiss={dismiss}
|
|
||||||
/>
|
|
||||||
) : null}
|
|
||||||
{params.status.visibility !== 'direct' ? (
|
|
||||||
<ActionsShare
|
|
||||||
url={params.status.url || params.status.uri}
|
|
||||||
type={params.type}
|
|
||||||
dismiss={dismiss}
|
|
||||||
/>
|
|
||||||
) : null}
|
|
||||||
<Button
|
|
||||||
type='text'
|
|
||||||
content={t('common:buttons.cancel')}
|
|
||||||
onPress={() => {
|
|
||||||
analytics('bottomsheet_acknowledge')
|
|
||||||
}}
|
|
||||||
style={styles.button}
|
|
||||||
/>
|
|
||||||
</>
|
</>
|
||||||
)
|
)
|
||||||
case 'account':
|
case 'account':
|
||||||
|
@ -7475,6 +7475,10 @@ react-native-codegen@^0.0.17:
|
|||||||
jscodeshift "^0.13.1"
|
jscodeshift "^0.13.1"
|
||||||
nullthrows "^1.1.1"
|
nullthrows "^1.1.1"
|
||||||
|
|
||||||
|
react-native-context-menu-view@xmflsct/react-native-context-menu-view:
|
||||||
|
version "1.5.4"
|
||||||
|
resolved "https://codeload.github.com/xmflsct/react-native-context-menu-view/tar.gz/bff5773d318970cd67b5cf114d4bec1e200178eb"
|
||||||
|
|
||||||
react-native-fast-image@8.5.11:
|
react-native-fast-image@8.5.11:
|
||||||
version "8.5.11"
|
version "8.5.11"
|
||||||
resolved "https://registry.yarnpkg.com/react-native-fast-image/-/react-native-fast-image-8.5.11.tgz#e3dc969d0e4e8df026646bf18194465aa55cbc2b"
|
resolved "https://registry.yarnpkg.com/react-native-fast-image/-/react-native-fast-image-8.5.11.tgz#e3dc969d0e4e8df026646bf18194465aa55cbc2b"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user