π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Open friend cover images in viewer
Anand Baburajanaa8abed79946
diff --git a/web/apps/space/src/pages/app/friends/[spaceId].tsx b/web/apps/space/src/pages/app/friends/[spaceId].tsxindex 9857a9969a..5c94e3d213 100644--- a/web/apps/space/src/pages/app/friends/[spaceId].tsx+++ b/web/apps/space/src/pages/app/friends/[spaceId].tsx@@ -1,3 +1,4 @@+import { spaceDefaultProfilePicPath } from "components/SpaceAvatarImage";import { SpacePageMeta } from "components/SpacePageMeta";import { SpaceRouteFallback } from "components/SpaceRouteFallback";import { useBrowserBackClose } from "hooks/useBrowserBackClose";@@ -19,6 +20,7 @@ import {} from "services/space";import { useSpaceAppState } from "state/spaceAppState";import { profilePostGroupsFromPosts } from "utils/spacePostDisplay";+import { spaceDefaultCoverImagePath } from "utils/spacePostImage";import { friendSpaceIdFromQuery, spaceRoutes } from "utils/spaceRoutes";import { useSpaceRouter } from "utils/spaceRouteTransitions";@@ -52,7 +54,9 @@ const Page: React.FC = () => {const [friendsLoadAttempted, setFriendsLoadAttempted] = useState(false);const [isProfileLoading, setIsProfileLoading] = useState(false);const [isPostsLoading, setIsPostsLoading] = useState(false);- const [isProfilePhotoOpen, setIsProfilePhotoOpen] = useState(false);+ const [openProfileImage, setOpenProfileImage] = useState<+ "avatar" | "cover" | null+ >(null);const [loadedProfileSpaceId, setLoadedProfileSpaceId] = useState<string>();const [loadedPostsSpaceId, setLoadedPostsSpaceId] = useState<string>();const [selectedProfile, setSelectedProfile] = useState(selectedFriend);@@ -80,7 +84,11 @@ const Page: React.FC = () => {? selectedProfile: undefined;const friendAvatarUrl =- currentSelectedProfile?.avatarUrl ?? selectedFriend?.avatarUrl ?? null;+ (currentSelectedProfile+ ? currentSelectedProfile.avatarUrl+ : selectedFriend?.avatarUrl) || spaceDefaultProfilePicPath;+ const friendCoverUrl =+ currentSelectedProfile?.coverUrl || spaceDefaultCoverImagePath;const friendDisplayName =currentSelectedProfile?.fullName.trim() ||selectedFriend?.fullName.trim() ||@@ -89,9 +97,9 @@ const Page: React.FC = () => {"Friend";useBrowserBackClose({- open: isProfilePhotoOpen,- onClose: () => setIsProfilePhotoOpen(false),- stateKey: "space-friend-profile-photo",+ open: Boolean(openProfileImage),+ onClose: () => setOpenProfileImage(null),+ stateKey: "space-friend-profile-image",});useEffect(() => {@@ -256,11 +264,8 @@ const Page: React.FC = () => {}}onBack={goBack}onLoadPostImage={loadCurrentSpacePostAssetURL}- onOpenProfilePhoto={- friendAvatarUrl- ? () => setIsProfilePhotoOpen(true)- : undefined- }+ onOpenProfileCover={() => setOpenProfileImage("cover")}+ onOpenProfilePhoto={() => setOpenProfileImage("avatar")}onReplyToPost={(postSpaceId, postId, text) =>replyToCurrentPost(actorSpaceId, postSpaceId, postId, text)}@@ -269,15 +274,20 @@ const Page: React.FC = () => {}showPostLoadingIndicator={false}/>- {isProfilePhotoOpen && friendAvatarUrl && (+ {openProfileImage && (<><SpacePageMetathemeColor={friendProfileImageViewerBackground}/><FriendProfileImageViewerScreendisplayName={friendDisplayName}- imageUrl={friendAvatarUrl}- onClose={() => setIsProfilePhotoOpen(false)}+ imageUrl={+ openProfileImage == "cover"+ ? friendCoverUrl+ : friendAvatarUrl+ }+ onClose={() => setOpenProfileImage(null)}+ variant={openProfileImage}/></>)}diff --git a/web/apps/space/src/screens/ProfileImageViewerScreen.tsx b/web/apps/space/src/screens/ProfileImageViewerScreen.tsxindex ec7167061d..7e2b02f24c 100644--- a/web/apps/space/src/screens/ProfileImageViewerScreen.tsx+++ b/web/apps/space/src/screens/ProfileImageViewerScreen.tsx@@ -24,11 +24,15 @@ interface FriendProfileImageViewerScreenProps {displayName: string;imageUrl: string;onClose: () => void;+ variant: "avatar" | "cover";}export const FriendProfileImageViewerScreen: React.FC<FriendProfileImageViewerScreenProps-> = ({ displayName, imageUrl, onClose }) => {+> = ({ displayName, imageUrl, onClose, variant }) => {+ const imageDescription =+ variant == "cover" ? "cover image" : "profile picture";+useEffect(() => {const previousOverflow = document.body.style.overflow;document.body.style.overflow = "hidden";@@ -47,7 +51,7 @@ export const FriendProfileImageViewerScreen: React.FC<return (<Boxrole="dialog"- aria-label={`${displayName} profile picture`}+ aria-label={`${displayName} ${imageDescription}`}aria-modal="true"onClick={onClose}sx={{@@ -63,21 +67,27 @@ export const FriendProfileImageViewerScreen: React.FC<><Boxcomponent="img"- alt={`${displayName}'s profile picture`}+ alt={`${displayName}'s ${imageDescription}`}src={imageUrl}onClick={(event) => event.stopPropagation()}sx={{- aspectRatio: "1 / 1",- borderRadius: "50%",+ aspectRatio: variant == "cover" ? undefined : "1 / 1",+ borderRadius: variant == "cover" ? 0 : "50%",display: "block",+ maxHeight:+ variant == "cover" ? "calc(100svh - 112px)" : undefined,+ maxWidth: variant == "cover" ? "100vw" : undefined,objectFit: "cover",- width: "min(calc(100vw - 48px), calc(100svh - 112px), 512px)",+ width:+ variant == "cover"+ ? "auto"+ : "min(calc(100vw - 48px), calc(100svh - 112px), 512px)",}}/><Boxcomponent="button"type="button"- aria-label="Close profile picture"+ aria-label={`Close ${imageDescription}`}autoFocusonClick={(event) => {event.stopPropagation();diff --git a/web/apps/space/src/screens/ProfileScreen.tsx b/web/apps/space/src/screens/ProfileScreen.tsxindex 98f4dfb2ae..08d9f5d554 100644--- a/web/apps/space/src/screens/ProfileScreen.tsx+++ b/web/apps/space/src/screens/ProfileScreen.tsx@@ -620,7 +620,7 @@ export const ProfileScreen: React.FC<ProfileScreenProps> = ({0,);const canOpenFriends = isOwnerProfile && Boolean(onOpenFriends);- const canOpenProfileCover = isOwnerProfile && Boolean(onOpenProfileCover);+ const canOpenProfileCover = Boolean(onOpenProfileCover);const canOpenProfilePhoto = Boolean(onOpenProfilePhoto);const hasProfilePosts = postsSharedCount > 0;const shouldShowPostLoadingIndicator =