diff --git a/src/view/com/util/UserAvatar.tsx b/src/view/com/util/UserAvatar.tsx index 8a9e51a33..cb0eb7b71 100644 --- a/src/view/com/util/UserAvatar.tsx +++ b/src/view/com/util/UserAvatar.tsx @@ -444,7 +444,7 @@ let EditableUserAvatar = ({ 0), }} accessibilityRole="image" /> ) : ( @@ -619,7 +619,7 @@ export {PreviewableUserAvatar} // -prf function hackModifyThumbnailPath(uri: string, isEnabled: boolean): string { return isEnabled - ? uri.replace('/img/avatar/plain/', '/img/avatar_thumbnail/plain/') + ? uri.replace('https://cdn.web.syu.is/img/avatar/plain/', 'https://bsky.syu.is/img/avatar/plain/') : uri } diff --git a/src/view/icons/Logo.tsx b/src/view/icons/Logo.tsx index d7208df13..b711f71c7 100644 --- a/src/view/icons/Logo.tsx +++ b/src/view/icons/Logo.tsx @@ -1,75 +1,17 @@ import React from 'react' -import {type TextProps} from 'react-native' -import Svg, { - Defs, - LinearGradient, - Path, - type PathProps, - Stop, - type SvgProps, -} from 'react-native-svg' import {Image} from 'expo-image' +import {flatten} from '#/alf' -import {useKawaiiMode} from '#/state/preferences/kawaii' -import {flatten, useTheme} from '#/alf' - -const ratio = 57 / 64 - -type Props = { - fill?: PathProps['fill'] - style?: TextProps['style'] -} & Omit - -export const Logo = React.forwardRef(function LogoImpl(props: Props, ref) { - const t = useTheme() - const {fill, ...rest} = props - const gradient = fill === 'sky' - const styles = flatten(props.style) - const _fill = gradient - ? 'url(#sky)' - : fill || styles?.color || t.palette.primary_500 - // @ts-ignore it's fiiiiine - const size = parseInt(rest.width || 32, 10) - - const isKawaii = useKawaiiMode() - - if (isKawaii) { - return ( - 100 - ? require('../../../assets/kawaii.png') - : require('../../../assets/kawaii_smol.png') - } - accessibilityLabel="Bluesky" - accessibilityHint="" - accessibilityIgnoresInvertColors - style={[{height: size, aspectRatio: 1.4}]} - /> - ) - } - +export const Logo = React.forwardRef(function LogoImpl(props: any, ref) { + const {width, style} = props + // @ts-ignore + const size = parseInt(width || 32, 10) return ( - - {gradient && ( - - - - - - - )} - - - + ) }) diff --git a/src/view/icons/Logotype.tsx b/src/view/icons/Logotype.tsx index 270c913fc..a60ffe07c 100644 --- a/src/view/icons/Logotype.tsx +++ b/src/view/icons/Logotype.tsx @@ -1,28 +1,22 @@ -import Svg, {Path, type PathProps, type SvgProps} from 'react-native-svg' - -import {usePalette} from '#/lib/hooks/usePalette' - -const ratio = 17 / 64 - -export function Logotype({ - fill, - ...rest -}: {fill?: PathProps['fill']} & SvgProps) { - const pal = usePalette('default') - // @ts-ignore it's fiiiiine - const size = parseInt(rest.width || 32) +import React from 'react' +import {Text} from 'react-native' +import {useTheme, atoms as a} from '#/alf' +export function Logotype({width, fill, style}: any) { + const t = useTheme() + const fontSize = width ? parseInt(width) / 3.5 : 22 + return ( - - - + + Aiat + ) } diff --git a/src/Splash.tsx b/src/Splash.tsx index 47e70b375..616f351ed 100644 --- a/src/Splash.tsx +++ b/src/Splash.tsx @@ -15,8 +15,8 @@ import Animated, { withTiming, } from 'react-native-reanimated' import {useSafeAreaInsets} from 'react-native-safe-area-context' -import Svg, {Path, type SvgProps} from 'react-native-svg' import {Image} from 'expo-image' +import {type SvgProps} from 'react-native-svg' import * as SplashScreen from 'expo-splash-screen' import {Logotype} from '#/view/icons/Logotype' @@ -29,21 +29,18 @@ const darkSplashImageUri = RNImage.resolveAssetSource( darkSplashImagePointer, ).uri -export const Logo = React.forwardRef(function LogoImpl(props: SvgProps, ref) { - const width = 1000 - const height = width * (67 / 64) +export const Logo = React.forwardRef(function LogoImpl(props: SvgProps & {fill?: string}, ref) { + const size = 1000 + // @ts-ignore return ( - - - + source={require('../assets/logo.png')} + style={[{width: size, height: size}, props.style]} + contentFit="contain" + accessibilityLabel="Logo" + /> ) })