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

fix: context

Browse Source
This commit is contained in:
leon-morival
2025-11-05 11:37:16 +01:00
parent 49b54418b2
commit a58eeac079
2 changed files with 64 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/screens/Production/DownloadSongs.js
+58 -61
View File
@@ -11,8 +11,8 @@ import {
import useMinuit from "react-native-minuit/src/hooks/useMinuit.js"; import useMinuit from "react-native-minuit/src/hooks/useMinuit.js";
import { responsiveHeight } from "react-native-responsive-dimensions"; import { responsiveHeight } from "react-native-responsive-dimensions";
import { background } from "../../assets"; import { background } from "../../assets";
import MusicLandHeader from "../../components/MusicLandHeader";
import FullscreenIntroVideo from "../../components/FullscreenIntroVideo"; import FullscreenIntroVideo from "../../components/FullscreenIntroVideo";
import MusicLandHeader from "../../components/MusicLandHeader";
import firebase, { import firebase, {
projectsRef, projectsRef,
serverTimestamp, serverTimestamp,
@@ -86,10 +86,7 @@ const DownloadSongs = ({ route }) => {
const afterPlaybackUrl = useMemo(() => { const afterPlaybackUrl = useMemo(() => {
if (!video) return null; if (!video) return null;
if (Platform.OS === "web") { return video?.afterPlayback;
return video?.afterPlaybackWeb || video?.afterPlayback || null;
}
return video?.afterPlayback || video?.afterPlaybackMobile || null;
}, [video]); }, [video]);
useEffect(() => { useEffect(() => {
@@ -229,65 +226,65 @@ const DownloadSongs = ({ route }) => {
/> />
<View style={{ gap: 12, paddingVertical: 12 }}> <View style={{ gap: 12, paddingVertical: 12 }}>
<Text style={styles.title}> <Text style={styles.title}>
Prêt à télécharger Prêt à télécharger
{action === "playback" ? " ton Playback" : " ta chanson"} ? {action === "playback" ? " ton Playback" : " ta chanson"} ?
</Text> </Text>
<View style={{ gap: 10 }}> <View style={{ gap: 10 }}>
<Pressable <Pressable
style={styles.itemContainer} style={styles.itemContainer}
onPress={handleDownloadUri} onPress={handleDownloadUri}
// navigate(Routes.DownloadPrices, { // navigate(Routes.DownloadPrices, {
// action, // action,
// uri, // uri,
// }) // })
>
<BlurView
style={styles.blurView}
intensity={Platform.OS !== "ios" ? 10 : 40}
tint="dark"
// experimentalBlurMethod={
// Platform.OS !== "ios" ? "dimezisBlurView" : "none"
// }
> >
<Text style={styles.label}> <BlurView
Télécharger{" "} style={styles.blurView}
{action === "playback" ? "mon Playback" : "ma chanson"} intensity={Platform.OS !== "ios" ? 10 : 40}
</Text> tint="dark"
<Text style={styles.description}>Pour moi uniquement</Text> // experimentalBlurMethod={
</BlurView> // Platform.OS !== "ios" ? "dimezisBlurView" : "none"
</Pressable> // }
<Pressable >
style={styles.itemContainer} <Text style={styles.label}>
onPress={() => Télécharger{" "}
navigate(Routes.StreamSong, { {action === "playback" ? "mon Playback" : "ma chanson"}
action, </Text>
}) <Text style={styles.description}>Pour moi uniquement</Text>
} </BlurView>
> </Pressable>
<BlurView <Pressable
style={styles.blurView} style={styles.itemContainer}
intensity={Platform.OS !== "ios" ? 10 : 40} onPress={() =>
tint="dark" navigate(Routes.StreamSong, {
// experimentalBlurMethod={ action,
// Platform.OS !== "ios" ? "dimezisBlurView" : "none" })
// } }
> >
<Text style={styles.label}> <BlurView
Diffuser{" "} style={styles.blurView}
{action === "playback" ? "mon Playback" : "ma chanson"} sur intensity={Platform.OS !== "ios" ? 10 : 40}
la plateforme de MusicLand (+ réseaux sociaux) et participer tint="dark"
au concours // experimentalBlurMethod={
</Text> // Platform.OS !== "ios" ? "dimezisBlurView" : "none"
<Text style={styles.description}> // }
Top 3: 1er 15% du CA ML - 2ème 10% du CA ML - 3ème 5% du CA >
ML (catégorie{" "} <Text style={styles.label}>
{action === "playback" ? "Playback" : "chanson"}) Diffuser{" "}
</Text> {action === "playback" ? "mon Playback" : "ma chanson"}{" "}
</BlurView> sur la plateforme de MusicLand (+ réseaux sociaux) et
</Pressable> participer au concours
</Text>
<Text style={styles.description}>
Top 3: 1er 15% du CA ML - 2ème 10% du CA ML - 3ème 5% du
CA ML (catégorie{" "}
{action === "playback" ? "Playback" : "chanson"})
</Text>
</BlurView>
</Pressable>
</View>
</View> </View>
</View> </CreateLyricsHeader>
</CreateLyricsHeader>
</View> </View>
</Page> </Page>
{action === "playback" && ( {action === "playback" && (
src/screens/Writing/Goals.js
+6 -9
View File
@@ -11,8 +11,8 @@ import { BaseButton } from "../../components/Button";
import ItemContainer from "../../components/ItemContainer/ItemContainer"; import ItemContainer from "../../components/ItemContainer/ItemContainer";
import ListSelection from "../../components/ListSelection/ListSelection"; import ListSelection from "../../components/ListSelection/ListSelection";
import Overlay from "../../components/Overlay"; import Overlay from "../../components/Overlay";
import { GOALS, OTHER_OBJECTIVE_OPTION } from "../../data/data";
import { strings } from "../../constants/strings"; import { strings } from "../../constants/strings";
import { GOALS, OTHER_OBJECTIVE_OPTION } from "../../data/data";
import { Palette } from "../../styles"; import { Palette } from "../../styles";
import { FONT_FAMILY } from "../../styles/Fonts"; import { FONT_FAMILY } from "../../styles/Fonts";
import CreateLyricsHeader from "./components/CreateLyricsHeader"; import CreateLyricsHeader from "./components/CreateLyricsHeader";
@@ -106,17 +106,14 @@ const Goals = ({
return ( return (
<> <>
<ScrollView contentContainerStyle={{ flex: 1, gap: 16, marginTop: 16 }}> <ScrollView contentContainerStyle={{ flex: 1, gap: 16, marginTop: 16 }}>
<View style={{ gap: 10 }}> <View style={{ gap: 10, height: "100%" }}>
<CreateLyricsHeader <CreateLyricsHeader title={strings.writing.steps.contextTitle} />
title={strings.writing.steps.contextTitle} {/* <View style={styles.examplesContainer}>
subTitle={strings.writing.steps.contextSubtitle}
/>
<View style={styles.examplesContainer}>
<Text style={styles.examplesText}> <Text style={styles.examplesText}>
{strings.writing.steps.contextExamples} {strings.writing.steps.contextExamples}
</Text> </Text>
</View> </View> */}
<ItemContainer> <ItemContainer height={"80%"}>
<ListSelection <ListSelection
options={goalsOptions} options={goalsOptions}
variant="simple" variant="simple"