diff --git a/package.json b/package.json index b3bf8d21..6f555597 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tooot", - "version": "4.5.1", + "version": "4.6.0", "description": "tooot for Mastodon", "author": "xmflsct ", "license": "GPL-3.0-or-later", diff --git a/src/components/Timeline/Shared/HeaderDefault.android.tsx b/src/components/Timeline/Shared/HeaderDefault.android.tsx index 9986b9a5..c3853bb5 100644 --- a/src/components/Timeline/Shared/HeaderDefault.android.tsx +++ b/src/components/Timeline/Shared/HeaderDefault.android.tsx @@ -81,15 +81,10 @@ const TimelineHeaderDefault = ({ queryKey, status, highlighted }: Props) => { {queryKey ? ( { @@ -104,7 +99,6 @@ const TimelineHeaderDefault = ({ queryKey, status, highlighted }: Props) => { size={StyleConstants.Font.Size.L} /> } - style={{ width: '100%', height: '100%', paddingHorizontal: StyleConstants.Font.Size.M }} /> ) : null} diff --git a/src/components/Timeline/Shared/HeaderDefault.ios.tsx b/src/components/Timeline/Shared/HeaderDefault.ios.tsx index f4694f10..d2219c87 100644 --- a/src/components/Timeline/Shared/HeaderDefault.ios.tsx +++ b/src/components/Timeline/Shared/HeaderDefault.ios.tsx @@ -51,15 +51,10 @@ const TimelineHeaderDefault = ({ queryKey, status, highlighted }: Props) => { {queryKey ? ( {}} @@ -70,7 +65,6 @@ const TimelineHeaderDefault = ({ queryKey, status, highlighted }: Props) => { size={StyleConstants.Font.Size.L} /> } - style={{ paddingHorizontal: StyleConstants.Font.Size.M }} /> ) : null} diff --git a/src/components/Timeline/Shared/HeaderNotification.android.tsx b/src/components/Timeline/Shared/HeaderNotification.android.tsx index 80120136..db54c04a 100644 --- a/src/components/Timeline/Shared/HeaderNotification.android.tsx +++ b/src/components/Timeline/Shared/HeaderNotification.android.tsx @@ -3,10 +3,7 @@ import contextMenuInstance from '@components/ContextMenu/instance' import contextMenuShare from '@components/ContextMenu/share' import contextMenuStatus from '@components/ContextMenu/status' import Icon from '@components/Icon' -import { - RelationshipIncoming, - RelationshipOutgoing -} from '@components/Relationship' +import { RelationshipIncoming, RelationshipOutgoing } from '@components/Relationship' import { QueryKeyTimeline } from '@utils/queryHooks/timeline' import { StyleConstants } from '@utils/styles/constants' import { useTheme } from '@utils/styles/ThemeManager' @@ -32,27 +29,33 @@ const TimelineHeaderNotification = ({ queryKey, notification }: Props) => { const shareOnPress = status && status?.visibility !== 'direct' ? contextMenuShare({ - actions: contextMenuActions, - type: 'status', - url: status.url || status.uri - }) + actions: contextMenuActions, + type: 'status', + url: status.url || status.uri + }) : null - const statusOnPress = status && contextMenuStatus({ - actions: contextMenuActions, - status: status, - queryKey - }) - const accountOnPress = status && contextMenuAccount({ - actions: contextMenuActions, - type: 'status', - queryKey, - id: status.account.id - }) - const instanceOnPress = status && contextMenuInstance({ - actions: contextMenuActions, - status: status, - queryKey - }) + const statusOnPress = + status && + contextMenuStatus({ + actions: contextMenuActions, + status: status, + queryKey + }) + const accountOnPress = + status && + contextMenuAccount({ + actions: contextMenuActions, + type: 'status', + queryKey, + id: status.account.id + }) + const instanceOnPress = + status && + contextMenuInstance({ + actions: contextMenuActions, + status: status, + queryKey + }) const actions = useMemo(() => { switch (notification.type) { @@ -64,14 +67,10 @@ const TimelineHeaderNotification = ({ queryKey, notification }: Props) => { if (notification.status) { return ( { @@ -91,7 +90,6 @@ const TimelineHeaderNotification = ({ queryKey, notification }: Props) => { size={StyleConstants.Font.Size.L} /> } - style={{ width: '100%', height: '100%' }} /> } /> @@ -104,21 +102,14 @@ const TimelineHeaderNotification = ({ queryKey, notification }: Props) => { { }} > {notification.status?.visibility ? ( - + ) : null} - + { if (notification.status) { return ( {}} @@ -66,21 +59,14 @@ const TimelineHeaderNotification = ({ notification }: Props) => { { }} > {notification.status?.visibility ? ( - + ) : null} - +