This commit is contained in:
2025-10-06 14:58:14 +02:00
parent fd416b5b05
commit c1af1cede9
6 changed files with 23 additions and 19 deletions
+2 -2
View File
@@ -231,13 +231,13 @@ const ShareModal = ({ payload }) => {
intensity={40} intensity={40}
{...blurProps} {...blurProps}
> >
<Pressable {/* <Pressable
onPress={closeSheet} onPress={closeSheet}
style={styles.closeButton} style={styles.closeButton}
hitSlop={8} hitSlop={8}
> >
<Feather name="x" size={18} color={Palette.white} /> <Feather name="x" size={18} color={Palette.white} />
</Pressable> </Pressable> */}
<Text style={styles.heading}>{heading}</Text> <Text style={styles.heading}>{heading}</Text>
<View style={styles.linkRow}> <View style={styles.linkRow}>
<Text numberOfLines={1} style={styles.linkText}> <Text numberOfLines={1} style={styles.linkText}>
+2 -3
View File
@@ -1,4 +1,3 @@
import { Feather } from "@expo/vector-icons";
import { Portal } from "@gorhom/portal"; import { Portal } from "@gorhom/portal";
import { BlurView } from "expo-blur"; import { BlurView } from "expo-blur";
import React, { useMemo } from "react"; import React, { useMemo } from "react";
@@ -36,13 +35,13 @@ const ShareQrModal = ({
tint="dark" tint="dark"
style={styles.modalCard} style={styles.modalCard}
> >
<Pressable {/* <Pressable
onPress={onClose} onPress={onClose}
style={styles.closeButton} style={styles.closeButton}
hitSlop={10} hitSlop={10}
> >
<Feather name="x" size={20} color={Palette.white} /> <Feather name="x" size={20} color={Palette.white} />
</Pressable> </Pressable> */}
<View style={styles.content}> <View style={styles.content}>
<Text style={styles.title}>{title}</Text> <Text style={styles.title}>{title}</Text>
+14 -8
View File
@@ -6,6 +6,7 @@ import React, {
useState, useState,
} from "react"; } from "react";
import { Alert, Platform, StyleSheet, View } from "react-native"; import { Alert, Platform, StyleSheet, View } from "react-native";
import useMinuit from "react-native-minuit/src/hooks/useMinuit.js";
import { background } from "../../assets"; import { background } from "../../assets";
import BorderGradientButton from "../../components/BorderGradientButton"; import BorderGradientButton from "../../components/BorderGradientButton";
import FeatureCarousel from "../../components/FeatureCarousel/FeatureCarousel"; import FeatureCarousel from "../../components/FeatureCarousel/FeatureCarousel";
@@ -13,10 +14,10 @@ import GradientButton from "../../components/GradientButton";
import MoreMenu from "../../components/MoreMenu"; import MoreMenu from "../../components/MoreMenu";
import ProjectDropDown from "../../components/ProjectDropDown/ProjectDropDown"; import ProjectDropDown from "../../components/ProjectDropDown/ProjectDropDown";
import ShareBtn from "../../components/ShareBtn/ShareBtn"; import ShareBtn from "../../components/ShareBtn/ShareBtn";
import { projectsRef } from "../../config/firebase";
import { isWeb } from "../../hooks/useLayoutType.js"; import { isWeb } from "../../hooks/useLayoutType.js";
import Page from "../../layouts/Page"; import Page from "../../layouts/Page";
import { navigate } from "../../navigation/NavigationService"; import { navigate } from "../../navigation/NavigationService";
import { projectsRef } from "../../config/firebase";
import { useUser } from "../../providers/UserDataProvider"; import { useUser } from "../../providers/UserDataProvider";
import { gutters, Palette } from "../../styles"; import { gutters, Palette } from "../../styles";
import { import {
@@ -24,7 +25,6 @@ import {
getCreationStageStates, getCreationStageStates,
getStageAction, getStageAction,
} from "../../utils/projectStages"; } from "../../utils/projectStages";
import useMinuit from "react-native-minuit/src/hooks/useMinuit.js";
const Home = () => { const Home = () => {
const { const {
@@ -38,7 +38,7 @@ const Home = () => {
const projects = useMemo( const projects = useMemo(
() => (Array.isArray(userProjects) ? userProjects : []), () => (Array.isArray(userProjects) ? userProjects : []),
[userProjects], [userProjects]
); );
const currentProject = useMemo(() => { const currentProject = useMemo(() => {
@@ -71,7 +71,7 @@ const Home = () => {
const stageStates = useMemo( const stageStates = useMemo(
() => getCreationStageStates(currentProject), () => getCreationStageStates(currentProject),
[currentProject], [currentProject]
); );
const firstUnlockedIndex = useMemo(() => { const firstUnlockedIndex = useMemo(() => {
@@ -105,7 +105,7 @@ const Home = () => {
selectProject(project.id); selectProject(project.id);
setActiveStageIndex(findFirstUnlockedStageIndex(project)); setActiveStageIndex(findFirstUnlockedStageIndex(project));
}, },
[selectProject], [selectProject]
); );
const handleCloseMenu = useCallback(() => { const handleCloseMenu = useCallback(() => {
@@ -173,7 +173,7 @@ const Home = () => {
}, },
}, },
], ],
{ cancelable: true }, { cancelable: true }
), ),
}, },
]; ];
@@ -219,7 +219,7 @@ const Home = () => {
const songwriterAction = useMemo( const songwriterAction = useMemo(
() => getStageAction("songwriter", null), () => getStageAction("songwriter", null),
[], []
); );
const handleStartNew = useCallback(() => { const handleStartNew = useCallback(() => {
@@ -229,7 +229,7 @@ const Home = () => {
console.log( console.log(
"navigating to", "navigating to",
songwriterAction.route, songwriterAction.route,
songwriterAction.params, songwriterAction.params
); );
navigate(songwriterAction.route, songwriterAction.params); navigate(songwriterAction.route, songwriterAction.params);
} }
@@ -303,6 +303,12 @@ const Home = () => {
onPress={handleStageAction} onPress={handleStageAction}
disabled={continueDisabled} disabled={continueDisabled}
/> />
{/* <BorderGradientButton
containerStyle={{ width: Platform.OS === "web" ? 250 : "100%" }}
title={"Continuer la création"}
onPress={() => navigate(Routes.SongReady)}
disabled={continueDisabled}
/> */}
</View> </View>
</View> </View>
</Page> </Page>
@@ -54,7 +54,7 @@ const PlaybackItem = ({
width: viewportWidth, width: viewportWidth,
height: viewportHeight, height: viewportHeight,
}); });
const [openComments, setOpenComments] = useState(false); const [openComments, setOpenComments] = useState(true);
const commentInputRef = useRef(null); const commentInputRef = useRef(null);
const { currentUID, followUser, unfollowUser } = useUser() || {}; const { currentUID, followUser, unfollowUser } = useUser() || {};
@@ -594,9 +594,7 @@ const PlaybackItem = ({
)} )}
</Pressable> </Pressable>
<Pressable <Pressable
onPress={() => { onPress={() => {}}
setOpenComments((v) => !v);
}}
style={[styles.actionButton, styles.actionSpacing]} style={[styles.actionButton, styles.actionSpacing]}
> >
<Image <Image
+1 -1
View File
@@ -159,7 +159,7 @@ const SongReady = () => {
}, [player0, player1]); }, [player0, player1]);
return ( return (
<Page headerType="NONE" backgroundImg={background.studioBG2}> <Page headerType="NONE" backgroundImg={background.studioBG2} maxWidth={800}>
<MusicLandHeader <MusicLandHeader
onPressBack={async () => { onPressBack={async () => {
try { try {
+2 -1
View File
@@ -1,5 +1,5 @@
import React, { useMemo, useState } from "react"; import React, { useMemo, useState } from "react";
import { StyleSheet, View } from "react-native"; import { Platform, StyleSheet, View } from "react-native";
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 { GOALS, OTHER_OBJECTIVE_OPTION } from "../../data/data"; import { GOALS, OTHER_OBJECTIVE_OPTION } from "../../data/data";
@@ -56,6 +56,7 @@ const Goals = ({
placeholder="Décrire lobjectif" placeholder="Décrire lobjectif"
value={otherObjective} value={otherObjective}
setValue={handleOtherObjectiveChange} setValue={handleOtherObjectiveChange}
height={Platform.OS === "web" ? 160 : undefined}
/> />
</View> </View>
); );