Merge branch 'main' into candidate

fastlane/metadata/en-US/release_notes.txt

@@ -1 +1,4 @@
 Enjoy toooting! This version includes following improvements and fixes:
+- Supports mute duration
+- Long press to copy toot
+- Button to fetch latest on load

fastlane/metadata/zh-Hans/release_notes.txt

@@ -1,2 +1,5 @@
 tooot-ing愉快！此版本包括以下改进和修复：
-- 新增neodb.social演出卡片
+- 新增neodb.social演出卡片
+- 支持选择隐藏用户时限
+- 长按复制嘟文
+- 新增获取最新嘟文按钮

src/components/Header/Right.tsx

@@ -17,6 +17,7 @@ export type Props = {
  loading?: boolean
  disabled?: boolean
  destructive?: boolean
+ destructiveColor?: string
 
  onPress: () => void
 } & ({ type?: undefined; content: IconName } | { type: 'text'; content: string })
@@ -34,6 +35,7 @@ const HeaderRight: React.FC<Props> = ({
  loading,
  disabled,
  destructive = false,
+ destructiveColor,
  onPress
 }) => {
  const { colors } = useTheme()
@@ -57,7 +59,7 @@ const HeaderRight: React.FC<Props> = ({
  color: disabled
  ? colors.secondary
  : destructive
- ? colors.red
+ ? destructiveColor || colors.red
  : colors.primaryDefault,
  opacity: loading ? 0 : 1
  }}

src/components/Timeline/Shared/Content.tsx

@@ -36,6 +36,7 @@ const TimelineContent: React.FC<Props> = ({ notificationOwnToot = false, setSpoi
  adaptiveSize
  numberOfLines={999}
  color={suppressSpoiler ? colors.disabled : undefined}
+ selectable
  />
  {inThread ? (
  <CustomText
@@ -62,6 +63,7 @@ const TimelineContent: React.FC<Props> = ({ notificationOwnToot = false, setSpoi
  }
  expandHint={t('shared.content.expandHint')}
  setSpoilerExpanded={setSpoilerExpanded}
+ selectable
  />
  </>
  ) : (
@@ -70,6 +72,7 @@ const TimelineContent: React.FC<Props> = ({ notificationOwnToot = false, setSpoi
  size={highlighted ? 'L' : 'M'}
  adaptiveSize
  numberOfLines={highlighted || inThread ? 999 : notificationOwnToot ? 2 : undefined}
+ selectable
  />
  )}
  </View>

src/components/Timeline/index.tsx

@@ -1,3 +1,4 @@
+import Icon from '@components/Icon'
 import ComponentSeparator from '@components/Separator'
 import CustomText from '@components/Text'
 import TimelineDefault from '@components/Timeline/Default'
@@ -10,12 +11,20 @@ import {
  setAccountStorage,
  useGlobalStorageListener
 } from '@utils/storage/actions'
-import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
+import { StyleConstants } from '@utils/styles/constants'
 import { throttle } from 'lodash'
 import React, { RefObject, useCallback, useEffect, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { FlatList, FlatListProps, Platform, RefreshControl } from 'react-native'
+import {
+ FlatList,
+ FlatListProps,
+ Platform,
+ Pressable,
+ RefreshControl,
+ StyleProp,
+ ViewStyle
+} from 'react-native'
 import Animated, {
  Easing,
  runOnJS,
@@ -127,6 +136,20 @@ const Timeline: React.FC<Props> = ({
  transform: [{ translateY: fetchedNoticeTop.value }]
  }))
 
+ const refetchedNoticeAnimate = useAnimatedStyle(() => ({
+ transform: [
+ {
+ translateY: withSequence(
+ withTiming(0),
+ withDelay(
+ 3000,
+ withTiming(fetchedNoticeHeight.value + 32, { easing: Easing.out(Easing.ease) })
+ )
+ )
+ }
+ ]
+ }))
+
  const scrollY = useSharedValue(0)
  const fetchingType = useSharedValue<0 | 1 | 2>(0)
 
@@ -169,10 +192,9 @@ const Timeline: React.FC<Props> = ({
  throttle(() => {
  if (readMarker) {
  const currentMarker = getAccountStorage.string(readMarker) || '0'
+ // setAccountStorage([{ key: readMarker, value: '108425743226508521' }])
  if (latestMarker.current > currentMarker) {
  setAccountStorage([{ key: readMarker, value: latestMarker.current }])
- } else {
- // setAccountStorage([{ key: readMarker, value: '105250709762254246' }])
  }
  }
  }, 1000 * 15),
@@ -242,6 +264,18 @@ const Timeline: React.FC<Props> = ({
  flRef.current?.scrollToOffset({ offset: 0, animated: false })
  )
 
+ const noticeDefaults: StyleProp<Animated.AnimateStyle<StyleProp<ViewStyle>>> = {
+ position: 'absolute',
+ alignSelf: 'center',
+ borderRadius: 99,
+ justifyContent: 'center',
+ alignItems: 'center',
+ backgroundColor: colors.backgroundDefault,
+ shadowColor: colors.primaryDefault,
+ shadowOffset: { width: 0, height: 0 },
+ shadowOpacity: theme === 'light' ? 0.16 : 0.24
+ }
+
  return (
  <>
  <TimelineRefresh
@@ -286,42 +320,78 @@ const Timeline: React.FC<Props> = ({
  {...customProps}
  />
  {!disableRefresh ? (
- <Animated.View
- style={[
- {
- position: 'absolute',
- alignSelf: 'center',
- top: -fetchedNoticeHeight.value - 16,
- paddingVertical: StyleConstants.Spacing.S,
- paddingHorizontal: StyleConstants.Spacing.M,
- backgroundColor: colors.backgroundDefault,
- shadowColor: colors.primaryDefault,
- shadowOffset: { width: 0, height: 0 },
- shadowOpacity: theme === 'light' ? 0.16 : 0.24,
- borderRadius: 99,
- justifyContent: 'center',
- alignItems: 'center'
- },
- fetchedNoticeAnimate
- ]}
- onLayout={({
- nativeEvent: {
- layout: { height }
- }
- }) => (fetchedNoticeHeight.value = height)}
- >
- <CustomText
- fontStyle='S'
- style={{ color: colors.primaryDefault }}
- children={
- fetchedCount !== null
- ? fetchedCount > 0
- ? t('refresh.fetched.found', { count: fetchedCount })
- : t('refresh.fetched.none')
- : t('refresh.fetching')
- }
- />
- </Animated.View>
+ <>
+ <Animated.View
+ style={[
+ {
+ top: -fetchedNoticeHeight.value - 16,
+ paddingVertical: StyleConstants.Spacing.S,
+ paddingHorizontal: StyleConstants.Spacing.M,
+ ...noticeDefaults
+ },
+ fetchedNoticeAnimate
+ ]}
+ onLayout={({
+ nativeEvent: {
+ layout: { height }
+ }
+ }) => (fetchedNoticeHeight.value = height)}
+ >
+ <CustomText
+ fontStyle='S'
+ style={{ color: colors.primaryDefault }}
+ children={
+ fetchedCount !== null
+ ? fetchedCount > 0
+ ? t('refresh.fetched.found', { count: fetchedCount })
+ : t('refresh.fetched.none')
+ : t('refresh.fetching')
+ }
+ />
+ </Animated.View>
+ {readMarker ? (
+ <Animated.View
+ style={[
+ {
+ bottom: 16,
+ borderColor: colors.primaryDefault,
+ borderWidth: 0.5,
+ ...noticeDefaults
+ },
+ refetchedNoticeAnimate
+ ]}
+ >
+ <Pressable
+ style={{
+ flexDirection: 'row',
+ alignItems: 'center',
+ gap: StyleConstants.Spacing.S,
+ paddingVertical: StyleConstants.Spacing.S,
+ paddingHorizontal: StyleConstants.Spacing.M
+ }}
+ onPress={async () => {
+ if (readMarker) {
+ setAccountStorage([{ key: readMarker, value: undefined }])
+ }
+ await refetch()
+ setTimeout(() => flRef.current?.scrollToOffset({ offset: 0 }), 50)
+ }}
+ >
+ <CustomText
+ fontStyle='M'
+ style={{ color: colors.primaryDefault }}
+ children={t('refresh.refetch')}
+ />
+ <Icon
+ name='log-in'
+ color={colors.primaryDefault}
+ size={StyleConstants.Font.Size.M}
+ style={{ transform: [{ rotate: '-90deg' }] }}
+ />
+ </Pressable>
+ </Animated.View>
+ ) : null}
+ </>
  ) : null}
  </>
  )

src/components/contextMenu/account.ts

@@ -4,6 +4,7 @@ import { useNavigation } from '@react-navigation/native'
 import { NativeStackNavigationProp } from '@react-navigation/native-stack'
 import { useQueryClient } from '@tanstack/react-query'
 import apiInstance from '@utils/api/instance'
+import { featureCheck } from '@utils/helpers/featureCheck'
 import { checkIsMyAccount } from '@utils/helpers/isMyAccount'
 import { TabSharedStackParamList, useNavState } from '@utils/navigation/navigators'
 import { useAccountQuery } from '@utils/queryHooks/account'
@@ -203,13 +204,21 @@ const menuAccount = ({
  type: 'item',
  key: 'account-mute',
  props: {
- onSelect: () =>
- actualAccount &&
- timelineMutation.mutate({
- type: 'updateAccountProperty',
- id: actualAccount.id,
- payload: { property: 'mute', currentValue: data?.muting }
- }),
+ onSelect: () => {
+ if (actualAccount) {
+ if (data?.muting !== true) {
+ if (featureCheck('mute_duration')) {
+ navigation.navigate('Tab-Shared-Mute', { account: actualAccount })
+ }
+ }
+
+ timelineMutation.mutate({
+ type: 'updateAccountProperty',
+ id: actualAccount.id,
+ payload: { property: 'mute', currentValue: data?.muting }
+ })
+ }
+ },
  disabled: Platform.OS !== 'android' ? !data || !isFetched : false,
  destructive: false,
  hidden: false

src/i18n/en/screens/tabs.json

@@ -417,6 +417,20 @@
  "history": {
  "name": "Edit History"
  },
+ "mute": {
+ "name": "Mute {{acct}}",
+ "mute": "Mute",
+ "description": "Hide posts from this user and posts mentioning them, but it will still allow them to see your posts and follow you.",
+ "notification": "Also hide notifications from this user",
+ "duration": {
+ "heading": "For duration",
+ "0": "Indefinitely",
+ "1800": "30 minutes",
+ "3600": "1 hour",
+ "86400": "1 day",
+ "604800": "1 week"
+ }
+ },
  "report": {
  "name": "Report {{acct}}",
  "report": "Report",