diff --git a/fastlane/metadata/en-US/release_notes.txt b/fastlane/metadata/en-US/release_notes.txt index 62516967..87d4f712 100644 --- a/fastlane/metadata/en-US/release_notes.txt +++ b/fastlane/metadata/en-US/release_notes.txt @@ -1,4 +1,5 @@ Enjoy toooting! This version includes following improvements and fixes: +- Auto fetch remote content in conversations! - Allowing adding more context of reports - Option to disable autoplay gif - Hide boosts from users diff --git a/fastlane/metadata/zh-Hans/release_notes.txt b/fastlane/metadata/zh-Hans/release_notes.txt index 8225007b..41ef5bc6 100644 --- a/fastlane/metadata/zh-Hans/release_notes.txt +++ b/fastlane/metadata/zh-Hans/release_notes.txt @@ -1,4 +1,5 @@ toooting愉快!此版本包括以下改进和修复: +- 主动获取对话的远程内容 - 可添加举报细节 - 新增暂停自动播放gif动画选项 - 隐藏用户的转嘟 diff --git a/src/components/Timeline/Shared/HeaderShared/Application.tsx b/src/components/Timeline/Shared/HeaderShared/Application.tsx index 2e021b2f..09d1ddba 100644 --- a/src/components/Timeline/Shared/HeaderShared/Application.tsx +++ b/src/components/Timeline/Shared/HeaderShared/Application.tsx @@ -7,11 +7,11 @@ import { useTranslation } from 'react-i18next' import StatusContext from '../Context' const HeaderSharedApplication: React.FC = () => { - const { status } = useContext(StatusContext) + const { status, isConversation } = useContext(StatusContext) const { colors } = useTheme() const { t } = useTranslation('componentTimeline') - return status?.application?.name && status.application.name !== 'Web' ? ( + return !isConversation && status?.application?.name && status.application.name !== 'Web' ? ( + withoutBoundary + ? prevItem?.poll?.options[index].title + ? diffChars(prevItem?.poll?.options[index].title, option.title) + : undefined + : prevItem?.poll?.options[index].title + ? diffWords(prevItem?.poll?.options[index].title, option.title) + : undefined + ) + : null return ( // @ts-ignore @@ -92,12 +103,28 @@ const ContentView: React.FC<{ paddingTop: StyleConstants.Font.LineHeight.M - StyleConstants.Font.Size.M, marginRight: StyleConstants.Spacing.S }} - name='Circle' + name={item.poll?.multiple ? 'Square' : 'Circle'} size={StyleConstants.Font.Size.M} - color={colors.disabled} + color={ + prevItem?.poll?.multiple !== item.poll?.multiple ? colors.red : colors.disabled + } /> - - + + {changesPoll?.[index]?.length ? ( + changesPoll[index]?.map(({ value, added, removed }, index) => ( + + )) + ) : ( + + )} diff --git a/src/screens/Tabs/Shared/Toot.tsx b/src/screens/Tabs/Shared/Toot.tsx index 60baf80a..3630781e 100644 --- a/src/screens/Tabs/Shared/Toot.tsx +++ b/src/screens/Tabs/Shared/Toot.tsx @@ -368,7 +368,7 @@ const TabSharedToot: React.FC> = ({ }) : null} {/* > = ({ style={{ position: 'absolute', top: 20, left: 4, color: colors.yellow }} /> */}