revert(mobile): restore native iOS large titles (#137)
This commit was merged in pull request #137.
This commit is contained in:
1 parent
3c221330c2
commit
4ad94ba643
21 files changed
+115
-427
No files matched your search
+1
-6
@@ -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
|
||||
|
||||
@@ -2,12 +2,7 @@ import { renderTabScreenContent } from "@/components/tab-screen-content"
|
||||
import { Stack } from "expo-router"
|
||||
|
||||
import { ProfileHeaderButton } from "@/components/profile-header-button"
|
||||
import {
|
||||
inlineTitleOptions,
|
||||
showHeaderProfile,
|
||||
tabStackScreenTitles,
|
||||
useStackScreenOptions,
|
||||
} from "@/lib/navigation"
|
||||
import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
|
||||
|
||||
export const unstable_settings = {
|
||||
anchor: "index",
|
||||
@@ -21,12 +16,19 @@ export default function HomeLayout() {
|
||||
screenLayout={renderTabScreenContent}
|
||||
screenOptions={({ route }) => ({
|
||||
...baseOptions,
|
||||
...inlineTitleOptions,
|
||||
title: tabStackScreenTitles[route.name] ?? "Home",
|
||||
// iOS shows the profile button inline with the screen title instead.
|
||||
headerRight: showHeaderProfile(route.name)
|
||||
? () => <ProfileHeaderButton />
|
||||
: undefined,
|
||||
headerRight:
|
||||
route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
|
||||
unstable_headerRightItems:
|
||||
route.name === "index"
|
||||
? () => [
|
||||
{
|
||||
type: "custom",
|
||||
element: <ProfileHeaderButton />,
|
||||
hidesSharedBackground: true,
|
||||
},
|
||||
]
|
||||
: undefined,
|
||||
})}
|
||||
/>
|
||||
)
|
||||
|
||||
@@ -53,7 +53,7 @@ export default function AlbumsScreen() {
|
||||
return (
|
||||
<>
|
||||
{searchBar}
|
||||
<MediaGridSkeleton title="Albums" />
|
||||
<MediaGridSkeleton />
|
||||
</>
|
||||
)
|
||||
}
|
||||
@@ -63,7 +63,6 @@ export default function AlbumsScreen() {
|
||||
{searchBar}
|
||||
|
||||
<MediaGridList
|
||||
title="Albums"
|
||||
content={albums}
|
||||
paddingBottom={contentBottomInset}
|
||||
onEndReached={() => {
|
||||
|
||||
@@ -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<FlatList<BrowseArtist>>()
|
||||
const { push } = useAppNavigation()
|
||||
const colors = useThemeColors()
|
||||
const { config } = useServerConfig()
|
||||
@@ -97,7 +94,7 @@ export default function ArtistsScreen() {
|
||||
return (
|
||||
<>
|
||||
{searchBar}
|
||||
<ArtistListSkeleton title="Artists" />
|
||||
<ArtistListSkeleton />
|
||||
</>
|
||||
)
|
||||
}
|
||||
@@ -106,11 +103,8 @@ export default function ArtistsScreen() {
|
||||
<>
|
||||
{searchBar}
|
||||
|
||||
<Animated.FlatList
|
||||
<FlatList
|
||||
{...longListProps}
|
||||
ref={ref}
|
||||
scrollEventThrottle={16}
|
||||
ListHeaderComponent={<ScreenTitle title="Artists" scrollY={scrollY} />}
|
||||
data={artists}
|
||||
keyExtractor={artistKey}
|
||||
renderItem={renderItem}
|
||||
|
||||
@@ -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 (
|
||||
<>
|
||||
<Stack.Screen
|
||||
options={{
|
||||
title,
|
||||
title: "Playlists",
|
||||
headerLargeTitle: true,
|
||||
headerRight: () => (
|
||||
<Pressable
|
||||
onPress={openCreatePlaylist}
|
||||
@@ -40,7 +38,7 @@ export default function PlaylistsTabScreen() {
|
||||
),
|
||||
}}
|
||||
/>
|
||||
<MediaGridSkeleton title={title} />
|
||||
<MediaGridSkeleton />
|
||||
</>
|
||||
)
|
||||
}
|
||||
@@ -49,7 +47,8 @@ export default function PlaylistsTabScreen() {
|
||||
<>
|
||||
<Stack.Screen
|
||||
options={{
|
||||
title,
|
||||
title: "Playlists",
|
||||
headerLargeTitle: true,
|
||||
headerRight: () => (
|
||||
<Pressable
|
||||
onPress={openCreatePlaylist}
|
||||
@@ -62,7 +61,6 @@ export default function PlaylistsTabScreen() {
|
||||
}}
|
||||
/>
|
||||
<MediaGridList
|
||||
title={title}
|
||||
content={playlists}
|
||||
paddingBottom={tabContentBottomInset}
|
||||
/>
|
||||
|
||||
@@ -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<FlatList<BrowseSong>>()
|
||||
const { playFromLibrarySong } = usePlaybackActions()
|
||||
const { isSongFavorite } = useFavorites()
|
||||
const { handleSongAction } = useMediaMenuActions()
|
||||
@@ -94,7 +87,7 @@ export default function SongsScreen() {
|
||||
return (
|
||||
<>
|
||||
{searchBar}
|
||||
<SongListSkeleton title="Songs" />
|
||||
<SongListSkeleton />
|
||||
</>
|
||||
)
|
||||
}
|
||||
@@ -103,11 +96,8 @@ export default function SongsScreen() {
|
||||
<>
|
||||
{searchBar}
|
||||
|
||||
<Animated.FlatList
|
||||
<FlatList
|
||||
{...longListProps}
|
||||
ref={ref}
|
||||
scrollEventThrottle={16}
|
||||
ListHeaderComponent={<ScreenTitle title="Songs" scrollY={scrollY} />}
|
||||
data={songs}
|
||||
keyExtractor={songKey}
|
||||
renderItem={renderItem}
|
||||
|
||||
@@ -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<FlatList<Card>>()
|
||||
|
||||
const cards = useMemo<Card[]>(() => {
|
||||
if (!queue) return []
|
||||
@@ -138,10 +135,8 @@ export default function DownloadsScreen() {
|
||||
|
||||
return (
|
||||
<>
|
||||
<Stack.Screen options={{ title: "Downloads" }} />
|
||||
<Animated.FlatList
|
||||
ref={ref}
|
||||
scrollEventThrottle={16}
|
||||
<Stack.Screen options={{ title: "Downloads", headerLargeTitle: true }} />
|
||||
<FlatList
|
||||
key={columns}
|
||||
onLayout={onLayout}
|
||||
data={cards}
|
||||
@@ -154,20 +149,13 @@ export default function DownloadsScreen() {
|
||||
numColumns={columns}
|
||||
style={{ flex: 1, backgroundColor: colors.background }}
|
||||
contentContainerStyle={{
|
||||
paddingTop: spacing.lg,
|
||||
paddingHorizontal: horizontalPadding,
|
||||
paddingBottom: tabContentBottomInset,
|
||||
gap,
|
||||
}}
|
||||
columnWrapperStyle={columns > 1 ? { gap } : undefined}
|
||||
contentInsetAdjustmentBehavior="automatic"
|
||||
ListHeaderComponent={
|
||||
<ScreenTitle
|
||||
title="Downloads"
|
||||
scrollY={scrollY}
|
||||
// The list padding already insets the title.
|
||||
style={{ paddingHorizontal: 0 }}
|
||||
/>
|
||||
}
|
||||
ListEmptyComponent={
|
||||
<View style={styles.empty}>
|
||||
<Text style={{ color: colors.mutedForeground }}>
|
||||
|
||||
@@ -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<FlatList<BrowseSong>>()
|
||||
|
||||
const handlePlaySong = useCallback(
|
||||
(song: BrowseSong) => void playFromSong(song.id, playableIds, PLAY_ORIGIN),
|
||||
@@ -93,11 +90,11 @@ export default function OtherDownloadsScreen() {
|
||||
|
||||
return (
|
||||
<>
|
||||
<Stack.Screen options={{ title: OTHER_DOWNLOADS_TITLE }} />
|
||||
<Animated.FlatList
|
||||
<Stack.Screen
|
||||
options={{ title: OTHER_DOWNLOADS_TITLE, headerLargeTitle: false }}
|
||||
/>
|
||||
<FlatList
|
||||
{...longListProps}
|
||||
ref={ref}
|
||||
scrollEventThrottle={16}
|
||||
data={songs}
|
||||
keyExtractor={(song) => song.id}
|
||||
renderItem={renderItem}
|
||||
@@ -106,32 +103,25 @@ export default function OtherDownloadsScreen() {
|
||||
contentInsetAdjustmentBehavior="automatic"
|
||||
onScrollBeginDrag={swipeGroup.closeOpenRow}
|
||||
ListHeaderComponent={
|
||||
<>
|
||||
<ScreenTitle title={OTHER_DOWNLOADS_TITLE} scrollY={scrollY} />
|
||||
{songs.length > 0 ? (
|
||||
<View style={styles.actions}>
|
||||
<Button
|
||||
title="Play"
|
||||
icon="play"
|
||||
onPress={() => void playInOrder(playableIds, PLAY_ORIGIN)}
|
||||
style={styles.play}
|
||||
/>
|
||||
<Pressable
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel="Shuffle"
|
||||
hitSlop={8}
|
||||
onPress={() => void playShuffled(playableIds, PLAY_ORIGIN)}
|
||||
style={[styles.shuffle, { backgroundColor: colors.card }]}
|
||||
>
|
||||
<Ionicons
|
||||
name="shuffle"
|
||||
size={24}
|
||||
color={colors.foreground}
|
||||
/>
|
||||
</Pressable>
|
||||
</View>
|
||||
) : null}
|
||||
</>
|
||||
songs.length > 0 ? (
|
||||
<View style={styles.actions}>
|
||||
<Button
|
||||
title="Play"
|
||||
icon="play"
|
||||
onPress={() => void playInOrder(playableIds, PLAY_ORIGIN)}
|
||||
style={styles.play}
|
||||
/>
|
||||
<Pressable
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel="Shuffle"
|
||||
hitSlop={8}
|
||||
onPress={() => void playShuffled(playableIds, PLAY_ORIGIN)}
|
||||
style={[styles.shuffle, { backgroundColor: colors.card }]}
|
||||
>
|
||||
<Ionicons name="shuffle" size={24} color={colors.foreground} />
|
||||
</Pressable>
|
||||
</View>
|
||||
) : undefined
|
||||
}
|
||||
ListEmptyComponent={
|
||||
<Text style={[styles.empty, { color: colors.mutedForeground }]}>
|
||||
|
||||
@@ -1,11 +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 { ProfileHeaderButton } from "@/components/profile-header-button"
|
||||
import { tabContentBottomInset } from "@/components/player"
|
||||
import { useCachedPaginatedQuery } from "@/hooks/use-cached-query"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
@@ -41,7 +38,6 @@ const HomeCarousels = memo(function HomeCarousels({
|
||||
|
||||
export default function HomeScreen() {
|
||||
const colors = useThemeColors()
|
||||
const { ref, scrollY } = useScreenTitleScroll<ScrollViewInstance>()
|
||||
const recentlyAdded = useCachedPaginatedQuery(
|
||||
api.library.browseRecentlyAddedPaginated,
|
||||
{},
|
||||
@@ -57,18 +53,14 @@ export default function HomeScreen() {
|
||||
(result) => result.status === "LoadingFirstPage" && !result.isCached
|
||||
)
|
||||
if (isLoading) {
|
||||
return (
|
||||
<HomeSkeleton title="Home" titleAccessory={<ProfileHeaderButton />} />
|
||||
)
|
||||
return <HomeSkeleton />
|
||||
}
|
||||
|
||||
const added = recentlyAdded.results.slice(0, CAROUSEL_ITEM_LIMIT)
|
||||
const played = recentlyPlayed.results.slice(0, CAROUSEL_ITEM_LIMIT)
|
||||
|
||||
return (
|
||||
<Animated.ScrollView
|
||||
ref={ref}
|
||||
scrollEventThrottle={16}
|
||||
<ScrollView
|
||||
style={{ flex: 1, backgroundColor: colors.background }}
|
||||
contentContainerStyle={[
|
||||
styles.content,
|
||||
@@ -76,14 +68,8 @@ export default function HomeScreen() {
|
||||
]}
|
||||
contentInsetAdjustmentBehavior="automatic"
|
||||
>
|
||||
<ScreenTitle
|
||||
title="Home"
|
||||
scrollY={scrollY}
|
||||
accessory={<ProfileHeaderButton />}
|
||||
style={styles.title}
|
||||
/>
|
||||
<HomeCarousels recentlyAdded={added} recentlyPlayed={played} />
|
||||
</Animated.ScrollView>
|
||||
</ScrollView>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -92,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,
|
||||
},
|
||||
})
|
||||
@@ -14,12 +14,11 @@ export default function RecentlyAddedScreen() {
|
||||
)
|
||||
|
||||
if (status === "LoadingFirstPage" && !isCached) {
|
||||
return <MediaGridSkeleton title="Recently Added" />
|
||||
return <MediaGridSkeleton />
|
||||
}
|
||||
|
||||
return (
|
||||
<MediaGridList
|
||||
title="Recently Added"
|
||||
content={results}
|
||||
paddingBottom={contentBottomInset}
|
||||
onEndReached={() => {
|
||||
|
||||
@@ -14,12 +14,11 @@ export default function RecentlyPlayedScreen() {
|
||||
)
|
||||
|
||||
if (status === "LoadingFirstPage" && !isCached) {
|
||||
return <MediaGridSkeleton title="Recently Played" />
|
||||
return <MediaGridSkeleton />
|
||||
}
|
||||
|
||||
return (
|
||||
<MediaGridList
|
||||
title="Recently Played"
|
||||
content={results}
|
||||
paddingBottom={contentBottomInset}
|
||||
onEndReached={() => {
|
||||
|
||||
@@ -3,12 +3,7 @@ import { renderTabScreenContent } from "@/components/tab-screen-content"
|
||||
import { Stack } from "expo-router"
|
||||
|
||||
import { ProfileHeaderButton } from "@/components/profile-header-button"
|
||||
import {
|
||||
inlineTitleOptions,
|
||||
showHeaderProfile,
|
||||
tabStackScreenTitles,
|
||||
useStackScreenOptions,
|
||||
} from "@/lib/navigation"
|
||||
import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
|
||||
|
||||
export const unstable_settings = {
|
||||
anchor: "index",
|
||||
@@ -23,14 +18,21 @@ export default function LibraryLayout() {
|
||||
screenLayout={renderTabScreenContent}
|
||||
screenOptions={({ route }) => ({
|
||||
...baseOptions,
|
||||
...inlineTitleOptions,
|
||||
title:
|
||||
tabStackScreenTitles[route.name] ??
|
||||
(tabletLayout ? "Recently Added" : "Library"),
|
||||
// iOS shows the profile button inline with the screen title instead.
|
||||
headerRight: showHeaderProfile(route.name)
|
||||
? () => <ProfileHeaderButton />
|
||||
: undefined,
|
||||
headerRight:
|
||||
route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
|
||||
unstable_headerRightItems:
|
||||
route.name === "index"
|
||||
? () => [
|
||||
{
|
||||
type: "custom",
|
||||
element: <ProfileHeaderButton />,
|
||||
hidesSharedBackground: true,
|
||||
},
|
||||
]
|
||||
: undefined,
|
||||
})}
|
||||
/>
|
||||
)
|
||||
|
||||
@@ -8,7 +8,6 @@ import { Ionicons } from "@expo/vector-icons"
|
||||
import { MediaGridList } from "@/components/media-cards"
|
||||
import { tabContentBottomInset } from "@/components/player"
|
||||
import { MediaGridSkeleton } from "@/components/skeletons"
|
||||
import { ProfileHeaderButton } from "@/components/profile-header-button"
|
||||
import { useCachedPaginatedQuery } from "@/hooks/use-cached-query"
|
||||
import { useAppNavigation } from "@/lib/app-navigation"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
@@ -73,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,
|
||||
{},
|
||||
@@ -126,20 +124,11 @@ export default function LibraryScreen() {
|
||||
)
|
||||
|
||||
if (status === "LoadingFirstPage" && !isCached) {
|
||||
return (
|
||||
<MediaGridSkeleton
|
||||
title={title}
|
||||
titleAccessory={<ProfileHeaderButton />}
|
||||
contentInset={false}
|
||||
header={listHeader}
|
||||
/>
|
||||
)
|
||||
return <MediaGridSkeleton contentInset={false} header={listHeader} />
|
||||
}
|
||||
|
||||
return (
|
||||
<MediaGridList
|
||||
title={title}
|
||||
titleAccessory={<ProfileHeaderButton />}
|
||||
content={results}
|
||||
paddingBottom={tabContentBottomInset}
|
||||
contentInset={false}
|
||||
|
||||
@@ -2,12 +2,7 @@ import { renderTabScreenContent } from "@/components/tab-screen-content"
|
||||
import { Stack } from "expo-router"
|
||||
|
||||
import { ProfileHeaderButton } from "@/components/profile-header-button"
|
||||
import {
|
||||
inlineTitleOptions,
|
||||
showHeaderProfile,
|
||||
tabStackScreenTitles,
|
||||
useStackScreenOptions,
|
||||
} from "@/lib/navigation"
|
||||
import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
|
||||
|
||||
export const unstable_settings = {
|
||||
anchor: "index",
|
||||
@@ -21,12 +16,19 @@ export default function SearchLayout() {
|
||||
screenLayout={renderTabScreenContent}
|
||||
screenOptions={({ route }) => ({
|
||||
...baseOptions,
|
||||
...inlineTitleOptions,
|
||||
title: tabStackScreenTitles[route.name] ?? "Search",
|
||||
// iOS shows the profile button inline with the screen title instead.
|
||||
headerRight: showHeaderProfile(route.name)
|
||||
? () => <ProfileHeaderButton />
|
||||
: undefined,
|
||||
headerRight:
|
||||
route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
|
||||
unstable_headerRightItems:
|
||||
route.name === "index"
|
||||
? () => [
|
||||
{
|
||||
type: "custom",
|
||||
element: <ProfileHeaderButton />,
|
||||
hidesSharedBackground: true,
|
||||
},
|
||||
]
|
||||
: undefined,
|
||||
})}
|
||||
/>
|
||||
)
|
||||
|
||||
@@ -35,7 +35,7 @@ export default function SearchScreen() {
|
||||
: {})}
|
||||
/>
|
||||
|
||||
<SearchResults searchQuery={searchQuery} title="Search" />
|
||||
<SearchResults searchQuery={searchQuery} />
|
||||
</>
|
||||
)
|
||||
}
|
||||
@@ -4,10 +4,9 @@ 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, type ReactNode } from "react"
|
||||
import { memo, useCallback, type ReactElement } from "react"
|
||||
import {
|
||||
FlatList,
|
||||
Platform,
|
||||
@@ -301,23 +300,17 @@ export function MediaGridList({
|
||||
onEndReached,
|
||||
ListHeaderComponent,
|
||||
contentInset = true,
|
||||
title,
|
||||
titleAccessory,
|
||||
}: {
|
||||
content: MediaItem[]
|
||||
paddingBottom: number
|
||||
onEndReached?: () => void
|
||||
ListHeaderComponent?: ReactElement
|
||||
contentInset?: boolean
|
||||
/** iOS `ScreenTitle` shown above the grid; it replaces the top inset. */
|
||||
title?: string
|
||||
titleAccessory?: ReactNode
|
||||
}) {
|
||||
const tabletLayout = useTabletLayout()
|
||||
const { columns, cardWidth, onLayout, horizontalPadding, gap } =
|
||||
useMediaGridLayout()
|
||||
const colors = useThemeColors()
|
||||
const { ref, scrollY } = useScreenTitleScroll<FlatList<MediaItem>>()
|
||||
const renderItem = useCallback(
|
||||
({ item }: ListRenderItemInfo<MediaItem>) => (
|
||||
<View style={{ width: cardWidth }}>
|
||||
@@ -335,32 +328,13 @@ export function MediaGridList({
|
||||
onEndReached={onEndReached}
|
||||
ListHeaderComponent={ListHeaderComponent}
|
||||
contentInset={contentInset}
|
||||
title={title}
|
||||
titleAccessory={titleAccessory}
|
||||
renderCard={renderTabletCard}
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
const header = title ? (
|
||||
<View>
|
||||
<ScreenTitle
|
||||
title={title}
|
||||
scrollY={scrollY}
|
||||
accessory={titleAccessory}
|
||||
// Inset grids already pad the whole list horizontally.
|
||||
style={{ paddingHorizontal: contentInset ? 0 : horizontalPadding }}
|
||||
/>
|
||||
{ListHeaderComponent}
|
||||
</View>
|
||||
) : (
|
||||
ListHeaderComponent
|
||||
)
|
||||
|
||||
return (
|
||||
<Animated.FlatList
|
||||
ref={ref}
|
||||
scrollEventThrottle={16}
|
||||
<FlatList
|
||||
key={columns}
|
||||
onLayout={onLayout}
|
||||
data={content}
|
||||
@@ -377,7 +351,6 @@ export function MediaGridList({
|
||||
paddingBottom,
|
||||
gap,
|
||||
...(contentInset ? { paddingHorizontal: horizontalPadding } : {}),
|
||||
...(title ? { paddingTop: 0 } : {}),
|
||||
},
|
||||
]}
|
||||
columnWrapperStyle={[
|
||||
@@ -386,7 +359,7 @@ export function MediaGridList({
|
||||
{ gap },
|
||||
]}
|
||||
contentInsetAdjustmentBehavior="automatic"
|
||||
ListHeaderComponent={header}
|
||||
ListHeaderComponent={ListHeaderComponent}
|
||||
onEndReached={onEndReached}
|
||||
onEndReachedThreshold={0.5}
|
||||
/>
|
||||
|
||||
@@ -1,97 +0,0 @@
|
||||
import { useHeaderHeight } from "expo-router/react-navigation"
|
||||
import type { Component, ReactNode } from "react"
|
||||
import {
|
||||
Platform,
|
||||
StyleSheet,
|
||||
Text,
|
||||
type ScrollViewInstance,
|
||||
type StyleProp,
|
||||
type ViewStyle,
|
||||
} 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<TScrollView>()
|
||||
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. `accessory` (e.g. the profile button) sits on the same row and
|
||||
* scrolls with it. Android keeps its native header, so this renders nothing.
|
||||
*/
|
||||
export function ScreenTitle({
|
||||
title,
|
||||
scrollY,
|
||||
accessory,
|
||||
style,
|
||||
}: {
|
||||
title: string
|
||||
/** From `useScreenTitleScroll`; omit for screens that never scroll. */
|
||||
scrollY?: SharedValue<number>
|
||||
accessory?: ReactNode
|
||||
style?: StyleProp<ViewStyle>
|
||||
}) {
|
||||
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 (
|
||||
<Animated.View style={[styles.row, style, pinStyle]}>
|
||||
<Text
|
||||
accessibilityRole="header"
|
||||
numberOfLines={2}
|
||||
style={[styles.title, { color: colors.foreground }]}
|
||||
>
|
||||
{title}
|
||||
</Text>
|
||||
{accessory}
|
||||
</Animated.View>
|
||||
)
|
||||
}
|
||||
|
||||
// Matches UIKit's large title metrics: 34pt bold in a 52pt tall area.
|
||||
const styles = StyleSheet.create({
|
||||
row: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
gap: spacing.md,
|
||||
paddingHorizontal: spacing.lg,
|
||||
paddingTop: 3,
|
||||
paddingBottom: 8,
|
||||
},
|
||||
title: {
|
||||
flex: 1,
|
||||
fontSize: 34,
|
||||
lineHeight: 41,
|
||||
fontWeight: "700",
|
||||
letterSpacing: 0.37,
|
||||
},
|
||||
})
|
||||
@@ -1,16 +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 { ProfileHeaderButton } from "@/components/profile-header-button"
|
||||
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"
|
||||
@@ -22,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<FlatList<BrowseSong>>()
|
||||
const { playFromSong } = usePlaybackActions()
|
||||
const { isSongFavorite } = useFavorites()
|
||||
const { handleSongAction } = useMediaMenuActions()
|
||||
@@ -87,19 +76,16 @@ function SearchResultsBody({
|
||||
)
|
||||
|
||||
if (isSearching) {
|
||||
return (
|
||||
<SongListSkeleton
|
||||
title={title}
|
||||
titleAccessory={<ProfileHeaderButton />}
|
||||
/>
|
||||
)
|
||||
return <SongListSkeleton />
|
||||
}
|
||||
|
||||
if (!hasQuery) {
|
||||
return <></>
|
||||
}
|
||||
|
||||
return (
|
||||
<Animated.FlatList
|
||||
ref={ref}
|
||||
scrollEventThrottle={16}
|
||||
data={hasQuery ? (results?.songs ?? []) : []}
|
||||
<FlatList
|
||||
data={results?.songs ?? []}
|
||||
keyExtractor={(song) => song.id}
|
||||
style={{ flex: 1, backgroundColor: colors.background }}
|
||||
contentContainerStyle={{ paddingBottom: tabContentBottomInset }}
|
||||
@@ -107,12 +93,7 @@ function SearchResultsBody({
|
||||
keyboardShouldPersistTaps="handled"
|
||||
ListHeaderComponent={
|
||||
<>
|
||||
<ScreenTitle
|
||||
title={title}
|
||||
scrollY={scrollY}
|
||||
accessory={<ProfileHeaderButton />}
|
||||
/>
|
||||
{hasQuery && !hasResults ? (
|
||||
{!hasResults ? (
|
||||
<View style={styles.empty}>
|
||||
<Text
|
||||
style={[styles.emptyText, { color: colors.mutedForeground }]}
|
||||
@@ -122,13 +103,13 @@ function SearchResultsBody({
|
||||
</View>
|
||||
) : null}
|
||||
|
||||
{hasQuery && results?.artists.length ? (
|
||||
{results?.artists.length ? (
|
||||
<View style={styles.section}>
|
||||
<ContentCarousel title="Artists" content={results.artists} />
|
||||
</View>
|
||||
) : null}
|
||||
|
||||
{hasQuery && results?.albums.length ? (
|
||||
{results?.albums.length ? (
|
||||
<View style={styles.section}>
|
||||
<ContentCarousel title="Albums" content={results.albums} />
|
||||
</View>
|
||||
@@ -137,7 +118,7 @@ function SearchResultsBody({
|
||||
}
|
||||
renderItem={renderItem}
|
||||
ListFooterComponent={
|
||||
hasQuery && playlistResults && playlistResults.length > 0 ? (
|
||||
playlistResults && playlistResults.length > 0 ? (
|
||||
<View style={styles.section}>
|
||||
<ContentCarousel title="Playlists" content={playlistResults} />
|
||||
</View>
|
||||
|
||||
@@ -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,18 +151,9 @@ function SongRows({ rows, inset }: { rows: number; inset?: boolean }) {
|
||||
))
|
||||
}
|
||||
|
||||
export function SongListSkeleton({
|
||||
rows = 10,
|
||||
title,
|
||||
titleAccessory,
|
||||
}: {
|
||||
rows?: number
|
||||
title?: string
|
||||
titleAccessory?: ReactNode
|
||||
}) {
|
||||
export function SongListSkeleton({ rows = 10 }: { rows?: number }) {
|
||||
return (
|
||||
<SkeletonScreen>
|
||||
{title ? <ScreenTitle title={title} accessory={titleAccessory} /> : null}
|
||||
<SongRows rows={rows} />
|
||||
</SkeletonScreen>
|
||||
)
|
||||
@@ -244,54 +234,23 @@ export function MediaGridSkeleton({
|
||||
items = 6,
|
||||
contentInset = true,
|
||||
header,
|
||||
title,
|
||||
titleAccessory,
|
||||
}: {
|
||||
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
|
||||
titleAccessory?: ReactNode
|
||||
}) {
|
||||
return (
|
||||
<SkeletonScreen>
|
||||
<MediaGridContent
|
||||
items={items}
|
||||
contentInset={contentInset && !title}
|
||||
header={
|
||||
title ? (
|
||||
<>
|
||||
<MediaGridTitle title={title} accessory={titleAccessory} />
|
||||
{header}
|
||||
</>
|
||||
) : (
|
||||
header
|
||||
)
|
||||
}
|
||||
contentInset={contentInset}
|
||||
header={header}
|
||||
/>
|
||||
</SkeletonScreen>
|
||||
)
|
||||
}
|
||||
|
||||
function MediaGridTitle({
|
||||
title,
|
||||
accessory,
|
||||
}: {
|
||||
title: string
|
||||
accessory?: ReactNode
|
||||
}) {
|
||||
const { horizontalPadding } = useMediaGridLayout()
|
||||
return (
|
||||
<ScreenTitle
|
||||
title={title}
|
||||
accessory={accessory}
|
||||
style={{ paddingHorizontal: horizontalPadding }}
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
export function CarouselSkeleton() {
|
||||
return (
|
||||
<View style={styles.carousel}>
|
||||
@@ -305,21 +264,10 @@ export function CarouselSkeleton() {
|
||||
)
|
||||
}
|
||||
|
||||
export function HomeSkeleton({
|
||||
title,
|
||||
titleAccessory,
|
||||
}: {
|
||||
title: string
|
||||
titleAccessory?: ReactNode
|
||||
}) {
|
||||
export function HomeSkeleton() {
|
||||
return (
|
||||
<SkeletonScreen>
|
||||
<View style={styles.home}>
|
||||
<ScreenTitle
|
||||
title={title}
|
||||
accessory={titleAccessory}
|
||||
style={styles.homeTitle}
|
||||
/>
|
||||
<CarouselSkeleton />
|
||||
<CarouselSkeleton />
|
||||
</View>
|
||||
@@ -440,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 (
|
||||
<SkeletonScreen>
|
||||
{title ? <ScreenTitle title={title} /> : null}
|
||||
{Array.from({ length: rows }, (_, index) => (
|
||||
<View
|
||||
key={index}
|
||||
@@ -515,12 +456,6 @@ const styles = StyleSheet.create({
|
||||
carousel: { gap: spacing.md, overflow: "hidden" },
|
||||
carouselRow: { flexDirection: "row", gap: spacing.md },
|
||||
home: { padding: spacing.lg, gap: spacing.xl },
|
||||
// Mirrors the home screen's title spacing.
|
||||
homeTitle: {
|
||||
paddingHorizontal: 0,
|
||||
marginTop: -spacing.lg,
|
||||
marginBottom: -spacing.md,
|
||||
},
|
||||
centeredHero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm },
|
||||
actions: {
|
||||
flexDirection: "row",
|
||||
|
||||
@@ -4,10 +4,9 @@ import {
|
||||
useRef,
|
||||
useState,
|
||||
type ReactElement,
|
||||
type ReactNode,
|
||||
} from "react"
|
||||
import {
|
||||
type ScrollViewInstance,
|
||||
ScrollView,
|
||||
View,
|
||||
type NativeSyntheticEvent,
|
||||
type NativeScrollEvent,
|
||||
@@ -16,7 +15,6 @@ import Animated from "react-native-reanimated"
|
||||
import { useSafeAreaInsets } from "react-native-safe-area-context"
|
||||
|
||||
import type { MediaItem } from "@/components/media-cards"
|
||||
import { ScreenTitle, useScreenTitleScroll } from "@/components/screen-title"
|
||||
import { useMediaGridLayout } from "@/hooks/use-media-grid-layout"
|
||||
import { tabletLayoutTransition } from "@/lib/tablet-motion"
|
||||
import { useThemeColors } from "@/lib/theme"
|
||||
@@ -30,9 +28,6 @@ type GridProps = {
|
||||
onEndReached?: () => void
|
||||
ListHeaderComponent?: ReactElement
|
||||
contentInset?: boolean
|
||||
/** iOS `ScreenTitle` shown above the grid; it replaces the top inset. */
|
||||
title?: string
|
||||
titleAccessory?: ReactNode
|
||||
renderCard: (item: MediaItem, width: number) => ReactElement
|
||||
}
|
||||
|
||||
@@ -46,13 +41,9 @@ export function TabletMediaGrid({
|
||||
onEndReached,
|
||||
ListHeaderComponent,
|
||||
contentInset = true,
|
||||
title,
|
||||
titleAccessory,
|
||||
renderCard,
|
||||
}: GridProps) {
|
||||
const colors = useThemeColors()
|
||||
const { ref, scrollY: titleScrollY } =
|
||||
useScreenTitleScroll<ScrollViewInstance>()
|
||||
const insets = useSafeAreaInsets()
|
||||
const { columns, cardWidth, onLayout, horizontalPadding, gap, ready } =
|
||||
useMediaGridLayout()
|
||||
@@ -111,28 +102,18 @@ export function TabletMediaGrid({
|
||||
setViewportHeight(event.nativeEvent.layout.height)
|
||||
}}
|
||||
>
|
||||
<Animated.ScrollView
|
||||
ref={ref}
|
||||
<ScrollView
|
||||
onScroll={onScroll}
|
||||
// Every frame, so the title pins smoothly on pull-down.
|
||||
scrollEventThrottle={16}
|
||||
scrollEventThrottle={32}
|
||||
contentInsetAdjustmentBehavior="automatic"
|
||||
contentContainerStyle={{
|
||||
paddingTop: contentInset && !title ? horizontalPadding : 0,
|
||||
paddingTop: contentInset ? horizontalPadding : 0,
|
||||
paddingBottom: paddingBottom + insets.bottom,
|
||||
}}
|
||||
>
|
||||
<View
|
||||
onLayout={(event) => setHeaderHeight(event.nativeEvent.layout.height)}
|
||||
>
|
||||
{title ? (
|
||||
<ScreenTitle
|
||||
title={title}
|
||||
scrollY={titleScrollY}
|
||||
accessory={titleAccessory}
|
||||
style={{ paddingHorizontal: horizontalPadding }}
|
||||
/>
|
||||
) : null}
|
||||
{ListHeaderComponent}
|
||||
</View>
|
||||
<View style={{ height: gridHeight }}>
|
||||
@@ -155,7 +136,7 @@ export function TabletMediaGrid({
|
||||
)
|
||||
})}
|
||||
</View>
|
||||
</Animated.ScrollView>
|
||||
</ScrollView>
|
||||
</Animated.View>
|
||||
)
|
||||
}
|
||||
@@ -17,25 +17,13 @@ export const tabStackScreenTitles: Record<string, string> = {
|
||||
"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" } } : {}
|
||||
|
||||
/** Tab roots show the profile button in the header, except on iOS where `ScreenTitle` holds it. */
|
||||
export function showHeaderProfile(routeName: string) {
|
||||
return routeName === "index" && Platform.OS !== "ios"
|
||||
}
|
||||
|
||||
export function useStackScreenOptions(
|
||||
overrides?: StackScreenOptions
|
||||
): StackScreenOptions {
|
||||
const theme = useThemeColors()
|
||||
|
||||
return {
|
||||
headerLargeTitle: false,
|
||||
headerLargeTitle: true,
|
||||
headerTransparent: true,
|
||||
headerTintColor: theme.foreground,
|
||||
headerLargeTitleStyle: { color: theme.foreground },
|
||||
|
||||
Reference in new issue
Block a user