Merge branch 'main' into release

tooot-app · Mar 19, 2023 · 88569e9 · 88569e9
2 parents 908da43 + 6c1eba0
commit 88569e9
Show file tree

Hide file tree

Showing 13 changed files with 203 additions and 278 deletions.
diff --git a/.yarn/patches/react-native-reanimated-zoom-npm-0.3.3-bbb8d84109.patch b/.yarn/patches/react-native-reanimated-zoom-npm-0.3.3-bbb8d84109.patch
@@ -0,0 +1,38 @@
+diff --git a/src/zoom.tsx b/src/zoom.tsx
+index 70ce1c8d6a43e711f06b93d1eda3b44a3ad9a659..cdc2713470f2d332b8bf3e9c97e38fd9b78281df 100644
+--- a/src/zoom.tsx
++++ b/src/zoom.tsx
+@@ -4,6 +4,7 @@ import Animated, {
+ useSharedValue,
+ useAnimatedStyle,
+ useDerivedValue,
++ withDecay,
+ withTiming,
+ cancelAnimation,
+ runOnJS,
+@@ -120,11 +121,22 @@ export function Zoom(props: Props) {
+ }
+ }
+ })
+- .onEnd(() => {
++ .onEnd((event) => {
+ if (isPinching.value || !isZoomed.value) return;
+
+- panTranslateX.value = 0;
+- panTranslateY.value = 0;
++ const maxTranslateX = (viewWidth.value / 2) * scale.value - viewWidth.value / 2;
++ const minTranslateX = -maxTranslateX;
++ translationX.value = withDecay({
++ velocity: event.velocityX,
++ clamp: [minTranslateX, maxTranslateX]
++ });
++
++ const maxTranslateY = (viewHeight.value / 2) * scale.value - viewHeight.value / 2;
++ const minTranslateY = -maxTranslateY;
++ translationY.value = withDecay({
++ velocity: event.velocityY,
++ clamp: [minTranslateY, maxTranslateY]
++ });
+ });
+
+ const pinch = Gesture.Pinch()
diff --git a/ios/tooot/Info.plist b/ios/tooot/Info.plist
@@ -35,6 +35,7 @@
  <array>
  <string>tooot-share</string>
  <string>tooot</string>
+ <string>https</string>
  </array>
  </dict>
  </array>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "tooot",
- "version": "4.9.2",
+ "version": "4.9.3",
  "description": "tooot for Mastodon",
  "author": "xmflsct <[email protected]>",
  "license": "GPL-3.0-or-later",
@@ -114,6 +114,7 @@
  "expo-av@^13.0.2": "patch:expo-av@npm%3A13.0.2#./.yarn/patches/expo-av-npm-13.0.2-7a651776f1.patch",
  "react-native-share-menu@^6.0.0": "patch:react-native-share-menu@npm%3A6.0.0#./.yarn/patches/react-native-share-menu-npm-6.0.0-f1094c3204.patch",
  "@types/react-native-share-menu@^5.0.2": "patch:@types/react-native-share-menu@npm%3A5.0.2#./.yarn/patches/@types-react-native-share-menu-npm-5.0.2-373df17ecc.patch",
- "react-native-ios-context-menu@^1.15.1": "patch:react-native-ios-context-menu@npm%3A1.15.1#./.yarn/patches/react-native-ios-context-menu-npm-1.15.1-0034bfa5ba.patch"
+ "react-native-ios-context-menu@^1.15.1": "patch:react-native-ios-context-menu@npm%3A1.15.1#./.yarn/patches/react-native-ios-context-menu-npm-1.15.1-0034bfa5ba.patch",
+ "react-native-reanimated-zoom@^0.3.3": "patch:react-native-reanimated-zoom@npm%3A0.3.3#./.yarn/patches/react-native-reanimated-zoom-npm-0.3.3-bbb8d84109.patch"
  }
 }
diff --git a/src/components/Timeline/Default.tsx b/src/components/Timeline/Default.tsx
@@ -1,6 +1,3 @@
-import menuInstance from '@components/contextMenu/instance'
-import menuShare from '@components/contextMenu/share'
-import menuStatus from '@components/contextMenu/status'
 import TimelineActioned from '@components/Timeline/Shared/Actioned'
 import TimelineActions from '@components/Timeline/Shared/Actions'
 import TimelineAttachment from '@components/Timeline/Shared/Attachment'
