leonm/musicland
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

block global audio from screens

Browse Source
This commit is contained in:
leon-morival
2025-10-07 14:14:42 +02:00
parent 6734dea010
commit 2198090838
8 changed files with 91 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/config/initialGlobalState.js
+2
View File
@@ -5,6 +5,8 @@ export default {
currentUserData: null,
currentUserRoles: [],
activeRouteName: null,
webBackgroundImg: null,
webLayoutMode: "default",
src/providers/PlayerProvider.js
+46 -1
View File
@@ -8,8 +8,46 @@ import React, {
} from "react";
import { Platform } from "react-native";
import { useAudioPlayer, useAudioPlayerStatus } from "expo-audio";
import { useGlobal } from "reactn";
import GlobalAudioPlayer from "../components/player/GlobalAudioPlayer";
import { Routes } from "../navigation/Routes";
const HIDDEN_ROUTE_NAMES = new Set([
Routes.Writing,
Routes.WritingLyrics,
Routes.CreateLyricsWithAi,
Routes.Lyrics,
Routes.FinishedWriting,
Routes.Studio,
Routes.Compose,
Routes.ComposeSong,
Routes.CustomizeVoice,
Routes.SongReady,
Routes.Regenerate,
Routes.PouchReady,
Routes.PhotoCover,
Routes.ValidateCover,
Routes.FinishCompose,
Routes.GeneratingSong,
Routes.ProductionOnboarding,
Routes.Production,
Routes.DownloadSongs,
Routes.DownloadPrices,
Routes.SongDownloaded,
Routes.StreamSong,
Routes.SongRelease,
Routes.PlaybackExample,
Routes.PlaybackOnboarding,
Routes.Playback,
Routes.RecordPlayback,
Routes.RecordedPlayback,
Routes.ChooseDecor,
Routes.CreatingDecor,
Routes.VideoFinalize,
Routes.FlowSelection,
Routes.ChooseCoverType,
]);
const noopAsync = async () => {};
const noop = () => {};
@@ -23,6 +61,7 @@ const DEFAULT_CONTEXT = {
positionMs: 0,
durationMs: 0,
error: null,
isPlayerVisible: true,
play: noopAsync,
togglePlay: noopAsync,
pause: noopAsync,
@@ -146,6 +185,7 @@ const normalizeTrack = (trackInput = {}, options = {}) => {
};
const PlayerProvider = ({ children }) => {
const [activeRouteName] = useGlobal("activeRouteName");
const [currentTrack, setCurrentTrack] = useState(null);
const [queue, setQueue] = useState([]);
const [playback, setPlayback] = useState({
@@ -167,6 +207,9 @@ const PlayerProvider = ({ children }) => {
const player = useAudioPlayer(source || null, 200);
const status = useAudioPlayerStatus(player);
const shouldHideOnRoute = activeRouteName
? HIDDEN_ROUTE_NAMES.has(activeRouteName)
: false;
useEffect(() => {
if (!status) return;
@@ -392,6 +435,7 @@ const PlayerProvider = ({ children }) => {
positionMs: playback.positionMs,
durationMs: playback.durationMs,
error,
isPlayerVisible: !shouldHideOnRoute,
play,
togglePlay,
pause,
@@ -415,6 +459,7 @@ const PlayerProvider = ({ children }) => {
resume,
seekBy,
seekTo,
shouldHideOnRoute,
stop,
]
);
@@ -422,7 +467,7 @@ const PlayerProvider = ({ children }) => {
return (
<PlayerContext.Provider value={contextValue}>
{children}
<GlobalAudioPlayer />
{!shouldHideOnRoute && <GlobalAudioPlayer />}
</PlayerContext.Provider>
);
};
src/providers/UserDataProvider.js
+3 -3
View File
@@ -19,7 +19,7 @@ export default ({ children }) => {
const { setIsLoading, setTooltip } = useMinuit();
const [pendingUserData, setPendingUserData] = useState({
creationTimestamp: new Date(),
createdAt: new Date(),
});
const [currentUID] = useGlobal("currentUID");
@@ -292,8 +292,8 @@ export default ({ children }) => {
userID: dynamicUID,
};
if (!cleanData?.creationTimestamp) {
cleanData.creationTimestamp = new Date();
if (!cleanData?.createdAt) {
cleanData.createdAt = firebase.firestore.FieldValue.serverTimestamp();
}
await usersRef.doc(dynamicUID).set(cleanData, { merge: true });
src/screens/Playback/Playback.js
+1 -3
View File
@@ -2,21 +2,19 @@ import React, { useCallback, useState } from "react";
import { Image, StyleSheet, View } from "react-native";
import { ai, background } from "../../assets";
import BorderGradientButton from "../../components/BorderGradientButton";
import FullscreenIntroVideo from "../../components/FullscreenIntroVideo";
import GradientButton from "../../components/GradientButton";
import MusicLandHeader from "../../components/MusicLandHeader";
import Page from "../../layouts/Page";
import { Routes } from "../../navigation";
import { goBack, navigate } from "../../navigation/NavigationService";
import { gutters } from "../../styles";
import FullscreenIntroVideo from "../../components/FullscreenIntroVideo";
const Playback = ({ route }) => {
const { project } = route.params;
const [showIntro, setShowIntro] = useState(true);
const onPressRecord = useCallback(() => {
// Les timestamps sont désormais générés automatiquement côté serveur
// lors de la mise à jour du document (si songUrl existe).
navigate(Routes.RecordPlayback, { project });
}, [project]);
src/screens/Playback/RecordPlayback.js
+10 -4
View File
@@ -1,5 +1,4 @@
import { useFocusEffect } from "@react-navigation/native";
import useSharedAudioPlayer from "../../hooks/useSharedAudioPlayer";
import { CameraView, useCameraPermissions } from "expo-camera";
import React, {
useCallback,
@@ -11,11 +10,12 @@ import React, {
import { Text, View } from "react-native";
import { useSafeAreaInsets } from "react-native-safe-area-context";
import Svg, { Circle } from "react-native-svg";
import alert from "../../components/Alert";
import GradientButton from "../../components/GradientButton";
import KaraokeLyrics from "../../components/KaraokeLyrics";
import MusicLandHeader from "../../components/MusicLandHeader";
import alert from "../../components/Alert";
import { increment, projectsRef } from "../../config/firebase";
import useSharedAudioPlayer from "../../hooks/useSharedAudioPlayer";
import { Routes } from "../../navigation";
import { goBack, navigate } from "../../navigation/NavigationService";
import { gutters, Palette } from "../../styles";
@@ -27,6 +27,7 @@ const TIME_BEFORE_INCREMENT_MS = 20000; // 20s
const RecordPlayback = ({ route }) => {
const { top, bottom } = useSafeAreaInsets();
const { project } = route.params || {};
console.log("project is : ", JSON.stringify(project, null, 2));
const projectId = project?.id;
const songIndex = project?.songIndex;
// Permissions
@@ -55,9 +56,14 @@ const RecordPlayback = ({ route }) => {
// Musique
const songUrl = project?.songUrl || null;
const player = useSharedAudioPlayer(songUrl ? { uri: songUrl } : undefined, {
id: projectId ? `record-${projectId}` : songUrl ? `record-${songUrl}` : undefined,
id: projectId
? `record-${projectId}`
: songUrl
? `record-${songUrl}`
: undefined,
title: typeof project?.title === "string" ? project.title : "Sans titre",
artist: typeof project?.userName === "string" ? project.userName : "MusicLand",
artist:
typeof project?.userName === "string" ? project.userName : "MusicLand",
artwork: project?.coverUrl || null,
coverUrl: project?.coverUrl || null,
metadata: { projectId, screen: "RecordPlayback" },
src/screens/Playback/RecordPlayback.web.js
+6 -5
View File
@@ -1,5 +1,4 @@
import { useFocusEffect } from "@react-navigation/native";
import useSharedAudioPlayer from "../../hooks/useSharedAudioPlayer";
import { useCameraPermissions } from "expo-camera";
import React, {
useCallback,
@@ -11,12 +10,13 @@ import React, {
import { Text, View } from "react-native";
import { useSafeAreaInsets } from "react-native-safe-area-context";
import Svg, { Circle } from "react-native-svg";
import alert from "../../components/Alert";
import GradientButton from "../../components/GradientButton";
import KaraokeLyrics from "../../components/KaraokeLyrics";
import MusicLandHeader from "../../components/MusicLandHeader";
import alert from "../../components/Alert";
import { increment, projectsRef } from "../../config/firebase";
import { isWeb } from "../../hooks/useLayoutType";
import useSharedAudioPlayer from "../../hooks/useSharedAudioPlayer";
import Page from "../../layouts/Page";
import { Routes } from "../../navigation";
import { goBack, navigate } from "../../navigation/NavigationService";
@@ -62,12 +62,13 @@ const RecordPlayback = ({ route }) => {
// Player
const songUrl = project?.songUrl || null;
const player = useSharedAudioPlayer(songUrl ? { uri: songUrl } : undefined, {
id: projectId ? `record-${projectId}` : songUrl ? `record-${songUrl}` : undefined,
id: project?.id,
title: typeof project?.title === "string" ? project.title : "Sans titre",
artist: typeof project?.userName === "string" ? project.userName : "MusicLand",
artist:
typeof project?.userName === "string" ? project.userName : "MusicLand",
artwork: project?.coverUrl || null,
coverUrl: project?.coverUrl || null,
metadata: { projectId, screen: "RecordPlayback" },
metadata: { projectId: project?.id, screen: "RecordPlayback" },
});
// MediaStream / Recorder (web only)