π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Refine Space home tiles and settings navigation
Anand Baburajancbe3bce159a9
diff --git a/web/apps/space/src/components/AddFriendTile.tsx b/web/apps/space/src/components/AddFriendTile.tsxindex 833cd3f9bc..3e817ae014 100644--- a/web/apps/space/src/components/AddFriendTile.tsx+++ b/web/apps/space/src/components/AddFriendTile.tsx@@ -118,7 +118,7 @@ export const SpaceAddFriendTile: React.FC<SpaceAddFriendTileProps> = ({bgcolor: spaceSurface,border: 0,borderRadius: "inherit",- color: spaceText,+ color: "#65656D",cursor: "pointer",display: "flex",height: "100%",diff --git a/web/apps/space/src/components/HomeHeader.tsx b/web/apps/space/src/components/HomeHeader.tsxindex 9e10891e2f..5b548c77a1 100644--- a/web/apps/space/src/components/HomeHeader.tsx+++ b/web/apps/space/src/components/HomeHeader.tsx@@ -1,10 +1,7 @@-import { BubbleChatIcon } from "@hugeicons/core-free-icons";+import { BubbleChatIcon, Menu01Icon } from "@hugeicons/core-free-icons";import { HugeiconsIcon } from "@hugeicons/react";-import { alpha, Box, Skeleton } from "@mui/material";-import { SpaceAvatarImage } from "components/AvatarImage";+import { alpha, Box } from "@mui/material";import React from "react";-import type { SetupProfile } from "screens/SetupProfileScreen";-import { useSpaceAppState } from "state/app-state";import {spaceAppBackgroundColor,spaceSurface,@@ -15,33 +12,23 @@ import { spaceTouchTargetSize } from "styles/touch-targets";const green = "#08C225";const dangerColor = "#F63A3A";const headerActionSize = spaceTouchTargetSize;-const headerAvatarSize = 36;-const headerAvatarImageSize = 28;const headerChatCircleSize = 36;const headerIconSize = 25;const headerSideWidth = 36;-const mediaPlaceholderColor = spaceSurface;-const avatarFadeSx = {- "@keyframes spaceAvatarFade": { from: { opacity: 0 }, to: { opacity: 1 } },- animation: "spaceAvatarFade 320ms cubic-bezier(0.22, 1, 0.36, 1) both",- "@media (prefers-reduced-motion: reduce)": { animation: "none" },-} as const;export const spaceHomeHeaderHeight = 64;interface SpaceHomeHeaderProps {children?: React.ReactNode;onOpenMessages?: () => void;- onOpenProfile?: () => void;- profile: SetupProfile | null;+ onOpenSettings?: () => void;showUnreadIndicator?: boolean;}export const SpaceHomeHeader: React.FC<SpaceHomeHeaderProps> = ({children,onOpenMessages,- onOpenProfile,- profile,+ onOpenSettings,showUnreadIndicator = false,}) => (<Box@@ -98,8 +85,8 @@ export const SpaceHomeHeader: React.FC<SpaceHomeHeaderProps> = ({<Boxcomponent="button"type="button"- aria-label="Open profile"- onClick={onOpenProfile}+ aria-label="Settings"+ onClick={onOpenSettings}sx={{appearance: "none",alignItems: "center",@@ -107,8 +94,8 @@ export const SpaceHomeHeader: React.FC<SpaceHomeHeaderProps> = ({border: 0,borderRadius: "50%",boxSizing: "border-box",- color: green,- cursor: onOpenProfile ? "pointer" : "default",+ color: spaceText,+ cursor: onOpenSettings ? "pointer" : "default",display: "flex",height: headerActionSize,justifyContent: "center",@@ -119,24 +106,13 @@ export const SpaceHomeHeader: React.FC<SpaceHomeHeaderProps> = ({position: "relative",width: headerActionSize,zIndex: 1,+ "&:focus-visible": {+ outline: `2px solid ${green}`,+ outlineOffset: 2,+ },}}>- <Box- sx={{- alignItems: "center",- bgcolor: "transparent",- borderRadius: "50%",- boxSizing: "border-box",- display: "flex",- height: headerAvatarSize,- justifyContent: "center",- overflow: "hidden",- p: "2.5px",- width: headerAvatarSize,- }}- >- <SpaceHomeHeaderAvatar profile={profile} />- </Box>+ <HugeiconsIcon icon={Menu01Icon} size={24} strokeWidth={2.4} /></Box><Boxsx={{@@ -235,36 +211,3 @@ export const SpaceHomeHeader: React.FC<SpaceHomeHeaderProps> = ({</Box></Box>);--const SpaceHomeHeaderAvatar: React.FC<{ profile: SetupProfile | null }> = ({- profile,-}) => {- const { cachedProfileAvatarUrl } = useSpaceAppState();- const avatarUrl = profile ? profile.avatarUrl : cachedProfileAvatarUrl;-- return avatarUrl || (profile && !profile.avatarObjectID) ? (- <Box- key={avatarUrl ?? "default-avatar"}- sx={{- ...avatarFadeSx,- borderRadius: "50%",- filter: avatarUrl ? undefined : "brightness(0.9)",- height: headerAvatarImageSize,- overflow: "hidden",- width: headerAvatarImageSize,- }}- >- <SpaceAvatarImage src={avatarUrl} />- </Box>- ) : (- <Skeleton- variant="circular"- sx={{- bgcolor: mediaPlaceholderColor,- height: headerAvatarImageSize,- transform: "none",- width: headerAvatarImageSize,- }}- />- );-};diff --git a/web/apps/space/src/components/OwnPostTile.tsx b/web/apps/space/src/components/OwnPostTile.tsxindex 31bc2b5bae..dd9aa5536e 100644--- a/web/apps/space/src/components/OwnPostTile.tsx+++ b/web/apps/space/src/components/OwnPostTile.tsx@@ -198,7 +198,7 @@ export const SpaceOwnPostTile: React.FC<SpaceOwnPostTileProps> = ({<Boxsx={{background:- imageUrl && !unavailable+ coverUrl && !unavailable? "linear-gradient(transparent, rgba(0, 0, 0, 0.72))": undefined,bottom: 0,diff --git a/web/apps/space/src/pages/app/index.tsx b/web/apps/space/src/pages/app/index.tsxindex 887372494c..2851fac6d9 100644--- a/web/apps/space/src/pages/app/index.tsx+++ b/web/apps/space/src/pages/app/index.tsx@@ -25,7 +25,6 @@ import {loadCurrentFriendRequests,loadCurrentSpaceFriends,loadCurrentSpacePostAssetURL,- loadCurrentSpaceProfilePostsPage,loadCurrentUnreadStatus,replyToCurrentPost,sendCurrentPoke,@@ -366,7 +365,6 @@ const Page: React.FC = () => {}}}onLoadFriendAvatar={loadCurrentFriendAvatarURL}- onLoadFriendPosts={loadCurrentSpaceProfilePostsPage}onLoadPostImage={loadCurrentSpacePostAssetURL}onOpenMessages={() => void router.push(spaceRoutes.messages)}onMessageFriend={(friend) =>@@ -435,6 +433,7 @@ const Page: React.FC = () => {? () => void router.push(spaceRoutes.profile): undefined}+ onOpenSettings={() => void router.push(spaceRoutes.settings)}onReplyToPost={profile?.spaceId? (diff --git a/web/apps/space/src/pages/app/profile.tsx b/web/apps/space/src/pages/app/profile.tsxindex 6632a19624..7e5b18abb6 100644--- a/web/apps/space/src/pages/app/profile.tsx+++ b/web/apps/space/src/pages/app/profile.tsx@@ -158,7 +158,6 @@ const Page: React.FC = () => {onOpenProfilePhoto={() =>void router.push(spaceRoutes.profilePhoto)}- onOpenSettings={() => void router.push(spaceRoutes.settings)}onLoadPostImage={loadCurrentSpacePostAssetURL}onSetPostLiked={async (postId, liked) => {await setCurrentPostLiked(actorSpaceId, postId, liked);diff --git a/web/apps/space/src/pages/app/settings.tsx b/web/apps/space/src/pages/app/settings.tsxindex 60285b03df..d7bb2c981b 100644--- a/web/apps/space/src/pages/app/settings.tsx+++ b/web/apps/space/src/pages/app/settings.tsx@@ -32,7 +32,7 @@ const Page: React.FC = () => {<><SpacePageMeta themeColor={spaceAppBackgroundColor} /><SettingsScreen- onBack={() => void router.push(spaceRoutes.profile)}+ onBack={() => void router.push(spaceRoutes.home)}onChangeCoverImage={() =>void router.push(spaceRoutes.profileCoverFrom("settings"))}diff --git a/web/apps/space/src/pages/layout-demo.tsx b/web/apps/space/src/pages/layout-demo.tsxindex d68ab2f478..3f5c3053d2 100644--- a/web/apps/space/src/pages/layout-demo.tsx+++ b/web/apps/space/src/pages/layout-demo.tsx@@ -24,6 +24,8 @@ import {type HomeTilePlacement,} from "utils/home-tile-layout";import { spaceDefaultCoverImagePath } from "utils/post-image";+import { useSpaceRouter } from "utils/route-transitions";+import { spaceRoutes } from "utils/routes";const controlButtonColor = spaceSurface;const demoProfile: SetupProfile = {@@ -142,6 +144,7 @@ const LayoutDemoPost: React.FC<LayoutDemoPostProps> = ({};const LayoutDemoPage: React.FC = () => {+ const router = useSpaceRouter();const [{ friendCount, ownPosts }, setDemo] = React.useState({friendCount: 0,ownPosts: [] as SpacePost[],@@ -238,7 +241,11 @@ const LayoutDemoPage: React.FC = () => {"@media (min-width: 600px)": { maxWidth: 390 },}}>- <SpaceHomeHeader profile={demoProfile} />+ <SpaceHomeHeader+ onOpenSettings={() =>+ void router.push(spaceRoutes.settings)+ }+ /><Boxsx={{boxSizing: "border-box",diff --git a/web/apps/space/src/screens/HomeScreen.tsx b/web/apps/space/src/screens/HomeScreen.tsxindex 70bc853e96..4dea99fbb7 100644--- a/web/apps/space/src/screens/HomeScreen.tsx+++ b/web/apps/space/src/screens/HomeScreen.tsx@@ -35,7 +35,6 @@ import {type SpaceFriendRequest,type SpacePost,type SpacePostAssetURLLoader,- type SpaceProfilePostPage,} from "services/space";import {spaceAppBackground,@@ -100,11 +99,6 @@ interface HomeScreenProps {onDeletePost?: (postId: number) => Promise<void>;onUpdatePostCaption?: (postId: number, caption: string) => Promise<void>;onLoadFriendAvatar?: (friend: FriendProfile) => Promise<string | null>;- onLoadFriendPosts?: (- friendSpaceId: string,- viewerSpaceId?: string,- cursor?: string,- ) => Promise<SpaceProfilePostPage>;onLoadPostImage?: SpacePostAssetURLLoader;onFriendRequestSentToastClose?: () => void;onAcceptFriendRequest?: (requestID: number) => Promise<void>;@@ -115,6 +109,7 @@ interface HomeScreenProps {onMessageFriend: (friend: FriendProfile) => void;onPokeFriend: (friend: FriendProfile) => Promise<void>;onOpenProfile?: () => void;+ onOpenSettings?: () => void;onReplyToPost?: (postSpaceId: string,postId: number,@@ -141,7 +136,6 @@ interface PostTileCanvasSize {interface SelectedHomeViewer {avatarUrl?: string | null;- browseHistory?: boolean;draftFile?: File;draftImageError?: string;focusReplyOnOpen?: boolean;@@ -742,7 +736,7 @@ export const FriendPostTile: React.FC<FriendPostTileProps> = ({p: "var(--space-tile-padding)",pt: showFriendRequestDetails? "var(--space-tile-padding)"- : `calc(${spaceTileCircleInset(requestActionSize)} + ${requestActionSize}px)`,+ : `calc(var(--space-tile-padding) + ${requestActionSize + requestButtonGap}px)`,pointerEvents: "none",position: "absolute",width: "100%",@@ -1026,7 +1020,6 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({onAcceptFriendRequest,onDiscardFriendRequest,onLoadFriendAvatar,- onLoadFriendPosts,onLoadPostImage,onFriendRequestSentToastClose,onOpenFriend,@@ -1035,6 +1028,7 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({onMessageFriend,onPokeFriend,onOpenProfile,+ onOpenSettings,onReplyToPost,onSetPostLiked,profile,@@ -1187,7 +1181,6 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({friend: FriendProfile,posts: SpacePost[],photo: SpaceViewerPhoto,- browseHistory = false,) => {if (photo.postId) {markPostRead({@@ -1199,7 +1192,6 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({Boolean(viewerSpaceId) && photo.friendID == viewerSpaceId;setSelectedViewer({avatarUrl: photo.avatarUrl,- browseHistory,friend,photo,postIndex: 0,@@ -1318,59 +1310,6 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({);const selectedViewerPostIndex = selectedViewer?.postIndex;const selectedViewerPosts = selectedViewer?.posts;- const historySessionId = selectedViewer?.browseHistory- ? selectedViewer.sessionId- : undefined;- const selectedFriendSpaceId =- selectedViewer?.friend?.spaceId ?? selectedViewer?.friend?.id;- React.useEffect(() => {- if (!historySessionId || !selectedFriendSpaceId || !onLoadFriendPosts) {- return;- }-- let cancelled = false;- const loadHistory = async () => {- let cursor: string | undefined;- do {- const page = await onLoadFriendPosts(- selectedFriendSpaceId,- viewerSpaceId,- cursor,- );- if (cancelled) return;- setSelectedViewer((viewer) => {- if (viewer?.sessionId !== historySessionId || !viewer.posts)- return viewer;-- const oldestPost = viewer.posts[viewer.posts.length - 1]!;- const olderPosts = page.items.filter(- (post) =>- !post.isUnavailable &&- (post.timestampMs < oldestPost.timestampMs ||- (post.timestampMs == oldestPost.timestampMs &&- post.postId < oldestPost.postId)),- );- return {- ...viewer,- posts: [...viewer.posts, ...olderPosts],- };- });- cursor = page.nextCursor;- } while (cursor);- };- void loadHistory().catch((error: unknown) =>- log.error("Failed to load friend post history", error),- );-- return () => {- cancelled = true;- };- }, [- historySessionId,- onLoadFriendPosts,- selectedFriendSpaceId,- viewerSpaceId,- ]);const selectedViewerPhotos = React.useMemo(() => {const friend = selectedViewer?.friend;@@ -1549,9 +1488,7 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({onOpenAvatar={(anchorRect) =>setSelectedContact({ anchorRect, friend, avatarUrl })}- onOpenPosts={(friend, posts, photo) =>- openPostPhotos(friend, posts, photo, isRead)- }+ onOpenPosts={openPostPhotos}placement={placement}posts={posts}/>@@ -1752,10 +1689,9 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({}}><SpaceHomeHeader- profile={profile}showUnreadIndicator={showUnreadIndicator}onOpenMessages={onOpenMessages}- onOpenProfile={onOpenProfile}+ onOpenSettings={onOpenSettings}><Boxref={postInputRef}@@ -1872,7 +1808,6 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({profile.avatarUrl,imageUrl,),- true,);}}/>@@ -1907,7 +1842,6 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({}postActionMode={selectedViewer.postActionMode}showSequenceProgress={Boolean(- !selectedViewer.browseHistory &&selectedViewerPosts &&selectedViewerPosts.length > 1,)}@@ -1954,10 +1888,9 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({: undefined}onSwipeLeft={- !selectedViewer.browseHistory &&- (!selectedViewerPosts ||- selectedViewerPostIndex ==- selectedViewerPosts.length - 1)+ !selectedViewerPosts ||+ selectedViewerPostIndex ==+ selectedViewerPosts.length - 1? closeSelectedPhoto: undefined}diff --git a/web/apps/space/src/screens/ProfileScreen.tsx b/web/apps/space/src/screens/ProfileScreen.tsxindex d2c966c3ff..e4718480e4 100644--- a/web/apps/space/src/screens/ProfileScreen.tsx+++ b/web/apps/space/src/screens/ProfileScreen.tsx@@ -2,7 +2,6 @@ import {AddSquareIcon,ArrowLeft02Icon,BubbleChatIcon,- Menu01Icon,MoreHorizontalIcon,Tick02Icon,UserRemove01Icon,@@ -542,7 +541,6 @@ interface ProfileScreenProps {onOpenPost?: (post: ProfilePostItem) => void;onOpenProfileCover?: () => void;onOpenProfilePhoto?: () => void;- onOpenSettings?: () => void;onLoadPostImage?: (asset: SpacePostAsset) => Promise<string>;onMessageFriend?: () => void;onReplyToPost?: (@@ -579,7 +577,6 @@ export const ProfileScreen: React.FC<ProfileScreenProps> = ({onOpenPost,onOpenProfileCover,onOpenProfilePhoto,- onOpenSettings,onLoadPostImage,onMessageFriend,onReplyToPost,@@ -1379,39 +1376,7 @@ export const ProfileScreen: React.FC<ProfileScreenProps> = ({>{firstName}</Box>- {isOwnerProfile ? (- <Box- component="button"- type="button"- aria-label="Settings"- onClick={onOpenSettings}- sx={{- alignItems: "center",- bgcolor: "transparent",- border: 0,- color: "inherit",- cursor: onOpenSettings- ? "pointer"- : "default",- display: "flex",- height: spaceTouchTargetSize,- justifyContent: "flex-end",- p: 0,- width: spaceTouchTargetSize,- "&:focus-visible": {- borderRadius: "50%",- outline: `2px solid ${green}`,- outlineOffset: 2,- },- }}- >- <HugeiconsIcon- icon={Menu01Icon}- size={20}- strokeWidth={2.4}- />- </Box>- ) : onMessageFriend ? (+ {!isOwnerProfile && onMessageFriend ? (<Boxcomponent="button"type="button"diff --git a/web/apps/space/src/screens/SettingsScreen.tsx b/web/apps/space/src/screens/SettingsScreen.tsxindex 06af17c37e..5b6d7a7e0a 100644--- a/web/apps/space/src/screens/SettingsScreen.tsx+++ b/web/apps/space/src/screens/SettingsScreen.tsx@@ -443,7 +443,7 @@ export const SettingsScreen: React.FC<SettingsScreenProps> = ({<Boxcomponent="button"type="button"- aria-label="Back to profile"+ aria-label="Back to home"onClick={onBack}sx={{alignItems: "center",diff --git a/web/apps/space/src/utils/route-transitions.tsx b/web/apps/space/src/utils/route-transitions.tsxindex 8d388ab373..69d8ba47b8 100644--- a/web/apps/space/src/utils/route-transitions.tsx+++ b/web/apps/space/src/utils/route-transitions.tsx@@ -42,7 +42,7 @@ const parentRoutePaths = (path: string) => {"/app/profile/cover-edit": ["/app/profile/cover"],"/app/profile/photo": ["/app/profile"],"/app/profile/photo-edit": ["/app/profile/photo"],- "/app/settings": ["/app/profile"],+ "/app/settings": ["/app"],"/app/settings/profile/name": ["/app/settings"],"/login": ["/"],"/passkeys/finish": ["/passkeys/verify"],@@ -76,6 +76,26 @@ const routeMotionDirection = (return "forward";};+const routeSlideDirection = (+ currentPath: string,+ targetPath: string | undefined,+ direction: SpaceRouteMotionDirection,+): SpaceRouteMotionDirection => {+ if (+ (currentPath == "/app" || currentPath == "/layout-demo") &&+ targetPath == "/app/settings"+ ) {+ return "back";+ }+ if (+ currentPath == "/app/settings" &&+ (targetPath == "/app" || targetPath == "/layout-demo")+ ) {+ return "forward";+ }+ return direction;+};+const recordRoutePush = (currentPath: string,targetPath: string,@@ -164,8 +184,9 @@ const pushSpaceRoute = async (}const direction = routeMotionDirection(currentPath, targetPath);- const didNavigate = await startSpaceRouteTransition(direction, () =>- router.push(url, as, options),+ const didNavigate = await startSpaceRouteTransition(+ routeSlideDirection(currentPath, targetPath, direction),+ () => router.push(url, as, options),);if (didNavigate) recordRoutePush(currentPath, targetPath, direction);return didNavigate;@@ -186,32 +207,40 @@ const backSpaceRoute = (router: NextRouter) => {const currentPath = routePath(router.asPath);const targetPath = previousStackRoute();- void startSpaceRouteTransition("back", () => {- const routeChangePromise = new Promise<boolean>((resolve, reject) => {- const cleanup = () => {- router.events.off("routeChangeComplete", handleComplete);- router.events.off("routeChangeError", handleError);- };- const handleComplete = () => {- cleanup();- resolve(true);- };- const handleError = (error: unknown) => {- cleanup();- reject(- error instanceof Error- ? error- : new Error("Space route change failed"),- );- };-- router.events.on("routeChangeComplete", handleComplete);- router.events.on("routeChangeError", handleError);- });+ void startSpaceRouteTransition(+ routeSlideDirection(currentPath, targetPath, "back"),+ () => {+ const routeChangePromise = new Promise<boolean>(+ (resolve, reject) => {+ const cleanup = () => {+ router.events.off(+ "routeChangeComplete",+ handleComplete,+ );+ router.events.off("routeChangeError", handleError);+ };+ const handleComplete = () => {+ cleanup();+ resolve(true);+ };+ const handleError = (error: unknown) => {+ cleanup();+ reject(+ error instanceof Error+ ? error+ : new Error("Space route change failed"),+ );+ };++ router.events.on("routeChangeComplete", handleComplete);+ router.events.on("routeChangeError", handleError);+ },+ );- router.back();- return routeChangePromise;- })+ router.back();+ return routeChangePromise;+ },+ ).then((didNavigate) => {if (didNavigate && targetPath) {recordRoutePush(currentPath, targetPath, "back");@@ -269,8 +298,9 @@ export const useSpaceRouteTransitionPopState = () => {if (!targetPath || targetPath == currentPath) return true;- void startSpaceRouteTransition("back", () =>- router.replace(state.url, state.as, state.options),+ void startSpaceRouteTransition(+ routeSlideDirection(currentPath, targetPath, "back"),+ () => router.replace(state.url, state.as, state.options),).then((didNavigate) => {if (didNavigate) {