-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into 62-use-bun-for-the-api
- Loading branch information
Showing
61 changed files
with
4,182 additions
and
3,810 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,35 +1,18 @@ | ||
import React from "react"; | ||
import { Avatar as _Avatar, IAvatarProps } from "native-base"; | ||
import { ImageSourcePropType } from "react-native"; | ||
import { Avatar as _Avatar, AvatarProps } from "@beep/ui"; | ||
import AvatarImage from "../assets/avatarDark.png"; | ||
import { IAvatarBadgeProps } from "native-base/lib/typescript/components/composites/Avatar"; | ||
|
||
interface Props { | ||
interface Props extends AvatarProps { | ||
url: string | null | undefined; | ||
online?: boolean; | ||
badgeSize?: IAvatarBadgeProps["size"]; | ||
} | ||
|
||
export function __Avatar(props: Props & IAvatarProps) { | ||
const { url, online, badgeSize, ...rest } = props; | ||
|
||
const source: ImageSourcePropType = url ? { uri: url } : AvatarImage; | ||
|
||
const key = url ? url : "default"; | ||
export function Avatar(props: Props) { | ||
const { url, ...rest } = props; | ||
|
||
return ( | ||
<_Avatar | ||
_image={{ | ||
defaultSource: AvatarImage, | ||
fallbackSource: AvatarImage, | ||
}} | ||
{...rest} | ||
key={key} | ||
source={source} | ||
> | ||
{online && <_Avatar.Badge size={badgeSize ?? "4"} bg="green.400" />} | ||
<_Avatar circular size="$6" {...rest}> | ||
<_Avatar.Image src={url ?? AvatarImage} defaultSource={AvatarImage} /> | ||
<_Avatar.Fallback bc="red" /> | ||
</_Avatar> | ||
); | ||
} | ||
|
||
export const Avatar = React.memo(__Avatar); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.