diff --git a/fastlane/metadata/en-US/release_notes.txt b/fastlane/metadata/en-US/release_notes.txt index 9875bbd6..eae9e30e 100644 --- a/fastlane/metadata/en-US/release_notes.txt +++ b/fastlane/metadata/en-US/release_notes.txt @@ -1,3 +1,4 @@ Enjoy toooting! This version includes following improvements and fixes: - Align filter experience with v4.0 and above - Supports enlarging user's avatar and banner +- Fix iPad weird sizing (not optimisation) diff --git a/fastlane/metadata/zh-Hans/release_notes.txt b/fastlane/metadata/zh-Hans/release_notes.txt index d10d84f2..1655a23d 100644 --- a/fastlane/metadata/zh-Hans/release_notes.txt +++ b/fastlane/metadata/zh-Hans/release_notes.txt @@ -1,3 +1,4 @@ toooting愉快!此版本包括以下改进和修复: - 改进过滤体验,与v4.0以上版本一致 - 支持查看用户的头像和横幅图片 +- 修复iPad部分尺寸问题(非优化) diff --git a/src/screens/Actions.tsx b/src/screens/Actions.tsx index 0a8b3c3a..966b6426 100644 --- a/src/screens/Actions.tsx +++ b/src/screens/Actions.tsx @@ -24,7 +24,7 @@ const ScreenActions = ({ const insets = useSafeAreaInsets() const DEFAULT_VALUE = 350 - const screenHeight = Dimensions.get('screen').height + const screenHeight = Dimensions.get('window').height const panY = useSharedValue(DEFAULT_VALUE) useEffect(() => { panY.value = withTiming(0) diff --git a/src/screens/Announcements.tsx b/src/screens/Announcements.tsx index 01afb295..a2fe1b42 100644 --- a/src/screens/Announcements.tsx +++ b/src/screens/Announcements.tsx @@ -61,7 +61,7 @@ const ScreenAnnouncements: React.FC return ( ['route']['params']['imageUrls'][0] }) => { - const screenRatio = SCREEN_WIDTH / SCREEN_HEIGHT + const screenRatio = WINDOW_WIDTH / WINDOW_HEIGHT const imageRatio = item.width && item.height ? item.width / item.height : 1 const imageWidth = item.width || 100 const imageHeight = item.height || 100 - const maxWidthScale = item.width ? (item.width / SCREEN_WIDTH / PixelRatio.get()) * 4 : 0 - const maxHeightScale = item.height ? (item.height / SCREEN_WIDTH / PixelRatio.get()) * 4 : 0 + const maxWidthScale = item.width ? (item.width / WINDOW_WIDTH / PixelRatio.get()) * 4 : 0 + const maxHeightScale = item.height ? (item.height / WINDOW_WIDTH / PixelRatio.get()) * 4 : 0 const max = Math.max.apply(Math, [maxWidthScale, maxHeightScale, 4]) return ( @@ -109,8 +109,8 @@ const ScreenImagesViewer = ({ children={ imageRatio - ? (SCREEN_HEIGHT / imageHeight) * imageWidth - : SCREEN_WIDTH, + ? (WINDOW_HEIGHT / imageHeight) * imageWidth + : WINDOW_WIDTH, height: screenRatio > imageRatio - ? SCREEN_HEIGHT - : (SCREEN_WIDTH / imageWidth) * imageHeight + ? WINDOW_HEIGHT + : (WINDOW_WIDTH / imageWidth) * imageHeight }} /> @@ -217,8 +217,8 @@ const ScreenImagesViewer = ({ }} initialScrollIndex={initialIndex} getItemLayout={(_, index) => ({ - length: SCREEN_WIDTH, - offset: SCREEN_WIDTH * index, + length: WINDOW_WIDTH, + offset: WINDOW_WIDTH * index, index })} /> diff --git a/src/screens/Tabs/Public/Root.tsx b/src/screens/Tabs/Public/Root.tsx index c1c07284..aaf0153f 100644 --- a/src/screens/Tabs/Public/Root.tsx +++ b/src/screens/Tabs/Public/Root.tsx @@ -88,7 +88,7 @@ const Root: React.FC null} onIndexChange={index => setSegment(index)} navigationState={{ index: segment, routes }} - initialLayout={{ width: Dimensions.get('screen').width }} + initialLayout={{ width: Dimensions.get('window').width }} /> ) } diff --git a/src/screens/Tabs/Shared/Account/Attachments.tsx b/src/screens/Tabs/Shared/Account/Attachments.tsx index 64a98782..b26bf7ad 100644 --- a/src/screens/Tabs/Shared/Account/Attachments.tsx +++ b/src/screens/Tabs/Shared/Account/Attachments.tsx @@ -23,7 +23,7 @@ const AccountAttachments: React.FC = ({ account }) => { const DISPLAY_AMOUNT = 6 - const width = (Dimensions.get('screen').width - StyleConstants.Spacing.Global.PagePadding * 2) / 4 + const width = (Dimensions.get('window').width - StyleConstants.Spacing.Global.PagePadding * 2) / 4 const queryKeyParams: QueryKeyTimeline[1] = { page: 'Account', diff --git a/src/screens/Tabs/Shared/Account/Header.tsx b/src/screens/Tabs/Shared/Account/Header.tsx index 11513fc0..036ad855 100644 --- a/src/screens/Tabs/Shared/Account/Header.tsx +++ b/src/screens/Tabs/Shared/Account/Header.tsx @@ -34,7 +34,7 @@ const AccountHeader: React.FC = ({ account }) => { diff --git a/src/screens/Tabs/Shared/Account/Nav.tsx b/src/screens/Tabs/Shared/Account/Nav.tsx index 645e6b03..5282190c 100644 --- a/src/screens/Tabs/Shared/Account/Nav.tsx +++ b/src/screens/Tabs/Shared/Account/Nav.tsx @@ -4,11 +4,7 @@ import { StyleConstants } from '@utils/styles/constants' import { useTheme } from '@utils/styles/ThemeManager' import React from 'react' import { Dimensions, StyleSheet, View } from 'react-native' -import Animated, { - Extrapolate, - interpolate, - useAnimatedStyle -} from 'react-native-reanimated' +import Animated, { Extrapolate, interpolate, useAnimatedStyle } from 'react-native-reanimated' import { useSafeAreaInsets } from 'react-native-safe-area-context' export interface Props { @@ -22,7 +18,7 @@ const AccountNav = React.memo( const headerHeight = useSafeAreaInsets().top + 44 const nameY = - Dimensions.get('screen').width / 3 + + Dimensions.get('window').width / 3 + StyleConstants.Avatar.L - StyleConstants.Spacing.Global.PagePadding * 2 + StyleConstants.Spacing.M - @@ -35,12 +31,7 @@ const AccountNav = React.memo( }) const styleMarginTop = useAnimatedStyle(() => { return { - marginTop: interpolate( - scrollY.value, - [nameY, nameY + 20], - [50, 0], - Extrapolate.CLAMP - ) + marginTop: interpolate(scrollY.value, [nameY, nameY + 20], [50, 0], Extrapolate.CLAMP) } }) @@ -61,8 +52,7 @@ const AccountNav = React.memo( flex: 1, alignItems: 'center', overflow: 'hidden', - marginTop: - useSafeAreaInsets().top + (44 - StyleConstants.Font.Size.L) / 2 + marginTop: useSafeAreaInsets().top + (44 - StyleConstants.Font.Size.L) / 2 }} >