From 92ba14f4ffa344bc2b4b318c68206c249921619d Mon Sep 17 00:00:00 2001 From: Joshua Higgins Date: Fri, 20 Nov 2026 00:53:13 -0500 Subject: [PATCH] Revert "feat(mobile): scroll-away inline screen titles on iOS (#129)" This reverts commit 249def86a09f0624a02e197e320de0d520f1cdcc. --- .../_layout.tsx | 7 +- apps/mobile/app/(app)/(tabs)/home/_layout.tsx | 7 +- .../app/(app)/(tabs)/home/browse/albums.tsx | 3 +- .../app/(app)/(tabs)/home/browse/artists.tsx | 12 +-- .../(app)/(tabs)/home/browse/playlists.tsx | 12 ++- .../app/(app)/(tabs)/home/browse/songs.tsx | 16 +--- .../app/(app)/(tabs)/home/downloads/index.tsx | 20 +---- .../app/(app)/(tabs)/home/downloads/other.tsx | 58 ++++++------- apps/mobile/app/(app)/(tabs)/home/index.tsx | 20 +---- .../app/(app)/(tabs)/home/recently-added.tsx | 3 +- .../app/(app)/(tabs)/home/recently-played.tsx | 3 +- .../app/(app)/(tabs)/library/_layout.tsx | 7 +- .../mobile/app/(app)/(tabs)/library/index.tsx | 10 +-- .../app/(app)/(tabs)/search/_layout.tsx | 7 +- apps/mobile/app/(app)/(tabs)/search/index.tsx | 2 +- apps/mobile/components/media-cards.tsx | 27 +----- apps/mobile/components/screen-title.tsx | 84 ------------------- apps/mobile/components/search-results.tsx | 35 +++----- apps/mobile/components/skeletons.tsx | 54 ++---------- apps/mobile/components/tablet-media-grid.tsx | 25 ++---- apps/mobile/lib/navigation.ts | 9 +- 21 files changed, 78 insertions(+), 343 deletions(-) delete mode 100644 apps/mobile/components/screen-title.tsx diff --git a/apps/mobile/app/(app)/(tabs)/(albums,artists,songs,playlists,favorites,recent,downloads)/_layout.tsx b/apps/mobile/app/(app)/(tabs)/(albums,artists,songs,playlists,favorites,recent,downloads)/_layout.tsx index 917c410..9453ea3 100644 --- a/apps/mobile/app/(app)/(tabs)/(albums,artists,songs,playlists,favorites,recent,downloads)/_layout.tsx +++ b/apps/mobile/app/(app)/(tabs)/(albums,artists,songs,playlists,favorites,recent,downloads)/_layout.tsx @@ -1,11 +1,7 @@ import { Stack } from "expo-router" import { renderTabScreenContent } from "@/components/tab-screen-content" -import { - inlineTitleOptions, - tabStackScreenTitles, - useStackScreenOptions, -} from "@/lib/navigation" +import { useStackScreenOptions, tabStackScreenTitles } from "@/lib/navigation" import { tabletSections, TabletSectionContext } from "@/lib/tablet-navigation" export default function TabletSectionLayout({ segment }: { segment: string }) { @@ -18,7 +14,6 @@ export default function TabletSectionLayout({ segment }: { segment: string }) { screenLayout={renderTabScreenContent} screenOptions={({ route }) => ({ ...options, - ...inlineTitleOptions, title: route.name === "index" ? section?.title diff --git a/apps/mobile/app/(app)/(tabs)/home/_layout.tsx b/apps/mobile/app/(app)/(tabs)/home/_layout.tsx index 7d17397..75da6ca 100644 --- a/apps/mobile/app/(app)/(tabs)/home/_layout.tsx +++ b/apps/mobile/app/(app)/(tabs)/home/_layout.tsx @@ -2,11 +2,7 @@ import { renderTabScreenContent } from "@/components/tab-screen-content" import { Stack } from "expo-router" import { ProfileHeaderButton } from "@/components/profile-header-button" -import { - inlineTitleOptions, - tabStackScreenTitles, - useStackScreenOptions, -} from "@/lib/navigation" +import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation" export const unstable_settings = { anchor: "index", @@ -20,7 +16,6 @@ export default function HomeLayout() { screenLayout={renderTabScreenContent} screenOptions={({ route }) => ({ ...baseOptions, - ...inlineTitleOptions, title: tabStackScreenTitles[route.name] ?? "Home", headerRight: route.name === "index" ? () => : undefined, diff --git a/apps/mobile/app/(app)/(tabs)/home/browse/albums.tsx b/apps/mobile/app/(app)/(tabs)/home/browse/albums.tsx index b1cae32..21da78d 100644 --- a/apps/mobile/app/(app)/(tabs)/home/browse/albums.tsx +++ b/apps/mobile/app/(app)/(tabs)/home/browse/albums.tsx @@ -53,7 +53,7 @@ export default function AlbumsScreen() { return ( <> {searchBar} - + ) } @@ -63,7 +63,6 @@ export default function AlbumsScreen() { {searchBar} { diff --git a/apps/mobile/app/(app)/(tabs)/home/browse/artists.tsx b/apps/mobile/app/(app)/(tabs)/home/browse/artists.tsx index ae5b13d..b83ea1f 100644 --- a/apps/mobile/app/(app)/(tabs)/home/browse/artists.tsx +++ b/apps/mobile/app/(app)/(tabs)/home/browse/artists.tsx @@ -2,13 +2,12 @@ import { Ionicons } from "@expo/vector-icons" import { Stack } from "expo-router" import { memo, useCallback } from "react" import { - type FlatList, + FlatList, Pressable, StyleSheet, Text, type ListRenderItemInfo, } from "react-native" -import Animated from "react-native-reanimated" import { MediaContextMenu, @@ -16,7 +15,6 @@ import { } from "@/components/media-context-menu" import { CoverImage } from "@/components/cover-image" import { ArtistListSkeleton } from "@/components/skeletons" -import { ScreenTitle, useScreenTitleScroll } from "@/components/screen-title" import { contentBottomInset } from "@/components/player" import { useServerConfig } from "@/contexts/server-config" import { @@ -35,7 +33,6 @@ import { spacing, useThemeColors } from "@/lib/theme" const PAGE_SIZE = 50 export default function ArtistsScreen() { - const { ref, scrollY } = useScreenTitleScroll>() const { push } = useAppNavigation() const colors = useThemeColors() const { config } = useServerConfig() @@ -97,7 +94,7 @@ export default function ArtistsScreen() { return ( <> {searchBar} - + ) } @@ -106,11 +103,8 @@ export default function ArtistsScreen() { <> {searchBar} - } data={artists} keyExtractor={artistKey} renderItem={renderItem} diff --git a/apps/mobile/app/(app)/(tabs)/home/browse/playlists.tsx b/apps/mobile/app/(app)/(tabs)/home/browse/playlists.tsx index ca36163..d8f2aab 100644 --- a/apps/mobile/app/(app)/(tabs)/home/browse/playlists.tsx +++ b/apps/mobile/app/(app)/(tabs)/home/browse/playlists.tsx @@ -1,4 +1,3 @@ -import { useContext } from "react" import { Pressable } from "react-native" import { MediaGridList } from "@/components/media-cards" @@ -11,20 +10,19 @@ import { Ionicons } from "@expo/vector-icons" import { Stack } from "expo-router" import { SymbolView } from "expo-symbols" import { useAddToPlaylist } from "@/contexts/add-to-playlist" -import { TabletSectionContext } from "@/lib/tablet-navigation" export default function PlaylistsTabScreen() { const colors = useThemeColors() const playlists = useCachedQuery(api.playlists.listAllPlaylists) const { openCreatePlaylist } = useAddToPlaylist() - const title = useContext(TabletSectionContext)?.title ?? "Playlists" if (playlists === undefined) { return ( <> ( - + ) } @@ -49,7 +47,8 @@ export default function PlaylistsTabScreen() { <> ( diff --git a/apps/mobile/app/(app)/(tabs)/home/browse/songs.tsx b/apps/mobile/app/(app)/(tabs)/home/browse/songs.tsx index 15065ca..204c67a 100644 --- a/apps/mobile/app/(app)/(tabs)/home/browse/songs.tsx +++ b/apps/mobile/app/(app)/(tabs)/home/browse/songs.tsx @@ -1,16 +1,10 @@ import { Stack } from "expo-router" import { useCallback, useState } from "react" -import { - type FlatList, - StyleSheet, - type ListRenderItemInfo, -} from "react-native" -import Animated from "react-native-reanimated" +import { FlatList, StyleSheet, type ListRenderItemInfo } from "react-native" import type { MediaAction } from "@/components/media-context-menu" import { contentBottomInset, SongListRow } from "@/components/player" import { SongListSkeleton } from "@/components/skeletons" -import { ScreenTitle, useScreenTitleScroll } from "@/components/screen-title" import { useFavorites } from "@/contexts/favorites" import { usePlaybackActions } from "@/contexts/playback" import { @@ -26,7 +20,6 @@ import { longListProps } from "@/lib/list" const PAGE_SIZE = 50 export default function SongsScreen() { - const { ref, scrollY } = useScreenTitleScroll>() const { playFromLibrarySong } = usePlaybackActions() const { isSongFavorite } = useFavorites() const { handleSongAction } = useMediaMenuActions() @@ -94,7 +87,7 @@ export default function SongsScreen() { return ( <> {searchBar} - + ) } @@ -103,11 +96,8 @@ export default function SongsScreen() { <> {searchBar} - } data={songs} keyExtractor={songKey} renderItem={renderItem} diff --git a/apps/mobile/app/(app)/(tabs)/home/downloads/index.tsx b/apps/mobile/app/(app)/(tabs)/home/downloads/index.tsx index f19f8f7..5880bdc 100644 --- a/apps/mobile/app/(app)/(tabs)/home/downloads/index.tsx +++ b/apps/mobile/app/(app)/(tabs)/home/downloads/index.tsx @@ -1,6 +1,6 @@ import { useMemo } from "react" import { - type FlatList, + FlatList, Pressable, StyleSheet, Text, @@ -8,10 +8,8 @@ import { type ListRenderItemInfo, } from "react-native" import { Stack } from "expo-router" -import Animated from "react-native-reanimated" import { CoverImage } from "@/components/cover-image" -import { ScreenTitle, useScreenTitleScroll } from "@/components/screen-title" import { tabContentBottomInset } from "@/components/player" import { FAVORITES_DOWNLOAD_ID, @@ -55,7 +53,6 @@ export default function DownloadsScreen() { const { push } = useAppNavigation() const { columns, cardWidth, onLayout, horizontalPadding, gap } = useMediaGridLayout() - const { ref, scrollY } = useScreenTitleScroll>() const cards = useMemo(() => { if (!queue) return [] @@ -138,10 +135,8 @@ export default function DownloadsScreen() { return ( <> - - + 1 ? { gap } : undefined} contentInsetAdjustmentBehavior="automatic" - ListHeaderComponent={ - - } ListEmptyComponent={ diff --git a/apps/mobile/app/(app)/(tabs)/home/downloads/other.tsx b/apps/mobile/app/(app)/(tabs)/home/downloads/other.tsx index 1713185..80599f2 100644 --- a/apps/mobile/app/(app)/(tabs)/home/downloads/other.tsx +++ b/apps/mobile/app/(app)/(tabs)/home/downloads/other.tsx @@ -1,17 +1,15 @@ import { useCallback, useMemo } from "react" import { - type FlatList, + FlatList, Pressable, StyleSheet, Text, View, type ListRenderItemInfo, } from "react-native" -import Animated from "react-native-reanimated" import { Ionicons } from "@expo/vector-icons" import { Stack } from "expo-router" -import { ScreenTitle, useScreenTitleScroll } from "@/components/screen-title" import { useSwipeRowGroup } from "@/components/ios-swipe-to-remove-row" import type { MediaAction } from "@/components/media-context-menu" import { contentBottomInset, SongListRow } from "@/components/player" @@ -54,7 +52,6 @@ export default function OtherDownloadsScreen() { const { isSongFavorite } = useFavorites() const { handleSongAction } = useMediaMenuActions() const swipeGroup = useSwipeRowGroup() - const { ref, scrollY } = useScreenTitleScroll>() const handlePlaySong = useCallback( (song: BrowseSong) => void playFromSong(song.id, playableIds, PLAY_ORIGIN), @@ -93,11 +90,11 @@ export default function OtherDownloadsScreen() { return ( <> - - + song.id} renderItem={renderItem} @@ -106,32 +103,25 @@ export default function OtherDownloadsScreen() { contentInsetAdjustmentBehavior="automatic" onScrollBeginDrag={swipeGroup.closeOpenRow} ListHeaderComponent={ - <> - - {songs.length > 0 ? ( - -