From 4725287554aa4fa28822bf203132ebc7165935ab Mon Sep 17 00:00:00 2001 From: xmflsct Date: Fri, 16 Dec 2022 17:00:07 +0100 Subject: [PATCH] Remove conversation levels for now as it doesn't work well yet --- fastlane/metadata/en-US/release_notes.txt | 1 - fastlane/metadata/zh-Hans/release_notes.txt | 1 - src/screens/Tabs/Shared/Toot.tsx | 165 ++++++++++---------- 3 files changed, 86 insertions(+), 81 deletions(-) diff --git a/fastlane/metadata/en-US/release_notes.txt b/fastlane/metadata/en-US/release_notes.txt index f67b4080..ca79b784 100644 --- a/fastlane/metadata/en-US/release_notes.txt +++ b/fastlane/metadata/en-US/release_notes.txt @@ -6,6 +6,5 @@ Enjoy toooting! This version includes following improvements and fixes: - Allow hiding boosts and replies in home timeline - Support toot in RTL languages - Added notification for admins -- Pilot conversation hierarchy - Fix whole word filter matching - Fix tablet cannot delete toot drafts diff --git a/fastlane/metadata/zh-Hans/release_notes.txt b/fastlane/metadata/zh-Hans/release_notes.txt index 3866a80a..35846c68 100644 --- a/fastlane/metadata/zh-Hans/release_notes.txt +++ b/fastlane/metadata/zh-Hans/release_notes.txt @@ -6,6 +6,5 @@ toooting愉快！此版本包括以下改进和修复： - 关注列表可隐藏转嘟和回复 - 新增管理员推送通知 - 支持嘟文右到左文字 -- 测试显示对话层级 - 修复过滤整词功能 - 修复平板不能删除草稿 diff --git a/src/screens/Tabs/Shared/Toot.tsx b/src/screens/Tabs/Shared/Toot.tsx index a3ba3e89..38d24107 100644 --- a/src/screens/Tabs/Shared/Toot.tsx +++ b/src/screens/Tabs/Shared/Toot.tsx @@ -5,10 +5,8 @@ import { TabSharedStackScreenProps } from '@utils/navigation/navigators' import { QueryKeyTimeline } from '@utils/queryHooks/timeline' import React, { useEffect, useRef, useState } from 'react' import { useTranslation } from 'react-i18next' -import { FlatList, View } from 'react-native' +import { FlatList } from 'react-native' import { InfiniteQueryObserver, useQueryClient } from '@tanstack/react-query' -import { StyleConstants } from '@utils/styles/constants' -import { useTheme } from '@utils/styles/ThemeManager' const TabSharedToot: React.FC> = ({ navigation, @@ -16,7 +14,6 @@ const TabSharedToot: React.FC> = ({ params: { toot, rootQueryKey } } }) => { - const { colors } = useTheme() const { t } = useTranslation('screenTabs') useEffect(() => { @@ -101,84 +98,94 @@ const TabSharedToot: React.FC> = ({ queryKey={queryKey} queryOptions={{ staleTime: 0, refetchOnMount: true }} customProps={{ - renderItem: ({ item, index }) => { - const levels = { - previous: - replyLevels.current.find( - reply => reply.id === data.current?.[index - 1]?.in_reply_to_id - )?.level || 0, - current: - replyLevels.current.find(reply => reply.id === item.in_reply_to_id)?.level || 0, - next: - replyLevels.current.find( - reply => reply.id === data.current?.[index + 1]?.in_reply_to_id - )?.level || 0 - } - + renderItem: ({ item }) => { return ( - <> - - {Array.from(Array(levels.current)).map((_, i) => { - if (index < highlightIndex.current) return null - if ( - levels.previous + 1 === levels.current || - (levels.previous && levels.current && levels.previous === levels.current) - ) { - return ( - - ) - } else { - return null - } - })} - {Array.from(Array(levels.next)).map((_, i) => { - if (index < highlightIndex.current) return null - if ( - levels.current + 1 === levels.next || - (levels.current && levels.next && levels.current === levels.next) - ) { - return ( - i + 1 - ? StyleConstants.Spacing.Global.PagePadding + StyleConstants.Avatar.XS - : StyleConstants.Spacing.Global.PagePadding, - left: StyleConstants.Spacing.Global.PagePadding / 2 + 8 * i, - height: 200, - borderLeftColor: colors.border, - borderLeftWidth: 1 - }} - /> - ) - } else { - return null - } - })} - + ) }, + // renderItem: ({ item, index }) => { + // const levels = { + // previous: + // replyLevels.current.find( + // reply => reply.id === data.current?.[index - 1]?.in_reply_to_id + // )?.level || 0, + // current: + // replyLevels.current.find(reply => reply.id === item.in_reply_to_id)?.level || 0, + // next: + // replyLevels.current.find( + // reply => reply.id === data.current?.[index + 1]?.in_reply_to_id + // )?.level || 0 + // } + + // return ( + // <> + // + // {Array.from(Array(levels.current)).map((_, i) => { + // if (index < highlightIndex.current) return null + // if ( + // levels.previous + 1 === levels.current || + // (levels.previous && levels.current && levels.previous === levels.current) + // ) { + // return ( + // + // ) + // } else { + // return null + // } + // })} + // {Array.from(Array(levels.next)).map((_, i) => { + // if (index < highlightIndex.current) return null + // if ( + // levels.current + 1 === levels.next || + // (levels.current && levels.next && levels.current === levels.next) + // ) { + // return ( + // i + 1 + // ? StyleConstants.Spacing.Global.PagePadding + StyleConstants.Avatar.XS + // : StyleConstants.Spacing.Global.PagePadding, + // left: StyleConstants.Spacing.Global.PagePadding / 2 + 8 * i, + // height: 200, + // borderLeftColor: colors.border, + // borderLeftWidth: 1 + // }} + // /> + // ) + // } else { + // return null + // } + // })} + // + // ) + // }, onScrollToIndexFailed: error => { const offset = error.averageItemLength * error.index flRef.current?.scrollToOffset({ offset })