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 9453ea3..917c410 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,7 +1,11 @@
import { Stack } from "expo-router"
import { renderTabScreenContent } from "@/components/tab-screen-content"
-import { useStackScreenOptions, tabStackScreenTitles } from "@/lib/navigation"
+import {
+ inlineTitleOptions,
+ tabStackScreenTitles,
+ useStackScreenOptions,
+} from "@/lib/navigation"
import { tabletSections, TabletSectionContext } from "@/lib/tablet-navigation"
export default function TabletSectionLayout({ segment }: { segment: string }) {
@@ -14,6 +18,7 @@ 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 75da6ca..7d17397 100644
--- a/apps/mobile/app/(app)/(tabs)/home/_layout.tsx
+++ b/apps/mobile/app/(app)/(tabs)/home/_layout.tsx
@@ -2,7 +2,11 @@ import { renderTabScreenContent } from "@/components/tab-screen-content"
import { Stack } from "expo-router"
import { ProfileHeaderButton } from "@/components/profile-header-button"
-import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
+import {
+ inlineTitleOptions,
+ tabStackScreenTitles,
+ useStackScreenOptions,
+} from "@/lib/navigation"
export const unstable_settings = {
anchor: "index",
@@ -16,6 +20,7 @@ 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 21da78d..297c5dd 100644
--- a/apps/mobile/app/(app)/(tabs)/home/browse/albums.tsx
+++ b/apps/mobile/app/(app)/(tabs)/home/browse/albums.tsx
@@ -44,6 +44,8 @@ export default function AlbumsScreen() {
placeholder: "Search",
onChangeText: handleChangeText,
onSearchButtonPress: onSearchSubmit,
+ // A search button in the bar leaves room for the inline title.
+ placement: "integratedButton",
},
}}
/>
@@ -53,7 +55,7 @@ export default function AlbumsScreen() {
return (
<>
{searchBar}
-
+
>
)
}
@@ -63,6 +65,7 @@ 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 b83ea1f..2bc57ff 100644
--- a/apps/mobile/app/(app)/(tabs)/home/browse/artists.tsx
+++ b/apps/mobile/app/(app)/(tabs)/home/browse/artists.tsx
@@ -2,12 +2,13 @@ import { Ionicons } from "@expo/vector-icons"
import { Stack } from "expo-router"
import { memo, useCallback } from "react"
import {
- FlatList,
+ type FlatList,
Pressable,
StyleSheet,
Text,
type ListRenderItemInfo,
} from "react-native"
+import Animated from "react-native-reanimated"
import {
MediaContextMenu,
@@ -15,6 +16,7 @@ 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 {
@@ -33,6 +35,7 @@ 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()
@@ -85,6 +88,8 @@ export default function ArtistsScreen() {
placeholder: "Search",
onChangeText: handleChangeText,
onSearchButtonPress: onSearchSubmit,
+ // A search button in the bar leaves room for the inline title.
+ placement: "integratedButton",
},
}}
/>
@@ -94,7 +99,7 @@ export default function ArtistsScreen() {
return (
<>
{searchBar}
-
+
>
)
}
@@ -103,8 +108,11 @@ 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 d8f2aab..ca36163 100644
--- a/apps/mobile/app/(app)/(tabs)/home/browse/playlists.tsx
+++ b/apps/mobile/app/(app)/(tabs)/home/browse/playlists.tsx
@@ -1,3 +1,4 @@
+import { useContext } from "react"
import { Pressable } from "react-native"
import { MediaGridList } from "@/components/media-cards"
@@ -10,19 +11,20 @@ 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 (
<>
(
-
+
>
)
}
@@ -47,8 +49,7 @@ 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 204c67a..c629f2a 100644
--- a/apps/mobile/app/(app)/(tabs)/home/browse/songs.tsx
+++ b/apps/mobile/app/(app)/(tabs)/home/browse/songs.tsx
@@ -1,10 +1,16 @@
import { Stack } from "expo-router"
import { useCallback, useState } from "react"
-import { FlatList, StyleSheet, type ListRenderItemInfo } from "react-native"
+import {
+ type FlatList,
+ StyleSheet,
+ type ListRenderItemInfo,
+} from "react-native"
+import Animated from "react-native-reanimated"
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 {
@@ -20,6 +26,7 @@ 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()
@@ -78,6 +85,8 @@ export default function SongsScreen() {
placeholder: "Search",
onChangeText: handleChangeText,
onSearchButtonPress: onSearchSubmit,
+ // A search button in the bar leaves room for the inline title.
+ placement: "integratedButton",
},
}}
/>
@@ -87,7 +96,7 @@ export default function SongsScreen() {
return (
<>
{searchBar}
-
+
>
)
}
@@ -96,8 +105,11 @@ 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 5880bdc..f19f8f7 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 {
- FlatList,
+ type FlatList,
Pressable,
StyleSheet,
Text,
@@ -8,8 +8,10 @@ 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,
@@ -53,6 +55,7 @@ export default function DownloadsScreen() {
const { push } = useAppNavigation()
const { columns, cardWidth, onLayout, horizontalPadding, gap } =
useMediaGridLayout()
+ const { ref, scrollY } = useScreenTitleScroll>()
const cards = useMemo(() => {
if (!queue) return []
@@ -135,8 +138,10 @@ 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 80599f2..1713185 100644
--- a/apps/mobile/app/(app)/(tabs)/home/downloads/other.tsx
+++ b/apps/mobile/app/(app)/(tabs)/home/downloads/other.tsx
@@ -1,15 +1,17 @@
import { useCallback, useMemo } from "react"
import {
- FlatList,
+ type 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"
@@ -52,6 +54,7 @@ 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),
@@ -90,11 +93,11 @@ export default function OtherDownloadsScreen() {
return (
<>
-
-
+ song.id}
renderItem={renderItem}
@@ -103,25 +106,32 @@ export default function OtherDownloadsScreen() {
contentInsetAdjustmentBehavior="automatic"
onScrollBeginDrag={swipeGroup.closeOpenRow}
ListHeaderComponent={
- songs.length > 0 ? (
-
-
- ) : undefined
+ <>
+
+ {songs.length > 0 ? (
+
+
+ ) : null}
+ >
}
ListEmptyComponent={
diff --git a/apps/mobile/app/(app)/(tabs)/home/index.tsx b/apps/mobile/app/(app)/(tabs)/home/index.tsx
index 7d1348a..12c5354 100644
--- a/apps/mobile/app/(app)/(tabs)/home/index.tsx
+++ b/apps/mobile/app/(app)/(tabs)/home/index.tsx
@@ -1,8 +1,10 @@
import { memo } from "react"
-import { ScrollView, StyleSheet } from "react-native"
+import { type ScrollViewInstance, StyleSheet } from "react-native"
+import Animated from "react-native-reanimated"
import { ContentCarousel } from "@/components/media-cards"
import { HomeSkeleton } from "@/components/skeletons"
+import { ScreenTitle, useScreenTitleScroll } from "@/components/screen-title"
import { tabContentBottomInset } from "@/components/player"
import { useCachedPaginatedQuery } from "@/hooks/use-cached-query"
import { api } from "@otunes/convex/_generated/api"
@@ -38,6 +40,7 @@ const HomeCarousels = memo(function HomeCarousels({
export default function HomeScreen() {
const colors = useThemeColors()
+ const { ref, scrollY } = useScreenTitleScroll()
const recentlyAdded = useCachedPaginatedQuery(
api.library.browseRecentlyAddedPaginated,
{},
@@ -53,14 +56,16 @@ export default function HomeScreen() {
(result) => result.status === "LoadingFirstPage" && !result.isCached
)
if (isLoading) {
- return
+ return
}
const added = recentlyAdded.results.slice(0, CAROUSEL_ITEM_LIMIT)
const played = recentlyPlayed.results.slice(0, CAROUSEL_ITEM_LIMIT)
return (
-
+
-
+
)
}
@@ -78,4 +84,10 @@ const styles = StyleSheet.create({
padding: spacing.lg,
gap: spacing.xl,
},
+ // The content padding already insets the title.
+ title: {
+ paddingHorizontal: 0,
+ marginTop: -spacing.lg,
+ marginBottom: -spacing.md,
+ },
})
diff --git a/apps/mobile/app/(app)/(tabs)/home/recently-added.tsx b/apps/mobile/app/(app)/(tabs)/home/recently-added.tsx
index aa7577d..f121e44 100644
--- a/apps/mobile/app/(app)/(tabs)/home/recently-added.tsx
+++ b/apps/mobile/app/(app)/(tabs)/home/recently-added.tsx
@@ -14,11 +14,12 @@ export default function RecentlyAddedScreen() {
)
if (status === "LoadingFirstPage" && !isCached) {
- return
+ return
}
return (
{
diff --git a/apps/mobile/app/(app)/(tabs)/home/recently-played.tsx b/apps/mobile/app/(app)/(tabs)/home/recently-played.tsx
index 82878be..341c996 100644
--- a/apps/mobile/app/(app)/(tabs)/home/recently-played.tsx
+++ b/apps/mobile/app/(app)/(tabs)/home/recently-played.tsx
@@ -14,11 +14,12 @@ export default function RecentlyPlayedScreen() {
)
if (status === "LoadingFirstPage" && !isCached) {
- return
+ return
}
return (
{
diff --git a/apps/mobile/app/(app)/(tabs)/library/_layout.tsx b/apps/mobile/app/(app)/(tabs)/library/_layout.tsx
index 50e70aa..b669a38 100644
--- a/apps/mobile/app/(app)/(tabs)/library/_layout.tsx
+++ b/apps/mobile/app/(app)/(tabs)/library/_layout.tsx
@@ -3,7 +3,11 @@ import { renderTabScreenContent } from "@/components/tab-screen-content"
import { Stack } from "expo-router"
import { ProfileHeaderButton } from "@/components/profile-header-button"
-import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
+import {
+ inlineTitleOptions,
+ tabStackScreenTitles,
+ useStackScreenOptions,
+} from "@/lib/navigation"
export const unstable_settings = {
anchor: "index",
@@ -18,6 +22,7 @@ export default function LibraryLayout() {
screenLayout={renderTabScreenContent}
screenOptions={({ route }) => ({
...baseOptions,
+ ...inlineTitleOptions,
title:
tabStackScreenTitles[route.name] ??
(tabletLayout ? "Recently Added" : "Library"),
diff --git a/apps/mobile/app/(app)/(tabs)/library/index.tsx b/apps/mobile/app/(app)/(tabs)/library/index.tsx
index be6eb3a..ac52002 100644
--- a/apps/mobile/app/(app)/(tabs)/library/index.tsx
+++ b/apps/mobile/app/(app)/(tabs)/library/index.tsx
@@ -72,6 +72,7 @@ export default function LibraryScreen() {
const { push } = useAppNavigation()
const isTablet = tabletLayout
const colors = useThemeColors()
+ const title = isTablet ? "Recently Added" : "Library"
const { results, status, loadMore, isCached } = useCachedPaginatedQuery(
api.library.browseRecentlyAddedPaginated,
{},
@@ -124,11 +125,18 @@ export default function LibraryScreen() {
)
if (status === "LoadingFirstPage" && !isCached) {
- return
+ return (
+
+ )
}
return (
({
...baseOptions,
+ // The search tab keeps the native large title: its header search
+ // field has to sit below the title, which an inline title can't do.
+ ...(route.name === "index"
+ ? { headerLargeTitle: true }
+ : inlineTitleOptions),
title: tabStackScreenTitles[route.name] ?? "Search",
headerRight:
route.name === "index" ? () => : undefined,
diff --git a/apps/mobile/components/media-cards.tsx b/apps/mobile/components/media-cards.tsx
index 5271569..418a6f9 100644
--- a/apps/mobile/components/media-cards.tsx
+++ b/apps/mobile/components/media-cards.tsx
@@ -4,6 +4,7 @@ import { tabletLayoutTransition } from "@/lib/tablet-motion"
import { TabletMediaGrid } from "@/components/tablet-media-grid"
import { useMediaGridLayout } from "@/hooks/use-media-grid-layout"
import { MusicEntityView } from "@/components/music-entity-view"
+import { ScreenTitle, useScreenTitleScroll } from "@/components/screen-title"
import { Link } from "expo-router"
import { Ionicons } from "@expo/vector-icons"
import { memo, useCallback, type ReactElement } from "react"
@@ -300,17 +301,21 @@ export function MediaGridList({
onEndReached,
ListHeaderComponent,
contentInset = true,
+ title,
}: {
content: MediaItem[]
paddingBottom: number
onEndReached?: () => void
ListHeaderComponent?: ReactElement
contentInset?: boolean
+ /** iOS `ScreenTitle` shown above the grid; it replaces the top inset. */
+ title?: string
}) {
const tabletLayout = useTabletLayout()
const { columns, cardWidth, onLayout, horizontalPadding, gap } =
useMediaGridLayout()
const colors = useThemeColors()
+ const { ref, scrollY } = useScreenTitleScroll>()
const renderItem = useCallback(
({ item }: ListRenderItemInfo) => (
@@ -328,13 +333,30 @@ export function MediaGridList({
onEndReached={onEndReached}
ListHeaderComponent={ListHeaderComponent}
contentInset={contentInset}
+ title={title}
renderCard={renderTabletCard}
/>
)
}
+ const header = title ? (
+
+
+ {ListHeaderComponent}
+
+ ) : (
+ ListHeaderComponent
+ )
+
return (
-
diff --git a/apps/mobile/components/screen-title.tsx b/apps/mobile/components/screen-title.tsx
new file mode 100644
index 0000000..99d814e
--- /dev/null
+++ b/apps/mobile/components/screen-title.tsx
@@ -0,0 +1,84 @@
+import { useHeaderHeight } from "expo-router/react-navigation"
+import type { Component } from "react"
+import {
+ Platform,
+ StyleSheet,
+ type ScrollViewInstance,
+ type StyleProp,
+ type TextStyle,
+} from "react-native"
+import Animated, {
+ useAnimatedRef,
+ useAnimatedStyle,
+ useScrollOffset,
+ type SharedValue,
+} from "react-native-reanimated"
+
+import { spacing, useThemeColors } from "@/lib/theme"
+
+/**
+ * Tracks the scroll view that renders a `ScreenTitle`. Attach `ref` to that
+ * Reanimated `Animated.ScrollView` / `Animated.FlatList` and pass `scrollY`
+ * to the title.
+ */
+export function useScreenTitleScroll<
+ TScrollView extends Component | ScrollViewInstance,
+>() {
+ const ref = useAnimatedRef()
+ const scrollY = useScrollOffset(ref)
+ return { ref, scrollY }
+}
+
+/**
+ * iOS screen title rendered as the first item of a screen's scroll content,
+ * in place of the native large title (Apple Music style): it scrolls away
+ * with the content, never collapses into the bar, and stays put on
+ * pull-down. Android keeps its native header title, so this renders nothing.
+ */
+export function ScreenTitle({
+ title,
+ scrollY,
+ style,
+}: {
+ title: string
+ /** From `useScreenTitleScroll`; omit for screens that never scroll. */
+ scrollY?: SharedValue
+ style?: StyleProp
+}) {
+ const colors = useThemeColors()
+ // At rest the scroll offset is minus the automatic header inset, so any
+ // offset below that is overscroll the title should cancel out.
+ const headerHeight = useHeaderHeight()
+ const pinStyle = useAnimatedStyle(() => ({
+ transform: [
+ {
+ translateY: scrollY ? Math.min(0, scrollY.value + headerHeight) : 0,
+ },
+ ],
+ }))
+
+ if (Platform.OS !== "ios") return null
+
+ return (
+
+ {title}
+
+ )
+}
+
+// Matches UIKit's large title metrics: 34pt bold in a 52pt tall area.
+const styles = StyleSheet.create({
+ title: {
+ fontSize: 34,
+ lineHeight: 41,
+ fontWeight: "700",
+ letterSpacing: 0.37,
+ paddingHorizontal: spacing.lg,
+ paddingTop: 3,
+ paddingBottom: 8,
+ },
+})
diff --git a/apps/mobile/components/skeletons.tsx b/apps/mobile/components/skeletons.tsx
index d0d0ec6..2519de0 100644
--- a/apps/mobile/components/skeletons.tsx
+++ b/apps/mobile/components/skeletons.tsx
@@ -9,6 +9,7 @@ import {
collectionInset,
} from "@/components/collection-list"
import { tabletCardTextHeight } from "@/components/tablet-media-grid"
+import { ScreenTitle } from "@/components/screen-title"
import { Link } from "expo-router"
import { useHeaderHeight } from "expo-router/react-navigation"
import Reanimated from "react-native-reanimated"
@@ -151,9 +152,16 @@ function SongRows({ rows, inset }: { rows: number; inset?: boolean }) {
))
}
-export function SongListSkeleton({ rows = 10 }: { rows?: number }) {
+export function SongListSkeleton({
+ rows = 10,
+ title,
+}: {
+ rows?: number
+ title?: string
+}) {
return (
+ {title ? : null}
)
@@ -234,23 +242,45 @@ export function MediaGridSkeleton({
items = 6,
contentInset = true,
header,
+ title,
}: {
items?: number
contentInset?: boolean
/** The loaded list's `ListHeaderComponent`, so it keeps its position. */
header?: ReactNode
+ /** The loaded list's `ScreenTitle`, which replaces its top inset. */
+ title?: string
}) {
return (
+
+ {header}
+ >
+ ) : (
+ header
+ )
+ }
/>
)
}
+function MediaGridTitle({ title }: { title: string }) {
+ const { horizontalPadding } = useMediaGridLayout()
+ return (
+
+ )
+}
+
export function CarouselSkeleton() {
return (
@@ -264,10 +294,11 @@ export function CarouselSkeleton() {
)
}
-export function HomeSkeleton() {
+export function HomeSkeleton({ title }: { title: string }) {
return (
+
@@ -388,10 +419,17 @@ export function CollectionDetailSkeleton({
)
}
-export function ArtistListSkeleton({ rows = 12 }: { rows?: number }) {
+export function ArtistListSkeleton({
+ rows = 12,
+ title,
+}: {
+ rows?: number
+ title?: string
+}) {
const colors = useThemeColors()
return (
+ {title ? : null}
{Array.from({ length: rows }, (_, index) => (
void
ListHeaderComponent?: ReactElement
contentInset?: boolean
+ /** iOS `ScreenTitle` shown above the grid; it replaces the top inset. */
+ title?: string
renderCard: (item: MediaItem, width: number) => ReactElement
}
@@ -41,9 +44,12 @@ export function TabletMediaGrid({
onEndReached,
ListHeaderComponent,
contentInset = true,
+ title,
renderCard,
}: GridProps) {
const colors = useThemeColors()
+ const { ref, scrollY: titleScrollY } =
+ useScreenTitleScroll()
const insets = useSafeAreaInsets()
const { columns, cardWidth, onLayout, horizontalPadding, gap, ready } =
useMediaGridLayout()
@@ -102,18 +108,27 @@ export function TabletMediaGrid({
setViewportHeight(event.nativeEvent.layout.height)
}}
>
-
setHeaderHeight(event.nativeEvent.layout.height)}
>
+ {title ? (
+
+ ) : null}
{ListHeaderComponent}
@@ -136,7 +151,7 @@ export function TabletMediaGrid({
)
})}
-
+
)
}
diff --git a/apps/mobile/lib/navigation.ts b/apps/mobile/lib/navigation.ts
index b175972..bf29cec 100644
--- a/apps/mobile/lib/navigation.ts
+++ b/apps/mobile/lib/navigation.ts
@@ -17,13 +17,20 @@ export const tabStackScreenTitles: Record = {
"downloads/other": "Other Downloaded Songs",
}
+/**
+ * iOS tab stacks render their titles in the scroll content with
+ * `ScreenTitle`, so the bar keeps the title (for back menus) but hides it.
+ */
+export const inlineTitleOptions: StackScreenOptions =
+ Platform.OS === "ios" ? { headerTitleStyle: { color: "transparent" } } : {}
+
export function useStackScreenOptions(
overrides?: StackScreenOptions
): StackScreenOptions {
const theme = useThemeColors()
return {
- headerLargeTitle: true,
+ headerLargeTitle: false,
headerTransparent: true,
headerTintColor: theme.foreground,
headerLargeTitleStyle: { color: theme.foreground },