Compare commits
No files matched your search
@@ -23,22 +23,3 @@ APP_VARIANT=development pnpm start
|
||||
An unset `APP_VARIANT` keeps the production identity. Unknown variants fail
|
||||
configuration. URL schemes are `otunes-development`, `otunes-preview`, and
|
||||
`otunes` respectively, allowing the apps to be installed together.
|
||||
|
||||
### Shared links and artwork
|
||||
|
||||
Shared URLs stay as ordinary HTTPS links. The web page's "Open App" action
|
||||
opens `otunes://open?url=<encoded HTTPS URL>`, including the server address and
|
||||
album, artist, or playlist destination. No domain association files, signing
|
||||
settings, or per-server mobile builds are needed.
|
||||
|
||||
The app checks the link's server against its configured server before opening
|
||||
media. Links for another server do not switch the current server. On a fresh
|
||||
installation, the server address is prefilled in setup. The destination is kept
|
||||
in memory through setup and sign-in, and is opened after authentication.
|
||||
The browser may ask before opening the app. If the app is absent, the web page
|
||||
remains available. Native changes still require a new mobile build.
|
||||
|
||||
Native sharing supplies media titles and artwork through iOS link metadata and Android's chooser
|
||||
thumbnail, while sharing the original HTTPS URL. Receiving apps control whether
|
||||
they display previews. If artwork cannot load, the URL is still shared. Existing
|
||||
builds without the native sharing module fall back to URL-only sharing.
|
||||
@@ -19,10 +19,9 @@ export default ({ config }: ConfigContext): ExpoConfig => {
|
||||
: variant === "preview"
|
||||
? " (Preview)"
|
||||
: ""
|
||||
// Expo writes this filename into Xcode build settings without quoting it.
|
||||
const composer = {
|
||||
development: "oTunesDev",
|
||||
preview: "oTunesPreview",
|
||||
development: "oTunes Dev",
|
||||
preview: "oTunes Preview",
|
||||
production: "oTunes",
|
||||
}[variant]
|
||||
|
||||
|
||||
@@ -186,7 +186,7 @@ export default function AlbumScreen() {
|
||||
stationArtistId={album.artist.id}
|
||||
selectedCount={album.tracks.length}
|
||||
favorited={isAlbumFav(album.id)}
|
||||
share={{ type: "album", albumId: album.id, title: album.title }}
|
||||
share={{ type: "album", albumId: album.id }}
|
||||
onAction={(action) =>
|
||||
void handleAlbumDetailAction(
|
||||
album.id as Id<"albums">,
|
||||
@@ -406,7 +406,6 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
|
||||
type: "song",
|
||||
albumId: album.id,
|
||||
songId: track.id,
|
||||
title: `${track.title} - ${album.title}`,
|
||||
}}
|
||||
onAction={(action) => void onAction(track, album, action)}
|
||||
>
|
||||
|
||||
@@ -75,11 +75,7 @@ export default function ArtistScreen() {
|
||||
<MediaActionMenu
|
||||
selectedCount={data.albums.length}
|
||||
favorited={isArtistFav(data.artist.id)}
|
||||
share={{
|
||||
type: "artist",
|
||||
artistId: data.artist.id,
|
||||
title: data.artist.name,
|
||||
}}
|
||||
share={{ type: "artist", artistId: data.artist.id }}
|
||||
onAction={(action) =>
|
||||
void handleArtistAction(data.artist, action)
|
||||
}
|
||||
|
||||
@@ -142,7 +142,7 @@ const ArtistRow = memo(function ArtistRow({
|
||||
return (
|
||||
<MediaContextMenu
|
||||
favorited={favorited}
|
||||
share={{ type: "artist", artistId: artist.id, title: artist.name }}
|
||||
share={{ type: "artist", artistId: artist.id }}
|
||||
onAction={(action) => void onAction(artist, action)}
|
||||
>
|
||||
<Pressable
|
||||
|
||||
@@ -1,7 +1,3 @@
|
||||
import {
|
||||
PlaylistSearchBar,
|
||||
usePlaylistSearch,
|
||||
} from "@/components/playlist-search-bar"
|
||||
import { useAndroidScreenPalette } from "@/contexts/android-tab-theme"
|
||||
import { MusicEntityView } from "@/components/music-entity-view"
|
||||
import { useMutation } from "convex/react"
|
||||
@@ -162,8 +158,6 @@ function PlaylistContent({
|
||||
const isSubscribed = playlist.isSubscribed
|
||||
const canEdit = playlist.isOwner && playlistId !== null
|
||||
const songIds = useMemo(() => songs.map((song) => song.id), [songs])
|
||||
const { filteredSongs, onQueryChange, onSearchSubmit } =
|
||||
usePlaylistSearch(songs)
|
||||
const swipeGroup = useSwipeRowGroup()
|
||||
|
||||
const handlePlaySong = useCallback(
|
||||
@@ -260,7 +254,6 @@ function PlaylistContent({
|
||||
share={{
|
||||
type: "playlist",
|
||||
playlistId: playlistId ?? "favorites",
|
||||
title: playlist?.title ?? "oTunes",
|
||||
}}
|
||||
includeActions={canEdit ? OWNER_MENU_ACTIONS : undefined}
|
||||
onAction={handlePlaylistMenuAction}
|
||||
@@ -283,7 +276,6 @@ function PlaylistContent({
|
||||
palette.background,
|
||||
palette.isDark,
|
||||
playlistId,
|
||||
playlist?.title,
|
||||
router,
|
||||
songIds,
|
||||
])
|
||||
@@ -318,14 +310,10 @@ function PlaylistContent({
|
||||
<StatusBar style={palette.isDark ? "light" : "dark"} />
|
||||
) : null}
|
||||
<Stack.Screen options={screenOptions} />
|
||||
<PlaylistSearchBar
|
||||
onQueryChange={onQueryChange}
|
||||
onSearchSubmit={onSearchSubmit}
|
||||
/>
|
||||
<FlatList
|
||||
onLayout={onLayout}
|
||||
{...longListProps}
|
||||
data={filteredSongs}
|
||||
data={songs}
|
||||
keyExtractor={songKey}
|
||||
renderItem={renderItem}
|
||||
style={{ flex: 1, backgroundColor: palette.background }}
|
||||
@@ -333,16 +321,6 @@ function PlaylistContent({
|
||||
contentContainerStyle={styles.listContent}
|
||||
contentInsetAdjustmentBehavior="automatic"
|
||||
onScrollBeginDrag={swipeGroup.closeOpenRow}
|
||||
ListEmptyComponent={
|
||||
<Text
|
||||
style={[
|
||||
styles.emptyResults,
|
||||
{ color: palette.secondaryForeground },
|
||||
]}
|
||||
>
|
||||
{songs.length ? "No songs found." : "No songs in this playlist."}
|
||||
</Text>
|
||||
}
|
||||
ListHeaderComponent={
|
||||
<PlaylistHero
|
||||
entityId={playlistId ?? "otunes:favorites"}
|
||||
@@ -538,7 +516,6 @@ const PlaylistHero = memo(function PlaylistHero({
|
||||
})
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
emptyResults: { padding: spacing.lg, textAlign: "center" },
|
||||
empty: { flex: 1, alignItems: "center", justifyContent: "center" },
|
||||
listContent: { paddingBottom: contentBottomInset },
|
||||
hero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm },
|
||||
|
||||
@@ -1,7 +1,3 @@
|
||||
import {
|
||||
PlaylistSearchBar,
|
||||
usePlaylistSearch,
|
||||
} from "@/components/playlist-search-bar"
|
||||
import { memo, useCallback, useEffect, useMemo } from "react"
|
||||
import {
|
||||
FlatList,
|
||||
@@ -41,8 +37,6 @@ export default function FavoritesScreen() {
|
||||
const { isSongFavorite } = useFavorites()
|
||||
const { handleSongAction } = useMediaMenuActions()
|
||||
const songIds = useMemo(() => songs.map((song) => song.id), [songs])
|
||||
const { filteredSongs, onQueryChange, onSearchSubmit } =
|
||||
usePlaylistSearch(songs)
|
||||
|
||||
useEffect(() => {
|
||||
if (favorites) rememberSongs(favorites.songs)
|
||||
@@ -105,25 +99,14 @@ export default function FavoritesScreen() {
|
||||
return (
|
||||
<>
|
||||
<Stack.Screen options={SCREEN_OPTIONS} />
|
||||
<PlaylistSearchBar
|
||||
onQueryChange={onQueryChange}
|
||||
onSearchSubmit={onSearchSubmit}
|
||||
/>
|
||||
<FlatList
|
||||
{...longListProps}
|
||||
data={filteredSongs}
|
||||
data={songs}
|
||||
keyExtractor={songKey}
|
||||
renderItem={renderItem}
|
||||
style={{ flex: 1, backgroundColor: colors.background }}
|
||||
contentContainerStyle={styles.listContent}
|
||||
contentInsetAdjustmentBehavior="automatic"
|
||||
ListEmptyComponent={
|
||||
<Text
|
||||
style={[styles.emptyResults, { color: colors.mutedForeground }]}
|
||||
>
|
||||
{songs.length ? "No songs found." : "No songs in this playlist."}
|
||||
</Text>
|
||||
}
|
||||
ListHeaderComponent={
|
||||
<FavoritesHero
|
||||
title={favorites.title}
|
||||
@@ -190,7 +173,6 @@ const FavoritesHero = memo(function FavoritesHero({
|
||||
})
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
emptyResults: { padding: spacing.lg, textAlign: "center" },
|
||||
empty: { flex: 1, alignItems: "center", justifyContent: "center" },
|
||||
listContent: { paddingBottom: contentBottomInset },
|
||||
hero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm },
|
||||
|
||||
@@ -1,10 +1,3 @@
|
||||
import { router, type Href } from "expo-router"
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
import {
|
||||
incomingMediaLink,
|
||||
subscribeIncomingMediaLink,
|
||||
takeIncomingMediaLink,
|
||||
} from "@/lib/incoming-media-link"
|
||||
import { useConvexAuth as useLocalConvexAuth } from "@convex-dev/auth/react"
|
||||
import {
|
||||
useConvexAuth as useServerConvexAuth,
|
||||
@@ -12,7 +5,7 @@ import {
|
||||
} from "convex/react"
|
||||
import { Stack } from "expo-router"
|
||||
import { Platform } from "react-native"
|
||||
import { useEffect, useSyncExternalStore } from "react"
|
||||
import { useEffect } from "react"
|
||||
|
||||
import { AppIntentBridge } from "@/components/app-intent-bridge"
|
||||
import { ConvexAuthRecovery } from "@/components/convex-auth-recovery"
|
||||
@@ -31,18 +24,6 @@ export default function AppLayout() {
|
||||
const { isWebSocketConnected } = useConvexConnectionState()
|
||||
const { invalidateSession } = useInvalidateAuthSession()
|
||||
const stackOptions = useStackScreenOptions()
|
||||
const { config } = useServerConfig()
|
||||
const pendingDestination = useSyncExternalStore(
|
||||
subscribeIncomingMediaLink,
|
||||
() => (config ? incomingMediaLink(config.serverUrl) : null),
|
||||
() => null
|
||||
)
|
||||
|
||||
useEffect(() => {
|
||||
if (!config || !pendingDestination) return
|
||||
const destination = takeIncomingMediaLink(config.serverUrl)
|
||||
if (destination) router.replace(destination as Href)
|
||||
}, [config, pendingDestination])
|
||||
|
||||
useEffect(() => {
|
||||
if (
|
||||
|
||||
@@ -1,54 +0,0 @@
|
||||
import { loadServerConfig, parseServerHostname } from "@/lib/server-config"
|
||||
import { secureGetItem } from "@/lib/auth-storage"
|
||||
import { rememberIncomingMediaLink } from "@/lib/incoming-media-link"
|
||||
import { showError } from "@/lib/toast"
|
||||
|
||||
export async function redirectSystemPath({
|
||||
path,
|
||||
}: {
|
||||
path: string
|
||||
initial: boolean
|
||||
}) {
|
||||
try {
|
||||
const link = new URL(path, "otunes:///")
|
||||
if (
|
||||
!["otunes:", "otunes-development:", "otunes-preview:"].includes(
|
||||
link.protocol
|
||||
) ||
|
||||
link.hostname !== "open"
|
||||
) {
|
||||
return path
|
||||
}
|
||||
|
||||
const target = new URL(link.searchParams.get("url") ?? "")
|
||||
const server = parseServerHostname(target.host)
|
||||
if (
|
||||
!server ||
|
||||
!["https:", "http:"].includes(target.protocol) ||
|
||||
target.username ||
|
||||
target.password ||
|
||||
new URL(server.serverUrl).origin !== target.origin ||
|
||||
!/^\/(album|artist|playlist)\/[a-zA-Z0-9_-]+$/.test(target.pathname)
|
||||
) {
|
||||
return "/"
|
||||
}
|
||||
|
||||
const config = await loadServerConfig(secureGetItem)
|
||||
if (config && new URL(config.serverUrl).origin !== target.origin) {
|
||||
showError("This link belongs to a different oTunes server")
|
||||
return "/"
|
||||
}
|
||||
|
||||
const query = new URLSearchParams()
|
||||
const songId = target.searchParams.get("s")
|
||||
if (target.pathname.startsWith("/album/") && songId) query.set("s", songId)
|
||||
const suffix = query.size ? `?${query}` : ""
|
||||
const destination = `/(app)/(tabs)/home${target.pathname}${suffix}`
|
||||
rememberIncomingMediaLink(destination, target.origin)
|
||||
return config
|
||||
? destination
|
||||
: `/server?hostname=${encodeURIComponent(server.hostname)}`
|
||||
} catch {
|
||||
return "/"
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,5 @@
|
||||
import { useConvexAuth } from "@convex-dev/auth/react"
|
||||
import { incomingMediaLink } from "@/lib/incoming-media-link"
|
||||
import { Redirect, type Href } from "expo-router"
|
||||
import { Redirect } from "expo-router"
|
||||
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
|
||||
@@ -12,16 +11,9 @@ export default function Index() {
|
||||
return <Redirect href="/server" />
|
||||
}
|
||||
|
||||
const destination = auth?.isAuthenticated
|
||||
? incomingMediaLink(config.serverUrl)
|
||||
: null
|
||||
|
||||
return (
|
||||
<Redirect
|
||||
href={
|
||||
(destination as Href) ??
|
||||
(auth?.isAuthenticated ? "/(app)/(tabs)/library" : "/signin")
|
||||
}
|
||||
href={auth?.isAuthenticated ? "/(app)/(tabs)/library" : "/signin"}
|
||||
/>
|
||||
)
|
||||
}
|
||||
@@ -1,5 +1,4 @@
|
||||
import { useLocalSearchParams } from "expo-router"
|
||||
import { useEffect, useState } from "react"
|
||||
import { useState } from "react"
|
||||
import { StyleSheet, Text, View } from "react-native"
|
||||
import { SafeAreaView } from "react-native-safe-area-context"
|
||||
|
||||
@@ -12,14 +11,7 @@ import { spacing, useThemeColors } from "@/lib/theme"
|
||||
export default function ServerScreen() {
|
||||
const colors = useThemeColors()
|
||||
const { setServerHostname } = useServerConfig()
|
||||
const { hostname: linkedHostname } = useLocalSearchParams<{
|
||||
hostname?: string
|
||||
}>()
|
||||
const [hostname, setHostname] = useState(linkedHostname ?? "")
|
||||
useEffect(() => {
|
||||
if (linkedHostname) setHostname(linkedHostname)
|
||||
}, [linkedHostname])
|
||||
|
||||
const [hostname, setHostname] = useState("")
|
||||
const [error, setError] = useState<string | null>(null)
|
||||
const [submitting, setSubmitting] = useState(false)
|
||||
|
||||
|
||||
File renamed without changes.
|
Before Width: | Height: | Size: 8.8 KiB After Width: | Height: | Size: 8.8 KiB |
File renamed without changes.
File renamed without changes.
|
Before Width: | Height: | Size: 8.8 KiB After Width: | Height: | Size: 8.8 KiB |
File renamed without changes.
@@ -80,7 +80,7 @@ export const AlbumCard = memo(function AlbumCard({
|
||||
favorited={isAlbumFavorite(album.id)}
|
||||
stationArtistId={album.artist.id}
|
||||
navigation={{ artist: { id: album.artist.id } }}
|
||||
share={{ type: "album", albumId: album.id, title: album.title }}
|
||||
share={{ type: "album", albumId: album.id }}
|
||||
onAction={(action) => void handleAlbumAction(album, action)}
|
||||
>
|
||||
<MusicEntityView kind="album" id={album.id}>
|
||||
@@ -125,7 +125,7 @@ export const ArtistCard = memo(function ArtistCard({
|
||||
return (
|
||||
<MediaContextMenu
|
||||
favorited={isArtistFavorite(artist.id)}
|
||||
share={{ type: "artist", artistId: artist.id, title: artist.name }}
|
||||
share={{ type: "artist", artistId: artist.id }}
|
||||
onAction={(action) => void handleArtistAction(artist, action)}
|
||||
>
|
||||
<MusicEntityView kind="artist" id={artist.id}>
|
||||
@@ -176,11 +176,7 @@ export const PlaylistCard = memo(function PlaylistCard({
|
||||
return (
|
||||
<MediaContextMenu
|
||||
showFavorite={false}
|
||||
share={{
|
||||
type: "playlist",
|
||||
playlistId: playlist.id,
|
||||
title: playlist.title,
|
||||
}}
|
||||
share={{ type: "playlist", playlistId: playlist.id }}
|
||||
onAction={(action) => void handlePlaylistAction(playlist, action)}
|
||||
>
|
||||
<MusicEntityView kind="playlist" id={playlist.id}>
|
||||
|
||||
@@ -59,8 +59,7 @@ export function MenuView({
|
||||
outlineVariant: "#545458",
|
||||
error: "#FF453A",
|
||||
}}
|
||||
// Rows fill their parent width; compact action buttons keep intrinsic sizing.
|
||||
matchContents={shouldOpenOnLongPress ? { vertical: true } : true}
|
||||
matchContents
|
||||
>
|
||||
<DropdownMenu
|
||||
expanded={expanded}
|
||||
@@ -71,9 +70,7 @@ export function MenuView({
|
||||
properties={{ clippingEnabled: false }}
|
||||
>
|
||||
<DropdownMenu.Trigger>
|
||||
<RNHostView
|
||||
matchContents={shouldOpenOnLongPress ? { vertical: true } : true}
|
||||
>
|
||||
<RNHostView matchContents>
|
||||
{shouldOpenOnLongPress ? (
|
||||
<GestureDetector gesture={longPress}>
|
||||
<View collapsable={false}>{children}</View>
|
||||
|
||||
@@ -147,7 +147,6 @@ export const SongListRow = memo(function SongListRow({
|
||||
type: "song",
|
||||
albumId: song.album.id,
|
||||
songId: song.id,
|
||||
title: `${song.title} - ${song.album.title}`,
|
||||
},
|
||||
onAction: (action) => onAction(song, action),
|
||||
}}
|
||||
|
||||
@@ -1,56 +0,0 @@
|
||||
import { useCallback, useMemo } from "react"
|
||||
import { Platform } from "react-native"
|
||||
import { Stack } from "expo-router"
|
||||
|
||||
import { useDebouncedSearch } from "@/hooks/use-debounced-search"
|
||||
import { useThemeColors } from "@/lib/theme"
|
||||
import type { BrowseSong } from "@otunes/convex/types"
|
||||
|
||||
export function usePlaylistSearch(songs: BrowseSong[]) {
|
||||
const search = useDebouncedSearch()
|
||||
const filteredSongs = useMemo(() => {
|
||||
const query = search.searchQuery.toLowerCase()
|
||||
if (!query) return songs
|
||||
return songs.filter((song) =>
|
||||
[song.title, song.artist.name, song.album.title].some((value) =>
|
||||
value.toLowerCase().includes(query)
|
||||
)
|
||||
)
|
||||
}, [songs, search.searchQuery])
|
||||
|
||||
return { ...search, filteredSongs }
|
||||
}
|
||||
|
||||
export function PlaylistSearchBar({
|
||||
onQueryChange,
|
||||
onSearchSubmit,
|
||||
}: Pick<
|
||||
ReturnType<typeof useDebouncedSearch>,
|
||||
"onQueryChange" | "onSearchSubmit"
|
||||
>) {
|
||||
const colors = useThemeColors()
|
||||
const handleChangeText = useCallback(
|
||||
(event: { nativeEvent: { text: string } }) => {
|
||||
onQueryChange(event.nativeEvent.text)
|
||||
},
|
||||
[onQueryChange]
|
||||
)
|
||||
|
||||
return (
|
||||
<Stack.SearchBar
|
||||
placeholder="Search playlist"
|
||||
onChangeText={handleChangeText}
|
||||
onSearchButtonPress={onSearchSubmit}
|
||||
autoCapitalize="none"
|
||||
{...(Platform.OS === "android"
|
||||
? {
|
||||
barTintColor: colors.background,
|
||||
textColor: colors.foreground,
|
||||
tintColor: colors.primary,
|
||||
hintTextColor: colors.mutedForeground,
|
||||
headerIconColor: colors.foreground,
|
||||
}
|
||||
: {})}
|
||||
/>
|
||||
)
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
import { useEffect, useRef, type ReactNode } from "react"
|
||||
import { useEffect, useRef } from "react"
|
||||
import {
|
||||
Animated,
|
||||
ScrollView,
|
||||
@@ -18,30 +18,6 @@ import {
|
||||
useTwoColumnCardWidth,
|
||||
} from "@/lib/theme"
|
||||
|
||||
/** Match the inset-adjusted lists used once screen data is available. */
|
||||
function SkeletonContent({
|
||||
children,
|
||||
embedded = false,
|
||||
}: {
|
||||
children: ReactNode
|
||||
embedded?: boolean
|
||||
}) {
|
||||
const colors = useThemeColors()
|
||||
if (embedded) return <>{children}</>
|
||||
|
||||
return (
|
||||
<ScrollView
|
||||
style={{ flex: 1, backgroundColor: colors.background }}
|
||||
contentContainerStyle={{ paddingBottom: contentBottomInset }}
|
||||
contentInsetAdjustmentBehavior="automatic"
|
||||
scrollEnabled={false}
|
||||
accessibilityLabel="Loading"
|
||||
>
|
||||
{children}
|
||||
</ScrollView>
|
||||
)
|
||||
}
|
||||
|
||||
export function Skeleton({ style }: { style?: StyleProp<ViewStyle> }) {
|
||||
const colors = useThemeColors()
|
||||
const opacity = useRef(new Animated.Value(1)).current
|
||||
@@ -98,21 +74,13 @@ export function SongRowSkeleton() {
|
||||
)
|
||||
}
|
||||
|
||||
export function SongListSkeleton({
|
||||
rows = 10,
|
||||
embedded = false,
|
||||
}: {
|
||||
rows?: number
|
||||
embedded?: boolean
|
||||
}) {
|
||||
export function SongListSkeleton({ rows = 10 }: { rows?: number }) {
|
||||
return (
|
||||
<SkeletonContent embedded={embedded}>
|
||||
<View accessibilityLabel="Loading" accessibilityRole="progressbar">
|
||||
{Array.from({ length: rows }, (_, index) => (
|
||||
<SongRowSkeleton key={index} />
|
||||
))}
|
||||
</View>
|
||||
</SkeletonContent>
|
||||
<View accessibilityLabel="Loading" accessibilityRole="progressbar">
|
||||
{Array.from({ length: rows }, (_, index) => (
|
||||
<SongRowSkeleton key={index} />
|
||||
))}
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -141,28 +109,24 @@ function CardSkeleton({
|
||||
export function MediaGridSkeleton({
|
||||
items = 6,
|
||||
contentInset = true,
|
||||
embedded = false,
|
||||
}: {
|
||||
items?: number
|
||||
contentInset?: boolean
|
||||
embedded?: boolean
|
||||
}) {
|
||||
const cardWidth = useTwoColumnCardWidth()
|
||||
return (
|
||||
<SkeletonContent embedded={embedded}>
|
||||
<View
|
||||
accessibilityLabel="Loading"
|
||||
accessibilityRole="progressbar"
|
||||
style={[
|
||||
styles.grid,
|
||||
contentInset ? styles.gridInset : styles.gridRowInset,
|
||||
]}
|
||||
>
|
||||
{Array.from({ length: items }, (_, index) => (
|
||||
<CardSkeleton key={index} width={cardWidth} />
|
||||
))}
|
||||
</View>
|
||||
</SkeletonContent>
|
||||
<View
|
||||
accessibilityLabel="Loading"
|
||||
accessibilityRole="progressbar"
|
||||
style={[
|
||||
styles.grid,
|
||||
contentInset ? styles.gridInset : styles.gridRowInset,
|
||||
]}
|
||||
>
|
||||
{Array.from({ length: items }, (_, index) => (
|
||||
<CardSkeleton key={index} width={cardWidth} />
|
||||
))}
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -228,9 +192,9 @@ export function CollectionDetailSkeleton({
|
||||
</View>
|
||||
</View>
|
||||
{round ? (
|
||||
<MediaGridSkeleton items={4} contentInset={false} embedded />
|
||||
<MediaGridSkeleton items={4} contentInset={false} />
|
||||
) : (
|
||||
<SongListSkeleton rows={8} embedded />
|
||||
<SongListSkeleton rows={8} />
|
||||
)}
|
||||
</ScrollView>
|
||||
)
|
||||
@@ -239,19 +203,17 @@ export function CollectionDetailSkeleton({
|
||||
export function ArtistListSkeleton({ rows = 12 }: { rows?: number }) {
|
||||
const colors = useThemeColors()
|
||||
return (
|
||||
<SkeletonContent>
|
||||
<View accessibilityLabel="Loading" accessibilityRole="progressbar">
|
||||
{Array.from({ length: rows }, (_, index) => (
|
||||
<View
|
||||
key={index}
|
||||
style={[styles.artistRow, { borderBottomColor: colors.border }]}
|
||||
>
|
||||
<Skeleton style={styles.artistAvatar} />
|
||||
<TextLine width="50%" height={16} />
|
||||
</View>
|
||||
))}
|
||||
</View>
|
||||
</SkeletonContent>
|
||||
<View accessibilityLabel="Loading" accessibilityRole="progressbar">
|
||||
{Array.from({ length: rows }, (_, index) => (
|
||||
<View
|
||||
key={index}
|
||||
style={[styles.artistRow, { borderBottomColor: colors.border }]}
|
||||
>
|
||||
<Skeleton style={styles.artistAvatar} />
|
||||
<TextLine width="50%" height={16} />
|
||||
</View>
|
||||
))}
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -271,7 +233,7 @@ const styles = StyleSheet.create({
|
||||
grid: { flexDirection: "row", flexWrap: "wrap", gap: spacing.md },
|
||||
gridInset: { padding: spacing.lg },
|
||||
gridRowInset: { paddingHorizontal: spacing.lg },
|
||||
carousel: { gap: spacing.md, overflow: "hidden" },
|
||||
carousel: { gap: spacing.md },
|
||||
carouselRow: { flexDirection: "row", gap: spacing.md },
|
||||
home: { padding: spacing.lg, gap: spacing.xl },
|
||||
hero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm },
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
// Keep the destination while server setup or sign-in is on screen.
|
||||
const listeners = new Set<() => void>()
|
||||
|
||||
export function subscribeIncomingMediaLink(listener: () => void) {
|
||||
listeners.add(listener)
|
||||
return () => {
|
||||
listeners.delete(listener)
|
||||
}
|
||||
}
|
||||
|
||||
let pendingLink: { path: string; serverOrigin: string } | null = null
|
||||
|
||||
export function incomingMediaLink(serverUrl: string) {
|
||||
if (!pendingLink) return null
|
||||
return new URL(serverUrl).origin === pendingLink.serverOrigin
|
||||
? pendingLink.path
|
||||
: null
|
||||
}
|
||||
|
||||
export function takeIncomingMediaLink(serverUrl: string) {
|
||||
const path = incomingMediaLink(serverUrl)
|
||||
pendingLink = null
|
||||
for (const listener of listeners) listener()
|
||||
return path
|
||||
}
|
||||
|
||||
export function rememberIncomingMediaLink(path: string, serverOrigin: string) {
|
||||
pendingLink = { path, serverOrigin }
|
||||
for (const listener of listeners) listener()
|
||||
}
|
||||
@@ -1,9 +1,8 @@
|
||||
export type MediaShareContext = (
|
||||
export type MediaShareContext =
|
||||
| { type: "album"; albumId: string }
|
||||
| { type: "song"; albumId: string; songId: string }
|
||||
| { type: "playlist"; playlistId: string; isFavorites?: boolean }
|
||||
| { type: "artist"; artistId: string }
|
||||
) & { title: string }
|
||||
|
||||
export function shouldShowShare(
|
||||
share: MediaShareContext | undefined,
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
import { requireOptionalNativeModule } from "expo"
|
||||
import * as Sharing from "expo-sharing"
|
||||
import { Platform, Share } from "react-native"
|
||||
|
||||
@@ -6,10 +5,6 @@ import type { MediaShareContext } from "@/lib/media-links"
|
||||
import { mediaShareUrl } from "@/lib/media-links"
|
||||
import { showError } from "@/lib/toast"
|
||||
|
||||
const nativeShare = requireOptionalNativeModule<{
|
||||
share: (url: string, artwork: string, title: string) => Promise<void>
|
||||
}>("MediaLinkShare")
|
||||
|
||||
export async function shareMediaLink(
|
||||
serverUrl: string,
|
||||
share: MediaShareContext
|
||||
@@ -22,32 +17,12 @@ export async function shareMediaLink(
|
||||
showError("Sharing is not available on this device")
|
||||
return
|
||||
}
|
||||
await Sharing.shareAsync(url, { dialogTitle: share.title })
|
||||
return
|
||||
}
|
||||
|
||||
if (nativeShare) {
|
||||
const type = share.type === "song" ? "album" : share.type
|
||||
const id =
|
||||
share.type === "album" || share.type === "song"
|
||||
? share.albumId
|
||||
: share.type === "artist"
|
||||
? share.artistId
|
||||
: share.isFavorites
|
||||
? "favorites"
|
||||
: share.playlistId
|
||||
await nativeShare.share(
|
||||
url,
|
||||
`${serverUrl.replace(/\/+$/, "")}/api/${type}/${id}/cover?size=512`,
|
||||
share.title
|
||||
)
|
||||
await Sharing.shareAsync(url, { dialogTitle: "Share" })
|
||||
return
|
||||
}
|
||||
|
||||
await Share.share(
|
||||
Platform.OS === "ios"
|
||||
? { url, title: share.title }
|
||||
: { message: url, title: share.title }
|
||||
Platform.OS === "ios" ? { url } : { message: url }
|
||||
)
|
||||
} catch (error) {
|
||||
if (error instanceof Error && /cancel/i.test(error.message)) {
|
||||
|
||||
@@ -1,53 +0,0 @@
|
||||
package com.abunchofknowitalls.otunes
|
||||
|
||||
import android.content.ClipData
|
||||
import android.content.Intent
|
||||
import androidx.core.content.FileProvider
|
||||
import expo.modules.kotlin.modules.Module
|
||||
import expo.modules.kotlin.modules.ModuleDefinition
|
||||
import java.io.File
|
||||
import java.net.URL
|
||||
|
||||
class MediaLinkShare : Module() {
|
||||
override fun definition() = ModuleDefinition {
|
||||
Name("MediaLinkShare")
|
||||
AsyncFunction("share") { link: String, artwork: String, title: String ->
|
||||
val context = requireNotNull(appContext.reactContext)
|
||||
val intent = Intent(Intent.ACTION_SEND).apply {
|
||||
type = "text/plain"
|
||||
putExtra(Intent.EXTRA_TEXT, link)
|
||||
putExtra(Intent.EXTRA_TITLE, title)
|
||||
putExtra(Intent.EXTRA_SUBJECT, title)
|
||||
}
|
||||
// ClipData supplies the chooser thumbnail while the shared item stays a URL.
|
||||
try {
|
||||
val connection = URL(artwork).openConnection().apply {
|
||||
connectTimeout = 8000
|
||||
readTimeout = 8000
|
||||
}
|
||||
context.cacheDir.listFiles()?.filter {
|
||||
it.name.startsWith("media-link-cover-") && it.lastModified() < System.currentTimeMillis() - 86400000
|
||||
}?.forEach { it.delete() }
|
||||
val extension = when (connection.contentType?.substringBefore(";")) {
|
||||
"image/webp" -> "webp"
|
||||
"image/png" -> "png"
|
||||
"image/jpeg" -> "jpg"
|
||||
"image/gif" -> "gif"
|
||||
else -> error("Artwork format is not supported")
|
||||
}
|
||||
val file = File(context.cacheDir, "media-link-cover-${java.util.UUID.randomUUID()}.${extension}")
|
||||
connection.getInputStream().use { input ->
|
||||
file.outputStream().use { output -> input.copyTo(output) }
|
||||
}
|
||||
val uri = FileProvider.getUriForFile(context, context.packageName + ".SharingFileProvider", file)
|
||||
intent.clipData = ClipData.newUri(context.contentResolver, "Artwork", uri)
|
||||
intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
|
||||
} catch (_: Exception) {
|
||||
// A failed artwork download must not prevent sharing the link.
|
||||
}
|
||||
appContext.throwingActivity.runOnUiThread {
|
||||
appContext.throwingActivity.startActivity(Intent.createChooser(intent, "Share"))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,55 +0,0 @@
|
||||
import UIKit
|
||||
import LinkPresentation
|
||||
internal import ExpoModulesCore
|
||||
|
||||
private final class MediaLinkItem: NSObject, UIActivityItemSource {
|
||||
let url: URL
|
||||
let image: UIImage?
|
||||
let title: String
|
||||
init(url: URL, image: UIImage?, title: String) {
|
||||
self.url = url
|
||||
self.image = image
|
||||
self.title = title
|
||||
}
|
||||
func activityViewControllerPlaceholderItem(_ controller: UIActivityViewController) -> Any { url }
|
||||
func activityViewController(_ controller: UIActivityViewController, itemForActivityType: UIActivity.ActivityType?) -> Any? { url }
|
||||
func activityViewControllerLinkMetadata(_ controller: UIActivityViewController) -> LPLinkMetadata? {
|
||||
let metadata = LPLinkMetadata()
|
||||
metadata.originalURL = url
|
||||
metadata.url = url
|
||||
metadata.title = title
|
||||
if let image {
|
||||
metadata.imageProvider = NSItemProvider(object: image)
|
||||
metadata.iconProvider = NSItemProvider(object: image)
|
||||
}
|
||||
return metadata
|
||||
}
|
||||
}
|
||||
|
||||
final class MediaLinkShare: Module {
|
||||
public func definition() -> ExpoModulesCore.ModuleDefinition {
|
||||
Name("MediaLinkShare")
|
||||
AsyncFunction("share") { (link: String, artwork: String, title: String) in
|
||||
guard let url = URL(string: link), let artworkURL = URL(string: artwork) else { return }
|
||||
var image: UIImage?
|
||||
var request = URLRequest(url: artworkURL)
|
||||
request.timeoutInterval = 8
|
||||
if let (data, response) = try? await URLSession.shared.data(for: request),
|
||||
(response as? HTTPURLResponse)?.statusCode == 200 {
|
||||
image = UIImage(data: data)
|
||||
}
|
||||
let artworkImage = image
|
||||
await MainActor.run {
|
||||
guard let presenter = self.appContext?.utilities?.currentViewController() else { return }
|
||||
let controller = UIActivityViewController(
|
||||
activityItems: [MediaLinkItem(url: url, image: artworkImage, title: title)], applicationActivities: nil)
|
||||
if let popover = controller.popoverPresentationController {
|
||||
popover.sourceView = presenter.view
|
||||
popover.sourceRect = CGRect(x: presenter.view.bounds.midX, y: presenter.view.bounds.midY, width: 0, height: 0)
|
||||
popover.permittedArrowDirections = []
|
||||
}
|
||||
presenter.present(controller, animated: true)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -389,7 +389,7 @@ export function AlbumView({
|
||||
|
||||
return (
|
||||
<div className="flex h-svh flex-col">
|
||||
<PageHeader openApp />
|
||||
<PageHeader />
|
||||
<ScrollArea className="min-h-0 flex-1 [&_[data-slot=scroll-area-viewport]>div]:block!">
|
||||
<div className="pb-28">
|
||||
<div className="mx-auto w-full min-w-0 max-w-9/10">
|
||||
|
||||
@@ -65,7 +65,7 @@ export function ArtistView({
|
||||
|
||||
return (
|
||||
<div className="flex h-svh flex-col">
|
||||
<PageHeader openApp />
|
||||
<PageHeader />
|
||||
<ScrollArea className="min-h-0 flex-1">
|
||||
<div className="pb-28">
|
||||
<div className="flex min-w-0 items-center gap-4 px-6 pt-6 pb-8 sm:gap-6">
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
import { OpenAppButton } from "@/components/open-app-button"
|
||||
import { MobileSidebarTrigger } from "@/components/mobile-sidebar-trigger"
|
||||
import { Skeleton } from "@/components/ui/skeleton"
|
||||
import { albumGridClassName } from "@/lib/album-grid-classes"
|
||||
@@ -20,13 +19,7 @@ function LoadingRegion({
|
||||
)
|
||||
}
|
||||
|
||||
export function PageHeader({
|
||||
title,
|
||||
openApp = false,
|
||||
}: {
|
||||
title?: string
|
||||
openApp?: boolean
|
||||
}) {
|
||||
export function PageHeader({ title }: { title?: string }) {
|
||||
return (
|
||||
<header
|
||||
className={cn(
|
||||
@@ -35,12 +28,7 @@ export function PageHeader({
|
||||
)}
|
||||
>
|
||||
<MobileSidebarTrigger />
|
||||
{title ? (
|
||||
<h1 className="text-lg font-semibold">{title}</h1>
|
||||
) : openApp ? (
|
||||
<span className="font-semibold">oTunes</span>
|
||||
) : null}
|
||||
{openApp ? <OpenAppButton /> : null}
|
||||
{title ? <h1 className="text-lg font-semibold">{title}</h1> : null}
|
||||
</header>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
"use client"
|
||||
|
||||
import { ArrowUpRight } from "lucide-react"
|
||||
|
||||
export function OpenAppButton() {
|
||||
function openApp() {
|
||||
const link = new URL("otunes://open")
|
||||
link.searchParams.set("url", window.location.href)
|
||||
window.location.assign(link.href)
|
||||
}
|
||||
|
||||
return (
|
||||
<button
|
||||
type="button"
|
||||
onClick={openApp}
|
||||
className="ml-auto inline-flex shrink-0 items-center gap-1 text-sm font-medium hover:underline focus-visible:outline-2 focus-visible:outline-offset-4 md:hidden"
|
||||
>
|
||||
Open App
|
||||
<ArrowUpRight aria-hidden className="size-4" />
|
||||
</button>
|
||||
)
|
||||
}
|
||||
@@ -76,8 +76,8 @@ export function PlayerBar() {
|
||||
queueOpen && !isMobile && "right-72"
|
||||
)}
|
||||
>
|
||||
<div className="pointer-events-auto flex w-full max-w-[40rem] items-center gap-2 rounded-full border border-foreground/20 bg-(--player-background) px-3 py-2 text-card-foreground shadow-lg [--player-background:var(--card)] md:gap-3 md:py-1.5 dark:border-white/20 dark:text-white dark:[--player-background:#303033]">
|
||||
<div className="flex shrink-0 items-center gap-0 md:gap-0.5 [&_button]:size-7 [&_svg]:size-4">
|
||||
<div className="pointer-events-auto flex w-full max-w-6xl items-center gap-2 rounded-full border border-foreground/20 bg-(--player-background) px-3 py-2 text-card-foreground shadow-lg [--player-background:var(--card)] @min-[640px]:gap-5 @min-[640px]:px-5 @min-[640px]:py-3 dark:border-white/20 dark:text-white dark:[--player-background:#303033]">
|
||||
<div className="flex shrink-0 items-center gap-0 @min-[640px]:gap-1 [&_button]:size-7 @min-[640px]:[&_button]:size-10 [&_svg]:size-4 @min-[640px]:[&_svg]:size-6">
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="icon"
|
||||
@@ -91,7 +91,7 @@ export function PlayerBar() {
|
||||
)}
|
||||
onClick={() => void toggleShuffle()}
|
||||
>
|
||||
<Shuffle className="size-4" />
|
||||
<Shuffle className="size-4 @min-[640px]:size-6" />
|
||||
</Button>
|
||||
<Button
|
||||
variant="ghost"
|
||||
@@ -100,7 +100,7 @@ export function PlayerBar() {
|
||||
disabled={!hasQueue}
|
||||
onClick={() => void skipPrevious()}
|
||||
>
|
||||
<SkipBack className="size-4 fill-current" />
|
||||
<SkipBack className="size-4 fill-current @min-[640px]:size-6" />
|
||||
</Button>
|
||||
<Button
|
||||
variant="ghost"
|
||||
@@ -110,9 +110,9 @@ export function PlayerBar() {
|
||||
onClick={() => setIsPlaying(!isPlaying)}
|
||||
>
|
||||
{isPlaying ? (
|
||||
<Pause className="size-5! fill-current" />
|
||||
<Pause className="size-5! fill-current @min-[640px]:size-8!" />
|
||||
) : (
|
||||
<Play className="size-5! fill-current" />
|
||||
<Play className="size-5! fill-current @min-[640px]:size-8!" />
|
||||
)}
|
||||
</Button>
|
||||
<Button
|
||||
@@ -122,7 +122,7 @@ export function PlayerBar() {
|
||||
disabled={!hasQueue}
|
||||
onClick={() => void skipNext()}
|
||||
>
|
||||
<SkipForward className="size-4 fill-current" />
|
||||
<SkipForward className="size-4 fill-current @min-[640px]:size-6" />
|
||||
</Button>
|
||||
<Button
|
||||
variant="ghost"
|
||||
@@ -138,33 +138,33 @@ export function PlayerBar() {
|
||||
onClick={() => void cycleRepeat()}
|
||||
>
|
||||
{repeatEnabled === "once" ? (
|
||||
<Repeat1 className="size-4" />
|
||||
<Repeat1 className="size-4 @min-[640px]:size-6" />
|
||||
) : (
|
||||
<Repeat className="size-4" />
|
||||
<Repeat className="size-4 @min-[640px]:size-6" />
|
||||
)}
|
||||
</Button>
|
||||
</div>
|
||||
|
||||
<div className="relative flex h-11 min-w-0 flex-1 items-center gap-2 pb-2 md:h-9 md:pb-1">
|
||||
<div className="relative flex h-11 min-w-0 flex-1 items-center gap-2 pb-2 @min-[640px]:h-16 @min-[640px]:gap-3">
|
||||
{currentSong ? (
|
||||
<>
|
||||
<div className="relative size-9 shrink-0 overflow-hidden rounded md:size-8">
|
||||
<div className="relative size-9 shrink-0 overflow-hidden rounded @min-[640px]:size-14">
|
||||
<Image
|
||||
src={albumCoverUrl(currentSong.album.id)}
|
||||
alt={currentSong.album.title}
|
||||
fill
|
||||
sizes="36px"
|
||||
sizes="56px"
|
||||
className="object-cover"
|
||||
/>
|
||||
</div>
|
||||
<div className="min-w-0 flex-1">
|
||||
<Link
|
||||
href={`/album/${currentSong.album.id}`}
|
||||
className="block truncate text-sm font-semibold hover:underline md:text-[13px] md:leading-4"
|
||||
className="block truncate text-sm font-semibold hover:underline @min-[640px]:text-xl"
|
||||
>
|
||||
{currentSong.title}
|
||||
</Link>
|
||||
<p className="truncate text-xs">
|
||||
<p className="truncate text-xs @min-[640px]:text-lg">
|
||||
<Link
|
||||
href={`/artist/${currentSong.artist.id}`}
|
||||
className="hover:underline"
|
||||
@@ -200,7 +200,7 @@ export function PlayerBar() {
|
||||
<div className="absolute inset-x-0 -bottom-1">
|
||||
<Slider
|
||||
className={cn(
|
||||
"h-3 flex-1 [&_[data-slot=slider-range]]:bg-current/80 [&_[data-slot=slider-thumb]]:size-2 [&_[data-slot=slider-thumb]]:border-current [&_[data-slot=slider-thumb]]:bg-current [&_[data-slot=slider-thumb]]:opacity-0 focus-within:[&_[data-slot=slider-thumb]]:opacity-100 hover:[&_[data-slot=slider-thumb]]:opacity-100 [&_[data-slot=slider-track]]:h-[3px] [&_[data-slot=slider-track]]:bg-current/30 md:[&_[data-slot=slider-track]]:h-0.5",
|
||||
"h-3 flex-1 [&_[data-slot=slider-range]]:bg-current/80 [&_[data-slot=slider-thumb]]:size-2 [&_[data-slot=slider-thumb]]:border-current [&_[data-slot=slider-thumb]]:bg-current [&_[data-slot=slider-thumb]]:opacity-0 focus-within:[&_[data-slot=slider-thumb]]:opacity-100 hover:[&_[data-slot=slider-thumb]]:opacity-100 [&_[data-slot=slider-track]]:h-[3px] [&_[data-slot=slider-track]]:bg-current/30",
|
||||
!hasActiveSong && "[&_[data-slot=slider-thumb]]:hidden"
|
||||
)}
|
||||
min={0}
|
||||
@@ -222,7 +222,7 @@ export function PlayerBar() {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="flex shrink-0 items-center gap-0 md:gap-1 [&_button]:size-7 [&_svg]:size-4">
|
||||
<div className="flex shrink-0 items-center gap-0 @min-[640px]:gap-2 [&_button]:size-7 @min-[640px]:[&_button]:size-10 [&_svg]:size-4 @min-[640px]:[&_svg]:size-6">
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="icon"
|
||||
@@ -230,7 +230,7 @@ export function PlayerBar() {
|
||||
aria-label="Lyrics"
|
||||
disabled
|
||||
>
|
||||
<MessageSquareQuote className="size-4" />
|
||||
<MessageSquareQuote className="size-4 @min-[640px]:size-6" />
|
||||
</Button>
|
||||
<Button
|
||||
variant="ghost"
|
||||
@@ -240,12 +240,12 @@ export function PlayerBar() {
|
||||
className={cn(queueOpen && "text-primary")}
|
||||
onClick={toggleQueueOpen}
|
||||
>
|
||||
<ListMusic className="size-4" />
|
||||
<ListMusic className="size-4 @min-[640px]:size-6" />
|
||||
</Button>
|
||||
<Popover>
|
||||
<PopoverTrigger asChild>
|
||||
<Button variant="ghost" size="icon" aria-label="Volume">
|
||||
<Volume2 className="size-4" />
|
||||
<Volume2 className="size-4 @min-[640px]:size-6" />
|
||||
</Button>
|
||||
</PopoverTrigger>
|
||||
<PopoverContent side="top" align="end" className="w-40">
|
||||
|
||||
@@ -6,7 +6,7 @@ import * as React from "react"
|
||||
import Image from "next/image"
|
||||
import { useRouter } from "next/navigation"
|
||||
import { useMutation } from "convex/react"
|
||||
import { Play, SearchIcon, Share2, Shuffle, Star, Trash2 } from "lucide-react"
|
||||
import { Play, Share2, Shuffle, Star, Trash2 } from "lucide-react"
|
||||
import { toast } from "sonner"
|
||||
|
||||
import { useAddToPlaylist } from "@/components/add-to-playlist-provider"
|
||||
@@ -305,19 +305,6 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
|
||||
const songs = isFavorites
|
||||
? playlist.songs.filter((song) => !hiddenFavoriteIds.has(song.id))
|
||||
: playlistSongs
|
||||
const [searchQuery, setSearchQuery] = React.useState("")
|
||||
const normalizedQuery = searchQuery.trim().toLowerCase()
|
||||
const filteredSongs = React.useMemo(
|
||||
() =>
|
||||
normalizedQuery
|
||||
? songs.filter((song) =>
|
||||
[song.title, song.artist.name, song.album.title].some((value) =>
|
||||
value.toLowerCase().includes(normalizedQuery)
|
||||
)
|
||||
)
|
||||
: songs,
|
||||
[songs, normalizedQuery]
|
||||
)
|
||||
const playlistSongIds = React.useMemo(
|
||||
() => songs.map((song) => song.id as Id<"songs">),
|
||||
[songs]
|
||||
@@ -340,8 +327,7 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
|
||||
handleSelect,
|
||||
handlePointerDown,
|
||||
prepareContextMenu,
|
||||
clearSelection,
|
||||
} = useTrackSelection(filteredSongs)
|
||||
} = useTrackSelection(songs)
|
||||
|
||||
const selectedStationArtistId = React.useMemo(
|
||||
() => stationArtistId(songs, selectedIds),
|
||||
@@ -349,12 +335,8 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
|
||||
)
|
||||
|
||||
const selectionPositions = React.useMemo(
|
||||
() =>
|
||||
getSelectionRangePositions(
|
||||
filteredSongs.map((song) => song.id),
|
||||
selectedIds
|
||||
),
|
||||
[filteredSongs, selectedIds]
|
||||
() => getSelectionRangePositions(songs.map((song) => song.id), selectedIds),
|
||||
[songs, selectedIds]
|
||||
)
|
||||
const totalDurationSeconds = React.useMemo(
|
||||
() => sumDurationSeconds(songs),
|
||||
@@ -479,13 +461,7 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
|
||||
}
|
||||
|
||||
function handleDrop(targetIndex: number) {
|
||||
if (
|
||||
normalizedQuery ||
|
||||
isFavorites ||
|
||||
!isOwner ||
|
||||
dragIndex === null ||
|
||||
dragIndex === targetIndex
|
||||
) {
|
||||
if (isFavorites || !isOwner || dragIndex === null || dragIndex === targetIndex) {
|
||||
setDragIndex(null)
|
||||
return
|
||||
}
|
||||
@@ -543,7 +519,7 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
|
||||
|
||||
return (
|
||||
<div className="flex h-svh flex-col">
|
||||
<PageHeader openApp />
|
||||
<PageHeader />
|
||||
<ScrollArea className="min-h-0 flex-1">
|
||||
<div className="pb-28">
|
||||
<div className="mx-auto w-full min-w-0 max-w-9/10">
|
||||
@@ -657,31 +633,13 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="px-6 pb-4">
|
||||
<div className="relative max-w-sm">
|
||||
<SearchIcon className="pointer-events-none absolute top-1/2 left-3 size-4 -translate-y-1/2 text-muted-foreground" />
|
||||
<input
|
||||
type="search"
|
||||
aria-label="Search playlist"
|
||||
placeholder="Search playlist"
|
||||
value={searchQuery}
|
||||
onChange={(event) => {
|
||||
setSearchQuery(event.target.value)
|
||||
clearSelection()
|
||||
setActiveTrackId("")
|
||||
setDragIndex(null)
|
||||
}}
|
||||
className="h-10 w-full min-w-0 rounded-full border border-input bg-input/30 pr-3 pl-9 text-sm text-foreground transition-colors outline-none placeholder:text-muted-foreground focus-visible:border-ring focus-visible:ring-2 focus-visible:ring-ring/50"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
{filteredSongs.length > 0 ? (
|
||||
filteredSongs.map((song, index) => (
|
||||
{songs.length > 0 ? (
|
||||
songs.map((song, index) => (
|
||||
<PlaylistSongRow
|
||||
key={song.id}
|
||||
song={song}
|
||||
index={index}
|
||||
isOwner={isOwner && !isFavorites && !normalizedQuery}
|
||||
isOwner={isOwner && !isFavorites}
|
||||
canRemove={isFavorites || isOwner}
|
||||
showFavoriteInMenu={!isFavorites}
|
||||
removeLabel={
|
||||
@@ -721,14 +679,14 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
|
||||
onMediaAction={handleMediaAction}
|
||||
onRemove={() => handleRemoveSong(song.id)}
|
||||
onDragStart={(event) => {
|
||||
if (normalizedQuery || isFavorites || !isOwner) {
|
||||
if (isFavorites || !isOwner) {
|
||||
return
|
||||
}
|
||||
setDragIndex(index)
|
||||
event.dataTransfer.effectAllowed = "move"
|
||||
}}
|
||||
onDragOver={(event) => {
|
||||
if (normalizedQuery || isFavorites || !isOwner) {
|
||||
if (isFavorites || !isOwner) {
|
||||
return
|
||||
}
|
||||
event.preventDefault()
|
||||
@@ -749,9 +707,7 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
|
||||
))
|
||||
) : (
|
||||
<p className="px-6 py-8 text-sm text-muted-foreground">
|
||||
{normalizedQuery
|
||||
? "No songs found."
|
||||
: "This playlist has no songs yet."}
|
||||
This playlist has no songs yet.
|
||||
</p>
|
||||
)}
|
||||
<MediaCollectionFooter
|
||||
|
||||
Reference in new issue
Block a user