diff --git a/apps/mobile/src/components/ui/datetime/RelativeDateTime.tsx b/apps/mobile/src/components/ui/datetime/RelativeDateTime.tsx index ff945345a..54ce805f1 100644 --- a/apps/mobile/src/components/ui/datetime/RelativeDateTime.tsx +++ b/apps/mobile/src/components/ui/datetime/RelativeDateTime.tsx @@ -49,7 +49,7 @@ interface RelativeDateTimeProps extends TextProps { export const RelativeDateTime = ({ date, - displayAbsoluteTimeAfterDay = 29, + displayAbsoluteTimeAfterDay = Infinity, dateFormatTemplate, postfixText, ...props diff --git a/apps/mobile/src/components/ui/tabview/TabBar.tsx b/apps/mobile/src/components/ui/tabview/TabBar.tsx index 1f0a8f8fd..24744cb2b 100644 --- a/apps/mobile/src/components/ui/tabview/TabBar.tsx +++ b/apps/mobile/src/components/ui/tabview/TabBar.tsx @@ -267,6 +267,7 @@ const TarBarItem: FC<{ onLayout(event, index) }} tab={tab} + className="py-1" > diff --git a/apps/mobile/src/modules/discover/Content.tsx b/apps/mobile/src/modules/discover/Content.tsx index 066b53980..6456481f8 100644 --- a/apps/mobile/src/modules/discover/Content.tsx +++ b/apps/mobile/src/modules/discover/Content.tsx @@ -9,5 +9,5 @@ export default function Content() { const { searchFocusedAtom } = useSearchPageContext() const isFocused = useAtomValue(searchFocusedAtom) - return {isFocused ? : } + return {isFocused ? : } } diff --git a/apps/mobile/src/modules/discover/DiscoverContext.ts b/apps/mobile/src/modules/discover/DiscoverContext.ts deleted file mode 100644 index 96fc869d1..000000000 --- a/apps/mobile/src/modules/discover/DiscoverContext.ts +++ /dev/null @@ -1,6 +0,0 @@ -import type { PrimitiveAtom } from "jotai" -import { createContext } from "react" - -export const DiscoverContext = createContext<{ - headerHeightAtom: PrimitiveAtom -}>(null!) diff --git a/apps/mobile/src/modules/discover/SearchContent.tsx b/apps/mobile/src/modules/discover/SearchContent.tsx index 67894b642..a60b0eeb1 100644 --- a/apps/mobile/src/modules/discover/SearchContent.tsx +++ b/apps/mobile/src/modules/discover/SearchContent.tsx @@ -13,8 +13,6 @@ import { import { SearchFeed } from "@/src/modules/discover/search-tabs/SearchFeed" import { SearchList } from "@/src/modules/discover/search-tabs/SearchList" -import { SearchTabBar } from "./SearchTabBar" - export const SearchContent = () => { const scrollContainerAnimatedX = useSearchPageScrollContainerAnimatedX() const { searchTypeAtom } = useSearchPageContext() @@ -44,7 +42,6 @@ export const SearchContent = () => { return ( <> - tab.value === searchType)} diff --git a/apps/mobile/src/modules/discover/search-tabs/SearchFeed.tsx b/apps/mobile/src/modules/discover/search-tabs/SearchFeed.tsx index fe1ebc2f3..211e72334 100644 --- a/apps/mobile/src/modules/discover/search-tabs/SearchFeed.tsx +++ b/apps/mobile/src/modules/discover/search-tabs/SearchFeed.tsx @@ -1,23 +1,29 @@ import { FeedViewType } from "@follow/constants" +import { getBackgroundGradient } from "@follow/utils" import { useQuery } from "@tanstack/react-query" +import { LinearGradient } from "expo-linear-gradient" import { useAtomValue } from "jotai" -import type { FC } from "react" -import type { ListRenderItem, ListRenderItemInfo } from "react-native" import { Text, useWindowDimensions, View } from "react-native" import { ScrollView } from "react-native-gesture-handler" import Animated, { FadeInUp } from "react-native-reanimated" +import { RelativeDateTime } from "@/src/components/ui/datetime/RelativeDateTime" import { FeedIcon } from "@/src/components/ui/icon/feed-icon" import { Image } from "@/src/components/ui/image/Image" import { ItemPressableStyle } from "@/src/components/ui/pressable/enum" import { ItemPressable } from "@/src/components/ui/pressable/ItemPressable" +import { RightCuteReIcon } from "@/src/icons/right_cute_re" +import { SafeAlertCuteReIcon } from "@/src/icons/safe_alert_cute_re" +import { SafetyCertificateCuteReIcon } from "@/src/icons/safety_certificate_cute_re" +import { User3CuteReIcon } from "@/src/icons/user_3_cute_re" import { apiClient } from "@/src/lib/api-fetch" import { useNavigation } from "@/src/lib/navigation/hooks" import { FollowScreen } from "@/src/screens/(modal)/FollowScreen" import { useSubscriptionByFeedId } from "@/src/store/subscription/hooks" +import { useColor } from "@/src/theme/colors" import { useSearchPageContext } from "../ctx" -import { BaseSearchPageFlatList, ItemSeparator, RenderScrollComponent } from "./__base" +import { ItemSeparator } from "./__base" import { useDataSkeleton } from "./hooks" type SearchResultItem = Awaited>["data"][number] @@ -25,8 +31,9 @@ type SearchResultItem = Awaited>["da export const SearchFeed = () => { const { searchValueAtom } = useSearchPageContext() const searchValue = useAtomValue(searchValueAtom) + const windowWidth = useWindowDimensions().width - const { data, isLoading, refetch } = useQuery({ + const { data, isLoading } = useQuery({ queryKey: ["searchFeed", searchValue], queryFn: () => { return apiClient.discover.$post({ @@ -45,33 +52,30 @@ export const SearchFeed = () => { if (data === undefined) return null return ( - + + Found {data.data?.length} feeds + + {data.data?.map((item) => ( + + + + + ))} + + ) } -const keyExtractor = (item: SearchResultItem) => { - return item.feed?.id || Math.random().toString() -} -const renderItem: ListRenderItem = (props) => ( - -) - -const SearchFeedItem: FC> = ({ item }) => { +const SearchFeedItem = ({ item }: { item: SearchResultItem }) => { const isSubscribed = useSubscriptionByFeedId(item.feed?.id ?? "") const navigation = useNavigation() + const iconColor = useColor("text") + return ( { if (item.feed?.id) { navigation.presentControllerView(FollowScreen, { @@ -118,64 +122,92 @@ const SearchFeedItem: FC> = ({ item }) => { {/* Subscribe */} {isSubscribed && ( - - Subscribed + + Followed )} + + + {item.feed?.url} + + {/* Preview */} {item.entries?.map((entry) => )} + + + + {item.subscriptionCount} followers + + + {item.updatesPerWeek ? ( + <> + + {item.updatesPerWeek} entries/week + + ) : item.entries?.[0]?.publishedAt ? ( + <> + + Updated + + + ) : null} + + ) } -const formatter = new Intl.DateTimeFormat("en-US", { - year: "numeric", - month: "short", - day: "numeric", -}) + const PreviewItem = ({ entry }: { entry: NonNullable[number] }) => { - const { width } = useWindowDimensions() const firstMedia = entry.media?.[0] + const [, , , bgAccent, bgAccentLight] = getBackgroundGradient( + entry.title || entry.url || "Untitled", + ) return ( - - {/* Left */} - - + + {firstMedia ? ( + + ) : ( + + {entry.title?.[0]} + + )} + + {entry.title} - - {formatter.format(new Date(entry.publishedAt))} - + - - {/* Right */} - {!!firstMedia && ( - - - - )} ) } diff --git a/apps/mobile/src/modules/discover/search-tabs/SearchList.tsx b/apps/mobile/src/modules/discover/search-tabs/SearchList.tsx index 1abd68e35..72e298a93 100644 --- a/apps/mobile/src/modules/discover/search-tabs/SearchList.tsx +++ b/apps/mobile/src/modules/discover/search-tabs/SearchList.tsx @@ -1,7 +1,7 @@ import { useQuery } from "@tanstack/react-query" import { useAtomValue } from "jotai" import { memo } from "react" -import { Text, View } from "react-native" +import { Text, useWindowDimensions, View } from "react-native" import { FallbackIcon } from "@/src/components/ui/icon/fallback-icon" import { Image } from "@/src/components/ui/image/Image" @@ -13,7 +13,7 @@ import { FollowScreen } from "@/src/screens/(modal)/FollowScreen" import { useSubscriptionByListId } from "@/src/store/subscription/hooks" import { useSearchPageContext } from "../ctx" -import { BaseSearchPageFlatList, ItemSeparator, RenderScrollComponent } from "./__base" +import { ItemSeparator } from "./__base" import { useDataSkeleton } from "./hooks" type SearchResultItem = Awaited>["data"][number] @@ -21,8 +21,9 @@ type SearchResultItem = Awaited>["da export const SearchList = () => { const { searchValueAtom } = useSearchPageContext() const searchValue = useAtomValue(searchValueAtom) + const windowWidth = useWindowDimensions().width - const { data, isLoading, refetch } = useQuery({ + const { data, isLoading } = useQuery({ queryKey: ["searchList", searchValue], queryFn: () => { return apiClient.discover.$post({ @@ -40,24 +41,20 @@ export const SearchList = () => { if (data === undefined) return null return ( - + + Found {data.data?.length} lists + + {data.data?.map((item) => ( + + + + + ))} + + ) } -const keyExtractor = (item: SearchResultItem) => item.list?.id ?? Math.random().toString() - -const renderItem = ({ item }: { item: SearchResultItem }) => ( - -) - const SearchListCard = memo(({ item }: { item: SearchResultItem }) => { const isSubscribed = useSubscriptionByListId(item.list?.id ?? "") const navigation = useNavigation() diff --git a/apps/mobile/src/modules/discover/search-tabs/SearchUser.tsx b/apps/mobile/src/modules/discover/search-tabs/SearchUser.tsx deleted file mode 100644 index 3d0ca7c2e..000000000 --- a/apps/mobile/src/modules/discover/search-tabs/SearchUser.tsx +++ /dev/null @@ -1,11 +0,0 @@ -import { Text } from "react-native" - -import { BaseSearchPageScrollView } from "./__base" - -export const SearchUser = () => { - return ( - - User - - ) -} diff --git a/apps/mobile/src/modules/discover/search-tabs/__base.tsx b/apps/mobile/src/modules/discover/search-tabs/__base.tsx index e21e57a4b..b52a76d38 100644 --- a/apps/mobile/src/modules/discover/search-tabs/__base.tsx +++ b/apps/mobile/src/modules/discover/search-tabs/__base.tsx @@ -1,35 +1,8 @@ import { cn } from "@follow/utils/src/utils" -import { forwardRef } from "react" -import type { ScrollViewProps } from "react-native" -import { ScrollView, useWindowDimensions, View } from "react-native" -import type { FlatListPropsWithLayout } from "react-native-reanimated" -import ReAnimated, { LinearTransition } from "react-native-reanimated" -import { useSafeAreaInsets } from "react-native-safe-area-context" +import { useWindowDimensions, View } from "react-native" import { useSearchBarHeight } from "../ctx" -export const BaseSearchPageScrollView = forwardRef( - ({ children, ...props }, ref) => { - const searchBarHeight = useSearchBarHeight() - const insets = useSafeAreaInsets() - const windowWidth = useWindowDimensions().width - const offsetTop = searchBarHeight - insets.top - return ( - - {children} - - ) - }, -) - export const BaseSearchPageRootView = ({ children, className, @@ -48,36 +21,7 @@ export const BaseSearchPageRootView = ({ ) } -export function BaseSearchPageFlatList({ - refreshing, - onRefresh, - ...props -}: FlatListPropsWithLayout & { refreshing: boolean; onRefresh: () => void }) { - const insets = useSafeAreaInsets() - const searchBarHeight = useSearchBarHeight() - const offsetTop = searchBarHeight - insets.top - const windowWidth = useWindowDimensions().width - - return ( - - ) -} - const itemSeparator = ( - + ) export const ItemSeparator = () => itemSeparator - -export const RenderScrollComponent = (props: ScrollViewProps) => ( - -) diff --git a/apps/mobile/src/modules/discover/search.tsx b/apps/mobile/src/modules/discover/search.tsx index 7dcefe9f4..5d4cb166f 100644 --- a/apps/mobile/src/modules/discover/search.tsx +++ b/apps/mobile/src/modules/discover/search.tsx @@ -13,13 +13,14 @@ import { useSafeAreaFrame, useSafeAreaInsets } from "react-native-safe-area-cont import { ReAnimatedTouchableOpacity } from "@/src/components/common/AnimatedComponents" import { BlurEffect } from "@/src/components/common/BlurEffect" import { getDefaultHeaderHeight } from "@/src/components/layouts/utils" +import { SetNavigationHeaderHeightContext } from "@/src/components/layouts/views/NavigationHeaderContext" import { Search2CuteReIcon } from "@/src/icons/search_2_cute_re" import { useScreenIsInSheetModal } from "@/src/lib/navigation/hooks" import { ScreenItemContext } from "@/src/lib/navigation/ScreenItemContext" import { accentColor, useColor } from "@/src/theme/colors" -import { useSearchPageContext } from "./ctx" -import { DiscoverContext } from "./DiscoverContext" +import { useSearchPageContext, useSearchPageScrollContainerAnimatedX } from "./ctx" +import { SearchTabBar } from "./SearchTabBar" const DynamicBlurEffect = () => { const { reAnimatedScrollY } = useContext(ScreenItemContext) @@ -38,9 +39,12 @@ export const DiscoverHeader = () => { const insets = useSafeAreaInsets() const sheetModal = useScreenIsInSheetModal() const headerHeight = getDefaultHeaderHeight(frame, sheetModal, insets.top) - const { headerHeightAtom } = useContext(DiscoverContext) - const setHeaderHeight = useSetAtom(headerHeightAtom) + const scrollContainerAnimatedX = useSearchPageScrollContainerAnimatedX() + const { searchFocusedAtom } = useSearchPageContext() + const isFocused = useAtomValue(searchFocusedAtom) + + const setHeaderHeight = useContext(SetNavigationHeaderHeightContext) return ( { + {isFocused && } ) } diff --git a/apps/mobile/src/screens/(stack)/(tabs)/discover.tsx b/apps/mobile/src/screens/(stack)/(tabs)/discover.tsx index c8e33bddf..a389a47c4 100644 --- a/apps/mobile/src/screens/(stack)/(tabs)/discover.tsx +++ b/apps/mobile/src/screens/(stack)/(tabs)/discover.tsx @@ -1,5 +1,3 @@ -import { atom } from "jotai" -import { useMemo, useState } from "react" import { View } from "react-native" import { SafeNavigationScrollView } from "@/src/components/layouts/views/SafeNavigationScrollView" @@ -11,30 +9,23 @@ import { SearchPageProvider, SearchPageScrollContainerAnimatedXProvider, } from "@/src/modules/discover/ctx" -import { DiscoverContext } from "@/src/modules/discover/DiscoverContext" import { DiscoverHeader } from "@/src/modules/discover/search" export default function Discover() { - const headerHeightAtom = useState(() => atom(0))[0] - - const ctxValue = useMemo(() => ({ headerHeightAtom }), [headerHeightAtom]) - return ( - - - - - - - } - > - - - - - + + + + + + } + > + + + + ) }