diff --git a/src/state/models/ui/profile.ts b/src/state/models/ui/profile.ts index 35831d1f..81daf797 100644 --- a/src/state/models/ui/profile.ts +++ b/src/state/models/ui/profile.ts @@ -8,7 +8,7 @@ import {ListsListModel} from '../lists/lists-list' export enum Sections { Posts = 'Posts', PostsWithReplies = 'Posts & replies', - CustomAlgorithms = 'Algos', + CustomAlgorithms = 'Feeds', Lists = 'Lists', } diff --git a/src/view/com/feeds/CustomFeed.tsx b/src/view/com/feeds/CustomFeed.tsx index 9a71eb84..748b89c0 100644 --- a/src/view/com/feeds/CustomFeed.tsx +++ b/src/view/com/feeds/CustomFeed.tsx @@ -98,6 +98,7 @@ export const CustomFeed = observer( } accessibilityHint="" onPress={onToggleSaved} + hitSlop={15} style={styles.btn}> {item.isSaved ? ( { - const pal = usePalette('default') - const store = useStores() - - useEffect(() => { - if (isPageFocused) { - store.shell.setMinimalShellMode(false) - store.me.savedFeeds.refresh(true) - } - }, [store, isPageFocused]) - - const onRefresh = useCallback(() => { - store.me.savedFeeds.refresh() - }, [store]) - - const renderListEmptyComponent = useCallback(() => { - return ( - - - You don't have any saved feeds. You can find feeds by searching on - Bluesky. - - - ) - }, [pal]) - - const renderListFooterComponent = useCallback(() => { - return ( - <> - - - - - Discover new feeds - - - {!store.me.savedFeeds.isEmpty && ( - - - - Change Order - - - )} - - - - Feeds are custom algorithms that users build with a little coding - expertise.{' '} - {' '} - for more information. - - - - ) - }, [pal, store.me.savedFeeds.isEmpty]) - - const renderItem = useCallback( - ({item}) => , - [], - ) - - return ( - item.data.uri} - refreshing={store.me.savedFeeds.isRefreshing} - refreshControl={ - - } - renderItem={renderItem} - initialNumToRender={10} - ListFooterComponent={renderListFooterComponent} - ListEmptyComponent={renderListEmptyComponent} - extraData={store.me.savedFeeds.isLoading} - contentOffset={{x: 0, y: headerOffset * -1}} - // @ts-ignore our .web version only -prf - desktopFixedHeight - /> - ) - }, -) - -const styles = StyleSheet.create({ - footerLinks: { - marginTop: 8, - borderBottomWidth: 1, - }, - footerLink: { - flexDirection: 'row', - borderTopWidth: 1, - paddingHorizontal: 26, - paddingVertical: 18, - gap: 18, - }, - empty: { - paddingHorizontal: 18, - paddingVertical: 16, - borderRadius: 8, - marginHorizontal: 18, - marginTop: 10, - }, - footerText: { - paddingHorizontal: 26, - paddingVertical: 22, - }, -}) diff --git a/src/view/com/pager/FeedsTabBar.web.tsx b/src/view/com/pager/FeedsTabBar.web.tsx index b51db174..0df91595 100644 --- a/src/view/com/pager/FeedsTabBar.web.tsx +++ b/src/view/com/pager/FeedsTabBar.web.tsx @@ -28,7 +28,7 @@ const FeedsTabBarDesktop = observer( ) => { const store = useStores() const items = useMemo( - () => ['Following', ...store.me.savedFeeds.pinnedFeedNames, 'My Feeds'], + () => ['Following', ...store.me.savedFeeds.pinnedFeedNames], [store.me.savedFeeds.pinnedFeedNames], ) const pal = usePalette('default') diff --git a/src/view/com/pager/FeedsTabBarMobile.tsx b/src/view/com/pager/FeedsTabBarMobile.tsx index 426f7628..94d04f32 100644 --- a/src/view/com/pager/FeedsTabBarMobile.tsx +++ b/src/view/com/pager/FeedsTabBarMobile.tsx @@ -58,7 +58,12 @@ export const FeedsTabBar = observer( Bluesky - + {query ? ( {isScrolledDown ? ( - + ) : null} item.data.uri} + contentContainerStyle={styles.contentContainer} refreshControl={ + + } + iconFilled={ + + } + label="My Feeds" + />