A review of the phone experience (the issue) found a desktop page made smaller. What changes: feat: - The player bar is one row on a phone (cover, title, play and next, a thin line of progress) and is not there while nothing plays. A tap or a swipe up on it opens the full-screen player. - The Back gesture closes the full-screen player instead of leaving the page under it; a swipe down closes it too. The full queue is listed on a phone. - The queue is kept in the browser: a reload, or a tab that Android throws away, comes back paused on the same song at the same second. It belongs to the person signed in and is forgotten on sign-out. - Tabs have icons; the page starts at its top on a new route and back goes to where the list was; a swipe on the page no longer reloads it. fix: - The player now knows when the system pauses the audio (another app, a headset), so the button and the lock screen no longer say it plays. - The lock screen has a working seek bar and the right play/pause state. - The player bar was not hidden by max-sm:hidden: its grid rules were outside the Tailwind layers and won. They are in the components layer now. - Song rows give the title the room on a phone (no number column). - The album header is centred and the greeting is smaller on a phone; recent songs on Home show the artist. - Thumbnails ask for the small cover (300 px) and not the 1000 px one. - Pages use dvh, the viewport covers the notch, and the tabs keep clear of the gesture bar; the update notice no longer sits on the bar. - No grey tap flash, no double-tap delay, no image menu on a long press.
41 lines
1.7 KiB
TypeScript
41 lines
1.7 KiB
TypeScript
import { useEffect, useRef } from 'react'
|
|
import { useLocation, useNavigate } from 'react-router-dom'
|
|
import { useNowPlayingUi } from '@/player/ui'
|
|
|
|
/**
|
|
* Makes the back button (on a phone, the back gesture) close the full-screen player instead of leaving the page under it.
|
|
*
|
|
* Opening the player adds one place to the history, on the same page, marked in the state of the location. Back then
|
|
* only takes that place away, and this closes the player. Closing it with its own button takes the place out again, and
|
|
* following a link inside it closes it. A place with the mark that nobody opened (a reload, or back from the page that was
|
|
* opened from the player) is cleaned in place: the player never opens by itself.
|
|
*/
|
|
export function useBackClosesPlayer() {
|
|
const open = useNowPlayingUi((s) => s.open)
|
|
const setOpen = useNowPlayingUi((s) => s.setOpen)
|
|
const location = useLocation()
|
|
const navigate = useNavigate()
|
|
const marked = (location.state as { player?: boolean } | null)?.player === true
|
|
// True from the moment this hook added the place until it is gone.
|
|
const added = useRef(false)
|
|
|
|
useEffect(() => {
|
|
if (!open && !marked) {
|
|
added.current = false
|
|
} else if (open && !marked && !added.current) {
|
|
added.current = true
|
|
navigate(location, { state: { player: true } })
|
|
} else if (open && !marked) {
|
|
// The place is gone and the player is still open: back, or a link, took us away.
|
|
added.current = false
|
|
setOpen(false)
|
|
} else if (!open && marked) {
|
|
if (added.current) {
|
|
added.current = false
|
|
navigate(-1)
|
|
} else {
|
|
navigate(location, { replace: true, state: null })
|
|
}
|
|
}
|
|
}, [open, marked, location, navigate, setOpen])
|
|
}
|