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 ? (
-
-
- ) : null}
- >
+ songs.length > 0 ? (
+
+
+ ) : undefined
}
ListEmptyComponent={
diff --git a/apps/mobile/app/(app)/(tabs)/home/index.tsx b/apps/mobile/app/(app)/(tabs)/home/index.tsx
index 12c5354..7d1348a 100644
--- a/apps/mobile/app/(app)/(tabs)/home/index.tsx
+++ b/apps/mobile/app/(app)/(tabs)/home/index.tsx
@@ -1,10 +1,8 @@
import { memo } from "react"
-import { type ScrollViewInstance, StyleSheet } from "react-native"
-import Animated from "react-native-reanimated"
+import { ScrollView, StyleSheet } from "react-native"
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"
@@ -40,7 +38,6 @@ const HomeCarousels = memo(function HomeCarousels({
export default function HomeScreen() {
const colors = useThemeColors()
- const { ref, scrollY } = useScreenTitleScroll()
const recentlyAdded = useCachedPaginatedQuery(
api.library.browseRecentlyAddedPaginated,
{},
@@ -56,16 +53,14 @@ 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 (
-
-
-
+
)
}
@@ -84,10 +78,4 @@ 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 f121e44..aa7577d 100644
--- a/apps/mobile/app/(app)/(tabs)/home/recently-added.tsx
+++ b/apps/mobile/app/(app)/(tabs)/home/recently-added.tsx
@@ -14,12 +14,11 @@ 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 341c996..82878be 100644
--- a/apps/mobile/app/(app)/(tabs)/home/recently-played.tsx
+++ b/apps/mobile/app/(app)/(tabs)/home/recently-played.tsx
@@ -14,12 +14,11 @@ 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 b669a38..50e70aa 100644
--- a/apps/mobile/app/(app)/(tabs)/library/_layout.tsx
+++ b/apps/mobile/app/(app)/(tabs)/library/_layout.tsx
@@ -3,11 +3,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",
@@ -22,7 +18,6 @@ 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 ac52002..be6eb3a 100644
--- a/apps/mobile/app/(app)/(tabs)/library/index.tsx
+++ b/apps/mobile/app/(app)/(tabs)/library/index.tsx
@@ -72,7 +72,6 @@ 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,
{},
@@ -125,18 +124,11 @@ export default function LibraryScreen() {
)
if (status === "LoadingFirstPage" && !isCached) {
- return (
-
- )
+ return
}
return (
({
...baseOptions,
- ...inlineTitleOptions,
title: tabStackScreenTitles[route.name] ?? "Search",
headerRight:
route.name === "index" ? () => : undefined,
diff --git a/apps/mobile/app/(app)/(tabs)/search/index.tsx b/apps/mobile/app/(app)/(tabs)/search/index.tsx
index 6804298..1dc5e39 100644
--- a/apps/mobile/app/(app)/(tabs)/search/index.tsx
+++ b/apps/mobile/app/(app)/(tabs)/search/index.tsx
@@ -35,7 +35,7 @@ export default function SearchScreen() {
: {})}
/>
-
+
>
)
}
diff --git a/apps/mobile/components/media-cards.tsx b/apps/mobile/components/media-cards.tsx
index 418a6f9..5271569 100644
--- a/apps/mobile/components/media-cards.tsx
+++ b/apps/mobile/components/media-cards.tsx
@@ -4,7 +4,6 @@ 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"
@@ -301,21 +300,17 @@ 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) => (
@@ -333,30 +328,13 @@ 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
deleted file mode 100644
index 99d814e..0000000
--- a/apps/mobile/components/screen-title.tsx
+++ /dev/null
@@ -1,84 +0,0 @@
-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/search-results.tsx b/apps/mobile/components/search-results.tsx
index d81d92e..9501421 100644
--- a/apps/mobile/components/search-results.tsx
+++ b/apps/mobile/components/search-results.tsx
@@ -1,15 +1,13 @@
import { memo, useCallback, useMemo } from "react"
import {
- type FlatList,
+ FlatList,
StyleSheet,
Text,
View,
type ListRenderItemInfo,
} from "react-native"
-import Animated from "react-native-reanimated"
import { ContentCarousel } from "@/components/media-cards"
-import { ScreenTitle, useScreenTitleScroll } from "@/components/screen-title"
import type { MediaAction } from "@/components/media-context-menu"
import { tabContentBottomInset, SongListRow } from "@/components/player"
import { SongListSkeleton } from "@/components/skeletons"
@@ -21,16 +19,8 @@ import { api } from "@otunes/convex/_generated/api"
import type { BrowseSong, SearchSong } from "@otunes/convex/types"
import { spacing, useThemeColors } from "@/lib/theme"
-function SearchResultsBody({
- searchQuery,
- title,
-}: {
- searchQuery: string
- /** iOS `ScreenTitle`, shown above the results and while idle. */
- title: string
-}) {
+function SearchResultsBody({ searchQuery }: { searchQuery: string }) {
const colors = useThemeColors()
- const { ref, scrollY } = useScreenTitleScroll>()
const { playFromSong } = usePlaybackActions()
const { isSongFavorite } = useFavorites()
const { handleSongAction } = useMediaMenuActions()
@@ -86,14 +76,16 @@ function SearchResultsBody({
)
if (isSearching) {
- return
+ return
+ }
+
+ if (!hasQuery) {
+ return <>>
}
return (
- song.id}
style={{ flex: 1, backgroundColor: colors.background }}
contentContainerStyle={{ paddingBottom: tabContentBottomInset }}
@@ -101,8 +93,7 @@ function SearchResultsBody({
keyboardShouldPersistTaps="handled"
ListHeaderComponent={
<>
-
- {hasQuery && !hasResults ? (
+ {!hasResults ? (
) : null}
- {hasQuery && results?.artists.length ? (
+ {results?.artists.length ? (
) : null}
- {hasQuery && results?.albums.length ? (
+ {results?.albums.length ? (
@@ -127,7 +118,7 @@ function SearchResultsBody({
}
renderItem={renderItem}
ListFooterComponent={
- hasQuery && playlistResults && playlistResults.length > 0 ? (
+ playlistResults && playlistResults.length > 0 ? (
diff --git a/apps/mobile/components/skeletons.tsx b/apps/mobile/components/skeletons.tsx
index 2519de0..d0d0ec6 100644
--- a/apps/mobile/components/skeletons.tsx
+++ b/apps/mobile/components/skeletons.tsx
@@ -9,7 +9,6 @@ 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"
@@ -152,16 +151,9 @@ function SongRows({ rows, inset }: { rows: number; inset?: boolean }) {
))
}
-export function SongListSkeleton({
- rows = 10,
- title,
-}: {
- rows?: number
- title?: string
-}) {
+export function SongListSkeleton({ rows = 10 }: { rows?: number }) {
return (
- {title ? : null}
)
@@ -242,45 +234,23 @@ 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
- )
- }
+ contentInset={contentInset}
+ header={header}
/>
)
}
-function MediaGridTitle({ title }: { title: string }) {
- const { horizontalPadding } = useMediaGridLayout()
- return (
-
- )
-}
-
export function CarouselSkeleton() {
return (
@@ -294,11 +264,10 @@ export function CarouselSkeleton() {
)
}
-export function HomeSkeleton({ title }: { title: string }) {
+export function HomeSkeleton() {
return (
-
@@ -419,17 +388,10 @@ export function CollectionDetailSkeleton({
)
}
-export function ArtistListSkeleton({
- rows = 12,
- title,
-}: {
- rows?: number
- title?: string
-}) {
+export function ArtistListSkeleton({ rows = 12 }: { rows?: number }) {
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
}
@@ -44,12 +41,9 @@ 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()
@@ -108,27 +102,18 @@ export function TabletMediaGrid({
setViewportHeight(event.nativeEvent.layout.height)
}}
>
-
setHeaderHeight(event.nativeEvent.layout.height)}
>
- {title ? (
-
- ) : null}
{ListHeaderComponent}
@@ -151,7 +136,7 @@ export function TabletMediaGrid({
)
})}
-
+
)
}
diff --git a/apps/mobile/lib/navigation.ts b/apps/mobile/lib/navigation.ts
index bf29cec..b175972 100644
--- a/apps/mobile/lib/navigation.ts
+++ b/apps/mobile/lib/navigation.ts
@@ -17,20 +17,13 @@ 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: false,
+ headerLargeTitle: true,
headerTransparent: true,
headerTintColor: theme.foreground,
headerLargeTitleStyle: { color: theme.foreground },