@@ -19,9 +16,8 @@ import { usePreferencesQuery } from '@utils/queryHooks/preferences'
 import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
-import React, { Fragment, useRef, useState } from 'react'
+import React, { useRef, useState } from 'react'
 import { Pressable, StyleProp, View, ViewStyle } from 'react-native'
-import * as ContextMenu from 'zeego/context-menu'
 import StatusContext from './Shared/Context'
 import TimelineFeedback from './Shared/Feedback'
 import TimelineFiltered, { FilteredProps, shouldFilter } from './Shared/Filtered'
@@ -126,15 +122,6 @@ const TimelineDefault: React.FC<Props> = ({
  </>
  )
 
- const mShare = menuShare({
- visibility: status.visibility,
- type: 'status',
- url: status.url || status.uri,
- rawContent
- })
- const mStatus = menuStatus({ status, queryKey })
- const mInstance = menuInstance({ status, queryKey })
-
  if (!isMyAccount) {
  let filterResults: FilteredProps['filterResults'] = []
  const [filterRevealed, setFilterRevealed] = useState(false)
@@ -183,67 +170,14 @@ const TimelineDefault: React.FC<Props> = ({
  <View style={mainStyle}>{main()}</View>
  ) : (
  <>
- <ContextMenu.Root>
- <ContextMenu.Trigger>
- <Pressable
- accessible={highlighted ? false : true}
- style={mainStyle}
- disabled={highlighted}
- onPress={() => navigation.push('Tab-Shared-Toot', { toot: status })}
- onLongPress={() => {}}
- children={main()}
- />
- </ContextMenu.Trigger>
-
- <ContextMenu.Content>
- {[mShare, mStatus, mInstance].map((menu, i) => (
- <Fragment key={i}>
- {menu.map((group, index) => (
- <ContextMenu.Group key={index}>
- {group.map(item => {
- switch (item.type) {
- case 'item':
- return (
- <ContextMenu.Item key={item.key} {...item.props}>
- <ContextMenu.ItemTitle children={item.title} />
- {item.icon ? (
- <ContextMenu.ItemIcon ios={{ name: item.icon }} />
- ) : null}
- </ContextMenu.Item>
- )
- case 'sub':
- return (
- // @ts-ignore
- <ContextMenu.Sub key={item.key}>
- <ContextMenu.SubTrigger
- key={item.trigger.key}
- {...item.trigger.props}
- >
- <ContextMenu.ItemTitle children={item.trigger.title} />
- {item.trigger.icon ? (
- <ContextMenu.ItemIcon ios={{ name: item.trigger.icon }} />
- ) : null}
- </ContextMenu.SubTrigger>
- <ContextMenu.SubContent>
- {item.items.map(sub => (
- <ContextMenu.Item key={sub.key} {...sub.props}>
- <ContextMenu.ItemTitle children={sub.title} />
- {sub.icon ? (
- <ContextMenu.ItemIcon ios={{ name: sub.icon }} />
- ) : null}
- </ContextMenu.Item>
- ))}
- </ContextMenu.SubContent>
- </ContextMenu.Sub>
- )
- }
- })}
- </ContextMenu.Group>
- ))}
- </Fragment>
- ))}
- </ContextMenu.Content>
- </ContextMenu.Root>
+ <Pressable
+ accessible={highlighted ? false : true}
+ style={mainStyle}
+ disabled={highlighted}
+ onPress={() => navigation.push('Tab-Shared-Toot', { toot: status })}
+ onLongPress={() => {}}
+ children={main()}
+ />
  <TimelineHeaderAndroid />
  </>
  )}

diff --git a/src/components/Timeline/Notifications.tsx b/src/components/Timeline/Notifications.tsx
@@ -1,6 +1,3 @@
-import menuInstance from '@components/contextMenu/instance'
-import menuShare from '@components/contextMenu/share'
-import menuStatus from '@components/contextMenu/status'
 import TimelineActioned from '@components/Timeline/Shared/Actioned'
 import TimelineActions from '@components/Timeline/Shared/Actions'
 import TimelineAttachment from '@components/Timeline/Shared/Attachment'
@@ -18,9 +15,8 @@ import { usePreferencesQuery } from '@utils/queryHooks/preferences'
 import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
-import React, { Fragment, useState } from 'react'
+import React, { useState } from 'react'
 import { Pressable, View } from 'react-native'
-import * as ContextMenu from 'zeego/context-menu'
 import StatusContext from './Shared/Context'
 import TimelineFiltered, { FilteredProps, shouldFilter } from './Shared/Filtered'
 import TimelineFullConversation from './Shared/FullConversation'
@@ -100,14 +96,6 @@ const TimelineNotifications: React.FC<Props> = ({ notification, queryKey }) => {
  )
  }
 
- const mShare = menuShare({
- visibility: notification.status?.visibility,
- type: 'status',
- url: notification.status?.url || notification.status?.uri
- })
- const mStatus = menuStatus({ status: notification.status, queryKey })
- const mInstance = menuInstance({ status: notification.status, queryKey })
-
  if (!isMyAccount) {
  let filterResults: FilteredProps['filterResults'] = []
  const [filterRevealed, setFilterRevealed] = useState(false)
@@ -143,67 +131,18 @@ const TimelineNotifications: React.FC<Props> = ({ notification, queryKey }) => {
  spoilerHidden
  }}
  >
- <ContextMenu.Root>
- <ContextMenu.Trigger>
- <Pressable
- style={{
- padding: StyleConstants.Spacing.Global.PagePadding,
- backgroundColor: colors.backgroundDefault,
- paddingBottom: notification.status ? 0 : StyleConstants.Spacing.Global.PagePadding
- }}
- onPress={() =>
- notification.status &&
- navigation.push('Tab-Shared-Toot', { toot: notification.status })
- }
- onLongPress={() => {}}
- children={main()}
- />
- </ContextMenu.Trigger>
-
- <ContextMenu.Content>
- {[mShare, mStatus, mInstance].map((menu, i) => (
- <Fragment key={i}>
- {menu.map((group, index) => (
- <ContextMenu.Group key={index}>
- {group.map(item => {
- switch (item.type) {
- case 'item':
- return (
- <ContextMenu.Item key={item.key} {...item.props}>
- <ContextMenu.ItemTitle children={item.title} />
- {item.icon ? <ContextMenu.ItemIcon ios={{ name: item.icon }} /> : null}
- </ContextMenu.Item>
- )
- case 'sub':
- return (
- // @ts-ignore
- <ContextMenu.Sub key={item.key}>
- <ContextMenu.SubTrigger key={item.trigger.key} {...item.trigger.props}>
- <ContextMenu.ItemTitle children={item.trigger.title} />
- {item.trigger.icon ? (
- <ContextMenu.ItemIcon ios={{ name: item.trigger.icon }} />
- ) : null}
- </ContextMenu.SubTrigger>
- <ContextMenu.SubContent>
- {item.items.map(sub => (
- <ContextMenu.Item key={sub.key} {...sub.props}>
- <ContextMenu.ItemTitle children={sub.title} />
- {sub.icon ? (
- <ContextMenu.ItemIcon ios={{ name: sub.icon }} />
- ) : null}
- </ContextMenu.Item>
- ))}
- </ContextMenu.SubContent>
- </ContextMenu.Sub>
- )
- }
- })}
- </ContextMenu.Group>
- ))}
- </Fragment>
- ))}
- </ContextMenu.Content>
- </ContextMenu.Root>
+ <Pressable
+ style={{
+ padding: StyleConstants.Spacing.Global.PagePadding,
+ backgroundColor: colors.backgroundDefault,
+ paddingBottom: notification.status ? 0 : StyleConstants.Spacing.Global.PagePadding
+ }}
+ onPress={() =>
+ notification.status && navigation.push('Tab-Shared-Toot', { toot: notification.status })
+ }
+ onLongPress={() => {}}
+ children={main()}
+ />
  <TimelineHeaderAndroid />
  </StatusContext.Provider>
  )