Compare commits
3
Commits
No files matched your search
@@ -73,15 +73,10 @@ select your signing team, then build and run. For a Release build, use Xcode's
|
||||
Archive action with the Catalyst destination. EAS's existing iOS profiles still
|
||||
build iPhone/iPad apps.
|
||||
|
||||
Don't enable Catalyst by hand in Xcode; the plugin configures everything during
|
||||
prebuild. It enables the Xcode target and React Native's CocoaPods patches,
|
||||
raises pod deployment targets to the app's, and disables precompiled React
|
||||
Native and Expo modules so dependencies can compile for Catalyst. System volume
|
||||
stays under macOS control.
|
||||
|
||||
The Mac app uses the same bundle identifier as the iOS app, so sign both with the
|
||||
same team. Handoff only pairs apps with a matching team and activity type, which
|
||||
`app.config.ts` declares once per build profile in `NSUserActivityTypes`.
|
||||
The Catalyst plugin enables the Xcode target and React Native's CocoaPods
|
||||
patches. It disables precompiled React Native and Expo modules so dependencies
|
||||
can compile for Catalyst. The Mac app derives a separate bundle identifier with
|
||||
Apple's `maccatalyst.` prefix. System volume stays under macOS control.
|
||||
|
||||
To return a checkout to ordinary iOS builds, rerun prebuild without
|
||||
`MAC_CATALYST=1`. Keep `APP_VARIANT` consistent when starting Metro.
|
||||
@@ -26,8 +26,6 @@ export default ({ config }: ConfigContext): ExpoConfig => {
|
||||
production: "oTunes",
|
||||
}[variant]
|
||||
|
||||
const bundleIdentifier = `${config.ios!.bundleIdentifier}${suffix}`
|
||||
|
||||
return {
|
||||
...config,
|
||||
plugins: [
|
||||
@@ -42,12 +40,11 @@ export default ({ config }: ConfigContext): ExpoConfig => {
|
||||
icon: `./assets/icon${iconSuffix}.png`,
|
||||
ios: {
|
||||
...config.ios,
|
||||
bundleIdentifier,
|
||||
bundleIdentifier: `${config.ios!.bundleIdentifier}${suffix}`,
|
||||
icon: `./assets/${composer}.icon`,
|
||||
infoPlist: {
|
||||
...config.ios?.infoPlist,
|
||||
// HandoffModule publishes this `.media` type; Catalyst shares this bundle ID.
|
||||
NSUserActivityTypes: [`${bundleIdentifier}.media`],
|
||||
NSUserActivityTypes: [`com.abunchofknowitalls.otunes${suffix}.media`],
|
||||
},
|
||||
},
|
||||
android: {
|
||||
|
||||
@@ -127,9 +127,7 @@ function TabsContent() {
|
||||
tintColor={tabColors.tintColor}
|
||||
minimizeBehavior="onScrollDown"
|
||||
{...(Platform.OS === "android"
|
||||
? // A new ripple color rebuilds Material's item backgrounds and
|
||||
// cuts off the in-flight ripple, so it must not follow the palette.
|
||||
{ disableIndicator: true, rippleColor: appleMusic.tabInactive }
|
||||
? { disableIndicator: true, rippleColor: tabColors.tintColor }
|
||||
: {})}
|
||||
>
|
||||
{Platform.OS === "ios" && !tabletLayout && showBottomAccessory ? (
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
import { SongSwipeRow } from "@/components/song-swipe-row"
|
||||
import {
|
||||
useSwipeRowGroup,
|
||||
@@ -15,6 +14,7 @@ import { Link, Stack, useIsFocused, useLocalSearchParams } from "expo-router"
|
||||
import { StatusBar } from "expo-status-bar"
|
||||
import { memo, useCallback, useEffect, useMemo } from "react"
|
||||
import { Platform, Pressable, StyleSheet, Text, View } from "react-native"
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
|
||||
import {
|
||||
CollectionDivider,
|
||||
@@ -142,7 +142,7 @@ export default function AlbumScreen() {
|
||||
}}
|
||||
/>
|
||||
<CollectionDetailSkeleton
|
||||
variant="album"
|
||||
zoomCoverSize={220}
|
||||
onLayout={onLayout}
|
||||
style={backgroundStyle}
|
||||
backgroundColor={
|
||||
@@ -211,7 +211,7 @@ export default function AlbumScreen() {
|
||||
<Ionicons
|
||||
name="ellipsis-horizontal"
|
||||
size={22}
|
||||
color={colors.foreground}
|
||||
color={palette.isDark ? "#fff" : "#000"}
|
||||
/>
|
||||
</Pressable>
|
||||
</MediaActionMenu>
|
||||
|
||||
@@ -42,7 +42,7 @@ export default function ArtistScreen() {
|
||||
headerLargeTitle: false,
|
||||
}}
|
||||
/>
|
||||
<CollectionDetailSkeleton variant="artist" />
|
||||
<CollectionDetailSkeleton round />
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -62,10 +62,7 @@ export default function HomeScreen() {
|
||||
return (
|
||||
<ScrollView
|
||||
style={{ flex: 1, backgroundColor: colors.background }}
|
||||
contentContainerStyle={[
|
||||
styles.content,
|
||||
{ paddingBottom: tabContentBottomInset },
|
||||
]}
|
||||
contentContainerStyle={[styles.content, { paddingBottom: tabContentBottomInset }]}
|
||||
contentInsetAdjustmentBehavior="automatic"
|
||||
>
|
||||
<HomeCarousels recentlyAdded={added} recentlyPlayed={played} />
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
import {
|
||||
CollectionHero,
|
||||
useCollectionHeroLayout,
|
||||
@@ -29,6 +28,7 @@ import {
|
||||
type ListRenderItemInfo,
|
||||
} from "react-native"
|
||||
import ReanimatedSwipeable from "react-native-gesture-handler/ReanimatedSwipeable"
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
|
||||
import { CollectionDivider } from "@/components/collection-list"
|
||||
import { CoverImage } from "@/components/cover-image"
|
||||
@@ -68,7 +68,6 @@ const OWNER_MENU_ACTIONS: MediaAction[] = [
|
||||
"play-last",
|
||||
"shuffle",
|
||||
"favorite",
|
||||
"change-cover",
|
||||
"delete-playlist",
|
||||
]
|
||||
|
||||
@@ -84,11 +83,7 @@ export default function PlaylistScreen() {
|
||||
const songs = playlist?.songs
|
||||
const coverUri =
|
||||
config && playlistId
|
||||
? playlistCoverUrl(
|
||||
config.serverUrl,
|
||||
playlist?.id ?? playlistId,
|
||||
playlist?.cover ?? null
|
||||
)
|
||||
? playlistCoverUrl(config.serverUrl, playlist?.id ?? playlistId)
|
||||
: ""
|
||||
const { palette: artworkPalette, settled } = useCoverPalette(
|
||||
coverUri,
|
||||
@@ -117,7 +112,7 @@ export default function PlaylistScreen() {
|
||||
}}
|
||||
/>
|
||||
<CollectionDetailSkeleton
|
||||
variant="playlist"
|
||||
zoomCoverSize={200}
|
||||
onLayout={onLayout}
|
||||
style={backgroundStyle}
|
||||
backgroundColor={
|
||||
@@ -175,7 +170,6 @@ function PlaylistContent({
|
||||
}) {
|
||||
const router = useRouter()
|
||||
const isFocused = useIsFocused()
|
||||
const colors = useThemeColors()
|
||||
const { playPlaylist, playPlaylistShuffled, playFromSong } =
|
||||
usePlaybackActions()
|
||||
const { isSongFavorite } = useFavorites()
|
||||
@@ -266,15 +260,6 @@ function PlaylistContent({
|
||||
void handleDelete()
|
||||
return
|
||||
}
|
||||
if (action === "change-cover") {
|
||||
if (playlistId) {
|
||||
router.push({
|
||||
pathname: "/playlist-cover",
|
||||
params: { id: playlistId },
|
||||
})
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
void handlePlaylistDetailAction(songIds, action)
|
||||
}
|
||||
@@ -307,7 +292,7 @@ function PlaylistContent({
|
||||
<Ionicons
|
||||
name="ellipsis-horizontal"
|
||||
size={22}
|
||||
color={colors.foreground}
|
||||
color={palette.isDark ? "#fff" : "#000"}
|
||||
/>
|
||||
</Pressable>
|
||||
</MediaActionMenu>
|
||||
@@ -315,7 +300,6 @@ function PlaylistContent({
|
||||
}
|
||||
}, [
|
||||
canEdit,
|
||||
colors.foreground,
|
||||
deletePlaylist,
|
||||
handlePlaylistDetailAction,
|
||||
palette.foreground,
|
||||
|
||||
@@ -36,7 +36,7 @@ export default function FavoritesScreen() {
|
||||
const colors = useThemeColors()
|
||||
const { config } = useServerConfig()
|
||||
const favorites = useCachedQuery(api.favorites.browseFavoritesPlaylistDetail)
|
||||
const songs = useMemo(() => favorites?.songs.flat() ?? [], [favorites])
|
||||
const songs = favorites?.songs ?? []
|
||||
const { playInOrder, playShuffled, playFromSong } = usePlaybackActions()
|
||||
const { isSongFavorite } = useFavorites()
|
||||
const { handleSongAction } = useMediaMenuActions()
|
||||
@@ -45,8 +45,8 @@ export default function FavoritesScreen() {
|
||||
usePlaylistSearch(songs)
|
||||
|
||||
useEffect(() => {
|
||||
rememberSongs(songs)
|
||||
}, [songs])
|
||||
if (favorites) rememberSongs(favorites.songs)
|
||||
}, [favorites])
|
||||
|
||||
const handlePlaySong = useCallback(
|
||||
(song: BrowseSong) => void playFromSong(song.id, songIds),
|
||||
@@ -84,7 +84,7 @@ export default function FavoritesScreen() {
|
||||
return (
|
||||
<>
|
||||
<Stack.Screen options={SCREEN_OPTIONS} />
|
||||
<CollectionDetailSkeleton variant="favorites" />
|
||||
<CollectionDetailSkeleton />
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -118,7 +118,12 @@ export default function LibraryScreen() {
|
||||
)
|
||||
|
||||
if (status === "LoadingFirstPage" && !isCached) {
|
||||
return <MediaGridSkeleton contentInset={false} header={listHeader} />
|
||||
return (
|
||||
<View style={{ flex: 1, backgroundColor: colors.background }}>
|
||||
{listHeader}
|
||||
<MediaGridSkeleton contentInset={false} />
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
return (
|
||||
|
||||
@@ -106,22 +106,6 @@ export default function AppLayout() {
|
||||
contentStyle: { backgroundColor: "#000" },
|
||||
}}
|
||||
/>
|
||||
<Stack.Screen
|
||||
name="playlist-cover"
|
||||
options={{
|
||||
title: "Cover",
|
||||
headerTitleAlign: "center",
|
||||
presentation:
|
||||
Platform.OS === "ios" ? "modal" : "fullScreenModal",
|
||||
animation: "slide_from_bottom",
|
||||
headerLargeTitle: false,
|
||||
headerTransparent: false,
|
||||
headerShadowVisible: false,
|
||||
headerStyle: { backgroundColor: "#000" },
|
||||
headerTintColor: "#fff",
|
||||
contentStyle: { backgroundColor: "#000" },
|
||||
}}
|
||||
/>
|
||||
<Stack.Screen
|
||||
name="player"
|
||||
options={{
|
||||
|
||||
@@ -1,391 +0,0 @@
|
||||
import { useMutation } from "convex/react"
|
||||
import { Image } from "expo-image"
|
||||
import * as ImagePicker from "expo-image-picker"
|
||||
import { router, Stack, useLocalSearchParams } from "expo-router"
|
||||
import { useMemo, useState, type ReactNode } from "react"
|
||||
import {
|
||||
Pressable,
|
||||
ScrollView,
|
||||
StyleSheet,
|
||||
Text,
|
||||
useWindowDimensions,
|
||||
View,
|
||||
} from "react-native"
|
||||
|
||||
import { CoverImage } from "@/components/cover-image"
|
||||
import { Button, LoadingView } from "@/components/ui/primitives"
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
import { useCachedQuery } from "@/hooks/use-cached-query"
|
||||
import { showError } from "@/lib/toast"
|
||||
import { albumCoverUrl, playlistCoverUrl } from "@/lib/urls"
|
||||
import { radius, spacing, useThemeColors } from "@/lib/theme"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import {
|
||||
COVER_GRID_ALBUMS,
|
||||
playlistCoverAlbums,
|
||||
randomPlaylistCovers,
|
||||
} from "@otunes/convex/client/playlist-cover"
|
||||
|
||||
type Choice =
|
||||
| { kind: "current" }
|
||||
| { kind: "albums"; albumIds: Id<"albums">[] }
|
||||
| { kind: "upload"; uri: string; image: string }
|
||||
|
||||
const STRIP_GAP = spacing.sm
|
||||
/** Selection border and padding around each thumb, both sides. */
|
||||
const THUMB_CHROME = 6
|
||||
|
||||
/**
|
||||
* Full screen cover editor for a playlist owner: a large preview of the
|
||||
* selected cover, the current cover pinned apart from four random album
|
||||
* grids, and Save in the header. Opened from the playlist's menu.
|
||||
*/
|
||||
export default function PlaylistCoverScreen() {
|
||||
const { id } = useLocalSearchParams<{ id: string }>()
|
||||
const playlistId = id as Id<"playlists">
|
||||
const playlist = useCachedQuery(api.playlists.browsePlaylistDetail, {
|
||||
id: playlistId,
|
||||
})
|
||||
const { config } = useServerConfig()
|
||||
const colors = useThemeColors()
|
||||
const { width } = useWindowDimensions()
|
||||
const setCoverAlbums = useMutation(api.playlists.setPlaylistCoverAlbums)
|
||||
const uploadCover = useMutation(api.playlists.uploadPlaylistCover)
|
||||
|
||||
const albums = useMemo(
|
||||
() => (playlist ? playlistCoverAlbums(playlist.songs) : []),
|
||||
[playlist]
|
||||
)
|
||||
const [options, setOptions] = useState<Id<"albums">[][] | null>(null)
|
||||
const [selected, setSelected] = useState<Choice | null>(null)
|
||||
const [saving, setSaving] = useState(false)
|
||||
|
||||
// Draw options once the songs arrive.
|
||||
if (options === null && playlist) {
|
||||
setOptions(randomPlaylistCovers(albums))
|
||||
}
|
||||
|
||||
const hasCurrent = playlist?.cover != null
|
||||
const choice: Choice | null =
|
||||
selected ??
|
||||
(hasCurrent
|
||||
? { kind: "current" }
|
||||
: options?.[0]
|
||||
? { kind: "albums", albumIds: options[0] }
|
||||
: null)
|
||||
|
||||
async function pickImage() {
|
||||
const result = await ImagePicker.launchImageLibraryAsync({
|
||||
mediaTypes: ["images"],
|
||||
allowsEditing: true,
|
||||
aspect: [1, 1],
|
||||
quality: 0.7,
|
||||
base64: true,
|
||||
})
|
||||
const asset = result.canceled ? undefined : result.assets[0]
|
||||
if (!asset?.base64) return
|
||||
setSelected({
|
||||
kind: "upload",
|
||||
uri: asset.uri,
|
||||
image: `data:${asset.mimeType ?? "image/jpeg"};base64,${asset.base64}`,
|
||||
})
|
||||
}
|
||||
|
||||
async function save() {
|
||||
if (!choice || choice.kind === "current") {
|
||||
router.back()
|
||||
return
|
||||
}
|
||||
setSaving(true)
|
||||
try {
|
||||
if (choice.kind === "albums") {
|
||||
await setCoverAlbums({ playlistId, albumIds: choice.albumIds })
|
||||
} else {
|
||||
await uploadCover({ playlistId, image: choice.image })
|
||||
}
|
||||
router.back()
|
||||
} catch (error) {
|
||||
showError(
|
||||
error instanceof Error ? error.message : "Failed to change cover"
|
||||
)
|
||||
setSaving(false)
|
||||
}
|
||||
}
|
||||
|
||||
const header = (
|
||||
<Stack.Screen
|
||||
options={{
|
||||
headerLeft: () => (
|
||||
<HeaderButton label="Cancel" onPress={() => router.back()} />
|
||||
),
|
||||
headerRight: () => (
|
||||
<HeaderButton
|
||||
label="Save"
|
||||
bold
|
||||
disabled={saving || !choice}
|
||||
onPress={() => void save()}
|
||||
/>
|
||||
),
|
||||
}}
|
||||
/>
|
||||
)
|
||||
|
||||
if (!playlist || !config || !options) {
|
||||
return (
|
||||
<>
|
||||
{header}
|
||||
<LoadingView />
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
const serverUrl = config.serverUrl
|
||||
const currentUri = playlistCoverUrl(serverUrl, playlistId, playlist.cover)
|
||||
const previewSize = Math.min(width - spacing.lg * 2, 360)
|
||||
// One row: current | uploaded? | options, thumbs at most 72pt.
|
||||
const thumbCount =
|
||||
options.length + (hasCurrent ? 1 : 0) + (choice?.kind === "upload" ? 1 : 0)
|
||||
const rowItems = thumbCount + (hasCurrent ? 1 : 0)
|
||||
const thumbSize = Math.min(
|
||||
72,
|
||||
Math.floor(
|
||||
(width - spacing.lg * 2 - STRIP_GAP * (rowItems - 1) - 1) /
|
||||
Math.max(thumbCount, 1)
|
||||
) - THUMB_CHROME
|
||||
)
|
||||
|
||||
function renderChoice(item: Choice, size: number) {
|
||||
if (item.kind === "current") {
|
||||
return (
|
||||
<CoverImage
|
||||
uri={currentUri}
|
||||
hasCover
|
||||
style={{ width: size, height: size }}
|
||||
/>
|
||||
)
|
||||
}
|
||||
if (item.kind === "upload") {
|
||||
return (
|
||||
<Image
|
||||
source={{ uri: item.uri }}
|
||||
style={{ width: size, height: size }}
|
||||
/>
|
||||
)
|
||||
}
|
||||
return (
|
||||
<AlbumGrid serverUrl={serverUrl} albumIds={item.albumIds} size={size} />
|
||||
)
|
||||
}
|
||||
|
||||
const isSelected = (item: Choice) =>
|
||||
choice?.kind === item.kind &&
|
||||
(item.kind !== "albums" ||
|
||||
(choice.kind === "albums" && choice.albumIds === item.albumIds))
|
||||
|
||||
return (
|
||||
<ScrollView
|
||||
style={{ backgroundColor: colors.background }}
|
||||
contentContainerStyle={styles.content}
|
||||
>
|
||||
{header}
|
||||
<View
|
||||
style={[
|
||||
styles.preview,
|
||||
{
|
||||
width: previewSize,
|
||||
height: previewSize,
|
||||
backgroundColor: colors.coverPlaceholder,
|
||||
},
|
||||
]}
|
||||
>
|
||||
{choice ? renderChoice(choice, previewSize) : null}
|
||||
</View>
|
||||
|
||||
<View style={styles.strip}>
|
||||
{hasCurrent ? (
|
||||
<>
|
||||
<Thumb
|
||||
size={thumbSize}
|
||||
selected={isSelected({ kind: "current" })}
|
||||
label="Current cover"
|
||||
onPress={() => setSelected({ kind: "current" })}
|
||||
>
|
||||
{renderChoice({ kind: "current" }, thumbSize)}
|
||||
</Thumb>
|
||||
<View
|
||||
style={[styles.separator, { backgroundColor: colors.border }]}
|
||||
/>
|
||||
</>
|
||||
) : null}
|
||||
{choice?.kind === "upload" ? (
|
||||
<Thumb size={thumbSize} selected label="Uploaded image">
|
||||
{renderChoice(choice, thumbSize)}
|
||||
</Thumb>
|
||||
) : null}
|
||||
{options.map((albumIds) => {
|
||||
const item: Choice = { kind: "albums", albumIds }
|
||||
return (
|
||||
<Thumb
|
||||
key={albumIds.join(",")}
|
||||
size={thumbSize}
|
||||
selected={isSelected(item)}
|
||||
label="Album cover option"
|
||||
onPress={() => setSelected(item)}
|
||||
>
|
||||
{renderChoice(item, thumbSize)}
|
||||
</Thumb>
|
||||
)
|
||||
})}
|
||||
</View>
|
||||
|
||||
{albums.length === 0 ? (
|
||||
<Text style={{ color: colors.mutedForeground, textAlign: "center" }}>
|
||||
No album artwork in this playlist yet.
|
||||
</Text>
|
||||
) : null}
|
||||
|
||||
<View style={styles.actions}>
|
||||
{albums.length >= COVER_GRID_ALBUMS ? (
|
||||
<Button
|
||||
title="Shuffle"
|
||||
icon="shuffle"
|
||||
variant="secondary"
|
||||
onPress={() => {
|
||||
setOptions(randomPlaylistCovers(albums))
|
||||
if (selected?.kind === "albums") setSelected(null)
|
||||
}}
|
||||
/>
|
||||
) : null}
|
||||
<Button
|
||||
title="Upload"
|
||||
icon="arrow-up"
|
||||
variant="secondary"
|
||||
onPress={() => void pickImage()}
|
||||
/>
|
||||
</View>
|
||||
</ScrollView>
|
||||
)
|
||||
}
|
||||
|
||||
function HeaderButton({
|
||||
label,
|
||||
bold = false,
|
||||
disabled = false,
|
||||
onPress,
|
||||
}: {
|
||||
label: string
|
||||
bold?: boolean
|
||||
disabled?: boolean
|
||||
onPress: () => void
|
||||
}) {
|
||||
const colors = useThemeColors()
|
||||
return (
|
||||
<Pressable
|
||||
accessibilityRole="button"
|
||||
hitSlop={8}
|
||||
disabled={disabled}
|
||||
onPress={onPress}
|
||||
style={{ opacity: disabled ? 0.4 : 1, paddingHorizontal: spacing.xs }}
|
||||
>
|
||||
<Text
|
||||
style={{
|
||||
color: colors.foreground,
|
||||
fontSize: 17,
|
||||
fontWeight: bold ? "600" : "400",
|
||||
}}
|
||||
>
|
||||
{label}
|
||||
</Text>
|
||||
</Pressable>
|
||||
)
|
||||
}
|
||||
|
||||
function Thumb({
|
||||
size,
|
||||
selected,
|
||||
label,
|
||||
onPress,
|
||||
children,
|
||||
}: {
|
||||
size: number
|
||||
selected: boolean
|
||||
label: string
|
||||
onPress?: () => void
|
||||
children: ReactNode
|
||||
}) {
|
||||
const colors = useThemeColors()
|
||||
return (
|
||||
<Pressable
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel={label}
|
||||
accessibilityState={{ selected }}
|
||||
onPress={onPress}
|
||||
style={[
|
||||
styles.thumb,
|
||||
{
|
||||
width: size + THUMB_CHROME,
|
||||
height: size + THUMB_CHROME,
|
||||
borderColor: selected ? colors.foreground : "transparent",
|
||||
},
|
||||
]}
|
||||
>
|
||||
<View style={styles.thumbInner}>{children}</View>
|
||||
</Pressable>
|
||||
)
|
||||
}
|
||||
|
||||
/** A generated cover option: one album alone, or four tiled 2x2. */
|
||||
function AlbumGrid({
|
||||
serverUrl,
|
||||
albumIds,
|
||||
size,
|
||||
}: {
|
||||
serverUrl: string
|
||||
albumIds: Id<"albums">[]
|
||||
size: number
|
||||
}) {
|
||||
const tile = albumIds.length > 1 ? size / 2 : size
|
||||
return (
|
||||
<View
|
||||
style={{
|
||||
width: size,
|
||||
height: size,
|
||||
flexDirection: "row",
|
||||
flexWrap: "wrap",
|
||||
}}
|
||||
>
|
||||
{albumIds.map((albumId) => (
|
||||
<CoverImage
|
||||
key={albumId}
|
||||
uri={albumCoverUrl(serverUrl, albumId)}
|
||||
hasCover
|
||||
style={{ width: tile, height: tile }}
|
||||
/>
|
||||
))}
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
content: {
|
||||
alignItems: "center",
|
||||
gap: spacing.xl,
|
||||
padding: spacing.lg,
|
||||
},
|
||||
preview: { borderRadius: radius.lg, overflow: "hidden" },
|
||||
strip: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
justifyContent: "center",
|
||||
gap: STRIP_GAP,
|
||||
},
|
||||
separator: { width: StyleSheet.hairlineWidth, alignSelf: "stretch" },
|
||||
thumb: {
|
||||
borderWidth: 2,
|
||||
borderRadius: radius.sm + 2,
|
||||
padding: 1,
|
||||
},
|
||||
thumbInner: { flex: 1, borderRadius: radius.sm, overflow: "hidden" },
|
||||
actions: { flexDirection: "row", gap: spacing.sm },
|
||||
})
|
||||
@@ -23,16 +23,19 @@ type LibraryKind = (typeof LIBRARY_KINDS)[number]
|
||||
const PAGE_SIZE = 500
|
||||
type CatalogPage = FunctionReturnType<typeof api.intentCatalog.page>
|
||||
|
||||
type Favorites = FunctionReturnType<typeof api.favorites.getUserFavorites>
|
||||
type Favorites = {
|
||||
favoriteSongs: string[]
|
||||
favoriteAlbums: string[]
|
||||
favoriteArtists: string[]
|
||||
}
|
||||
|
||||
function favoriteIds(favorites: Favorites, kind: LibraryKind) {
|
||||
return new Set<string>(
|
||||
(kind === "song"
|
||||
kind === "song"
|
||||
? favorites.favoriteSongs
|
||||
: kind === "album"
|
||||
? favorites.favoriteAlbums
|
||||
: favorites.favoriteArtists
|
||||
).flat()
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
@@ -214,13 +214,12 @@ export function useIntentDispatch() {
|
||||
)
|
||||
}
|
||||
if (kind === "artist") {
|
||||
const chunks = await fetchCachedQuery(
|
||||
return fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.playlists.getOrderedArtistSongIds,
|
||||
{ artistId: id as Id<"artists"> }
|
||||
)
|
||||
return chunks.flat()
|
||||
}
|
||||
if (kind === "playlist") {
|
||||
if (id === FAVORITES_PLAYLIST_ID) {
|
||||
@@ -230,7 +229,7 @@ export function useIntentDispatch() {
|
||||
api.favorites.getUserFavorites,
|
||||
{}
|
||||
)
|
||||
return favorites.favoriteSongs.flat()
|
||||
return favorites.favoriteSongs
|
||||
}
|
||||
return fetchCachedQuery(
|
||||
convex,
|
||||
@@ -392,18 +391,17 @@ export function useIntentDispatch() {
|
||||
api.favorites.getUserFavorites,
|
||||
{}
|
||||
)
|
||||
const favoriteSongs = favorites.favoriteSongs.flat()
|
||||
if (favoriteSongs.length === 0) {
|
||||
if (favorites.favoriteSongs.length === 0) {
|
||||
throw new IntentRejected(
|
||||
"Nothing is queued, and your favorites are empty."
|
||||
)
|
||||
}
|
||||
if (shuffled) {
|
||||
ensureActive(invocation)
|
||||
await actions.playShuffled(favoriteSongs)
|
||||
await actions.playShuffled(favorites.favoriteSongs)
|
||||
} else {
|
||||
ensureActive(invocation)
|
||||
await actions.playInOrder(favoriteSongs)
|
||||
await actions.playInOrder(favorites.favoriteSongs)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
@@ -71,10 +71,7 @@ class ConvexAuthErrorBoundary extends Component<
|
||||
}
|
||||
}
|
||||
|
||||
export function ConvexAuthRecovery({
|
||||
children,
|
||||
onInvalidate,
|
||||
}: ConvexAuthRecoveryProps) {
|
||||
export function ConvexAuthRecovery({ children, onInvalidate }: ConvexAuthRecoveryProps) {
|
||||
const localAuth = useLocalConvexAuth()
|
||||
const serverAuth = useServerConvexAuth()
|
||||
const hadServerAuthRef = useRef(false)
|
||||
@@ -116,9 +113,9 @@ export function ConvexAuthRecovery({
|
||||
|
||||
const sessionEstablished = Boolean(
|
||||
serverAuth &&
|
||||
!serverAuth.isLoading &&
|
||||
!serverAuth.isRefreshing &&
|
||||
serverAuth.isAuthenticated
|
||||
!serverAuth.isLoading &&
|
||||
!serverAuth.isRefreshing &&
|
||||
serverAuth.isAuthenticated
|
||||
)
|
||||
|
||||
return (
|
||||
|
||||
@@ -35,11 +35,7 @@ export function HandoffBridge() {
|
||||
if (!active || !activity) return
|
||||
try {
|
||||
const source = new URL(activity.server)
|
||||
if (!config) {
|
||||
showError("Connect to an oTunes server to continue this activity.")
|
||||
return
|
||||
}
|
||||
if (source.origin !== new URL(config.serverUrl).origin) {
|
||||
if (!config || source.origin !== new URL(config.serverUrl).origin) {
|
||||
showError("This activity belongs to a different oTunes server.")
|
||||
return
|
||||
}
|
||||
|
||||
@@ -112,10 +112,7 @@ function SwipeRowBody({
|
||||
setIsOpen(false)
|
||||
}, [removing, translateX])
|
||||
|
||||
const handleSwipeStart = useCallback(
|
||||
() => group.setOpen(close),
|
||||
[close, group]
|
||||
)
|
||||
const handleSwipeStart = useCallback(() => group.setOpen(close), [close, group])
|
||||
|
||||
const handleSettle = useCallback(
|
||||
(open: boolean) => {
|
||||
@@ -254,7 +251,8 @@ function SwipeRowBody({
|
||||
const pillWidth = Math.max(
|
||||
0,
|
||||
resting +
|
||||
(revealed - PILL_COMMITTED_MARGIN * 2 - resting) * commitProgress.value
|
||||
(revealed - PILL_COMMITTED_MARGIN * 2 - resting) *
|
||||
commitProgress.value
|
||||
)
|
||||
const restingHeight = interpolate(
|
||||
pillWidth,
|
||||
|
||||
@@ -200,11 +200,7 @@ export const PlaylistCard = memo(function PlaylistCard({
|
||||
<Link.AppleZoom>
|
||||
<View collapsable={false}>
|
||||
<CoverImage
|
||||
uri={playlistCoverUrl(
|
||||
config.serverUrl,
|
||||
playlist.id,
|
||||
playlist.cover
|
||||
)}
|
||||
uri={playlistCoverUrl(config.serverUrl, playlist.id)}
|
||||
hasCover={playlist.cover != null}
|
||||
style={
|
||||
fluid
|
||||
|
||||
@@ -33,7 +33,6 @@ export type MediaAction =
|
||||
| "go-artist"
|
||||
| "go-album"
|
||||
| "remove-from-playlist"
|
||||
| "change-cover"
|
||||
| "delete-playlist"
|
||||
|
||||
export type MediaNavigation = {
|
||||
@@ -129,11 +128,6 @@ const MEDIA_ACTION_ITEMS: {
|
||||
image: "minus.circle",
|
||||
destructive: true,
|
||||
},
|
||||
{
|
||||
action: "change-cover",
|
||||
label: () => "Change Cover",
|
||||
image: "photo",
|
||||
},
|
||||
{
|
||||
action: "delete-playlist",
|
||||
label: () => "Delete Playlist",
|
||||
@@ -157,7 +151,7 @@ function isActionIncluded(
|
||||
return config.includeActions.includes(action)
|
||||
}
|
||||
|
||||
if (action === "delete-playlist" || action === "change-cover") {
|
||||
if (action === "delete-playlist") {
|
||||
return false
|
||||
}
|
||||
|
||||
|
||||
@@ -26,7 +26,6 @@ const actionIcons = {
|
||||
"go-artist": "person-outline",
|
||||
"go-album": "disc-outline",
|
||||
"remove-from-playlist": "remove-circle-outline",
|
||||
"change-cover": "image-outline",
|
||||
"delete-playlist": "trash-outline",
|
||||
} satisfies Record<MediaAction, ComponentProps<typeof Ionicons>["name"]>
|
||||
|
||||
|
||||
@@ -1,20 +1,15 @@
|
||||
import { useMediaGridLayout } from "@/hooks/use-media-grid-layout"
|
||||
import { useTabletLayout } from "@/hooks/use-tablet-layout"
|
||||
import {
|
||||
CollectionHero,
|
||||
useCollectionHeroLayout,
|
||||
} from "@/components/collection-hero"
|
||||
import {
|
||||
CollectionDivider,
|
||||
collectionInset,
|
||||
} from "@/components/collection-list"
|
||||
import { tabletCardTextHeight } from "@/components/tablet-media-grid"
|
||||
import { Link } from "expo-router"
|
||||
import { useHeaderHeight } from "expo-router/react-navigation"
|
||||
import Reanimated from "react-native-reanimated"
|
||||
import { type ComponentProps, type ReactNode } from "react"
|
||||
import { type ReactNode, type ComponentProps } from "react"
|
||||
import {
|
||||
Platform,
|
||||
ScrollView,
|
||||
StyleSheet,
|
||||
View,
|
||||
type DimensionValue,
|
||||
@@ -22,42 +17,34 @@ import {
|
||||
type ViewStyle,
|
||||
} from "react-native"
|
||||
|
||||
import { contentBottomInset } from "@/components/player"
|
||||
import { carouselCardWidth, radius, spacing, useThemeColors } from "@/lib/theme"
|
||||
|
||||
/**
|
||||
* Loading screens never scroll, so they cannot rely on scroll-view inset
|
||||
* adjustment. iOS headers are transparent and overlap the screen; Android
|
||||
* headers are opaque and already sit above it.
|
||||
*/
|
||||
function SkeletonScreen({
|
||||
/** Reserve the transparent native header explicitly while skeletons cannot scroll. */
|
||||
function SkeletonContent({
|
||||
children,
|
||||
style,
|
||||
backgroundColor,
|
||||
onLayout,
|
||||
embedded = false,
|
||||
}: {
|
||||
children: ReactNode
|
||||
style?: ComponentProps<typeof Reanimated.View>["style"]
|
||||
backgroundColor?: string
|
||||
onLayout?: () => void
|
||||
embedded?: boolean
|
||||
}) {
|
||||
const colors = useThemeColors()
|
||||
const headerHeight = useHeaderHeight()
|
||||
if (embedded) return <>{children}</>
|
||||
|
||||
return (
|
||||
<Reanimated.View
|
||||
onLayout={onLayout}
|
||||
<ScrollView
|
||||
style={{ flex: 1, backgroundColor: colors.background }}
|
||||
contentContainerStyle={{
|
||||
paddingTop: Platform.OS === "ios" ? headerHeight : 0,
|
||||
paddingBottom: contentBottomInset,
|
||||
}}
|
||||
contentInsetAdjustmentBehavior="never"
|
||||
scrollEnabled={false}
|
||||
accessibilityLabel="Loading"
|
||||
accessibilityRole="progressbar"
|
||||
style={[
|
||||
styles.screen,
|
||||
{
|
||||
backgroundColor: backgroundColor ?? colors.background,
|
||||
paddingTop: Platform.OS === "ios" ? headerHeight : 0,
|
||||
},
|
||||
style,
|
||||
]}
|
||||
>
|
||||
{children}
|
||||
</Reanimated.View>
|
||||
</ScrollView>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -74,103 +61,56 @@ export function Skeleton({ style }: { style?: StyleProp<ViewStyle> }) {
|
||||
)
|
||||
}
|
||||
|
||||
/** Occupies the line box of text at `fontSize`, so loaded text lands in place. */
|
||||
function TextLine({
|
||||
width,
|
||||
fontSize,
|
||||
height = 14,
|
||||
}: {
|
||||
width: DimensionValue
|
||||
fontSize: number
|
||||
height?: number
|
||||
}) {
|
||||
return (
|
||||
<View
|
||||
style={{
|
||||
width,
|
||||
height: Math.round(fontSize * 1.2),
|
||||
justifyContent: "center",
|
||||
}}
|
||||
>
|
||||
<Skeleton
|
||||
style={{ height: Math.round(fontSize * 0.8), borderRadius: 4 }}
|
||||
/>
|
||||
</View>
|
||||
)
|
||||
return <Skeleton style={{ width, height, borderRadius: 4 }} />
|
||||
}
|
||||
|
||||
/** Mirrors `SongRow`, including its `inset` album/playlist layout. */
|
||||
export function SongRowSkeleton({ inset = false }: { inset?: boolean }) {
|
||||
export function SongRowSkeleton() {
|
||||
const colors = useThemeColors()
|
||||
const meta = (
|
||||
<View style={styles.songMeta}>
|
||||
<TextLine width="60%" fontSize={16} />
|
||||
<View style={styles.songSubtitle}>
|
||||
<TextLine width="40%" fontSize={14} />
|
||||
</View>
|
||||
</View>
|
||||
)
|
||||
if (inset) {
|
||||
return (
|
||||
<View style={styles.insetRow}>
|
||||
<Skeleton style={styles.songArtwork} />
|
||||
<View
|
||||
style={[
|
||||
styles.insetSongContent,
|
||||
{ borderBottomColor: colors.border },
|
||||
]}
|
||||
>
|
||||
{meta}
|
||||
</View>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
return (
|
||||
<View style={[styles.songRow, { borderBottomColor: colors.border }]}>
|
||||
<Skeleton style={styles.songArtwork} />
|
||||
{meta}
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
function TrackRowSkeleton() {
|
||||
const colors = useThemeColors()
|
||||
return (
|
||||
<View style={styles.trackRow}>
|
||||
<View style={styles.trackNumber}>
|
||||
<TextLine width={12} fontSize={16} />
|
||||
</View>
|
||||
<View style={[styles.trackContent, { borderBottomColor: colors.border }]}>
|
||||
<TextLine width="55%" fontSize={16} />
|
||||
<View style={styles.songMeta}>
|
||||
<TextLine width="60%" height={16} />
|
||||
<TextLine width="40%" />
|
||||
</View>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
function SongRows({ rows, inset }: { rows: number; inset?: boolean }) {
|
||||
return Array.from({ length: rows }, (_, index) => (
|
||||
<SongRowSkeleton key={index} inset={inset} />
|
||||
))
|
||||
}
|
||||
|
||||
export function SongListSkeleton({ rows = 10 }: { rows?: number }) {
|
||||
export function SongListSkeleton({
|
||||
rows = 10,
|
||||
embedded = false,
|
||||
}: {
|
||||
rows?: number
|
||||
embedded?: boolean
|
||||
}) {
|
||||
return (
|
||||
<SkeletonScreen>
|
||||
<SongRows rows={rows} />
|
||||
</SkeletonScreen>
|
||||
<SkeletonContent embedded={embedded}>
|
||||
<View accessibilityLabel="Loading" accessibilityRole="progressbar">
|
||||
{Array.from({ length: rows }, (_, index) => (
|
||||
<SongRowSkeleton key={index} />
|
||||
))}
|
||||
</View>
|
||||
</SkeletonContent>
|
||||
)
|
||||
}
|
||||
|
||||
/** Mirrors the album, playlist, and artist cards in `media-cards`. */
|
||||
function CardSkeleton({
|
||||
width,
|
||||
minHeight,
|
||||
round = false,
|
||||
}: {
|
||||
width: number
|
||||
minHeight?: number
|
||||
round?: boolean
|
||||
}) {
|
||||
return (
|
||||
<View style={[styles.card, { width, minHeight }]}>
|
||||
<View style={[styles.card, { width }]}>
|
||||
<Skeleton
|
||||
style={{
|
||||
width,
|
||||
@@ -178,37 +118,35 @@ function CardSkeleton({
|
||||
borderRadius: round ? width / 2 : radius.md,
|
||||
}}
|
||||
/>
|
||||
<TextLine width="80%" fontSize={14} />
|
||||
{round ? null : <TextLine width="50%" fontSize={12} />}
|
||||
<TextLine width="80%" />
|
||||
{round ? null : <TextLine width="50%" height={12} />}
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
/** Mirrors `MediaGridList`: a `FlatList` on phones, `TabletMediaGrid` on iPad. */
|
||||
function MediaGridContent({
|
||||
items,
|
||||
contentInset,
|
||||
header,
|
||||
export function MediaGridSkeleton({
|
||||
items = 6,
|
||||
contentInset = true,
|
||||
embedded = false,
|
||||
}: {
|
||||
items: number
|
||||
contentInset: boolean
|
||||
header?: ReactNode
|
||||
items?: number
|
||||
contentInset?: boolean
|
||||
embedded?: boolean
|
||||
}) {
|
||||
const tabletLayout = useTabletLayout()
|
||||
const { cardWidth, columns, onLayout, horizontalPadding, gap, ready } =
|
||||
useMediaGridLayout()
|
||||
return (
|
||||
<>
|
||||
{header}
|
||||
<SkeletonContent embedded={embedded}>
|
||||
<View
|
||||
onLayout={onLayout}
|
||||
accessibilityLabel="Loading"
|
||||
accessibilityRole="progressbar"
|
||||
style={[
|
||||
styles.grid,
|
||||
contentInset ? styles.gridInset : styles.gridRowInset,
|
||||
{
|
||||
paddingHorizontal: horizontalPadding,
|
||||
paddingTop: contentInset ? horizontalPadding : 0,
|
||||
// FlatList applies its content gap after the list header as well.
|
||||
marginTop: header && !tabletLayout ? gap : 0,
|
||||
gap,
|
||||
},
|
||||
]}
|
||||
@@ -216,47 +154,20 @@ function MediaGridContent({
|
||||
{Array.from(
|
||||
{ length: ready ? Math.max(items, columns * 3) : 0 },
|
||||
(_, index) => (
|
||||
<CardSkeleton
|
||||
key={index}
|
||||
width={cardWidth}
|
||||
minHeight={
|
||||
tabletLayout ? cardWidth + tabletCardTextHeight : undefined
|
||||
}
|
||||
/>
|
||||
<CardSkeleton key={index} width={cardWidth} />
|
||||
)
|
||||
)}
|
||||
</View>
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
export function MediaGridSkeleton({
|
||||
items = 6,
|
||||
contentInset = true,
|
||||
header,
|
||||
}: {
|
||||
items?: number
|
||||
contentInset?: boolean
|
||||
/** The loaded list's `ListHeaderComponent`, so it keeps its position. */
|
||||
header?: ReactNode
|
||||
}) {
|
||||
return (
|
||||
<SkeletonScreen>
|
||||
<MediaGridContent
|
||||
items={items}
|
||||
contentInset={contentInset}
|
||||
header={header}
|
||||
/>
|
||||
</SkeletonScreen>
|
||||
</SkeletonContent>
|
||||
)
|
||||
}
|
||||
|
||||
export function CarouselSkeleton() {
|
||||
return (
|
||||
<View style={styles.carousel}>
|
||||
<TextLine width={160} fontSize={22} />
|
||||
<TextLine width={160} height={22} />
|
||||
<View style={styles.carouselRow}>
|
||||
{Array.from({ length: 8 }, (_, index) => (
|
||||
{Array.from({ length: 3 }, (_, index) => (
|
||||
<CardSkeleton key={index} width={carouselCardWidth} />
|
||||
))}
|
||||
</View>
|
||||
@@ -265,148 +176,140 @@ export function CarouselSkeleton() {
|
||||
}
|
||||
|
||||
export function HomeSkeleton() {
|
||||
const headerHeight = useHeaderHeight()
|
||||
const colors = useThemeColors()
|
||||
return (
|
||||
<SkeletonScreen>
|
||||
<View style={styles.home}>
|
||||
<CarouselSkeleton />
|
||||
<CarouselSkeleton />
|
||||
</View>
|
||||
</SkeletonScreen>
|
||||
)
|
||||
}
|
||||
|
||||
function HeroActions({
|
||||
favorite = true,
|
||||
reverse = false,
|
||||
}: {
|
||||
favorite?: boolean
|
||||
reverse?: boolean
|
||||
}) {
|
||||
return (
|
||||
<View style={[styles.actions, reverse && styles.actionsReverse]}>
|
||||
{favorite ? <Skeleton style={styles.iconAction} /> : null}
|
||||
<Skeleton style={styles.playButton} />
|
||||
<Skeleton style={styles.iconAction} />
|
||||
</View>
|
||||
<ScrollView
|
||||
style={{ flex: 1, backgroundColor: colors.background }}
|
||||
contentContainerStyle={[
|
||||
styles.home,
|
||||
{ paddingTop: (Platform.OS === "ios" ? headerHeight : 0) + spacing.lg },
|
||||
]}
|
||||
contentInsetAdjustmentBehavior="never"
|
||||
scrollEnabled={false}
|
||||
accessibilityLabel="Loading"
|
||||
>
|
||||
<CarouselSkeleton />
|
||||
<CarouselSkeleton />
|
||||
</ScrollView>
|
||||
)
|
||||
}
|
||||
|
||||
/** Album and playlist pages: cover, title, play buttons, then tracks. */
|
||||
export function CollectionDetailSkeleton({
|
||||
variant,
|
||||
zoomCoverSize,
|
||||
style,
|
||||
round = false,
|
||||
backgroundColor,
|
||||
onLayout,
|
||||
}: {
|
||||
variant: "album" | "playlist" | "favorites" | "artist"
|
||||
style?: ComponentProps<typeof Reanimated.View>["style"]
|
||||
zoomCoverSize?: number
|
||||
style?: ComponentProps<typeof Reanimated.ScrollView>["style"]
|
||||
round?: boolean
|
||||
backgroundColor?: string
|
||||
onLayout?: () => void
|
||||
}) {
|
||||
const colors = useThemeColors()
|
||||
const headerHeight = useHeaderHeight()
|
||||
const { landscape, coverSize: tabletCoverSize } = useCollectionHeroLayout()
|
||||
|
||||
if (variant === "artist" || variant === "favorites") {
|
||||
const artist = variant === "artist"
|
||||
const coverSize = artist ? 180 : 200
|
||||
const hero = (
|
||||
<View style={styles.centeredHero}>
|
||||
<Skeleton
|
||||
style={{
|
||||
width: coverSize,
|
||||
height: coverSize,
|
||||
borderRadius: artist ? coverSize / 2 : radius.lg,
|
||||
}}
|
||||
/>
|
||||
<TextLine width={200} fontSize={artist ? 28 : 24} />
|
||||
<HeroActions favorite={artist} />
|
||||
</View>
|
||||
)
|
||||
return (
|
||||
<SkeletonScreen
|
||||
style={style}
|
||||
backgroundColor={backgroundColor}
|
||||
onLayout={onLayout}
|
||||
>
|
||||
{artist ? (
|
||||
<MediaGridContent items={4} contentInset={false} header={hero} />
|
||||
) : (
|
||||
<>
|
||||
{hero}
|
||||
<CollectionDivider />
|
||||
<SongRows rows={8} inset />
|
||||
</>
|
||||
)}
|
||||
</SkeletonScreen>
|
||||
)
|
||||
}
|
||||
|
||||
const album = variant === "album"
|
||||
const coverSize = tabletCoverSize ?? (album ? 220 : 200)
|
||||
const coverSize =
|
||||
!round && landscape
|
||||
? tabletCoverSize!
|
||||
: (zoomCoverSize ?? (round ? 180 : 210))
|
||||
const actions = (
|
||||
<View style={styles.actions}>
|
||||
<Skeleton style={styles.iconAction} />
|
||||
<Skeleton style={styles.playButton} />
|
||||
<Skeleton style={styles.iconAction} />
|
||||
</View>
|
||||
)
|
||||
const artwork = (
|
||||
<Skeleton
|
||||
style={{
|
||||
width: coverSize,
|
||||
height: coverSize,
|
||||
borderRadius: round ? coverSize / 2 : radius.lg,
|
||||
}}
|
||||
/>
|
||||
)
|
||||
return (
|
||||
<SkeletonScreen
|
||||
style={style}
|
||||
backgroundColor={backgroundColor}
|
||||
<Reanimated.ScrollView
|
||||
onLayout={onLayout}
|
||||
style={[
|
||||
{ flex: 1, backgroundColor: backgroundColor ?? colors.background },
|
||||
style,
|
||||
]}
|
||||
contentContainerStyle={{
|
||||
paddingTop: Platform.OS === "ios" ? headerHeight : 0,
|
||||
paddingBottom: contentBottomInset,
|
||||
}}
|
||||
contentInsetAdjustmentBehavior="never"
|
||||
scrollEnabled={false}
|
||||
accessibilityLabel="Loading"
|
||||
>
|
||||
<CollectionHero
|
||||
artwork={
|
||||
<Link.AppleZoomTarget>
|
||||
<View collapsable={false}>
|
||||
<Skeleton
|
||||
style={{
|
||||
width: coverSize,
|
||||
height: coverSize,
|
||||
borderRadius: radius.lg,
|
||||
}}
|
||||
/>
|
||||
</View>
|
||||
</Link.AppleZoomTarget>
|
||||
}
|
||||
actions={<HeroActions favorite={album} reverse={landscape} />}
|
||||
>
|
||||
<TextLine
|
||||
width={landscape ? "85%" : 200}
|
||||
fontSize={landscape ? 22 : 24}
|
||||
/>
|
||||
<TextLine
|
||||
width={landscape ? "60%" : 120}
|
||||
fontSize={landscape ? 22 : 16}
|
||||
/>
|
||||
{album ? (
|
||||
<TextLine width={landscape ? "40%" : 150} fontSize={14} />
|
||||
) : null}
|
||||
</CollectionHero>
|
||||
<CollectionDivider />
|
||||
{album ? (
|
||||
Array.from({ length: 10 }, (_, index) => (
|
||||
<TrackRowSkeleton key={index} />
|
||||
))
|
||||
{round ? (
|
||||
<View style={styles.artistHero}>
|
||||
{zoomCoverSize ? (
|
||||
<Link.AppleZoomTarget>
|
||||
<View collapsable={false}>{artwork}</View>
|
||||
</Link.AppleZoomTarget>
|
||||
) : (
|
||||
artwork
|
||||
)}
|
||||
<TextLine width={200} height={24} />
|
||||
<TextLine width={120} height={16} />
|
||||
{actions}
|
||||
</View>
|
||||
) : (
|
||||
<SongRows rows={8} inset />
|
||||
<CollectionHero
|
||||
artwork={
|
||||
zoomCoverSize ? (
|
||||
<Link.AppleZoomTarget>
|
||||
<View collapsable={false}>{artwork}</View>
|
||||
</Link.AppleZoomTarget>
|
||||
) : (
|
||||
artwork
|
||||
)
|
||||
}
|
||||
actions={actions}
|
||||
>
|
||||
<TextLine width={landscape && !round ? "85%" : 200} height={24} />
|
||||
<TextLine
|
||||
width={landscape && !round ? "60%" : 120}
|
||||
height={landscape && !round ? 22 : 16}
|
||||
/>
|
||||
<TextLine width={landscape && !round ? "70%" : 150} height={14} />
|
||||
</CollectionHero>
|
||||
)}
|
||||
</SkeletonScreen>
|
||||
{round ? (
|
||||
<MediaGridSkeleton items={4} contentInset={false} embedded />
|
||||
) : (
|
||||
<SongListSkeleton rows={8} embedded />
|
||||
)}
|
||||
</Reanimated.ScrollView>
|
||||
)
|
||||
}
|
||||
|
||||
export function ArtistListSkeleton({ rows = 12 }: { rows?: number }) {
|
||||
const colors = useThemeColors()
|
||||
return (
|
||||
<SkeletonScreen>
|
||||
{Array.from({ length: rows }, (_, index) => (
|
||||
<View
|
||||
key={index}
|
||||
style={[styles.artistRow, { borderBottomColor: colors.border }]}
|
||||
>
|
||||
<Skeleton style={styles.artistAvatar} />
|
||||
<TextLine width="50%" fontSize={16} />
|
||||
</View>
|
||||
))}
|
||||
</SkeletonScreen>
|
||||
<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>
|
||||
)
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
screen: { flex: 1, overflow: "hidden" },
|
||||
songRow: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
@@ -416,55 +319,22 @@ const styles = StyleSheet.create({
|
||||
paddingHorizontal: spacing.lg,
|
||||
borderBottomWidth: StyleSheet.hairlineWidth,
|
||||
},
|
||||
insetRow: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
gap: spacing.md,
|
||||
paddingLeft: collectionInset,
|
||||
},
|
||||
insetSongContent: {
|
||||
flex: 1,
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
alignSelf: "stretch",
|
||||
minHeight: 64,
|
||||
paddingVertical: 10,
|
||||
marginRight: collectionInset,
|
||||
borderBottomWidth: StyleSheet.hairlineWidth,
|
||||
},
|
||||
songArtwork: { width: 44, height: 44, borderRadius: 6 },
|
||||
songMeta: { flex: 1 },
|
||||
songSubtitle: { marginTop: 3 },
|
||||
trackRow: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
gap: spacing.sm,
|
||||
paddingLeft: collectionInset,
|
||||
},
|
||||
trackNumber: { width: 24, alignItems: "center" },
|
||||
trackContent: {
|
||||
flex: 1,
|
||||
justifyContent: "center",
|
||||
alignSelf: "stretch",
|
||||
minHeight: 52,
|
||||
paddingVertical: 12,
|
||||
marginRight: collectionInset,
|
||||
borderBottomWidth: StyleSheet.hairlineWidth,
|
||||
},
|
||||
songMeta: { flex: 1, gap: 6 },
|
||||
card: { gap: spacing.xs },
|
||||
grid: { flexDirection: "row", flexWrap: "wrap" },
|
||||
grid: { flexDirection: "row", flexWrap: "wrap", gap: spacing.md },
|
||||
gridInset: { padding: spacing.lg },
|
||||
gridRowInset: { paddingHorizontal: spacing.lg },
|
||||
carousel: { gap: spacing.md, overflow: "hidden" },
|
||||
carouselRow: { flexDirection: "row", gap: spacing.md },
|
||||
home: { padding: spacing.lg, gap: spacing.xl },
|
||||
centeredHero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm },
|
||||
artistHero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm },
|
||||
actions: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
justifyContent: "center",
|
||||
gap: spacing.sm,
|
||||
marginTop: spacing.sm,
|
||||
},
|
||||
actionsReverse: { flexDirection: "row-reverse" },
|
||||
iconAction: { width: 44, height: 44, borderRadius: 22 },
|
||||
playButton: { width: 160, height: 44, borderRadius: 999 },
|
||||
artistRow: {
|
||||
|
||||
@@ -19,9 +19,6 @@ import { useMediaGridLayout } from "@/hooks/use-media-grid-layout"
|
||||
import { tabletLayoutTransition } from "@/lib/tablet-motion"
|
||||
import { useThemeColors } from "@/lib/theme"
|
||||
|
||||
/** Height reserved under each tablet card's artwork for its title and subtitle. */
|
||||
export const tabletCardTextHeight = 48
|
||||
|
||||
type GridProps = {
|
||||
content: MediaItem[]
|
||||
paddingBottom: number
|
||||
@@ -51,7 +48,7 @@ export function TabletMediaGrid({
|
||||
const [headerHeight, setHeaderHeight] = useState(0)
|
||||
const [scrollY, setScrollY] = useState(0)
|
||||
const lastRequestedLength = useRef(-1)
|
||||
const rowHeight = cardWidth + tabletCardTextHeight + gap
|
||||
const rowHeight = cardWidth + 48 + gap
|
||||
const firstRow = Math.max(
|
||||
0,
|
||||
Math.floor((scrollY - headerHeight) / rowHeight) - 2
|
||||
|
||||
@@ -1,19 +1,13 @@
|
||||
import { useOpenSettings } from "@/hooks/use-open-settings"
|
||||
import { requireNativeView } from "expo"
|
||||
import { useIsFocused, useRouter } from "expo-router"
|
||||
import { useMemo } from "react"
|
||||
import { useIsFocused } from "expo-router"
|
||||
import { Platform, type ViewProps } from "react-native"
|
||||
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
import { useCachedQuery } from "@/hooks/use-cached-query"
|
||||
import { useProfileImageUrl } from "@/hooks/use-profile-image-url"
|
||||
import { tabPath } from "@/lib/app-navigation"
|
||||
import { initialsFromName } from "@/lib/format"
|
||||
import { playlistCoverUrl } from "@/lib/urls"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
|
||||
type SidebarPlaylist = { id: string; title: string; imageURL?: string }
|
||||
|
||||
const NativeSidebar =
|
||||
Platform.OS === "ios"
|
||||
? requireNativeView<
|
||||
@@ -22,39 +16,16 @@ const NativeSidebar =
|
||||
initials: string
|
||||
imageURL?: string
|
||||
active: boolean
|
||||
playlists: SidebarPlaylist[]
|
||||
onProfilePress: () => void
|
||||
onPlaylistPress: (event: { nativeEvent: { id: string } }) => void
|
||||
}
|
||||
>("TabletSidebar")
|
||||
: null
|
||||
|
||||
/** iPad sidebar extras: the account footer and a row per playlist with its cover. */
|
||||
export function TabletSidebar() {
|
||||
const user = useCachedQuery(api.auth.currentUser)
|
||||
const sidebarPlaylists = useCachedQuery(api.playlists.listSidebarPlaylists)
|
||||
const { config } = useServerConfig()
|
||||
const imageUrl = useProfileImageUrl(user?.image)
|
||||
const openSettings = useOpenSettings()
|
||||
const router = useRouter()
|
||||
const active = useIsFocused()
|
||||
const serverUrl = config?.serverUrl
|
||||
|
||||
const playlists = useMemo(
|
||||
() =>
|
||||
[
|
||||
...(sidebarPlaylists?.owned ?? []),
|
||||
...(sidebarPlaylists?.subscribed ?? []),
|
||||
].map((playlist): SidebarPlaylist => ({
|
||||
id: playlist.id,
|
||||
title: playlist.title,
|
||||
imageURL:
|
||||
serverUrl && playlist.cover
|
||||
? playlistCoverUrl(serverUrl, playlist.id, playlist.cover, 64)
|
||||
: undefined,
|
||||
})),
|
||||
[serverUrl, sidebarPlaylists]
|
||||
)
|
||||
|
||||
if (!NativeSidebar) return null
|
||||
return (
|
||||
@@ -64,11 +35,7 @@ export function TabletSidebar() {
|
||||
initials={initialsFromName(user?.name ?? "Me")}
|
||||
imageURL={imageUrl}
|
||||
active={active}
|
||||
playlists={playlists}
|
||||
onProfilePress={openSettings}
|
||||
onPlaylistPress={({ nativeEvent }) =>
|
||||
router.navigate(tabPath("(playlists)", `/playlist/${nativeEvent.id}`))
|
||||
}
|
||||
/>
|
||||
)
|
||||
}
|
||||
@@ -150,7 +150,7 @@ export function AddToPlaylistProvider({ children }: { children: ReactNode }) {
|
||||
{ artistId }
|
||||
)
|
||||
if (selectionRequestIdRef.current !== requestId) return
|
||||
setPendingSongIds(songIds.flat())
|
||||
setPendingSongIds(songIds)
|
||||
setOpen(true)
|
||||
} catch (error) {
|
||||
if (selectionRequestIdRef.current !== requestId) return
|
||||
|
||||
@@ -100,15 +100,15 @@ export function FavoritesProvider({ children }: { children: ReactNode }) {
|
||||
)
|
||||
|
||||
const songIds = useMemo(
|
||||
() => new Set<string>(favorites?.favoriteSongs.flat()),
|
||||
() => new Set(favorites?.favoriteSongs.map(String) ?? []),
|
||||
[favorites?.favoriteSongs]
|
||||
)
|
||||
const albumIds = useMemo(
|
||||
() => new Set<string>(favorites?.favoriteAlbums.flat()),
|
||||
() => new Set(favorites?.favoriteAlbums.map(String) ?? []),
|
||||
[favorites?.favoriteAlbums]
|
||||
)
|
||||
const artistIds = useMemo(
|
||||
() => new Set<string>(favorites?.favoriteArtists.flat()),
|
||||
() => new Set(favorites?.favoriteArtists.map(String) ?? []),
|
||||
[favorites?.favoriteArtists]
|
||||
)
|
||||
const idsRef = useRef({ songIds, albumIds, artistIds })
|
||||
|
||||
@@ -401,7 +401,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
cacheScope,
|
||||
api.playlists.getOrderedArtistSongIds,
|
||||
{ artistId }
|
||||
).then((chunks) => chunks.flat()),
|
||||
),
|
||||
recorded: { entity: { kind: "artist", id: artistId } },
|
||||
}))
|
||||
const playlist = collection(
|
||||
@@ -482,14 +482,12 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
|
||||
let songIds: Id<"songs">[]
|
||||
try {
|
||||
songIds = (
|
||||
await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.library.browseSortedSongIds,
|
||||
sort
|
||||
)
|
||||
).flat()
|
||||
songIds = await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.library.browseSortedSongIds,
|
||||
sort
|
||||
)
|
||||
} catch {
|
||||
return
|
||||
}
|
||||
|
||||
@@ -83,11 +83,7 @@ export function createCoverPaletteSource<Swatches>({
|
||||
const [waitedKey, setWaitedKey] = useState<string | null>(null)
|
||||
|
||||
const swatches =
|
||||
resolved.key === key
|
||||
? resolved.swatches
|
||||
: key
|
||||
? cachedSwatches(key)
|
||||
: null
|
||||
resolved.key === key ? resolved.swatches : key ? cachedSwatches(key) : null
|
||||
|
||||
useEffect(() => {
|
||||
if (!key || hasCover === false) return
|
||||
|
||||
@@ -173,7 +173,7 @@ export function useMediaMenuActions() {
|
||||
api.playlists.getOrderedArtistSongIds,
|
||||
{ artistId: artist.id as Id<"artists"> }
|
||||
)
|
||||
await runQueueAction(action, songIds.flat())
|
||||
await runQueueAction(action, songIds)
|
||||
break
|
||||
}
|
||||
default:
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
import { ConvexError, type Value } from "convex/values"
|
||||
|
||||
const AUTH_ERROR_MESSAGES = new Set(["Not authenticated", "User not logged in"])
|
||||
const AUTH_ERROR_MESSAGES = new Set([
|
||||
"Not authenticated",
|
||||
"User not logged in",
|
||||
])
|
||||
|
||||
function matchesAuthMessage(message: string): boolean {
|
||||
if (AUTH_ERROR_MESSAGES.has(message)) {
|
||||
|
||||
@@ -37,9 +37,7 @@ export function authStorageKey(key: string, storageNamespace: string): string {
|
||||
return `${key}_${escapedNamespace}`
|
||||
}
|
||||
|
||||
export async function clearStoredAuthTokens(
|
||||
storageNamespace: string
|
||||
): Promise<void> {
|
||||
export async function clearStoredAuthTokens(storageNamespace: string): Promise<void> {
|
||||
await Promise.all(
|
||||
AUTH_STORAGE_KEYS.map((key) =>
|
||||
secureRemoveItem(authStorageKey(key, storageNamespace))
|
||||
|
||||
@@ -5,10 +5,7 @@ export function formatDuration(seconds: number): string {
|
||||
return `${minutes}:${remainingSeconds.toString().padStart(2, "0")}`
|
||||
}
|
||||
|
||||
export function formatRemainingDuration(
|
||||
current: number,
|
||||
total: number
|
||||
): string {
|
||||
export function formatRemainingDuration(current: number, total: number): string {
|
||||
const remaining = Math.max(0, Math.floor(total) - Math.floor(current))
|
||||
return `-${formatDuration(remaining)}`
|
||||
}
|
||||
|
||||
@@ -79,9 +79,7 @@ export function deriveCoverPalette(
|
||||
secondaryForeground: toHex(secondaryForeground),
|
||||
accent: toHex(accent),
|
||||
accentForeground: toHex(accentForeground),
|
||||
accentText: toHex(
|
||||
withMinContrast(accent, background, SECONDARY_MIN_CONTRAST)
|
||||
),
|
||||
accentText: toHex(withMinContrast(accent, background, SECONDARY_MIN_CONTRAST)),
|
||||
surface: toHex(mix(foreground, background, lightText ? 0.16 : 0.1)),
|
||||
divider: toHex(mix(foreground, background, lightText ? 0.2 : 0.14)),
|
||||
isDark: lightText,
|
||||
@@ -96,10 +94,7 @@ function legibleBackground(color: Rgb, schemeIsDark: boolean): Rgb {
|
||||
? withLightness(color, Math.min(lch.l, 0.86))
|
||||
: withLightness(color, Math.max(lch.l, 0.2))
|
||||
const y = luminance(clamped)
|
||||
if (
|
||||
y <= DARK_BACKGROUND_MAX_LUMINANCE ||
|
||||
y >= LIGHT_BACKGROUND_MIN_LUMINANCE
|
||||
) {
|
||||
if (y <= DARK_BACKGROUND_MAX_LUMINANCE || y >= LIGHT_BACKGROUND_MIN_LUMINANCE) {
|
||||
return clamped
|
||||
}
|
||||
|
||||
@@ -130,10 +125,7 @@ function pickAccent(candidates: string[], background: Rgb): Rgb | null {
|
||||
}
|
||||
|
||||
function prefersLightText(background: Rgb) {
|
||||
return (
|
||||
contrastRatio([255, 255, 255], background) >=
|
||||
contrastRatio([0, 0, 0], background)
|
||||
)
|
||||
return contrastRatio([255, 255, 255], background) >= contrastRatio([0, 0, 0], background)
|
||||
}
|
||||
|
||||
/** Moves `color`'s lightness away from `background` until it reaches `min`. */
|
||||
@@ -188,10 +180,7 @@ function withLuminance(color: Rgb, target: number): Rgb {
|
||||
high = mid
|
||||
}
|
||||
}
|
||||
return withLightness(
|
||||
color,
|
||||
target <= DARK_BACKGROUND_MAX_LUMINANCE ? low : high
|
||||
)
|
||||
return withLightness(color, target <= DARK_BACKGROUND_MAX_LUMINANCE ? low : high)
|
||||
}
|
||||
|
||||
/** `amount` of `color` over `base`. */
|
||||
@@ -217,8 +206,7 @@ function toLinear(channel: number) {
|
||||
}
|
||||
|
||||
function fromLinear(value: number) {
|
||||
const c =
|
||||
value <= 0.0031308 ? value * 12.92 : 1.055 * value ** (1 / 2.4) - 0.055
|
||||
const c = value <= 0.0031308 ? value * 12.92 : 1.055 * value ** (1 / 2.4) - 0.055
|
||||
return c * 255
|
||||
}
|
||||
|
||||
|
||||
@@ -13,10 +13,7 @@ const SERVER_CONFIG_KEY = "otunes.server-config"
|
||||
const LEGACY_SERVER_CONFIG_KEY = "otunes:server-config"
|
||||
|
||||
function normalizeHostnameInput(input: string): string {
|
||||
return input
|
||||
.trim()
|
||||
.replace(/^https?:\/\//i, "")
|
||||
.replace(/\/+$/, "")
|
||||
return input.trim().replace(/^https?:\/\//i, "").replace(/\/+$/, "")
|
||||
}
|
||||
|
||||
function buildServerUrl(hostname: string): string {
|
||||
|
||||
@@ -39,15 +39,12 @@ export function albumCoverUrl(
|
||||
return sizedCoverUrl(`${serverUrl}/api/album/${albumId}/cover`, size)
|
||||
}
|
||||
|
||||
/** `version` is the summary's `cover`; it changes with the artwork. */
|
||||
export function playlistCoverUrl(
|
||||
serverUrl: string,
|
||||
playlistId: string,
|
||||
version: string | null,
|
||||
size?: CoverImageSize
|
||||
) {
|
||||
const uri = `${serverUrl}/api/playlist/${playlistId}/cover`
|
||||
return sizedCoverUrl(version ? `${uri}?v=${version}` : uri, size)
|
||||
return sizedCoverUrl(`${serverUrl}/api/playlist/${playlistId}/cover`, size)
|
||||
}
|
||||
|
||||
export function songAudioSource(
|
||||
|
||||
@@ -7,15 +7,11 @@ private enum HandoffState {
|
||||
static var pending: [String: String]?
|
||||
static var notify: (() -> Void)?
|
||||
|
||||
// app.config.ts declares the one `.media` type per build profile; iOS and
|
||||
// Catalyst must publish the same string for Handoff to pair them. Other
|
||||
// plugins (expo-router) append their own types, so match by suffix.
|
||||
static let activityType =
|
||||
(Bundle.main.object(forInfoDictionaryKey: "NSUserActivityTypes") as! [String])
|
||||
.first { $0.hasSuffix(".media") }!
|
||||
static var activityType: String {
|
||||
"\(Bundle.main.bundleIdentifier!).media"
|
||||
}
|
||||
}
|
||||
|
||||
// ExpoAppSceneDelegate forwards scene(_:continue:) and cold-start activities here.
|
||||
public final class HandoffAppDelegateSubscriber: ExpoAppDelegateSubscriber {
|
||||
public func application(
|
||||
_ application: UIApplication,
|
||||
|
||||
@@ -5,11 +5,7 @@ final class TabletSidebar: Module {
|
||||
public func definition() -> ExpoModulesCore.ModuleDefinition {
|
||||
Name("TabletSidebar")
|
||||
View(TabletSidebarView.self) {
|
||||
Events("onProfilePress", "onPlaylistPress")
|
||||
Prop("playlists") { (view: TabletSidebarView, value: [SidebarPlaylist]) in
|
||||
view.playlists = value
|
||||
view.configure()
|
||||
}
|
||||
Events("onProfilePress")
|
||||
Prop("accountName") { (view: TabletSidebarView, value: String) in
|
||||
view.accountName = value
|
||||
view.configure()
|
||||
@@ -30,23 +26,9 @@ final class TabletSidebar: Module {
|
||||
}
|
||||
}
|
||||
|
||||
/// A playlist row under the sidebar's Playlists section.
|
||||
struct SidebarPlaylist: Record {
|
||||
@Field var id: String = ""
|
||||
@Field var title: String = ""
|
||||
/// Cover URL; changes whenever the artwork does. `nil` shows a list icon.
|
||||
@Field var imageURL: String?
|
||||
}
|
||||
|
||||
/// Adds UIKit sidebar features not yet exposed by Expo Router's native tabs.
|
||||
final class TabletSidebarView: ExpoView {
|
||||
let onProfilePress = EventDispatcher()
|
||||
let onPlaylistPress = EventDispatcher()
|
||||
var playlists: [SidebarPlaylist] = []
|
||||
private let selectionProxy = SidebarSelectionProxy()
|
||||
private var playlistTabs: [String: UITab] = [:]
|
||||
private var coverImages: [String: UIImage] = [:]
|
||||
private var coverTasks: [String: URLSessionDataTask] = [:]
|
||||
var accountName = ""
|
||||
var initials = ""
|
||||
var imageURL: String?
|
||||
@@ -100,13 +82,11 @@ final class TabletSidebarView: ExpoView {
|
||||
|
||||
deinit {
|
||||
if let tabsObserver { NotificationCenter.default.removeObserver(tabsObserver) }
|
||||
coverTasks.values.forEach { $0.cancel() }
|
||||
}
|
||||
|
||||
@available(iOS 18.0, *)
|
||||
private func configure(_ controller: UITabBarController) {
|
||||
configureGroups(controller)
|
||||
configurePlaylists(controller)
|
||||
|
||||
let footer: SidebarAccountButton
|
||||
if let existing = controller.sidebar.bottomBarView as? SidebarAccountButton {
|
||||
@@ -123,7 +103,6 @@ final class TabletSidebarView: ExpoView {
|
||||
@available(iOS 18.0, *)
|
||||
private func configureTabBar(_ controller: UITabBarController, footer: SidebarAccountButton) {
|
||||
let destinations = controller.tabs.compactMap { $0 as? UITabGroup }.flatMap { $0.children }
|
||||
.filter { !$0.identifier.hasPrefix(playlistTabPrefix) }
|
||||
let selected = destinations.first { $0 === controller.selectedTab }
|
||||
let contextualTab = selected ?? footer.contextualTab ?? destinations.first
|
||||
footer.contextualTab = contextualTab
|
||||
@@ -181,101 +160,6 @@ final class TabletSidebarView: ExpoView {
|
||||
}
|
||||
}
|
||||
|
||||
private let playlistTabPrefix = "otunes.playlist."
|
||||
private let playlistIconSize: CGFloat = 24
|
||||
|
||||
extension TabletSidebarView {
|
||||
/// Lists each playlist under Playlists with its cover. Rows are never
|
||||
/// selected natively: a tap opens the playlist in the All Playlists stack.
|
||||
@available(iOS 18.0, *)
|
||||
fileprivate func configurePlaylists(_ controller: UITabBarController) {
|
||||
guard let group = controller.tabs.first(where: { $0.identifier == "otunes.playlists" })
|
||||
as? UITabGroup else { return }
|
||||
|
||||
if !(controller.delegate is SidebarSelectionProxy) {
|
||||
selectionProxy.original = controller.delegate
|
||||
controller.delegate = selectionProxy
|
||||
}
|
||||
selectionProxy.onPlaylist = { [weak self] id in self?.onPlaylistPress(["id": id]) }
|
||||
|
||||
var rows: [UITab] = []
|
||||
for playlist in playlists {
|
||||
let identifier = playlistTabPrefix + playlist.id
|
||||
let tab = playlistTabs[identifier] ?? UITab(
|
||||
title: playlist.title, image: nil, identifier: identifier,
|
||||
viewControllerProvider: { _ in UIViewController() })
|
||||
playlistTabs[identifier] = tab
|
||||
if tab.title != playlist.title { tab.title = playlist.title }
|
||||
tab.preferredPlacement = .sidebarOnly
|
||||
tab.image = playlistImage(identifier: identifier, url: playlist.imageURL)
|
||||
rows.append(tab)
|
||||
}
|
||||
let ids = Set(rows.map(\.identifier))
|
||||
playlistTabs = playlistTabs.filter { ids.contains($0.key) }
|
||||
|
||||
let fixed = group.children.filter { !$0.identifier.hasPrefix(playlistTabPrefix) }
|
||||
let children = fixed + rows
|
||||
if group.children.map(\.identifier) != children.map(\.identifier) {
|
||||
group.children = children
|
||||
}
|
||||
}
|
||||
|
||||
/// The cached cover for `url`, starting a download on a miss.
|
||||
@available(iOS 18.0, *)
|
||||
private func playlistImage(identifier: String, url: String?) -> UIImage? {
|
||||
let placeholder = UIImage(systemName: "music.note.list")
|
||||
guard let url, let remote = URL(string: url) else { return placeholder }
|
||||
if let image = coverImages[url] { return image }
|
||||
if coverTasks[url] == nil {
|
||||
let task = URLSession.shared.dataTask(with: remote) { [weak self] data, _, _ in
|
||||
guard let data, let image = UIImage(data: data) else { return }
|
||||
DispatchQueue.main.async {
|
||||
guard let self else { return }
|
||||
self.coverTasks[url] = nil
|
||||
self.coverImages[url] = roundedIcon(image)
|
||||
if let tab = self.playlistTabs[identifier] { tab.image = self.coverImages[url] }
|
||||
}
|
||||
}
|
||||
coverTasks[url] = task
|
||||
task.resume()
|
||||
}
|
||||
return placeholder
|
||||
}
|
||||
}
|
||||
|
||||
/// Square cover shrunk to sidebar icon size with rounded corners, drawn as is
|
||||
/// rather than tinted like a symbol.
|
||||
private func roundedIcon(_ image: UIImage) -> UIImage {
|
||||
let size = CGSize(width: playlistIconSize, height: playlistIconSize)
|
||||
let rendered = UIGraphicsImageRenderer(size: size).image { _ in
|
||||
UIBezierPath(roundedRect: CGRect(origin: .zero, size: size), cornerRadius: 4).addClip()
|
||||
image.draw(in: CGRect(origin: .zero, size: size))
|
||||
}
|
||||
return rendered.withRenderingMode(.alwaysOriginal)
|
||||
}
|
||||
|
||||
/// Sits in front of the router's tab controller delegate. Taps on playlist
|
||||
/// rows go to JS; everything else is forwarded untouched.
|
||||
private final class SidebarSelectionProxy: NSObject, UITabBarControllerDelegate {
|
||||
weak var original: UITabBarControllerDelegate?
|
||||
var onPlaylist: ((String) -> Void)?
|
||||
|
||||
override func responds(to aSelector: Selector!) -> Bool {
|
||||
super.responds(to: aSelector) || (original?.responds(to: aSelector) ?? false)
|
||||
}
|
||||
|
||||
override func forwardingTarget(for aSelector: Selector!) -> Any? { original }
|
||||
|
||||
@available(iOS 18.0, *)
|
||||
func tabBarController(_ tabBarController: UITabBarController, shouldSelectTab tab: UITab) -> Bool {
|
||||
if tab.identifier.hasPrefix(playlistTabPrefix) {
|
||||
onPlaylist?(String(tab.identifier.dropFirst(playlistTabPrefix.count)))
|
||||
return false
|
||||
}
|
||||
return original?.tabBarController?(tabBarController, shouldSelectTab: tab) ?? true
|
||||
}
|
||||
}
|
||||
|
||||
@available(iOS 18.0, *)
|
||||
private final class SidebarAccountButton: UIView {
|
||||
var onPress: (() -> Void)?
|
||||
|
||||
@@ -4,20 +4,6 @@ const {
|
||||
withXcodeProject,
|
||||
} = require("expo/config-plugins")
|
||||
|
||||
// Pods left at React Native's iOS 15.1 minimum map to a macOS target below what
|
||||
// current Xcode accepts for Catalyst, so raise them to the app's own target.
|
||||
const raisePodDeploymentTargets = `
|
||||
app_target = installer.aggregate_targets.first.platform.deployment_target
|
||||
installer.pods_project.targets.each do |target|
|
||||
target.build_configurations.each do |build|
|
||||
current = build.build_settings['IPHONEOS_DEPLOYMENT_TARGET']
|
||||
if current.nil? || Pod::Version.new(current) < app_target
|
||||
build.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = app_target.to_s
|
||||
end
|
||||
end
|
||||
end
|
||||
`
|
||||
|
||||
// Opt in during prebuild so normal iOS builds keep their precompiled dependencies.
|
||||
module.exports = (config) => {
|
||||
config = withPodfileProperties(config, (config) => {
|
||||
@@ -27,15 +13,14 @@ module.exports = (config) => {
|
||||
})
|
||||
|
||||
config = withPodfile(config, (config) => {
|
||||
const flag = /:mac_catalyst_enabled\s*=>\s*(?:false|true)/
|
||||
const postInstall = /(react_native_post_install\([\s\S]*?\n {4}\)\n)/
|
||||
let contents = config.modResults.contents
|
||||
if (!flag.test(contents) || !postInstall.test(contents)) {
|
||||
const pattern = /:mac_catalyst_enabled\s*=>\s*(?:false|true)/
|
||||
if (!pattern.test(config.modResults.contents)) {
|
||||
throw new Error("Cannot enable Catalyst: Expo's Podfile template has changed")
|
||||
}
|
||||
contents = contents.replace(flag, ":mac_catalyst_enabled => true")
|
||||
contents = contents.replace(postInstall, `$1${raisePodDeploymentTargets}`)
|
||||
config.modResults.contents = contents
|
||||
config.modResults.contents = config.modResults.contents.replace(
|
||||
pattern,
|
||||
":mac_catalyst_enabled => true"
|
||||
)
|
||||
return config
|
||||
})
|
||||
|
||||
@@ -47,8 +32,7 @@ module.exports = (config) => {
|
||||
for (const { value } of lists[target.buildConfigurationList].buildConfigurations) {
|
||||
const settings = configurations[value].buildSettings
|
||||
settings.SUPPORTS_MACCATALYST = "YES"
|
||||
// Share the iOS bundle ID so Handoff and the App ID match across devices.
|
||||
settings.DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = "NO"
|
||||
settings.DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = "YES"
|
||||
settings.TARGETED_DEVICE_FAMILY = '"1,2"'
|
||||
}
|
||||
return config
|
||||
|
||||
@@ -32,7 +32,7 @@ export default function Page() {
|
||||
<ContentCarousel
|
||||
title="Recently Added"
|
||||
href="/recently-added"
|
||||
content={recentlyAdded.flat()}
|
||||
content={recentlyAdded}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -18,7 +18,7 @@ export default function Page() {
|
||||
) : (
|
||||
<div className="flex-1 overflow-y-auto p-6 pb-28">
|
||||
<div className={albumGridClassName}>
|
||||
{albums.flat().map((album) => (
|
||||
{albums.map((album) => (
|
||||
<AlbumCard key={album.id} album={album} />
|
||||
))}
|
||||
</div>
|
||||
|
||||
@@ -18,7 +18,7 @@ export default function Page() {
|
||||
) : (
|
||||
<div className="flex-1 overflow-y-auto p-6 pb-28">
|
||||
<div className={albumGridClassName}>
|
||||
{albums.flat().map((album) => (
|
||||
{albums.map((album) => (
|
||||
<AlbumCard key={album.id} album={album} />
|
||||
))}
|
||||
</div>
|
||||
|
||||
@@ -8,7 +8,11 @@ import { albumGridClassName } from "@/lib/album-grid-classes"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import type { BrowseAlbum, PlaylistSummary } from "@otunes/convex/types"
|
||||
|
||||
function RecentlyPlayedCard({ item }: { item: BrowseAlbum | PlaylistSummary }) {
|
||||
function RecentlyPlayedCard({
|
||||
item,
|
||||
}: {
|
||||
item: BrowseAlbum | PlaylistSummary
|
||||
}) {
|
||||
if ("owner" in item) {
|
||||
return <PlaylistCard playlist={item} />
|
||||
}
|
||||
|
||||
@@ -9,10 +9,7 @@ import { ContentCarousel } from "@/components/content-carousel"
|
||||
import { SearchResultsSkeleton } from "@/components/library-skeletons"
|
||||
import { SearchPrompt } from "@/components/search-prompt"
|
||||
import { SearchSongItem } from "@/components/search-song-item"
|
||||
import {
|
||||
SearchTopResultCard,
|
||||
type TopResult,
|
||||
} from "@/components/search-top-result-card"
|
||||
import { SearchTopResultCard, type TopResult } from "@/components/search-top-result-card"
|
||||
import { useCachedQuery } from "@/hooks/use-cached-query"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
|
||||
@@ -110,7 +107,10 @@ function SearchResults({ query }: { query: string }) {
|
||||
)}
|
||||
|
||||
{showPlaylists && (
|
||||
<ContentCarousel title="Playlists" content={playlistResults ?? []} />
|
||||
<ContentCarousel
|
||||
title="Playlists"
|
||||
content={playlistResults ?? []}
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,23 +1,18 @@
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import { fetchConvexStorageFile, getConvexClient } from "@/lib/convex-server"
|
||||
import { serveCoverFile, serveStoredCover } from "@/lib/serve-cover"
|
||||
import { getConvexClient } from "@/lib/convex-server"
|
||||
import { serveCoverFile } from "@/lib/serve-cover"
|
||||
|
||||
/** Playlist artwork, drawn or uploaded ahead of time into Convex storage. */
|
||||
export async function GET(
|
||||
request: Request,
|
||||
{ params }: { params: Promise<{ id: string }> }
|
||||
) {
|
||||
const { id } = await params
|
||||
try {
|
||||
const storageUrl = await getConvexClient().query(
|
||||
api.library.getPlaylistCover,
|
||||
{ id: id as Id<"playlists"> }
|
||||
)
|
||||
const image = storageUrl ? await fetchConvexStorageFile(storageUrl) : null
|
||||
return image
|
||||
? await serveStoredCover(image, request)
|
||||
: await serveCoverFile(null, request)
|
||||
const cover = await getConvexClient().query(api.library.getPlaylistCover, {
|
||||
id: id as Id<"playlists">,
|
||||
})
|
||||
return serveCoverFile(cover, request)
|
||||
} catch {
|
||||
return new Response("Not found", { status: 404 })
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import sharp from "sharp"
|
||||
import { fetchConvexStorageFile, getConvexClient } from "@/lib/convex-server"
|
||||
import { getConvexClient, getConvexServerUrl } from "@/lib/convex-server"
|
||||
|
||||
const AVATAR_SIZE = 256
|
||||
|
||||
@@ -24,12 +24,17 @@ export async function GET(
|
||||
return new Response("Not found", { status: 404 })
|
||||
}
|
||||
|
||||
const image = await fetchConvexStorageFile(storageUrl)
|
||||
if (!image) {
|
||||
// The backend builds storage URLs from its public origin, which may not
|
||||
// be reachable from here. Fetch the same path from the internal URL.
|
||||
const { pathname, search } = new URL(storageUrl)
|
||||
const upstream = await fetch(
|
||||
new URL(pathname + search, getConvexServerUrl())
|
||||
)
|
||||
if (!upstream.ok) {
|
||||
return new Response("Not found", { status: 404 })
|
||||
}
|
||||
|
||||
const data = await sharp(image)
|
||||
const data = await sharp(Buffer.from(await upstream.arrayBuffer()))
|
||||
.rotate()
|
||||
.resize(AVATAR_SIZE, AVATAR_SIZE, {
|
||||
fit: "cover",
|
||||
|
||||
@@ -42,9 +42,7 @@ function formatAddToPlaylistToast(
|
||||
}
|
||||
|
||||
const addedLabel =
|
||||
addedCount > 1
|
||||
? `Added ${addedCount} songs to ${title}`
|
||||
: `Added to ${title}`
|
||||
addedCount > 1 ? `Added ${addedCount} songs to ${title}` : `Added to ${title}`
|
||||
|
||||
if (skippedCount === 0) {
|
||||
return addedLabel
|
||||
@@ -66,15 +64,14 @@ type AddToPlaylistContextValue = {
|
||||
openCreatePlaylist: () => void
|
||||
}
|
||||
|
||||
const AddToPlaylistContext =
|
||||
React.createContext<AddToPlaylistContextValue | null>(null)
|
||||
const AddToPlaylistContext = React.createContext<AddToPlaylistContextValue | null>(
|
||||
null
|
||||
)
|
||||
|
||||
export function useAddToPlaylist() {
|
||||
const context = React.useContext(AddToPlaylistContext)
|
||||
if (!context) {
|
||||
throw new Error(
|
||||
"useAddToPlaylist must be used within AddToPlaylistProvider"
|
||||
)
|
||||
throw new Error("useAddToPlaylist must be used within AddToPlaylistProvider")
|
||||
}
|
||||
return context
|
||||
}
|
||||
@@ -184,7 +181,7 @@ export function AddToPlaylistProvider({
|
||||
}
|
||||
)
|
||||
if (requestId === selectionRequestRef.current) {
|
||||
showAddToPlaylist(songIds.flat())
|
||||
showAddToPlaylist(songIds)
|
||||
}
|
||||
} catch (error) {
|
||||
if (requestId === selectionRequestRef.current) {
|
||||
@@ -204,10 +201,7 @@ export function AddToPlaylistProvider({
|
||||
setCreateOpen(true)
|
||||
}, [])
|
||||
|
||||
async function handleAddToPlaylist(
|
||||
playlistId: Id<"playlists">,
|
||||
title: string
|
||||
) {
|
||||
async function handleAddToPlaylist(playlistId: Id<"playlists">, title: string) {
|
||||
setIsSubmitting(true)
|
||||
try {
|
||||
const { addedCount, skippedCount } = await addSongs({
|
||||
|
||||
@@ -104,7 +104,10 @@ export function AlbumCard({ album }: { album: BrowseAlbum }) {
|
||||
onMouseEnter={() => setHovered(true)}
|
||||
onMouseLeave={() => setHovered(false)}
|
||||
>
|
||||
<Link className="absolute inset-0" href={"/album/" + album.id}>
|
||||
<Link
|
||||
className="absolute inset-0"
|
||||
href={"/album/" + album.id}
|
||||
>
|
||||
<Image
|
||||
src={albumCoverUrl(album.id)}
|
||||
alt={album.title}
|
||||
@@ -173,7 +176,9 @@ export function AlbumCard({ album }: { album: BrowseAlbum }) {
|
||||
href={"/artist/" + album.artist.id}
|
||||
className="text-muted-foreground decoration-muted-foreground hover:underline"
|
||||
>
|
||||
<p className="truncate text-xs">{album.artist.name}</p>
|
||||
<p className="truncate text-xs">
|
||||
{album.artist.name}
|
||||
</p>
|
||||
</Link>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -44,10 +44,7 @@ import { albumCoverUrl } from "@/lib/cover-urls"
|
||||
import { sumDurationSeconds } from "@/lib/media-summary"
|
||||
import { albumDetailSongs, rememberSongs } from "@/lib/song-cache"
|
||||
|
||||
function formatMetadata(
|
||||
genre: string | null,
|
||||
year: number | null
|
||||
): string | null {
|
||||
function formatMetadata(genre: string | null, year: number | null): string | null {
|
||||
const parts: string[] = []
|
||||
if (genre) {
|
||||
parts.push(genre)
|
||||
@@ -63,9 +60,7 @@ type AlbumTrackSection = {
|
||||
tracks: BrowseAlbumTrack[]
|
||||
}
|
||||
|
||||
function groupAlbumTracksByDisk(
|
||||
tracks: BrowseAlbumTrack[]
|
||||
): AlbumTrackSection[] {
|
||||
function groupAlbumTracksByDisk(tracks: BrowseAlbumTrack[]): AlbumTrackSection[] {
|
||||
const hasDiskNumbers = tracks.some((track) => track.diskNumber !== null)
|
||||
if (!hasDiskNumbers) {
|
||||
return [{ label: null, tracks }]
|
||||
@@ -143,11 +138,7 @@ export function AlbumView({
|
||||
} = useTrackSelection(album.tracks, validHighlightedSongId)
|
||||
|
||||
const selectionPositions = React.useMemo(
|
||||
() =>
|
||||
getSelectionRangePositions(
|
||||
album.tracks.map((track) => track.id),
|
||||
selectedIds
|
||||
),
|
||||
() => getSelectionRangePositions(album.tracks.map((track) => track.id), selectedIds),
|
||||
[album.tracks, selectedIds]
|
||||
)
|
||||
|
||||
@@ -201,11 +192,7 @@ export function AlbumView({
|
||||
|
||||
const handleRowPlay = React.useCallback(
|
||||
(index: number) => {
|
||||
void playFromSong(
|
||||
album.tracks[index].id,
|
||||
albumSongIds,
|
||||
`album:${album.id}`
|
||||
)
|
||||
void playFromSong(album.tracks[index].id, albumSongIds, `album:${album.id}`)
|
||||
},
|
||||
[album.tracks, album.id, albumSongIds, playFromSong]
|
||||
)
|
||||
@@ -228,7 +215,7 @@ export function AlbumView({
|
||||
<PageHeader openApp />
|
||||
<ScrollArea className="min-h-0 flex-1 [&_[data-slot=scroll-area-viewport]>div]:block!">
|
||||
<div className="pb-28">
|
||||
<div className="mx-auto w-full max-w-9/10 min-w-0">
|
||||
<div className="mx-auto w-full min-w-0 max-w-9/10">
|
||||
<div className="flex flex-col gap-8 pt-6 pb-8 sm:flex-row sm:items-end">
|
||||
<div className="relative mx-auto aspect-square w-full max-w-60 shrink-0 overflow-hidden rounded-lg ring-1 ring-foreground/10 sm:mx-0">
|
||||
<Image
|
||||
@@ -358,9 +345,7 @@ export function AlbumView({
|
||||
song={trackSongs.get(track.id)!}
|
||||
index={listIndex}
|
||||
trackNumber={
|
||||
track.track > 0
|
||||
? track.track
|
||||
: sectionTrackIndex + 1
|
||||
track.track > 0 ? track.track : sectionTrackIndex + 1
|
||||
}
|
||||
subtitle={track.artists?.join(", ")}
|
||||
isActive={track.id === activeTrackId}
|
||||
|
||||
@@ -43,7 +43,6 @@ import Link from "next/link"
|
||||
import { useTheme } from "next-themes"
|
||||
import * as React from "react"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import { playlistCoverUrl } from "@/lib/cover-urls"
|
||||
import { useCachedQuery } from "@/hooks/use-cached-query"
|
||||
import { useMounted } from "@/hooks/use-mounted"
|
||||
import { clearPersistentCache } from "@/lib/persistent-cache"
|
||||
@@ -87,28 +86,17 @@ export function AppSidebar() {
|
||||
const isDark = mounted && resolvedTheme === "dark"
|
||||
|
||||
const playlistNav = [
|
||||
{
|
||||
title: "All Playlists",
|
||||
path: "/playlists",
|
||||
icon: <LayoutGrid />,
|
||||
},
|
||||
{ title: "Favorites", path: "/playlist/favorites", icon: <Star /> },
|
||||
...[
|
||||
...(sidebarPlaylists?.owned ?? []),
|
||||
...(sidebarPlaylists?.subscribed ?? []),
|
||||
].map((playlist) => ({
|
||||
{ title: "All Playlists", path: "/playlists", icon: LayoutGrid },
|
||||
{ title: "Favorites", path: "/playlist/favorites", icon: Star },
|
||||
...(sidebarPlaylists?.owned ?? []).map((playlist) => ({
|
||||
title: playlist.title,
|
||||
path: `/playlist/${playlist.id}`,
|
||||
icon: playlist.cover ? (
|
||||
// eslint-disable-next-line @next/next/no-img-element -- versioned cover, already sized by the route
|
||||
<img
|
||||
src={playlistCoverUrl(playlist.id, playlist.cover, 64)}
|
||||
alt=""
|
||||
className="size-4 shrink-0 rounded-[3px] object-cover"
|
||||
/>
|
||||
) : (
|
||||
<ListMusic />
|
||||
),
|
||||
icon: ListMusic,
|
||||
})),
|
||||
...(sidebarPlaylists?.subscribed ?? []).map((playlist) => ({
|
||||
title: playlist.title,
|
||||
path: `/playlist/${playlist.id}`,
|
||||
icon: ListMusic,
|
||||
})),
|
||||
]
|
||||
|
||||
@@ -177,7 +165,7 @@ export function AppSidebar() {
|
||||
<SidebarMenuItem key={item.path}>
|
||||
<SidebarMenuButton isActive={pathname === item.path} asChild>
|
||||
<Link href={item.path} onClick={() => setOpenMobile(false)}>
|
||||
{item.icon}
|
||||
<item.icon />
|
||||
<span>{item.title}</span>
|
||||
</Link>
|
||||
</SidebarMenuButton>
|
||||
|
||||
@@ -32,8 +32,8 @@ export function ArtistsPage() {
|
||||
<ArtistsSkeleton />
|
||||
) : (
|
||||
<ArtistsView
|
||||
artists={artists.flat()}
|
||||
albums={albums.flat()}
|
||||
artists={artists}
|
||||
albums={albums}
|
||||
artistId={artistIdFromPathname(pathname)}
|
||||
onSelectArtist={selectArtist}
|
||||
/>
|
||||
|
||||
@@ -13,12 +13,7 @@ import {
|
||||
CardHeader,
|
||||
CardTitle,
|
||||
} from "@/components/ui/card"
|
||||
import {
|
||||
Field,
|
||||
FieldError,
|
||||
FieldGroup,
|
||||
FieldLabel,
|
||||
} from "@/components/ui/field"
|
||||
import { Field, FieldError, FieldGroup, FieldLabel } from "@/components/ui/field"
|
||||
import { Input } from "@/components/ui/input"
|
||||
import { Spinner } from "@/components/ui/spinner"
|
||||
|
||||
@@ -106,64 +101,64 @@ export function AuthForm({
|
||||
administrator if you need access.
|
||||
</p>
|
||||
) : (
|
||||
<form onSubmit={handleSubmit}>
|
||||
<FieldGroup>
|
||||
{flow === "signUp" && (
|
||||
<Field>
|
||||
<FieldLabel htmlFor="name">Name</FieldLabel>
|
||||
<Input
|
||||
id="name"
|
||||
name="name"
|
||||
type="text"
|
||||
autoComplete="name"
|
||||
placeholder="Ada Lovelace"
|
||||
required
|
||||
/>
|
||||
</Field>
|
||||
)}
|
||||
<form onSubmit={handleSubmit}>
|
||||
<FieldGroup>
|
||||
{flow === "signUp" && (
|
||||
<Field>
|
||||
<FieldLabel htmlFor="email">Email</FieldLabel>
|
||||
<FieldLabel htmlFor="name">Name</FieldLabel>
|
||||
<Input
|
||||
id="email"
|
||||
name="email"
|
||||
type="email"
|
||||
autoComplete="email"
|
||||
placeholder="you@example.com"
|
||||
id="name"
|
||||
name="name"
|
||||
type="text"
|
||||
autoComplete="name"
|
||||
placeholder="Ada Lovelace"
|
||||
required
|
||||
/>
|
||||
</Field>
|
||||
<Field>
|
||||
<FieldLabel htmlFor="password">Password</FieldLabel>
|
||||
<Input
|
||||
id="password"
|
||||
name="password"
|
||||
type="password"
|
||||
autoComplete={
|
||||
flow === "signIn" ? "current-password" : "new-password"
|
||||
}
|
||||
required
|
||||
/>
|
||||
</Field>
|
||||
{error && <FieldError>{error}</FieldError>}
|
||||
<Field>
|
||||
<Button type="submit" disabled={submitting}>
|
||||
{submitting && <Spinner />}
|
||||
{text.submit}
|
||||
</Button>
|
||||
</Field>
|
||||
{!hideSignUpLink ? (
|
||||
<p className="text-center text-sm text-muted-foreground">
|
||||
{text.switchPrompt}{" "}
|
||||
<Link
|
||||
href={text.switchHref}
|
||||
className="text-primary underline-offset-4 hover:underline"
|
||||
>
|
||||
{text.switchLabel}
|
||||
</Link>
|
||||
</p>
|
||||
) : null}
|
||||
</FieldGroup>
|
||||
</form>
|
||||
)}
|
||||
<Field>
|
||||
<FieldLabel htmlFor="email">Email</FieldLabel>
|
||||
<Input
|
||||
id="email"
|
||||
name="email"
|
||||
type="email"
|
||||
autoComplete="email"
|
||||
placeholder="you@example.com"
|
||||
required
|
||||
/>
|
||||
</Field>
|
||||
<Field>
|
||||
<FieldLabel htmlFor="password">Password</FieldLabel>
|
||||
<Input
|
||||
id="password"
|
||||
name="password"
|
||||
type="password"
|
||||
autoComplete={
|
||||
flow === "signIn" ? "current-password" : "new-password"
|
||||
}
|
||||
required
|
||||
/>
|
||||
</Field>
|
||||
{error && <FieldError>{error}</FieldError>}
|
||||
<Field>
|
||||
<Button type="submit" disabled={submitting}>
|
||||
{submitting && <Spinner />}
|
||||
{text.submit}
|
||||
</Button>
|
||||
</Field>
|
||||
{!hideSignUpLink ? (
|
||||
<p className="text-center text-sm text-muted-foreground">
|
||||
{text.switchPrompt}{" "}
|
||||
<Link
|
||||
href={text.switchHref}
|
||||
className="text-primary underline-offset-4 hover:underline"
|
||||
>
|
||||
{text.switchLabel}
|
||||
</Link>
|
||||
</p>
|
||||
) : null}
|
||||
</FieldGroup>
|
||||
</form>
|
||||
)}
|
||||
</CardContent>
|
||||
</Card>
|
||||
|
||||
@@ -39,7 +39,6 @@ export function ConvexClientProvider({
|
||||
}) {
|
||||
return (
|
||||
<ConvexAuthNextjsProvider client={getConvexClient(convexUrl)}>
|
||||
<PersistentCacheProvider>{children}</PersistentCacheProvider>{" "}
|
||||
</ConvexAuthNextjsProvider>
|
||||
<PersistentCacheProvider>{children}</PersistentCacheProvider> </ConvexAuthNextjsProvider>
|
||||
)
|
||||
}
|
||||
@@ -29,7 +29,7 @@ export function FavoriteMediaButton({
|
||||
className={cn(
|
||||
"rounded-full",
|
||||
!isFavorite &&
|
||||
"hover:border-transparent hover:bg-primary hover:text-primary-foreground",
|
||||
"hover:bg-primary hover:text-primary-foreground hover:border-transparent",
|
||||
className
|
||||
)}
|
||||
aria-label={isFavorite ? favoritedLabel : unfavoritedLabel}
|
||||
|
||||
@@ -86,15 +86,15 @@ export function FavoritesProvider({ children }: { children: React.ReactNode }) {
|
||||
)
|
||||
|
||||
const songIds = React.useMemo(
|
||||
() => new Set<string>(favorites?.favoriteSongs.flat()),
|
||||
() => new Set(favorites?.favoriteSongs.map(String) ?? []),
|
||||
[favorites?.favoriteSongs]
|
||||
)
|
||||
const albumIds = React.useMemo(
|
||||
() => new Set<string>(favorites?.favoriteAlbums.flat()),
|
||||
() => new Set(favorites?.favoriteAlbums.map(String) ?? []),
|
||||
[favorites?.favoriteAlbums]
|
||||
)
|
||||
const artistIds = React.useMemo(
|
||||
() => new Set<string>(favorites?.favoriteArtists.flat()),
|
||||
() => new Set(favorites?.favoriteArtists.map(String) ?? []),
|
||||
[favorites?.favoriteArtists]
|
||||
)
|
||||
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
import { formatMediaSummary, formatReleaseDate } from "@/lib/media-summary"
|
||||
import {
|
||||
formatMediaSummary,
|
||||
formatReleaseDate,
|
||||
} from "@/lib/media-summary"
|
||||
import { TRACK_ROW_PADDING } from "@/lib/selection-range-styles"
|
||||
|
||||
export function MediaCollectionFooter({
|
||||
|
||||
@@ -1,7 +1,12 @@
|
||||
"use client"
|
||||
|
||||
import { useAction, useMutation, useQuery } from "convex/react"
|
||||
import { MoreHorizontal, Trash2, Upload, UserPlus } from "lucide-react"
|
||||
import {
|
||||
MoreHorizontal,
|
||||
Trash2,
|
||||
Upload,
|
||||
UserPlus,
|
||||
} from "lucide-react"
|
||||
import { useCallback, useEffect, useRef, useState } from "react"
|
||||
import { toast } from "sonner"
|
||||
|
||||
@@ -43,7 +48,7 @@ import { usePlayback } from "@/components/playback-provider"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import type { PlaybackQuality } from "@otunes/convex/playback-stream"
|
||||
import { resizeProfileImageToDataUrl } from "@/lib/resize-image"
|
||||
import { resizeProfileImageToDataUrl } from "@/lib/resize-profile-image"
|
||||
import { cn } from "@/lib/utils"
|
||||
|
||||
type Section = "profile" | "quality" | "users" | "library"
|
||||
@@ -148,7 +153,9 @@ function UserAvatar({
|
||||
key={user.image ?? "fallback"}
|
||||
size={size === "sm" ? "sm" : "default"}
|
||||
>
|
||||
{user.image ? <AvatarImage src={user.image} alt={user.name} /> : null}
|
||||
{user.image ? (
|
||||
<AvatarImage src={user.image} alt={user.name} />
|
||||
) : null}
|
||||
<AvatarFallback>{initials}</AvatarFallback>
|
||||
</Avatar>
|
||||
)
|
||||
@@ -684,9 +691,7 @@ function UserRowActions({
|
||||
setAdmin({ userId: user._id, isAdmin: !user.isAdmin })
|
||||
.then(() =>
|
||||
toast.success(
|
||||
user.isAdmin
|
||||
? "Admin access removed"
|
||||
: "User is now admin"
|
||||
user.isAdmin ? "Admin access removed" : "User is now admin"
|
||||
)
|
||||
)
|
||||
.catch((error: Error) => toast.error(error.message))
|
||||
|
||||
@@ -341,7 +341,9 @@ export function useIsPlaying() {
|
||||
export function usePlaybackProgress() {
|
||||
const context = useContext(PlaybackProgressContext)
|
||||
if (!context) {
|
||||
throw new Error("usePlaybackProgress must be used within PlaybackProvider")
|
||||
throw new Error(
|
||||
"usePlaybackProgress must be used within PlaybackProvider"
|
||||
)
|
||||
}
|
||||
return context
|
||||
}
|
||||
@@ -364,11 +366,11 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
api.playback.getPlaybackState,
|
||||
isSignedIn ? {} : "skip"
|
||||
)
|
||||
const syncPlaybackStateMutation = useMutation(api.playback.syncPlaybackState)
|
||||
const recordPlayMutation = useMutation(api.playback.recordPlay)
|
||||
const updateSongProgressMutation = useMutation(
|
||||
api.playback.updateSongProgress
|
||||
const syncPlaybackStateMutation = useMutation(
|
||||
api.playback.syncPlaybackState
|
||||
)
|
||||
const recordPlayMutation = useMutation(api.playback.recordPlay)
|
||||
const updateSongProgressMutation = useMutation(api.playback.updateSongProgress)
|
||||
|
||||
useEffect(() => {
|
||||
if (!isSignedIn) {
|
||||
@@ -476,27 +478,31 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
const isPlaybackActive = Boolean(currentSongId && isPlaying)
|
||||
const repeatEnabled = playback.repeatEnabled
|
||||
const queueLength = queueSongIds.length
|
||||
const nextQueueSongId = queueSongIds.length > 1 ? queueSongIds[1] : null
|
||||
const nextQueueSongId =
|
||||
queueSongIds.length > 1 ? queueSongIds[1] : null
|
||||
const nextQueueSongDoc = useCachedQuery(
|
||||
api.library.getSongPlaybackInfo,
|
||||
nextQueueSongId ? { id: nextQueueSongId } : "skip"
|
||||
)
|
||||
|
||||
const seekTo = useCallback((seconds: number) => {
|
||||
const audio = audioRef.current
|
||||
if (!audio) {
|
||||
return
|
||||
}
|
||||
const seekTo = useCallback(
|
||||
(seconds: number) => {
|
||||
const audio = audioRef.current
|
||||
if (!audio) {
|
||||
return
|
||||
}
|
||||
|
||||
const maxDuration =
|
||||
Number.isFinite(audio.duration) && audio.duration > 0
|
||||
? audio.duration
|
||||
: durationRef.current
|
||||
const clamped = Math.max(0, Math.min(seconds, maxDuration || 0))
|
||||
audio.currentTime = clamped
|
||||
currentTimeRef.current = clamped
|
||||
setCurrentTime(clamped)
|
||||
}, [])
|
||||
const maxDuration =
|
||||
Number.isFinite(audio.duration) && audio.duration > 0
|
||||
? audio.duration
|
||||
: durationRef.current
|
||||
const clamped = Math.max(0, Math.min(seconds, maxDuration || 0))
|
||||
audio.currentTime = clamped
|
||||
currentTimeRef.current = clamped
|
||||
setCurrentTime(clamped)
|
||||
},
|
||||
[]
|
||||
)
|
||||
|
||||
const saveProgress = useCallback(
|
||||
(seconds: number) => {
|
||||
@@ -949,13 +955,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
}
|
||||
|
||||
const preloadAudio = preloadAudioRef.current
|
||||
if (
|
||||
shouldContinuePlaying &&
|
||||
preloadAudio &&
|
||||
nextQueueSongId &&
|
||||
user &&
|
||||
nextQueueSongDoc
|
||||
) {
|
||||
if (shouldContinuePlaying && preloadAudio && nextQueueSongId && user && nextQueueSongDoc) {
|
||||
const settings = playbackLoadSettings(
|
||||
user,
|
||||
dolbyAtmosSupported,
|
||||
@@ -1233,14 +1233,12 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
|
||||
let songIds: Id<"songs">[]
|
||||
try {
|
||||
songIds = (
|
||||
await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.library.browseSortedSongIds,
|
||||
sort
|
||||
)
|
||||
).flat()
|
||||
songIds = await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.library.browseSortedSongIds,
|
||||
sort
|
||||
)
|
||||
} catch {
|
||||
return
|
||||
}
|
||||
@@ -1270,7 +1268,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
cacheScope,
|
||||
api.playlists.getOrderedArtistSongIds,
|
||||
{ artistId }
|
||||
).then((chunks) => chunks.flat()),
|
||||
),
|
||||
[convex, cacheScope]
|
||||
)
|
||||
|
||||
|
||||
@@ -62,10 +62,10 @@ export function PlaylistCard({ playlist }: { playlist: PlaylistSummary }) {
|
||||
<div className="group relative aspect-square overflow-hidden rounded-lg ring-1 ring-foreground/10">
|
||||
<Link className="absolute inset-0" href={"/playlist/" + playlist.id}>
|
||||
<Image
|
||||
src={playlistCoverUrl(playlist.id, playlist.cover, 384)}
|
||||
src={playlistCoverUrl(playlist.id)}
|
||||
alt={playlist.title}
|
||||
fill
|
||||
unoptimized
|
||||
sizes="(max-width: 640px) 50vw, (max-width: 1024px) 25vw, 16vw"
|
||||
className="object-cover"
|
||||
/>
|
||||
</Link>
|
||||
|
||||
@@ -1,215 +0,0 @@
|
||||
"use client"
|
||||
|
||||
import * as React from "react"
|
||||
import Image from "next/image"
|
||||
import { useMutation } from "convex/react"
|
||||
import { ArrowUp, Shuffle } from "lucide-react"
|
||||
import { toast } from "sonner"
|
||||
|
||||
import { Button } from "@/components/ui/button"
|
||||
import {
|
||||
Dialog,
|
||||
DialogContent,
|
||||
DialogHeader,
|
||||
DialogTitle,
|
||||
} from "@/components/ui/dialog"
|
||||
import { albumCoverUrl, playlistCoverUrl } from "@/lib/cover-urls"
|
||||
import { resizeImageToDataUrl } from "@/lib/resize-image"
|
||||
import { cn } from "@/lib/utils"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import {
|
||||
COVER_GRID_ALBUMS,
|
||||
playlistCoverAlbums,
|
||||
randomPlaylistCovers,
|
||||
} from "@otunes/convex/client/playlist-cover"
|
||||
import type { BrowseSong } from "@otunes/convex/types"
|
||||
|
||||
const UPLOAD_SIZE = 1024
|
||||
|
||||
/**
|
||||
* Lets a playlist owner pick generated artwork (random 2x2 grids of the
|
||||
* playlist's albums, reshuffled on demand) or upload an image. The current
|
||||
* cover sits apart from the options so the owner can always keep it.
|
||||
*/
|
||||
export function PlaylistCoverDialog({
|
||||
open,
|
||||
onOpenChange,
|
||||
playlistId,
|
||||
title,
|
||||
coverVersion,
|
||||
songs,
|
||||
}: {
|
||||
open: boolean
|
||||
onOpenChange: (open: boolean) => void
|
||||
playlistId: Id<"playlists">
|
||||
title: string
|
||||
coverVersion: string | null
|
||||
songs: BrowseSong[]
|
||||
}) {
|
||||
const setCoverAlbums = useMutation(api.playlists.setPlaylistCoverAlbums)
|
||||
const uploadCover = useMutation(api.playlists.uploadPlaylistCover)
|
||||
const fileInputRef = React.useRef<HTMLInputElement>(null)
|
||||
const albums = React.useMemo(() => playlistCoverAlbums(songs), [songs])
|
||||
const [options, setOptions] = React.useState<Id<"albums">[][]>([])
|
||||
const canShuffle = albums.length >= COVER_GRID_ALBUMS
|
||||
|
||||
function shuffle() {
|
||||
setOptions(randomPlaylistCovers(albums))
|
||||
}
|
||||
|
||||
// Fresh options each time the dialog opens.
|
||||
const [wasOpen, setWasOpen] = React.useState(false)
|
||||
if (open !== wasOpen) {
|
||||
setWasOpen(open)
|
||||
if (open) shuffle()
|
||||
}
|
||||
|
||||
async function pick(albumIds: Id<"albums">[]) {
|
||||
onOpenChange(false)
|
||||
try {
|
||||
await setCoverAlbums({ playlistId, albumIds })
|
||||
} catch (error) {
|
||||
toast.error(
|
||||
error instanceof Error ? error.message : "Failed to change cover"
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
async function upload(file: File) {
|
||||
if (!file.type.startsWith("image/")) {
|
||||
toast.error("Choose an image file")
|
||||
return
|
||||
}
|
||||
onOpenChange(false)
|
||||
try {
|
||||
const image = await resizeImageToDataUrl(file, UPLOAD_SIZE)
|
||||
await uploadCover({ playlistId, image })
|
||||
} catch (error) {
|
||||
toast.error(
|
||||
error instanceof Error ? error.message : "Failed to upload cover"
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<Dialog open={open} onOpenChange={onOpenChange}>
|
||||
<DialogContent className="sm:max-w-xl">
|
||||
<DialogHeader>
|
||||
<DialogTitle>Playlist Cover</DialogTitle>
|
||||
</DialogHeader>
|
||||
|
||||
<div className="flex items-stretch gap-3">
|
||||
{coverVersion ? (
|
||||
<>
|
||||
<CoverButton
|
||||
label="Keep current cover"
|
||||
selected
|
||||
onClick={() => onOpenChange(false)}
|
||||
>
|
||||
<Image
|
||||
src={playlistCoverUrl(playlistId, coverVersion, 256)}
|
||||
alt={title}
|
||||
fill
|
||||
unoptimized
|
||||
className="object-cover"
|
||||
/>
|
||||
</CoverButton>
|
||||
<div className="w-px shrink-0 bg-border" />
|
||||
</>
|
||||
) : null}
|
||||
<div className="grid flex-[4] grid-cols-4 gap-3">
|
||||
{options.map((albumIds) => (
|
||||
<CoverButton
|
||||
key={albumIds.join(",")}
|
||||
label="Use this cover"
|
||||
onClick={() => void pick(albumIds)}
|
||||
>
|
||||
<AlbumGrid albumIds={albumIds} />
|
||||
</CoverButton>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{albums.length === 0 ? (
|
||||
<p className="text-sm text-muted-foreground">
|
||||
No album artwork in this playlist yet.
|
||||
</p>
|
||||
) : null}
|
||||
|
||||
<div className="flex gap-2">
|
||||
{canShuffle ? (
|
||||
<Button variant="secondary" onClick={shuffle}>
|
||||
<Shuffle />
|
||||
Shuffle
|
||||
</Button>
|
||||
) : null}
|
||||
<Button
|
||||
variant="secondary"
|
||||
onClick={() => fileInputRef.current?.click()}
|
||||
>
|
||||
<ArrowUp />
|
||||
Upload Image
|
||||
</Button>
|
||||
<input
|
||||
ref={fileInputRef}
|
||||
type="file"
|
||||
accept="image/*"
|
||||
className="hidden"
|
||||
onChange={(event) => {
|
||||
const file = event.target.files?.[0]
|
||||
event.target.value = ""
|
||||
if (file) void upload(file)
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
)
|
||||
}
|
||||
|
||||
function CoverButton({
|
||||
label,
|
||||
selected = false,
|
||||
onClick,
|
||||
children,
|
||||
}: {
|
||||
label: string
|
||||
selected?: boolean
|
||||
onClick: () => void
|
||||
children: React.ReactNode
|
||||
}) {
|
||||
return (
|
||||
<button
|
||||
type="button"
|
||||
aria-label={label}
|
||||
onClick={onClick}
|
||||
className={cn(
|
||||
"relative aspect-square min-w-0 flex-1 overflow-hidden rounded-md ring-offset-2 ring-offset-background transition-shadow outline-none hover:ring-2 hover:ring-foreground/60 focus-visible:ring-2 focus-visible:ring-ring",
|
||||
selected && "ring-2 ring-foreground hover:ring-foreground"
|
||||
)}
|
||||
>
|
||||
{children}
|
||||
</button>
|
||||
)
|
||||
}
|
||||
|
||||
/** Preview of a generated cover: one album alone, or four tiled 2x2. */
|
||||
function AlbumGrid({ albumIds }: { albumIds: Id<"albums">[] }) {
|
||||
const grid = albumIds.length > 1
|
||||
return (
|
||||
<div className={cn("grid size-full", grid && "grid-cols-2")}>
|
||||
{albumIds.map((albumId) => (
|
||||
<div key={albumId} className="relative">
|
||||
<Image
|
||||
src={albumCoverUrl(albumId)}
|
||||
alt=""
|
||||
fill
|
||||
sizes={grid ? "64px" : "128px"}
|
||||
className="object-cover"
|
||||
/>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
@@ -34,7 +34,5 @@ export function FavoritesPlaylistPage() {
|
||||
return <PageMessage>Sign in to view your favorites.</PageMessage>
|
||||
}
|
||||
|
||||
return (
|
||||
<PlaylistView playlist={{ ...favorites, songs: favorites.songs.flat() }} />
|
||||
)
|
||||
return <PlaylistView playlist={favorites} />
|
||||
}
|
||||
@@ -6,16 +6,7 @@ import * as React from "react"
|
||||
import Image from "next/image"
|
||||
import { useRouter } from "next/navigation"
|
||||
import { useMutation } from "convex/react"
|
||||
import {
|
||||
ImageIcon,
|
||||
Pencil,
|
||||
Play,
|
||||
SearchIcon,
|
||||
Share2,
|
||||
Shuffle,
|
||||
Star,
|
||||
Trash2,
|
||||
} from "lucide-react"
|
||||
import { Play, SearchIcon, Share2, Shuffle, Star, Trash2 } from "lucide-react"
|
||||
import { toast } from "sonner"
|
||||
|
||||
import { useFavorites } from "@/components/favorites-provider"
|
||||
@@ -24,7 +15,6 @@ import {
|
||||
usePlaybackActions,
|
||||
} from "@/components/playback-provider"
|
||||
import { MediaCollectionFooter } from "@/components/media-collection-footer"
|
||||
import { PlaylistCoverDialog } from "@/components/playlist-cover-dialog"
|
||||
import {
|
||||
MediaContextMenu,
|
||||
type MediaContextAction,
|
||||
@@ -107,8 +97,6 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
|
||||
const [dragIndex, setDragIndex] = React.useState<number | null>(null)
|
||||
const [isSubscribed, setIsSubscribed] = React.useState(playlist.isSubscribed)
|
||||
const [subscriptionPending, setSubscriptionPending] = React.useState(false)
|
||||
const [coverDialogOpen, setCoverDialogOpen] = React.useState(false)
|
||||
const canEditCover = isOwner && !isFavorites && playlist.id !== null
|
||||
|
||||
if (syncedPlaylist !== playlist) {
|
||||
setSyncedPlaylist(playlist)
|
||||
@@ -303,32 +291,21 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
|
||||
<div className="pb-28">
|
||||
<div className="mx-auto w-full max-w-9/10 min-w-0">
|
||||
<div className="flex flex-col gap-8 px-6 pt-6 pb-8 sm:flex-row sm:items-end">
|
||||
<div className="group relative mx-auto aspect-square w-full max-w-60 shrink-0 overflow-hidden rounded-lg ring-1 ring-foreground/10 sm:mx-0">
|
||||
<div className="relative mx-auto aspect-square w-full max-w-60 shrink-0 overflow-hidden rounded-lg ring-1 ring-foreground/10 sm:mx-0">
|
||||
{isFavorites ? (
|
||||
<div className="flex size-full items-center justify-center bg-muted">
|
||||
<Star className="size-16 fill-primary text-primary" />
|
||||
</div>
|
||||
) : (
|
||||
<Image
|
||||
src={playlistCoverUrl(playlist.id!, playlist.cover, 512)}
|
||||
src={playlistCoverUrl(playlist.id!)}
|
||||
alt={playlist.title}
|
||||
fill
|
||||
unoptimized
|
||||
sizes="240px"
|
||||
className="object-cover"
|
||||
preload
|
||||
/>
|
||||
)}
|
||||
{canEditCover ? (
|
||||
<Button
|
||||
variant="secondary"
|
||||
size="icon"
|
||||
className="absolute right-2 bottom-2 rounded-full opacity-0 shadow-md transition-opacity group-hover:opacity-100 focus-visible:opacity-100"
|
||||
aria-label="Change cover"
|
||||
onClick={() => setCoverDialogOpen(true)}
|
||||
>
|
||||
<Pencil />
|
||||
</Button>
|
||||
) : null}
|
||||
</div>
|
||||
|
||||
<div className="flex min-w-0 flex-1 flex-col gap-4">
|
||||
@@ -408,13 +385,6 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
|
||||
{isOwner && !isFavorites ? (
|
||||
<>
|
||||
<DropdownMenuSeparator />
|
||||
<DropdownMenuItem
|
||||
className="justify-between"
|
||||
onClick={() => setCoverDialogOpen(true)}
|
||||
>
|
||||
Change Cover
|
||||
<ImageIcon />
|
||||
</DropdownMenuItem>
|
||||
<DropdownMenuItem
|
||||
variant="destructive"
|
||||
className="justify-between"
|
||||
@@ -506,16 +476,6 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
|
||||
</div>
|
||||
</div>
|
||||
</ScrollArea>
|
||||
{canEditCover ? (
|
||||
<PlaylistCoverDialog
|
||||
open={coverDialogOpen}
|
||||
onOpenChange={setCoverDialogOpen}
|
||||
playlistId={playlist.id!}
|
||||
title={playlist.title}
|
||||
coverVersion={playlist.cover}
|
||||
songs={songs}
|
||||
/>
|
||||
) : null}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
@@ -66,7 +66,7 @@ function HistorySongRow({ song }: { song: HistorySong }) {
|
||||
showAlbum={false}
|
||||
/>
|
||||
|
||||
<span className="shrink-0 text-xs text-muted-foreground tabular-nums">
|
||||
<span className="shrink-0 text-xs tabular-nums text-muted-foreground">
|
||||
{formatDuration(song.durationSeconds)}
|
||||
</span>
|
||||
</div>
|
||||
@@ -218,11 +218,7 @@ export function QueuePanel() {
|
||||
(index) => selectableQueue[index].queueIndex
|
||||
)
|
||||
const targetQueueIndex = selectableQueue[targetLocalIndex].queueIndex
|
||||
const next = moveQueueBlock(
|
||||
queueSongIds,
|
||||
fromQueueIndices,
|
||||
targetQueueIndex
|
||||
)
|
||||
const next = moveQueueBlock(queueSongIds, fromQueueIndices, targetQueueIndex)
|
||||
|
||||
setDragIndex(null)
|
||||
|
||||
@@ -267,10 +263,7 @@ export function QueuePanel() {
|
||||
{historySongs.length > 0 ? (
|
||||
<ul className="flex flex-col border-b py-1">
|
||||
{historySongs.map((song) => (
|
||||
<HistorySongRow
|
||||
key={`history-${song.id}-${song.historyIndex}`}
|
||||
song={song}
|
||||
/>
|
||||
<HistorySongRow key={`history-${song.id}-${song.historyIndex}`} song={song} />
|
||||
))}
|
||||
</ul>
|
||||
) : null}
|
||||
|
||||
@@ -50,7 +50,8 @@ export function SongsView() {
|
||||
const { isSongFavorite, toggleSongFavorite } = useFavorites()
|
||||
const { playFromLibrarySong } = usePlaybackActions()
|
||||
const [sortKey, setSortKey] = useState<SortKey>("title")
|
||||
const [sortDirection, setSortDirection] = useState<SortDirection>("asc")
|
||||
const [sortDirection, setSortDirection] =
|
||||
useState<SortDirection>("asc")
|
||||
const loadMoreRef = useRef<HTMLDivElement>(null)
|
||||
|
||||
const { results, status, loadMore, isCached } = useCachedPaginatedQuery(
|
||||
|
||||
@@ -29,7 +29,8 @@ function ThemeFavicon() {
|
||||
return
|
||||
}
|
||||
|
||||
const href = resolvedTheme === "dark" ? "/favicon-dark.png" : "/favicon.png"
|
||||
const href =
|
||||
resolvedTheme === "dark" ? "/favicon-dark.png" : "/favicon.png"
|
||||
|
||||
for (const rel of ["icon", "shortcut icon"] as const) {
|
||||
let link = document.querySelector<HTMLLinkElement>(`link[rel="${rel}"]`)
|
||||
|
||||
@@ -155,9 +155,7 @@ function FavoriteStarButton({
|
||||
: "text-primary hover:text-primary",
|
||||
className
|
||||
)}
|
||||
aria-label={
|
||||
isFavorite ? `Remove ${title} from favorites` : `Favorite ${title}`
|
||||
}
|
||||
aria-label={isFavorite ? `Remove ${title} from favorites` : `Favorite ${title}`}
|
||||
onClick={(event) => {
|
||||
event.stopPropagation()
|
||||
onToggle()
|
||||
@@ -177,7 +175,7 @@ function ExplicitBadge({ inRange }: { inRange: boolean }) {
|
||||
return (
|
||||
<span
|
||||
className={cn(
|
||||
"ml-1.5 inline-flex size-3.5 shrink-0 items-center justify-center rounded-sm text-[9px] leading-none font-semibold",
|
||||
"ml-1.5 inline-flex size-3.5 shrink-0 items-center justify-center rounded-sm text-[9px] font-semibold leading-none",
|
||||
inRange
|
||||
? "bg-white/20 text-primary-foreground"
|
||||
: "bg-muted-foreground/20 text-muted-foreground"
|
||||
@@ -221,13 +219,7 @@ function TrackTitle({
|
||||
export function LibraryTrackListHeader() {
|
||||
const labelClass = "text-xs text-muted-foreground"
|
||||
return (
|
||||
<div
|
||||
className={cn(
|
||||
"flex h-9 items-center",
|
||||
LIBRARY_ROW_LAYOUT,
|
||||
TRACK_ROW_PADDING
|
||||
)}
|
||||
>
|
||||
<div className={cn("flex h-9 items-center", LIBRARY_ROW_LAYOUT, TRACK_ROW_PADDING)}>
|
||||
<div className={LIBRARY_NAME_COLUMNS}>
|
||||
<span aria-hidden />
|
||||
<span aria-hidden />
|
||||
@@ -354,16 +346,10 @@ function TrackRowComponent({
|
||||
? "text-primary-foreground hover:text-primary-foreground/80 hover:underline"
|
||||
: "text-muted-foreground hover:text-foreground hover:underline"
|
||||
content = (
|
||||
<div
|
||||
className={cn("relative z-10", LIBRARY_ROW_LAYOUT, TRACK_ROW_PADDING)}
|
||||
>
|
||||
<div className={cn("relative z-10", LIBRARY_ROW_LAYOUT, TRACK_ROW_PADDING)}>
|
||||
<div className={LIBRARY_NAME_COLUMNS}>
|
||||
{favoriteStar}
|
||||
<TrackCover
|
||||
albumId={song.album.id}
|
||||
alt={song.album.title}
|
||||
inRange={inRange}
|
||||
>
|
||||
<TrackCover albumId={song.album.id} alt={song.album.title} inRange={inRange}>
|
||||
<div className="absolute inset-0 flex items-center justify-center bg-black/0 transition-colors group-hover:bg-black/40">
|
||||
<Button
|
||||
size="icon-sm"
|
||||
@@ -408,9 +394,7 @@ function TrackRowComponent({
|
||||
}
|
||||
case "album":
|
||||
content = (
|
||||
<div
|
||||
className={cn("relative z-10", ALBUM_TRACK_ROW, TRACK_ROW_PADDING)}
|
||||
>
|
||||
<div className={cn("relative z-10", ALBUM_TRACK_ROW, TRACK_ROW_PADDING)}>
|
||||
{favoriteStar}
|
||||
{trackNumberButton}
|
||||
<TrackTitle song={song} subtitle={subtitle} inRange={inRange} />
|
||||
@@ -421,14 +405,8 @@ function TrackRowComponent({
|
||||
break
|
||||
case "playlist":
|
||||
content = (
|
||||
<div
|
||||
className={cn("relative z-10", ALBUM_TRACK_ROW, TRACK_ROW_PADDING)}
|
||||
>
|
||||
<TrackCover
|
||||
albumId={song.album.id}
|
||||
alt={song.album.title}
|
||||
inRange={inRange}
|
||||
>
|
||||
<div className={cn("relative z-10", ALBUM_TRACK_ROW, TRACK_ROW_PADDING)}>
|
||||
<TrackCover albumId={song.album.id} alt={song.album.title} inRange={inRange}>
|
||||
<div className="absolute inset-0 flex items-center justify-center bg-black/0 opacity-0 transition-opacity group-hover/cover:bg-black/40 group-hover/cover:opacity-100">
|
||||
<FavoriteStarButton
|
||||
title={song.title}
|
||||
@@ -499,7 +477,7 @@ function TrackRowComponent({
|
||||
}
|
||||
},
|
||||
className: cn(
|
||||
"group relative w-full cursor-pointer text-left text-sm transition-colors select-none",
|
||||
"group relative w-full cursor-pointer select-none text-left text-sm transition-colors",
|
||||
flush ? "py-2" : "py-2.5",
|
||||
inRange && "text-primary-foreground",
|
||||
isDragging && "opacity-50"
|
||||
|
||||
@@ -48,14 +48,8 @@ function AccordionTrigger({
|
||||
{...props}
|
||||
>
|
||||
{children}
|
||||
<ChevronDownIcon
|
||||
data-slot="accordion-trigger-icon"
|
||||
className="pointer-events-none shrink-0 group-aria-expanded/accordion-trigger:hidden"
|
||||
/>
|
||||
<ChevronUpIcon
|
||||
data-slot="accordion-trigger-icon"
|
||||
className="pointer-events-none hidden shrink-0 group-aria-expanded/accordion-trigger:inline"
|
||||
/>
|
||||
<ChevronDownIcon data-slot="accordion-trigger-icon" className="pointer-events-none shrink-0 group-aria-expanded/accordion-trigger:hidden" />
|
||||
<ChevronUpIcon data-slot="accordion-trigger-icon" className="pointer-events-none hidden shrink-0 group-aria-expanded/accordion-trigger:inline" />
|
||||
</AccordionPrimitive.Trigger>
|
||||
</AccordionPrimitive.Header>
|
||||
)
|
||||
|
||||
@@ -82,7 +82,9 @@ function BreadcrumbSeparator({
|
||||
className={cn("[&>svg]:size-3.5", className)}
|
||||
{...props}
|
||||
>
|
||||
{children ?? <ChevronRightIcon />}
|
||||
{children ?? (
|
||||
<ChevronRightIcon />
|
||||
)}
|
||||
</li>
|
||||
)
|
||||
}
|
||||
@@ -102,7 +104,8 @@ function BreadcrumbEllipsis({
|
||||
)}
|
||||
{...props}
|
||||
>
|
||||
<MoreHorizontalIcon />
|
||||
<MoreHorizontalIcon
|
||||
/>
|
||||
<span className="sr-only">More</span>
|
||||
</span>
|
||||
)
|
||||
|
||||
@@ -10,11 +10,7 @@ import {
|
||||
|
||||
import { cn } from "@/lib/utils"
|
||||
import { Button, buttonVariants } from "@/components/ui/button"
|
||||
import {
|
||||
ChevronLeftIcon,
|
||||
ChevronRightIcon,
|
||||
ChevronDownIcon,
|
||||
} from "lucide-react"
|
||||
import { ChevronLeftIcon, ChevronRightIcon, ChevronDownIcon } from "lucide-react"
|
||||
|
||||
function Calendar({
|
||||
className,
|
||||
@@ -157,10 +153,7 @@ function Calendar({
|
||||
|
||||
if (orientation === "right") {
|
||||
return (
|
||||
<ChevronRightIcon
|
||||
className={cn("size-4", className)}
|
||||
{...props}
|
||||
/>
|
||||
<ChevronRightIcon className={cn("size-4", className)} {...props} />
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
@@ -23,7 +23,8 @@ function Checkbox({
|
||||
data-slot="checkbox-indicator"
|
||||
className="grid place-content-center text-current transition-none [&>svg]:size-3.5"
|
||||
>
|
||||
<CheckIcon />
|
||||
<CheckIcon
|
||||
/>
|
||||
</CheckboxPrimitive.Indicator>
|
||||
</CheckboxPrimitive.Root>
|
||||
)
|
||||
|
||||
@@ -112,10 +112,7 @@ function ComboboxContent({
|
||||
<ComboboxPrimitive.Popup
|
||||
data-slot="combobox-content"
|
||||
data-chips={!!anchor}
|
||||
className={cn(
|
||||
"group/combobox-content relative max-h-(--available-height) w-(--anchor-width) max-w-(--available-width) min-w-[calc(var(--anchor-width)+--spacing(7))] origin-(--transform-origin) animate-none! overflow-hidden rounded-lg bg-popover/70 text-popover-foreground shadow-md ring-1 ring-foreground/10 duration-100 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 data-[chips=true]:min-w-(--anchor-width) data-[side=bottom]:slide-in-from-top-2 data-[side=inline-end]:slide-in-from-left-2 data-[side=inline-start]:slide-in-from-right-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 **:data-[slot$=-item]:focus:bg-foreground/10 **:data-[slot$=-item]:data-highlighted:bg-foreground/10 **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10! *:data-[slot=input-group]:m-1 *:data-[slot=input-group]:mb-0 *:data-[slot=input-group]:h-8 *:data-[slot=input-group]:border-input/30 *:data-[slot=input-group]:bg-input/30 *:data-[slot=input-group]:shadow-none **:data-[variant=destructive]:**:text-accent-foreground! **:data-[variant=destructive]:text-accent-foreground! **:data-[variant=destructive]:focus:bg-foreground/10! data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95",
|
||||
className
|
||||
)}
|
||||
className={cn("group/combobox-content max-h-(--available-height) w-(--anchor-width) max-w-(--available-width) min-w-[calc(var(--anchor-width)+--spacing(7))] origin-(--transform-origin) overflow-hidden rounded-lg text-popover-foreground shadow-md ring-1 ring-foreground/10 duration-100 data-[chips=true]:min-w-(--anchor-width) data-[side=bottom]:slide-in-from-top-2 data-[side=inline-end]:slide-in-from-left-2 data-[side=inline-start]:slide-in-from-right-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 *:data-[slot=input-group]:m-1 *:data-[slot=input-group]:mb-0 *:data-[slot=input-group]:h-8 *:data-[slot=input-group]:border-input/30 *:data-[slot=input-group]:bg-input/30 *:data-[slot=input-group]:shadow-none data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95 animate-none! relative bg-popover/70 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 **:data-[slot$=-item]:focus:bg-foreground/10 **:data-[slot$=-item]:data-highlighted:bg-foreground/10 **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10! **:data-[variant=destructive]:focus:bg-foreground/10! **:data-[variant=destructive]:text-accent-foreground! **:data-[variant=destructive]:**:text-accent-foreground!", className )}
|
||||
{...props}
|
||||
/>
|
||||
</ComboboxPrimitive.Positioner>
|
||||
|
||||
@@ -11,7 +11,10 @@ import {
|
||||
DialogHeader,
|
||||
DialogTitle,
|
||||
} from "@/components/ui/dialog"
|
||||
import { InputGroup, InputGroupAddon } from "@/components/ui/input-group"
|
||||
import {
|
||||
InputGroup,
|
||||
InputGroupAddon,
|
||||
} from "@/components/ui/input-group"
|
||||
import { SearchIcon, CheckIcon } from "lucide-react"
|
||||
|
||||
function Command({
|
||||
|
||||
@@ -68,10 +68,7 @@ function ContextMenuContent({
|
||||
<ContextMenuPrimitive.Portal>
|
||||
<ContextMenuPrimitive.Content
|
||||
data-slot="context-menu-content"
|
||||
className={cn(
|
||||
"relative z-50 max-h-(--radix-context-menu-content-available-height) min-w-36 origin-(--radix-context-menu-content-transform-origin) animate-none! overflow-x-hidden overflow-y-auto rounded-lg bg-popover/70 p-1 text-popover-foreground shadow-md ring-1 ring-foreground/10 duration-100 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 **:data-[slot$=-item]:focus:bg-foreground/10 **:data-[slot$=-item]:data-highlighted:bg-foreground/10 **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10! **:data-[variant=destructive]:**:text-accent-foreground! **:data-[variant=destructive]:text-accent-foreground! **:data-[variant=destructive]:focus:bg-foreground/10! data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95",
|
||||
className
|
||||
)}
|
||||
className={cn("z-50 max-h-(--radix-context-menu-content-available-height) min-w-36 origin-(--radix-context-menu-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-lg p-1 text-popover-foreground shadow-md ring-1 ring-foreground/10 duration-100 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95 animate-none! relative bg-popover/70 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 **:data-[slot$=-item]:focus:bg-foreground/10 **:data-[slot$=-item]:data-highlighted:bg-foreground/10 **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10! **:data-[variant=destructive]:focus:bg-foreground/10! **:data-[variant=destructive]:text-accent-foreground! **:data-[variant=destructive]:**:text-accent-foreground!", className )}
|
||||
{...props}
|
||||
/>
|
||||
</ContextMenuPrimitive.Portal>
|
||||
@@ -132,10 +129,7 @@ function ContextMenuSubContent({
|
||||
return (
|
||||
<ContextMenuPrimitive.SubContent
|
||||
data-slot="context-menu-sub-content"
|
||||
className={cn(
|
||||
"relative z-50 min-w-32 origin-(--radix-context-menu-content-transform-origin) animate-none! overflow-hidden rounded-lg border bg-popover/70 p-1 text-popover-foreground shadow-lg duration-100 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 **:data-[slot$=-item]:focus:bg-foreground/10 **:data-[slot$=-item]:data-highlighted:bg-foreground/10 **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10! **:data-[variant=destructive]:**:text-accent-foreground! **:data-[variant=destructive]:text-accent-foreground! **:data-[variant=destructive]:focus:bg-foreground/10! data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95",
|
||||
className
|
||||
)}
|
||||
className={cn("z-50 min-w-32 origin-(--radix-context-menu-content-transform-origin) overflow-hidden rounded-lg border p-1 text-popover-foreground shadow-lg duration-100 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95 animate-none! relative bg-popover/70 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 **:data-[slot$=-item]:focus:bg-foreground/10 **:data-[slot$=-item]:data-highlighted:bg-foreground/10 **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10! **:data-[variant=destructive]:focus:bg-foreground/10! **:data-[variant=destructive]:text-accent-foreground! **:data-[variant=destructive]:**:text-accent-foreground!", className )}
|
||||
{...props}
|
||||
/>
|
||||
)
|
||||
@@ -163,7 +157,8 @@ function ContextMenuCheckboxItem({
|
||||
>
|
||||
<span className="pointer-events-none absolute right-2">
|
||||
<ContextMenuPrimitive.ItemIndicator>
|
||||
<CheckIcon />
|
||||
<CheckIcon
|
||||
/>
|
||||
</ContextMenuPrimitive.ItemIndicator>
|
||||
</span>
|
||||
{children}
|
||||
@@ -191,7 +186,8 @@ function ContextMenuRadioItem({
|
||||
>
|
||||
<span className="pointer-events-none absolute right-2">
|
||||
<ContextMenuPrimitive.ItemIndicator>
|
||||
<CheckIcon />
|
||||
<CheckIcon
|
||||
/>
|
||||
</ContextMenuPrimitive.ItemIndicator>
|
||||
</span>
|
||||
{children}
|
||||
|
||||
@@ -74,7 +74,8 @@ function DialogContent({
|
||||
className="absolute top-2 right-2"
|
||||
size="icon-sm"
|
||||
>
|
||||
<XIcon />
|
||||
<XIcon
|
||||
/>
|
||||
<span className="sr-only">Close</span>
|
||||
</Button>
|
||||
</DialogPrimitive.Close>
|
||||
|
||||
@@ -43,10 +43,7 @@ function DropdownMenuContent({
|
||||
data-slot="dropdown-menu-content"
|
||||
sideOffset={sideOffset}
|
||||
align={align}
|
||||
className={cn(
|
||||
"relative z-50 max-h-(--radix-dropdown-menu-content-available-height) w-(--radix-dropdown-menu-trigger-width) min-w-32 origin-(--radix-dropdown-menu-content-transform-origin) animate-none! overflow-x-hidden overflow-y-auto rounded-lg bg-popover/70 p-1 text-popover-foreground shadow-md ring-1 ring-foreground/10 duration-100 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 **:data-[slot$=-item]:not-data-[variant=destructive]:focus:bg-foreground/10 **:data-[slot$=-item]:not-data-[variant=destructive]:data-highlighted:bg-foreground/10 **:data-[slot$=-item]:not-data-[variant=destructive]:data-highlighted:**:text-accent-foreground **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10! data-[state=closed]:overflow-hidden data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95",
|
||||
className
|
||||
)}
|
||||
className={cn("z-50 max-h-(--radix-dropdown-menu-content-available-height) w-(--radix-dropdown-menu-trigger-width) min-w-32 origin-(--radix-dropdown-menu-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-lg p-1 text-popover-foreground shadow-md ring-1 ring-foreground/10 duration-100 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-[state=closed]:overflow-hidden data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95 animate-none! relative bg-popover/70 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 **:data-[slot$=-item]:not-data-[variant=destructive]:focus:bg-foreground/10 **:data-[slot$=-item]:not-data-[variant=destructive]:data-highlighted:bg-foreground/10 **:data-[slot$=-item]:not-data-[variant=destructive]:data-highlighted:**:text-accent-foreground **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10!", className )}
|
||||
{...props}
|
||||
/>
|
||||
</DropdownMenuPrimitive.Portal>
|
||||
@@ -109,7 +106,8 @@ function DropdownMenuCheckboxItem({
|
||||
data-slot="dropdown-menu-checkbox-item-indicator"
|
||||
>
|
||||
<DropdownMenuPrimitive.ItemIndicator>
|
||||
<CheckIcon />
|
||||
<CheckIcon
|
||||
/>
|
||||
</DropdownMenuPrimitive.ItemIndicator>
|
||||
</span>
|
||||
{children}
|
||||
@@ -151,7 +149,8 @@ function DropdownMenuRadioItem({
|
||||
data-slot="dropdown-menu-radio-item-indicator"
|
||||
>
|
||||
<DropdownMenuPrimitive.ItemIndicator>
|
||||
<CheckIcon />
|
||||
<CheckIcon
|
||||
/>
|
||||
</DropdownMenuPrimitive.ItemIndicator>
|
||||
</span>
|
||||
{children}
|
||||
@@ -245,10 +244,7 @@ function DropdownMenuSubContent({
|
||||
return (
|
||||
<DropdownMenuPrimitive.SubContent
|
||||
data-slot="dropdown-menu-sub-content"
|
||||
className={cn(
|
||||
"relative z-50 min-w-[96px] origin-(--radix-dropdown-menu-content-transform-origin) animate-none! overflow-hidden rounded-lg bg-popover/70 p-1 text-popover-foreground shadow-lg ring-1 ring-foreground/10 duration-100 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 **:data-[slot$=-item]:not-data-[variant=destructive]:focus:bg-foreground/10 **:data-[slot$=-item]:not-data-[variant=destructive]:data-highlighted:bg-foreground/10 **:data-[slot$=-item]:not-data-[variant=destructive]:data-highlighted:**:text-accent-foreground **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10! data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95",
|
||||
className
|
||||
)}
|
||||
className={cn("z-50 min-w-[96px] origin-(--radix-dropdown-menu-content-transform-origin) overflow-hidden rounded-lg p-1 text-popover-foreground shadow-lg ring-1 ring-foreground/10 duration-100 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95 animate-none! relative bg-popover/70 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 **:data-[slot$=-item]:not-data-[variant=destructive]:focus:bg-foreground/10 **:data-[slot$=-item]:not-data-[variant=destructive]:data-highlighted:bg-foreground/10 **:data-[slot$=-item]:not-data-[variant=destructive]:data-highlighted:**:text-accent-foreground **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10!", className )}
|
||||
{...props}
|
||||
/>
|
||||
)
|
||||
|
||||
@@ -78,7 +78,8 @@ function InputOTPSeparator({ ...props }: React.ComponentProps<"div">) {
|
||||
role="separator"
|
||||
{...props}
|
||||
>
|
||||
<MinusIcon />
|
||||
<MinusIcon
|
||||
/>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -78,10 +78,7 @@ function MenubarContent({
|
||||
align={align}
|
||||
alignOffset={alignOffset}
|
||||
sideOffset={sideOffset}
|
||||
className={cn(
|
||||
"relative z-50 min-w-36 origin-(--radix-menubar-content-transform-origin) animate-none! overflow-hidden rounded-lg bg-popover/70 p-1 text-popover-foreground shadow-md ring-1 ring-foreground/10 duration-100 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 **:data-[slot$=-item]:focus:bg-foreground/10 **:data-[slot$=-item]:data-highlighted:bg-foreground/10 **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10! **:data-[variant=destructive]:**:text-accent-foreground! **:data-[variant=destructive]:text-accent-foreground! **:data-[variant=destructive]:focus:bg-foreground/10! data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95",
|
||||
className
|
||||
)}
|
||||
className={cn("z-50 min-w-36 origin-(--radix-menubar-content-transform-origin) overflow-hidden rounded-lg p-1 text-popover-foreground shadow-md ring-1 ring-foreground/10 duration-100 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 animate-none! relative bg-popover/70 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 **:data-[slot$=-item]:focus:bg-foreground/10 **:data-[slot$=-item]:data-highlighted:bg-foreground/10 **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10! **:data-[variant=destructive]:focus:bg-foreground/10! **:data-[variant=destructive]:text-accent-foreground! **:data-[variant=destructive]:**:text-accent-foreground!", className )}
|
||||
{...props}
|
||||
/>
|
||||
</MenubarPortal>
|
||||
@@ -133,7 +130,8 @@ function MenubarCheckboxItem({
|
||||
>
|
||||
<span className="pointer-events-none absolute left-1.5 flex size-4 items-center justify-center [&_svg:not([class*='size-'])]:size-4">
|
||||
<MenubarPrimitive.ItemIndicator>
|
||||
<CheckIcon />
|
||||
<CheckIcon
|
||||
/>
|
||||
</MenubarPrimitive.ItemIndicator>
|
||||
</span>
|
||||
{children}
|
||||
@@ -161,7 +159,8 @@ function MenubarRadioItem({
|
||||
>
|
||||
<span className="pointer-events-none absolute left-1.5 flex size-4 items-center justify-center [&_svg:not([class*='size-'])]:size-4">
|
||||
<MenubarPrimitive.ItemIndicator>
|
||||
<CheckIcon />
|
||||
<CheckIcon
|
||||
/>
|
||||
</MenubarPrimitive.ItemIndicator>
|
||||
</span>
|
||||
{children}
|
||||
@@ -255,10 +254,7 @@ function MenubarSubContent({
|
||||
return (
|
||||
<MenubarPrimitive.SubContent
|
||||
data-slot="menubar-sub-content"
|
||||
className={cn(
|
||||
"relative z-50 min-w-32 origin-(--radix-menubar-content-transform-origin) animate-none! overflow-hidden rounded-lg bg-popover/70 p-1 text-popover-foreground shadow-lg ring-1 ring-foreground/10 duration-100 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 **:data-[slot$=-item]:focus:bg-foreground/10 **:data-[slot$=-item]:data-highlighted:bg-foreground/10 **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10! **:data-[variant=destructive]:**:text-accent-foreground! **:data-[variant=destructive]:text-accent-foreground! **:data-[variant=destructive]:focus:bg-foreground/10! data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95",
|
||||
className
|
||||
)}
|
||||
className={cn("z-50 min-w-32 origin-(--radix-menubar-content-transform-origin) overflow-hidden rounded-lg p-1 text-popover-foreground shadow-lg ring-1 ring-foreground/10 duration-100 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95 animate-none! relative bg-popover/70 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 **:data-[slot$=-item]:focus:bg-foreground/10 **:data-[slot$=-item]:data-highlighted:bg-foreground/10 **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10! **:data-[variant=destructive]:focus:bg-foreground/10! **:data-[variant=destructive]:text-accent-foreground! **:data-[variant=destructive]:**:text-accent-foreground!", className )}
|
||||
{...props}
|
||||
/>
|
||||
)
|
||||
|
||||
@@ -27,11 +27,7 @@ function NativeSelect({
|
||||
className="h-8 w-full min-w-0 appearance-none rounded-lg border border-input bg-transparent py-1 pr-8 pl-2.5 text-sm transition-colors outline-none select-none selection:bg-primary selection:text-primary-foreground placeholder:text-muted-foreground focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-ring/50 disabled:pointer-events-none disabled:cursor-not-allowed aria-invalid:border-destructive aria-invalid:ring-3 aria-invalid:ring-destructive/20 data-[size=sm]:h-7 data-[size=sm]:rounded-[min(var(--radius-md),10px)] data-[size=sm]:py-0.5 dark:bg-input/30 dark:hover:bg-input/50 dark:aria-invalid:border-destructive/50 dark:aria-invalid:ring-destructive/40"
|
||||
{...props}
|
||||
/>
|
||||
<ChevronDownIcon
|
||||
className="pointer-events-none absolute top-1/2 right-2.5 size-4 -translate-y-1/2 text-muted-foreground select-none"
|
||||
aria-hidden="true"
|
||||
data-slot="native-select-icon"
|
||||
/>
|
||||
<ChevronDownIcon className="pointer-events-none absolute top-1/2 right-2.5 size-4 -translate-y-1/2 text-muted-foreground select-none" aria-hidden="true" data-slot="native-select-icon" />
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -74,10 +74,7 @@ function NavigationMenuTrigger({
|
||||
{...props}
|
||||
>
|
||||
{children}{" "}
|
||||
<ChevronDownIcon
|
||||
className="relative top-px ml-1 size-3 transition duration-300 group-data-popup-open/navigation-menu-trigger:rotate-180 group-data-open/navigation-menu-trigger:rotate-180"
|
||||
aria-hidden="true"
|
||||
/>
|
||||
<ChevronDownIcon className="relative top-px ml-1 size-3 transition duration-300 group-data-popup-open/navigation-menu-trigger:rotate-180 group-data-open/navigation-menu-trigger:rotate-180" aria-hidden="true" />
|
||||
</NavigationMenuPrimitive.Trigger>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -2,11 +2,7 @@ import * as React from "react"
|
||||
|
||||
import { cn } from "@/lib/utils"
|
||||
import { Button } from "@/components/ui/button"
|
||||
import {
|
||||
ChevronLeftIcon,
|
||||
ChevronRightIcon,
|
||||
MoreHorizontalIcon,
|
||||
} from "lucide-react"
|
||||
import { ChevronLeftIcon, ChevronRightIcon, MoreHorizontalIcon } from "lucide-react"
|
||||
|
||||
function Pagination({ className, ...props }: React.ComponentProps<"nav">) {
|
||||
return (
|
||||
@@ -115,7 +111,8 @@ function PaginationEllipsis({
|
||||
)}
|
||||
{...props}
|
||||
>
|
||||
<MoreHorizontalIcon />
|
||||
<MoreHorizontalIcon
|
||||
/>
|
||||
<span className="sr-only">More pages</span>
|
||||
</span>
|
||||
)
|
||||
|
||||
@@ -69,12 +69,7 @@ function SelectContent({
|
||||
<SelectPrimitive.Content
|
||||
data-slot="select-content"
|
||||
data-align-trigger={position === "item-aligned"}
|
||||
className={cn(
|
||||
"relative z-50 max-h-(--radix-select-content-available-height) min-w-36 origin-(--radix-select-content-transform-origin) animate-none! overflow-x-hidden overflow-y-auto rounded-lg bg-popover/70 text-popover-foreground shadow-md ring-1 ring-foreground/10 duration-100 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 data-[align-trigger=true]:animate-none data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 **:data-[slot$=-item]:focus:bg-foreground/10 **:data-[slot$=-item]:data-highlighted:bg-foreground/10 **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10! **:data-[variant=destructive]:**:text-accent-foreground! **:data-[variant=destructive]:text-accent-foreground! **:data-[variant=destructive]:focus:bg-foreground/10! data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95",
|
||||
position === "popper" &&
|
||||
"data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1",
|
||||
className
|
||||
)}
|
||||
className={cn("z-50 max-h-(--radix-select-content-available-height) min-w-36 origin-(--radix-select-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-lg text-popover-foreground shadow-md ring-1 ring-foreground/10 duration-100 data-[align-trigger=true]:animate-none data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95 animate-none! relative bg-popover/70 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 **:data-[slot$=-item]:focus:bg-foreground/10 **:data-[slot$=-item]:data-highlighted:bg-foreground/10 **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10! **:data-[variant=destructive]:focus:bg-foreground/10! **:data-[variant=destructive]:text-accent-foreground! **:data-[variant=destructive]:**:text-accent-foreground!", position ==="popper"&&"data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1", className )}
|
||||
position={position}
|
||||
align={align}
|
||||
{...props}
|
||||
@@ -158,7 +153,8 @@ function SelectScrollUpButton({
|
||||
)}
|
||||
{...props}
|
||||
>
|
||||
<ChevronUpIcon />
|
||||
<ChevronUpIcon
|
||||
/>
|
||||
</SelectPrimitive.ScrollUpButton>
|
||||
)
|
||||
}
|
||||
@@ -176,7 +172,8 @@ function SelectScrollDownButton({
|
||||
)}
|
||||
{...props}
|
||||
>
|
||||
<ChevronDownIcon />
|
||||
<ChevronDownIcon
|
||||
/>
|
||||
</SelectPrimitive.ScrollDownButton>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -75,7 +75,8 @@ function SheetContent({
|
||||
className="absolute top-3 right-3"
|
||||
size="icon-sm"
|
||||
>
|
||||
<XIcon />
|
||||
<XIcon
|
||||
/>
|
||||
<span className="sr-only">Close</span>
|
||||
</Button>
|
||||
</SheetPrimitive.Close>
|
||||
|
||||
@@ -2,13 +2,7 @@
|
||||
|
||||
import { useTheme } from "next-themes"
|
||||
import { Toaster as Sonner, type ToasterProps } from "sonner"
|
||||
import {
|
||||
CircleCheckIcon,
|
||||
InfoIcon,
|
||||
TriangleAlertIcon,
|
||||
OctagonXIcon,
|
||||
Loader2Icon,
|
||||
} from "lucide-react"
|
||||
import { CircleCheckIcon, InfoIcon, TriangleAlertIcon, OctagonXIcon, Loader2Icon } from "lucide-react"
|
||||
|
||||
const Toaster = ({ ...props }: ToasterProps) => {
|
||||
const { theme = "system" } = useTheme()
|
||||
@@ -19,11 +13,21 @@ const Toaster = ({ ...props }: ToasterProps) => {
|
||||
theme={theme as ToasterProps["theme"]}
|
||||
className="toaster group"
|
||||
icons={{
|
||||
success: <CircleCheckIcon className="size-4" />,
|
||||
info: <InfoIcon className="size-4" />,
|
||||
warning: <TriangleAlertIcon className="size-4" />,
|
||||
error: <OctagonXIcon className="size-4" />,
|
||||
loading: <Loader2Icon className="size-4 animate-spin" />,
|
||||
success: (
|
||||
<CircleCheckIcon className="size-4" />
|
||||
),
|
||||
info: (
|
||||
<InfoIcon className="size-4" />
|
||||
),
|
||||
warning: (
|
||||
<TriangleAlertIcon className="size-4" />
|
||||
),
|
||||
error: (
|
||||
<OctagonXIcon className="size-4" />
|
||||
),
|
||||
loading: (
|
||||
<Loader2Icon className="size-4 animate-spin" />
|
||||
),
|
||||
}}
|
||||
style={
|
||||
{
|
||||
|
||||
@@ -3,12 +3,7 @@ import { Loader2Icon } from "lucide-react"
|
||||
|
||||
function Spinner({ className, ...props }: React.ComponentProps<"svg">) {
|
||||
return (
|
||||
<Loader2Icon
|
||||
role="status"
|
||||
aria-label="Loading"
|
||||
className={cn("size-4 animate-spin", className)}
|
||||
{...props}
|
||||
/>
|
||||
<Loader2Icon role="status" aria-label="Loading" className={cn("size-4 animate-spin", className)} {...props} />
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
@@ -64,18 +64,12 @@ export function useMediaActions() {
|
||||
api.playlists.getOrderedArtistSongIds,
|
||||
{ artistId: artistId as Id<"artists"> }
|
||||
)
|
||||
void runQueueAction(action, songIds.flat())
|
||||
void runQueueAction(action, songIds)
|
||||
break
|
||||
}
|
||||
}
|
||||
},
|
||||
[
|
||||
convex,
|
||||
cacheScope,
|
||||
toggleArtistFavorite,
|
||||
openAddArtistToPlaylist,
|
||||
runQueueAction,
|
||||
]
|
||||
[convex, cacheScope, toggleArtistFavorite, openAddArtistToPlaylist, runQueueAction]
|
||||
)
|
||||
|
||||
return { runSongsAction, runArtistAction }
|
||||
@@ -99,8 +93,7 @@ export function useTrackListMediaAction({
|
||||
|
||||
return React.useCallback(
|
||||
(action: MediaContextAction, songId: string) => {
|
||||
const targetIds =
|
||||
selectedIds.size > 0 ? Array.from(selectedIds) : [songId]
|
||||
const targetIds = selectedIds.size > 0 ? Array.from(selectedIds) : [songId]
|
||||
const stationArtist =
|
||||
artistId ??
|
||||
(songs ? stationArtistId(songs, new Set(targetIds)) : undefined)
|
||||
|
||||
@@ -3,7 +3,10 @@
|
||||
import * as React from "react"
|
||||
|
||||
import type { BrowseSong } from "@otunes/convex/types"
|
||||
import { albumCoverUrl, type CoverImageSize } from "@/lib/cover-urls"
|
||||
import {
|
||||
albumCoverUrl,
|
||||
type CoverImageSize,
|
||||
} from "@/lib/cover-urls"
|
||||
|
||||
const MEDIA_SESSION_ACTIONS = [
|
||||
"play",
|
||||
@@ -14,7 +17,12 @@ const MEDIA_SESSION_ACTIONS = [
|
||||
] as const
|
||||
|
||||
const MEDIA_SESSION_ARTWORK_SIZES = [
|
||||
64, 128, 192, 256, 384, 512,
|
||||
64,
|
||||
128,
|
||||
192,
|
||||
256,
|
||||
384,
|
||||
512,
|
||||
] as const satisfies readonly CoverImageSize[]
|
||||
|
||||
function mediaSessionSupported() {
|
||||
@@ -34,8 +42,10 @@ function setActionHandler(
|
||||
|
||||
function artworkForSong(song: BrowseSong): MediaImage[] {
|
||||
return MEDIA_SESSION_ARTWORK_SIZES.map((size) => ({
|
||||
src: new URL(albumCoverUrl(song.album.id, size), window.location.origin)
|
||||
.href,
|
||||
src: new URL(
|
||||
albumCoverUrl(song.album.id, size),
|
||||
window.location.origin
|
||||
).href,
|
||||
sizes: `${size}x${size}`,
|
||||
}))
|
||||
}
|
||||
|
||||
@@ -24,14 +24,3 @@ export function getConvexClient() {
|
||||
}
|
||||
return client
|
||||
}
|
||||
|
||||
/**
|
||||
* Downloads a Convex storage file. The backend builds storage URLs from its
|
||||
* public origin, which may not be reachable from here, so the same path is
|
||||
* fetched from the internal URL. `null` when it is missing.
|
||||
*/
|
||||
export async function fetchConvexStorageFile(storageUrl: string) {
|
||||
const { pathname, search } = new URL(storageUrl)
|
||||
const response = await fetch(new URL(pathname + search, getConvexServerUrl()))
|
||||
return response.ok ? Buffer.from(await response.arrayBuffer()) : null
|
||||
}
|
||||
@@ -12,15 +12,6 @@ export function albumCoverUrl(albumId: string, size?: CoverImageSize) {
|
||||
return withCoverImageSize(`/api/album/${albumId}/cover`, size)
|
||||
}
|
||||
|
||||
/** `version` is the summary's `cover`; it changes with the artwork. */
|
||||
export function playlistCoverUrl(
|
||||
playlistId: string,
|
||||
version: string | null,
|
||||
size?: CoverImageSize
|
||||
) {
|
||||
const params = new URLSearchParams()
|
||||
if (version) params.set("v", version)
|
||||
if (size) params.set("size", String(size))
|
||||
const query = params.toString()
|
||||
return `/api/playlist/${playlistId}/cover${query ? `?${query}` : ""}`
|
||||
export function playlistCoverUrl(playlistId: string, size?: CoverImageSize) {
|
||||
return withCoverImageSize(`/api/playlist/${playlistId}/cover`, size)
|
||||
}
|
||||
@@ -7,7 +7,10 @@ export function getContiguousSelectedIndices(
|
||||
.map((item, index) => (selectedIds.has(item.selectionId) ? index : -1))
|
||||
.filter((index) => index >= 0)
|
||||
|
||||
if (selectedIndices.length > 1 && selectedIndices.includes(dragIndex)) {
|
||||
if (
|
||||
selectedIndices.length > 1 &&
|
||||
selectedIndices.includes(dragIndex)
|
||||
) {
|
||||
return selectedIndices
|
||||
}
|
||||
|
||||
@@ -34,10 +37,7 @@ export function moveQueueBlock<T>(
|
||||
}
|
||||
|
||||
const removedBefore = sorted.filter((index) => index < targetIndex).length
|
||||
const insertAt = Math.max(
|
||||
0,
|
||||
Math.min(targetIndex - removedBefore, remaining.length)
|
||||
)
|
||||
const insertAt = Math.max(0, Math.min(targetIndex - removedBefore, remaining.length))
|
||||
|
||||
const next = [...remaining]
|
||||
next.splice(insertAt, 0, ...block)
|
||||
|
||||
@@ -1,62 +0,0 @@
|
||||
/**
|
||||
* Downscales an image to `size`×`size` (center-cropped cover) and returns a
|
||||
* base64 data URL. JPEG, unless `keepLossless` and the file is PNG or WebP.
|
||||
*/
|
||||
export function resizeImageToDataUrl(
|
||||
file: File,
|
||||
size: number,
|
||||
{ keepLossless = false } = {}
|
||||
): Promise<string> {
|
||||
return new Promise((resolve, reject) => {
|
||||
const url = URL.createObjectURL(file)
|
||||
const image = new Image()
|
||||
|
||||
image.onload = () => {
|
||||
URL.revokeObjectURL(url)
|
||||
|
||||
const canvas = document.createElement("canvas")
|
||||
canvas.width = size
|
||||
canvas.height = size
|
||||
|
||||
const ctx = canvas.getContext("2d")
|
||||
if (!ctx) {
|
||||
reject(new Error("Could not process image"))
|
||||
return
|
||||
}
|
||||
|
||||
const scale = Math.max(size / image.width, size / image.height)
|
||||
const width = image.width * scale
|
||||
const height = image.height * scale
|
||||
ctx.drawImage(
|
||||
image,
|
||||
(size - width) / 2,
|
||||
(size - height) / 2,
|
||||
width,
|
||||
height
|
||||
)
|
||||
|
||||
const outputType =
|
||||
keepLossless &&
|
||||
(file.type === "image/png" || file.type === "image/webp")
|
||||
? "image/png"
|
||||
: "image/jpeg"
|
||||
resolve(
|
||||
canvas.toDataURL(
|
||||
outputType,
|
||||
outputType === "image/jpeg" ? 0.9 : undefined
|
||||
)
|
||||
)
|
||||
}
|
||||
|
||||
image.onerror = () => {
|
||||
URL.revokeObjectURL(url)
|
||||
reject(new Error("Could not load image"))
|
||||
}
|
||||
|
||||
image.src = url
|
||||
})
|
||||
}
|
||||
|
||||
export function resizeProfileImageToDataUrl(file: File) {
|
||||
return resizeImageToDataUrl(file, 256, { keepLossless: true })
|
||||
}
|
||||
@@ -0,0 +1,49 @@
|
||||
const PROFILE_IMAGE_SIZE = 256
|
||||
|
||||
/**
|
||||
* Downscales an image to 256×256 (center-cropped cover) and returns a base64 data URL.
|
||||
*/
|
||||
export function resizeProfileImageToDataUrl(file: File): Promise<string> {
|
||||
return new Promise((resolve, reject) => {
|
||||
const url = URL.createObjectURL(file)
|
||||
const image = new Image()
|
||||
|
||||
image.onload = () => {
|
||||
URL.revokeObjectURL(url)
|
||||
|
||||
const canvas = document.createElement("canvas")
|
||||
canvas.width = PROFILE_IMAGE_SIZE
|
||||
canvas.height = PROFILE_IMAGE_SIZE
|
||||
|
||||
const ctx = canvas.getContext("2d")
|
||||
if (!ctx) {
|
||||
reject(new Error("Could not process image"))
|
||||
return
|
||||
}
|
||||
|
||||
const scale = Math.max(
|
||||
PROFILE_IMAGE_SIZE / image.width,
|
||||
PROFILE_IMAGE_SIZE / image.height
|
||||
)
|
||||
const width = image.width * scale
|
||||
const height = image.height * scale
|
||||
const x = (PROFILE_IMAGE_SIZE - width) / 2
|
||||
const y = (PROFILE_IMAGE_SIZE - height) / 2
|
||||
|
||||
ctx.drawImage(image, x, y, width, height)
|
||||
|
||||
const outputType =
|
||||
file.type === "image/png" || file.type === "image/webp"
|
||||
? "image/png"
|
||||
: "image/jpeg"
|
||||
resolve(canvas.toDataURL(outputType, outputType === "image/jpeg" ? 0.9 : undefined))
|
||||
}
|
||||
|
||||
image.onerror = () => {
|
||||
URL.revokeObjectURL(url)
|
||||
reject(new Error("Could not load image"))
|
||||
}
|
||||
|
||||
image.src = url
|
||||
})
|
||||
}
|
||||
@@ -1,7 +1,11 @@
|
||||
import { cn } from "@/lib/utils"
|
||||
|
||||
export type SelectionRangePosition =
|
||||
"none" | "only" | "start" | "middle" | "end"
|
||||
| "none"
|
||||
| "only"
|
||||
| "start"
|
||||
| "middle"
|
||||
| "end"
|
||||
|
||||
export function getSelectionRangePositions(
|
||||
itemIds: string[],
|
||||
@@ -96,28 +100,20 @@ export function TrackRowHoverHighlight({ flush = false }: { flush?: boolean }) {
|
||||
aria-hidden
|
||||
className={cn(
|
||||
"pointer-events-none bg-muted/60 opacity-0 transition-opacity group-hover:opacity-100",
|
||||
flush
|
||||
? FLUSH_ROW_HIGHLIGHT_INSET
|
||||
: [TRACK_ROW_HIGHLIGHT_INSET, "rounded-lg"]
|
||||
flush ? FLUSH_ROW_HIGHLIGHT_INSET : [TRACK_ROW_HIGHLIGHT_INSET, "rounded-lg"]
|
||||
)}
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
/** Background for the active (focused or now playing) row. */
|
||||
export function TrackRowActiveHighlight({
|
||||
flush = false,
|
||||
}: {
|
||||
flush?: boolean
|
||||
}) {
|
||||
export function TrackRowActiveHighlight({ flush = false }: { flush?: boolean }) {
|
||||
return (
|
||||
<div
|
||||
aria-hidden
|
||||
className={cn(
|
||||
"pointer-events-none bg-muted/60",
|
||||
flush
|
||||
? FLUSH_ROW_HIGHLIGHT_INSET
|
||||
: [TRACK_ROW_HIGHLIGHT_INSET, "rounded-lg"]
|
||||
flush ? FLUSH_ROW_HIGHLIGHT_INSET : [TRACK_ROW_HIGHLIGHT_INSET, "rounded-lg"]
|
||||
)}
|
||||
/>
|
||||
)
|
||||
|
||||
@@ -8,7 +8,8 @@ export const PLACEHOLDER_PATH = path.join(
|
||||
)
|
||||
|
||||
const COVER_IMAGE_SIZES = new Set([64, 128, 192, 256, 384, 512, 768, 1024])
|
||||
const COVER_CACHE_CONTROL = "public, max-age=300, stale-while-revalidate=86400"
|
||||
const COVER_CACHE_CONTROL =
|
||||
"public, max-age=300, stale-while-revalidate=86400"
|
||||
|
||||
const MIME_TYPES: Record<string, string> = {
|
||||
".jpg": "image/jpeg",
|
||||
@@ -34,29 +35,6 @@ function requestedCoverSize(request: Request): number | undefined {
|
||||
return COVER_IMAGE_SIZES.has(size) ? size : undefined
|
||||
}
|
||||
|
||||
/**
|
||||
* Serves stored playlist artwork as a square WebP, `?size=` pixels a side
|
||||
* (1024 by default). URLs
|
||||
* carry the artwork's version (`?v=`), so new artwork gets a new URL and
|
||||
* versioned responses can be cached for good.
|
||||
*/
|
||||
export async function serveStoredCover(image: Buffer, request: Request) {
|
||||
const size = requestedCoverSize(request) ?? 1024
|
||||
const data = await sharp(image)
|
||||
.rotate()
|
||||
.resize(size, size, { fit: "cover", withoutEnlargement: true })
|
||||
.webp({ quality: 80 })
|
||||
.toBuffer()
|
||||
return new Response(new Uint8Array(data), {
|
||||
headers: {
|
||||
"Content-Type": "image/webp",
|
||||
"Cache-Control": new URL(request.url).searchParams.has("v")
|
||||
? "public, max-age=31536000, immutable"
|
||||
: COVER_CACHE_CONTROL,
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
export async function serveCoverFile(
|
||||
coverPath: string | null | undefined,
|
||||
request: Request
|
||||
|
||||
@@ -16,7 +16,10 @@ export type ByteRange = {
|
||||
*/
|
||||
function toWebStream(
|
||||
source: Readable,
|
||||
{ cancel, finish }: { cancel: () => void; finish?: () => Promise<void> }
|
||||
{
|
||||
cancel,
|
||||
finish,
|
||||
}: { cancel: () => void; finish?: () => Promise<void> }
|
||||
): ReadableStream<Uint8Array> {
|
||||
let done = false
|
||||
|
||||
|
||||
@@ -34,8 +34,7 @@ export function cacheDir(kind: "hls" | "lossless") {
|
||||
|
||||
function maxCacheBytes() {
|
||||
const configured = Number(process.env.OTUNES_CACHE_MAX_MB)
|
||||
const mb =
|
||||
Number.isFinite(configured) && configured > 0 ? configured : DEFAULT_MAX_MB
|
||||
const mb = Number.isFinite(configured) && configured > 0 ? configured : DEFAULT_MAX_MB
|
||||
return mb * 1024 * 1024
|
||||
}
|
||||
|
||||
|
||||
@@ -63,7 +63,11 @@ function hlsLookupKey(
|
||||
return `${songId}:${quality ?? ""}:${preferAtmos ? "1" : "0"}`
|
||||
}
|
||||
|
||||
async function hlsJobKey(song: SongSource, sourcePath: string, kbps: number) {
|
||||
async function hlsJobKey(
|
||||
song: SongSource,
|
||||
sourcePath: string,
|
||||
kbps: number
|
||||
) {
|
||||
const stat = await fs.stat(sourcePath)
|
||||
return crypto
|
||||
.createHash("sha256")
|
||||
@@ -80,10 +84,7 @@ async function hlsJobKey(song: SongSource, sourcePath: string, kbps: number) {
|
||||
}
|
||||
|
||||
export function hlsSegmentPath(job: HlsJob, segmentIndex: number) {
|
||||
return path.join(
|
||||
job.dir,
|
||||
`segment_${segmentIndex.toString().padStart(5, "0")}.ts`
|
||||
)
|
||||
return path.join(job.dir, `segment_${segmentIndex.toString().padStart(5, "0")}.ts`)
|
||||
}
|
||||
|
||||
async function touchHlsJob(job: HlsJob) {
|
||||
@@ -131,9 +132,7 @@ export function getExistingHlsJob(
|
||||
quality: string | null,
|
||||
preferAtmos: boolean
|
||||
) {
|
||||
return (
|
||||
state.jobsByLookup.get(hlsLookupKey(songId, quality, preferAtmos)) ?? null
|
||||
)
|
||||
return state.jobsByLookup.get(hlsLookupKey(songId, quality, preferAtmos)) ?? null
|
||||
}
|
||||
|
||||
export async function waitForHlsSegment(
|
||||
@@ -221,10 +220,7 @@ function startTranscode(job: HlsJob, sourcePath: string, kbps: number) {
|
||||
if (code === 0) {
|
||||
void pruneCache()
|
||||
} else {
|
||||
console.error(
|
||||
`ffmpeg HLS exited with code ${code}`,
|
||||
ffmpeg.stderrTail()
|
||||
)
|
||||
console.error(`ffmpeg HLS exited with code ${code}`, ffmpeg.stderrTail())
|
||||
}
|
||||
},
|
||||
() => {
|
||||
|
||||
@@ -59,9 +59,7 @@ async function convert(source: string, key: string): Promise<string> {
|
||||
])
|
||||
const code = await ffmpeg.exited
|
||||
if (code !== 0) {
|
||||
throw new Error(
|
||||
`Lossless conversion failed: ${code}: ${ffmpeg.stderrTail()}`
|
||||
)
|
||||
throw new Error(`Lossless conversion failed: ${code}: ${ffmpeg.stderrTail()}`)
|
||||
}
|
||||
await fs.rename(temporary, output)
|
||||
} finally {
|
||||
|
||||
@@ -99,7 +99,6 @@ convex_cli deploy --typecheck disable --codegen disable
|
||||
|
||||
log "Running data migrations"
|
||||
convex_cli run migrations:migrateUsers
|
||||
convex_cli run migrations:migratePlaylists
|
||||
|
||||
# `env get` exits 0 with no output when the variable is unset. Any other failure
|
||||
# must not be read as "no keys": regenerating them signs every user out.
|
||||
|
||||
+1
-5
@@ -22,11 +22,7 @@
|
||||
"pnpm": {
|
||||
"patchedDependencies": {
|
||||
"expo-audio@58.0.10": "patches/expo-audio@58.0.10.patch",
|
||||
"react-native-screens@4.30.0": "patches/react-native-screens@4.30.0.patch",
|
||||
"react-native-reanimated@4.7.1": "patches/react-native-reanimated@4.7.1.patch",
|
||||
"expo-modules-core@58.0.24": "patches/expo-modules-core@58.0.24.patch",
|
||||
"expo-file-system@58.0.10": "patches/expo-file-system@58.0.10.patch",
|
||||
"@react-native-community/slider@5.2.1": "patches/@react-native-community__slider@5.2.1.patch"
|
||||
"react-native-screens@4.30.0": "patches/react-native-screens@4.30.0.patch"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,54 +1,63 @@
|
||||
import type { OptimisticLocalStore, OptimisticUpdate } from "convex/browser"
|
||||
import type {
|
||||
FunctionArgs,
|
||||
FunctionReference,
|
||||
FunctionReturnType,
|
||||
} from "convex/server"
|
||||
import type { FunctionArgs, FunctionReference } from "convex/server"
|
||||
|
||||
import { api } from "../convex/_generated/api"
|
||||
import { chunk } from "../convex/limits"
|
||||
import type { Id } from "../convex/_generated/dataModel"
|
||||
|
||||
type UserFavorites = FunctionReturnType<typeof api.favorites.getUserFavorites>
|
||||
type FavoriteList = keyof UserFavorites
|
||||
type FavoriteIds = {
|
||||
favoriteSongs: Id<"songs">[]
|
||||
favoriteAlbums: Id<"albums">[]
|
||||
favoriteArtists: Id<"artists">[]
|
||||
}
|
||||
|
||||
/** Rewrites one list of the cached `getUserFavorites` result, if loaded. */
|
||||
function patchFavorites(
|
||||
type FavoriteList = keyof FavoriteIds
|
||||
|
||||
function patchFavorites<List extends FavoriteList>(
|
||||
store: OptimisticLocalStore,
|
||||
list: FavoriteList,
|
||||
update: (ids: string[]) => string[]
|
||||
list: List,
|
||||
update: (ids: FavoriteIds[List]) => FavoriteIds[List]
|
||||
) {
|
||||
const current = store.getQuery(api.favorites.getUserFavorites, {})
|
||||
if (!current) return
|
||||
const ids: string[] = current[list].flat()
|
||||
const next = update(ids)
|
||||
if (next !== ids) {
|
||||
// `next` only holds ids of this list's kind, which TS cannot follow here.
|
||||
store.setQuery(api.favorites.getUserFavorites, {}, {
|
||||
...current,
|
||||
[list]: chunk(next),
|
||||
} as UserFavorites)
|
||||
const next = update(current[list])
|
||||
if (next !== current[list]) {
|
||||
store.setQuery(
|
||||
api.favorites.getUserFavorites,
|
||||
{},
|
||||
{
|
||||
...current,
|
||||
[list]: next,
|
||||
}
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
function addFavorites(
|
||||
function addFavorites<List extends FavoriteList>(
|
||||
store: OptimisticLocalStore,
|
||||
list: FavoriteList,
|
||||
ids: string[]
|
||||
list: List,
|
||||
ids: FavoriteIds[List]
|
||||
) {
|
||||
patchFavorites(store, list, (current) => {
|
||||
const added = ids.filter((id) => !current.includes(id))
|
||||
return added.length === 0 ? current : [...new Set([...current, ...added])]
|
||||
const added = ids.filter((id) => !(current as string[]).includes(id))
|
||||
return added.length === 0
|
||||
? current
|
||||
: ([...new Set([...current, ...added])] as FavoriteIds[List])
|
||||
})
|
||||
}
|
||||
|
||||
function removeFavorites(
|
||||
function removeFavorites<List extends FavoriteList>(
|
||||
store: OptimisticLocalStore,
|
||||
list: FavoriteList,
|
||||
ids: string[]
|
||||
list: List,
|
||||
ids: FavoriteIds[List]
|
||||
) {
|
||||
const removed = new Set(ids)
|
||||
patchFavorites(store, list, (current) =>
|
||||
current.filter((id) => !removed.has(id))
|
||||
const removed = new Set<string>(ids)
|
||||
patchFavorites(
|
||||
store,
|
||||
list,
|
||||
(current) =>
|
||||
(current as string[]).filter(
|
||||
(id) => !removed.has(id)
|
||||
) as FavoriteIds[List]
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
@@ -1,52 +0,0 @@
|
||||
import type { Id } from "../convex/_generated/dataModel"
|
||||
import { COVER_GRID_ALBUMS } from "../convex/limits"
|
||||
import type { BrowseSong } from "../convex/types"
|
||||
|
||||
export { COVER_GRID_ALBUMS }
|
||||
|
||||
export type CoverAlbum = BrowseSong["album"]
|
||||
|
||||
/** Distinct albums that have artwork, in playlist order. */
|
||||
export function playlistCoverAlbums(songs: readonly BrowseSong[]) {
|
||||
const albums = new Map<string, CoverAlbum>()
|
||||
for (const song of songs) {
|
||||
if (song.album.cover !== null && !albums.has(song.album.id)) {
|
||||
albums.set(song.album.id, song.album)
|
||||
}
|
||||
}
|
||||
return [...albums.values()]
|
||||
}
|
||||
|
||||
/** `count` distinct items in random order (Fisher-Yates prefix). */
|
||||
function sample<T>(items: readonly T[], count: number) {
|
||||
const pool = [...items]
|
||||
for (let index = 0; index < count; index++) {
|
||||
const swap = index + Math.floor(Math.random() * (pool.length - index))
|
||||
;[pool[index], pool[swap]] = [pool[swap], pool[index]]
|
||||
}
|
||||
return pool.slice(0, count)
|
||||
}
|
||||
|
||||
/**
|
||||
* Cover options to pick from, as album ids for `setPlaylistCoverAlbums`.
|
||||
* With four or more albums: `count` random 2x2 grids, avoiding repeats.
|
||||
* With fewer: each album's cover alone.
|
||||
*/
|
||||
export function randomPlaylistCovers(
|
||||
albums: readonly CoverAlbum[],
|
||||
count = 4
|
||||
): Id<"albums">[][] {
|
||||
const ids = albums.map((album) => album.id)
|
||||
if (ids.length < COVER_GRID_ALBUMS) return ids.map((id) => [id])
|
||||
|
||||
const options = new Map<string, Id<"albums">[]>()
|
||||
for (
|
||||
let attempt = 0;
|
||||
options.size < count && attempt < count * 10;
|
||||
attempt++
|
||||
) {
|
||||
const option = sample(ids, COVER_GRID_ALBUMS)
|
||||
options.set(option.join(","), option)
|
||||
}
|
||||
return [...options.values()]
|
||||
}
|
||||
-8
@@ -11,10 +11,8 @@
|
||||
import type * as actions from "../actions.js";
|
||||
import type * as auth from "../auth.js";
|
||||
import type * as crons from "../crons.js";
|
||||
import type * as favoriteStore from "../favoriteStore.js";
|
||||
import type * as favorites from "../favorites.js";
|
||||
import type * as http from "../http.js";
|
||||
import type * as images from "../images.js";
|
||||
import type * as intentCatalog from "../intentCatalog.js";
|
||||
import type * as intentCatalogChanges from "../intentCatalogChanges.js";
|
||||
import type * as library from "../library.js";
|
||||
@@ -22,8 +20,6 @@ import type * as limits from "../limits.js";
|
||||
import type * as migrations from "../migrations.js";
|
||||
import type * as playback from "../playback.js";
|
||||
import type * as playbackState from "../playbackState.js";
|
||||
import type * as playlistCover from "../playlistCover.js";
|
||||
import type * as playlistCoverImages from "../playlistCoverImages.js";
|
||||
import type * as playlists from "../playlists.js";
|
||||
import type * as types from "../types.js";
|
||||
import type * as users from "../users.js";
|
||||
@@ -38,10 +34,8 @@ declare const fullApi: ApiFromModules<{
|
||||
actions: typeof actions;
|
||||
auth: typeof auth;
|
||||
crons: typeof crons;
|
||||
favoriteStore: typeof favoriteStore;
|
||||
favorites: typeof favorites;
|
||||
http: typeof http;
|
||||
images: typeof images;
|
||||
intentCatalog: typeof intentCatalog;
|
||||
intentCatalogChanges: typeof intentCatalogChanges;
|
||||
library: typeof library;
|
||||
@@ -49,8 +43,6 @@ declare const fullApi: ApiFromModules<{
|
||||
migrations: typeof migrations;
|
||||
playback: typeof playback;
|
||||
playbackState: typeof playbackState;
|
||||
playlistCover: typeof playlistCover;
|
||||
playlistCoverImages: typeof playlistCoverImages;
|
||||
playlists: typeof playlists;
|
||||
types: typeof types;
|
||||
users: typeof users;
|
||||
|
||||
@@ -29,7 +29,7 @@ function playlistMutation() {
|
||||
mutation: (definition) => definition,
|
||||
query: (definition) => definition,
|
||||
}
|
||||
if (name === "./library" || name === "./limits") return {}
|
||||
if (name === "./library") return {}
|
||||
throw new Error(`Unexpected import ${name}`)
|
||||
},
|
||||
})
|
||||
|
||||
Loaded 100 of 120 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user