From 5f2ce39b42a9fd8576f5316a30c896b88f83cd06 Mon Sep 17 00:00:00 2001 From: Joshua Higgins Date: Fri, 20 Nov 2026 00:40:16 -0500 Subject: [PATCH] fix(mobile): put the profile button inline with the iOS screen title (#134) --- apps/mobile/app/(app)/(tabs)/home/_layout.tsx | 17 +++---- apps/mobile/app/(app)/(tabs)/home/index.tsx | 12 ++++- .../app/(app)/(tabs)/library/_layout.tsx | 17 +++---- .../mobile/app/(app)/(tabs)/library/index.tsx | 3 ++ .../app/(app)/(tabs)/search/_layout.tsx | 17 +++---- apps/mobile/components/media-cards.tsx | 6 ++- apps/mobile/components/screen-title.tsx | 45 ++++++++++++------- apps/mobile/components/search-results.tsx | 14 +++++- apps/mobile/components/skeletons.tsx | 31 ++++++++++--- apps/mobile/components/tablet-media-grid.tsx | 4 ++ apps/mobile/lib/navigation.ts | 5 +++ 11 files changed, 109 insertions(+), 62 deletions(-) diff --git a/apps/mobile/app/(app)/(tabs)/home/_layout.tsx b/apps/mobile/app/(app)/(tabs)/home/_layout.tsx index 7d17397..db744ab 100644 --- a/apps/mobile/app/(app)/(tabs)/home/_layout.tsx +++ b/apps/mobile/app/(app)/(tabs)/home/_layout.tsx @@ -4,6 +4,7 @@ import { Stack } from "expo-router" import { ProfileHeaderButton } from "@/components/profile-header-button" import { inlineTitleOptions, + showHeaderProfile, tabStackScreenTitles, useStackScreenOptions, } from "@/lib/navigation" @@ -22,18 +23,10 @@ export default function HomeLayout() { ...baseOptions, ...inlineTitleOptions, title: tabStackScreenTitles[route.name] ?? "Home", - headerRight: - route.name === "index" ? () => : undefined, - unstable_headerRightItems: - route.name === "index" - ? () => [ - { - type: "custom", - element: , - hidesSharedBackground: true, - }, - ] - : undefined, + // iOS shows the profile button inline with the screen title instead. + headerRight: showHeaderProfile(route.name) + ? () => + : undefined, })} /> ) diff --git a/apps/mobile/app/(app)/(tabs)/home/index.tsx b/apps/mobile/app/(app)/(tabs)/home/index.tsx index 12c5354..3513bc4 100644 --- a/apps/mobile/app/(app)/(tabs)/home/index.tsx +++ b/apps/mobile/app/(app)/(tabs)/home/index.tsx @@ -5,6 +5,7 @@ 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 { 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" @@ -56,7 +57,9 @@ export default function HomeScreen() { (result) => result.status === "LoadingFirstPage" && !result.isCached ) if (isLoading) { - return + return ( + } /> + ) } const added = recentlyAdded.results.slice(0, CAROUSEL_ITEM_LIMIT) @@ -73,7 +76,12 @@ export default function HomeScreen() { ]} contentInsetAdjustmentBehavior="automatic" > - + } + style={styles.title} + /> ) diff --git a/apps/mobile/app/(app)/(tabs)/library/_layout.tsx b/apps/mobile/app/(app)/(tabs)/library/_layout.tsx index b669a38..b4a0aad 100644 --- a/apps/mobile/app/(app)/(tabs)/library/_layout.tsx +++ b/apps/mobile/app/(app)/(tabs)/library/_layout.tsx @@ -5,6 +5,7 @@ import { Stack } from "expo-router" import { ProfileHeaderButton } from "@/components/profile-header-button" import { inlineTitleOptions, + showHeaderProfile, tabStackScreenTitles, useStackScreenOptions, } from "@/lib/navigation" @@ -26,18 +27,10 @@ export default function LibraryLayout() { title: tabStackScreenTitles[route.name] ?? (tabletLayout ? "Recently Added" : "Library"), - headerRight: - route.name === "index" ? () => : undefined, - unstable_headerRightItems: - route.name === "index" - ? () => [ - { - type: "custom", - element: , - hidesSharedBackground: true, - }, - ] - : undefined, + // iOS shows the profile button inline with the screen title instead. + headerRight: showHeaderProfile(route.name) + ? () => + : undefined, })} /> ) diff --git a/apps/mobile/app/(app)/(tabs)/library/index.tsx b/apps/mobile/app/(app)/(tabs)/library/index.tsx index ac52002..120b6dd 100644 --- a/apps/mobile/app/(app)/(tabs)/library/index.tsx +++ b/apps/mobile/app/(app)/(tabs)/library/index.tsx @@ -8,6 +8,7 @@ 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" @@ -128,6 +129,7 @@ export default function LibraryScreen() { return ( } contentInset={false} header={listHeader} /> @@ -137,6 +139,7 @@ export default function LibraryScreen() { return ( } content={results} paddingBottom={tabContentBottomInset} contentInset={false} diff --git a/apps/mobile/app/(app)/(tabs)/search/_layout.tsx b/apps/mobile/app/(app)/(tabs)/search/_layout.tsx index 688b642..79f8928 100644 --- a/apps/mobile/app/(app)/(tabs)/search/_layout.tsx +++ b/apps/mobile/app/(app)/(tabs)/search/_layout.tsx @@ -4,6 +4,7 @@ import { Stack } from "expo-router" import { ProfileHeaderButton } from "@/components/profile-header-button" import { inlineTitleOptions, + showHeaderProfile, tabStackScreenTitles, useStackScreenOptions, } from "@/lib/navigation" @@ -22,18 +23,10 @@ export default function SearchLayout() { ...baseOptions, ...inlineTitleOptions, title: tabStackScreenTitles[route.name] ?? "Search", - headerRight: - route.name === "index" ? () => : undefined, - unstable_headerRightItems: - route.name === "index" - ? () => [ - { - type: "custom", - element: , - hidesSharedBackground: true, - }, - ] - : undefined, + // iOS shows the profile button inline with the screen title instead. + headerRight: showHeaderProfile(route.name) + ? () => + : undefined, })} /> ) diff --git a/apps/mobile/components/media-cards.tsx b/apps/mobile/components/media-cards.tsx index 418a6f9..1d7a999 100644 --- a/apps/mobile/components/media-cards.tsx +++ b/apps/mobile/components/media-cards.tsx @@ -7,7 +7,7 @@ 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" +import { memo, useCallback, type ReactElement, type ReactNode } from "react" import { FlatList, Platform, @@ -302,6 +302,7 @@ export function MediaGridList({ ListHeaderComponent, contentInset = true, title, + titleAccessory, }: { content: MediaItem[] paddingBottom: number @@ -310,6 +311,7 @@ export function MediaGridList({ 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 } = @@ -334,6 +336,7 @@ export function MediaGridList({ ListHeaderComponent={ListHeaderComponent} contentInset={contentInset} title={title} + titleAccessory={titleAccessory} renderCard={renderTabletCard} /> ) @@ -344,6 +347,7 @@ export function MediaGridList({ diff --git a/apps/mobile/components/screen-title.tsx b/apps/mobile/components/screen-title.tsx index 99d814e..b98d17e 100644 --- a/apps/mobile/components/screen-title.tsx +++ b/apps/mobile/components/screen-title.tsx @@ -1,11 +1,12 @@ import { useHeaderHeight } from "expo-router/react-navigation" -import type { Component } from "react" +import type { Component, ReactNode } from "react" import { Platform, StyleSheet, + Text, type ScrollViewInstance, type StyleProp, - type TextStyle, + type ViewStyle, } from "react-native" import Animated, { useAnimatedRef, @@ -33,17 +34,20 @@ export function useScreenTitleScroll< * 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. + * 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 - style?: StyleProp + accessory?: ReactNode + style?: StyleProp }) { const colors = useThemeColors() // At rest the scroll offset is minus the automatic header inset, so any @@ -60,25 +64,34 @@ export function ScreenTitle({ if (Platform.OS !== "ios") return null return ( - - {title} - + + + {title} + + {accessory} + ) } // 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, + 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, + }, }) diff --git a/apps/mobile/components/search-results.tsx b/apps/mobile/components/search-results.tsx index d81d92e..6a53665 100644 --- a/apps/mobile/components/search-results.tsx +++ b/apps/mobile/components/search-results.tsx @@ -9,6 +9,7 @@ import { 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" @@ -86,7 +87,12 @@ function SearchResultsBody({ ) if (isSearching) { - return + return ( + } + /> + ) } return ( @@ -101,7 +107,11 @@ function SearchResultsBody({ keyboardShouldPersistTaps="handled" ListHeaderComponent={ <> - + } + /> {hasQuery && !hasResults ? ( - {title ? : null} + {title ? : null} ) @@ -243,6 +245,7 @@ export function MediaGridSkeleton({ contentInset = true, header, title, + titleAccessory, }: { items?: number contentInset?: boolean @@ -250,6 +253,7 @@ export function MediaGridSkeleton({ header?: ReactNode /** The loaded list's `ScreenTitle`, which replaces its top inset. */ title?: string + titleAccessory?: ReactNode }) { return ( @@ -259,7 +263,7 @@ export function MediaGridSkeleton({ header={ title ? ( <> - + {header} ) : ( @@ -271,11 +275,18 @@ export function MediaGridSkeleton({ ) } -function MediaGridTitle({ title }: { title: string }) { +function MediaGridTitle({ + title, + accessory, +}: { + title: string + accessory?: ReactNode +}) { const { horizontalPadding } = useMediaGridLayout() return ( ) @@ -294,11 +305,21 @@ export function CarouselSkeleton() { ) } -export function HomeSkeleton({ title }: { title: string }) { +export function HomeSkeleton({ + title, + titleAccessory, +}: { + title: string + titleAccessory?: ReactNode +}) { return ( - + diff --git a/apps/mobile/components/tablet-media-grid.tsx b/apps/mobile/components/tablet-media-grid.tsx index e4be1f8..f4182ca 100644 --- a/apps/mobile/components/tablet-media-grid.tsx +++ b/apps/mobile/components/tablet-media-grid.tsx @@ -4,6 +4,7 @@ import { useRef, useState, type ReactElement, + type ReactNode, } from "react" import { type ScrollViewInstance, @@ -31,6 +32,7 @@ type GridProps = { contentInset?: boolean /** iOS `ScreenTitle` shown above the grid; it replaces the top inset. */ title?: string + titleAccessory?: ReactNode renderCard: (item: MediaItem, width: number) => ReactElement } @@ -45,6 +47,7 @@ export function TabletMediaGrid({ ListHeaderComponent, contentInset = true, title, + titleAccessory, renderCard, }: GridProps) { const colors = useThemeColors() @@ -126,6 +129,7 @@ export function TabletMediaGrid({ ) : null} diff --git a/apps/mobile/lib/navigation.ts b/apps/mobile/lib/navigation.ts index bf29cec..111e442 100644 --- a/apps/mobile/lib/navigation.ts +++ b/apps/mobile/lib/navigation.ts @@ -24,6 +24,11 @@ export const tabStackScreenTitles: Record = { 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 {