type fixes

This commit is contained in:
Hailey
2025-05-05 08:54:08 -07:00
parent d36837dcf0
commit 29863ca89d
12 changed files with 58 additions and 64 deletions
+3 -3
View File
@@ -8,7 +8,6 @@ import {
TouchableOpacity,
View,
} from 'react-native'
import {type Image as RNImage} from 'react-native-image-crop-picker'
import {LinearGradient} from 'expo-linear-gradient'
import {type AppBskyGraphDefs, RichText as RichTextAPI} from '@atproto/api'
import {msg, Trans} from '@lingui/macro'
@@ -17,6 +16,7 @@ import {useLingui} from '@lingui/react'
import {usePalette} from '#/lib/hooks/usePalette'
import {useWebMediaQueries} from '#/lib/hooks/useWebMediaQueries'
import {compressIfNeeded} from '#/lib/media/manip'
import {type PickerImage} from '#/lib/media/picker.shared'
import {cleanError, isNetworkError} from '#/lib/strings/errors'
import {enforceLen} from '#/lib/strings/helpers'
import {richTextToString} from '#/lib/strings/rich-text-helpers'
@@ -95,7 +95,7 @@ export function Component({
const isDescriptionOver = graphemeLength > MAX_DESCRIPTION
const [avatar, setAvatar] = useState<string | undefined>(list?.avatar)
const [newAvatar, setNewAvatar] = useState<RNImage | undefined | null>()
const [newAvatar, setNewAvatar] = useState<PickerImage | undefined | null>()
const onDescriptionChange = useCallback(
(newText: string) => {
@@ -112,7 +112,7 @@ export function Component({
}, [closeModal])
const onSelectNewAvatar = useCallback(
async (img: RNImage | null) => {
async (img: PickerImage | null) => {
if (!img) {
setNewAvatar(null)
setAvatar(undefined)
+3 -3
View File
@@ -1,14 +1,14 @@
import React from 'react'
import {StyleSheet, TouchableOpacity, View} from 'react-native'
import {Image as RNImage} from 'react-native-image-crop-picker'
import {manipulateAsync, SaveFormat} from 'expo-image-manipulator'
import {LinearGradient} from 'expo-linear-gradient'
import {msg, Trans} from '@lingui/macro'
import {useLingui} from '@lingui/react'
import ReactCrop, {PercentCrop} from 'react-image-crop'
import ReactCrop, {type PercentCrop} from 'react-image-crop'
import {usePalette} from '#/lib/hooks/usePalette'
import {useWebMediaQueries} from '#/lib/hooks/useWebMediaQueries'
import {type PickerImage} from '#/lib/media/picker.shared'
import {getDataUriSize} from '#/lib/media/util'
import {gradients, s} from '#/lib/styles'
import {useModalControls} from '#/state/modals'
@@ -25,7 +25,7 @@ export function Component({
uri: string
aspect?: number
circular?: boolean
onSelect: (img?: RNImage) => void
onSelect: (img?: PickerImage) => void
}) {
const pal = usePalette('default')
const {_} = useLingui()
+5 -5
View File
@@ -8,7 +8,6 @@ import {
TouchableOpacity,
View,
} from 'react-native'
import {type Image as RNImage} from 'react-native-image-crop-picker'
import Animated, {FadeOut} from 'react-native-reanimated'
import {LinearGradient} from 'expo-linear-gradient'
import {type AppBskyActorDefs} from '@atproto/api'
@@ -18,6 +17,7 @@ import {useLingui} from '@lingui/react'
import {MAX_DESCRIPTION, MAX_DISPLAY_NAME, urls} from '#/lib/constants'
import {usePalette} from '#/lib/hooks/usePalette'
import {compressIfNeeded} from '#/lib/media/manip'
import {type PickerImage} from '#/lib/media/picker.shared'
import {cleanError} from '#/lib/strings/errors'
import {enforceLen} from '#/lib/strings/helpers'
import {colors, gradients, s} from '#/lib/styles'
@@ -67,16 +67,16 @@ export function Component({
profile.avatar,
)
const [newUserBanner, setNewUserBanner] = useState<
RNImage | undefined | null
PickerImage | undefined | null
>()
const [newUserAvatar, setNewUserAvatar] = useState<
RNImage | undefined | null
PickerImage | undefined | null
>()
const onPressCancel = () => {
closeModal()
}
const onSelectNewAvatar = useCallback(
async (img: RNImage | null) => {
async (img: PickerImage | null) => {
setImageError('')
if (img === null) {
setNewUserAvatar(null)
@@ -95,7 +95,7 @@ export function Component({
)
const onSelectNewBanner = useCallback(
async (img: RNImage | null) => {
async (img: PickerImage | null) => {
setImageError('')
if (!img) {
setNewUserBanner(null)
+6 -6
View File
@@ -2,13 +2,13 @@ import React, {memo, useMemo} from 'react'
import {
Image,
Pressable,
StyleProp,
type StyleProp,
StyleSheet,
View,
ViewStyle,
type ViewStyle,
} from 'react-native'
import Svg, {Circle, Path, Rect} from 'react-native-svg'
import {ModerationUI} from '@atproto/api'
import {type ModerationUI} from '@atproto/api'
import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
import {msg, Trans} from '@lingui/macro'
import {useLingui} from '@lingui/react'
@@ -37,12 +37,12 @@ import {Link} from '#/components/Link'
import {MediaInsetBorder} from '#/components/MediaInsetBorder'
import * as Menu from '#/components/Menu'
import {ProfileHoverCard} from '#/components/ProfileHoverCard'
import * as bsky from '#/types/bsky'
import type * as bsky from '#/types/bsky'
import {
openCamera,
openCropper,
openPicker,
RNImage,
type RNImage,
} from '../../../lib/media/picker'
export type UserAvatarType = 'user' | 'algo' | 'list' | 'labeler'
@@ -346,7 +346,7 @@ let EditableUserAvatar = ({
})
onSelectNewAvatar(croppedImage)
},
isIOS ? 500 : 0,
isIOS ? 500 : 500,
)
} catch (e: any) {
// Don't log errors for cancelling selection to sentry on ios or android