fix of the day, payment + sub + music generation

This commit is contained in:
Thomas Demirdjian
2025-11-17 14:27:15 +01:00
parent 97321cdbda
commit 93f2711574
20 changed files with 761 additions and 398 deletions
+120 -76
View File
@@ -2,11 +2,21 @@
import { useFocusEffect } from "@react-navigation/native";
import { BlurView } from "expo-blur";
import React, { useCallback, useEffect, useRef, useState } from "react";
import { Image, Modal, Pressable, Text, View } from "react-native";
import {
FlatList,
Image,
Modal,
Pressable,
ScrollView,
Text,
View,
useWindowDimensions,
} from "react-native";
import { responsiveHeight } from "react-native-responsive-dimensions";
import { background, icons } from "../../assets";
import alert from "../../components/Alert";
import BorderGradientButton from "../../components/BorderGradientButton";
import CreditAmount from "../../components/CreditAmount";
import GradientButton from "../../components/GradientButton";
import ValidateModal from "../../components/modal/ValidateModal";
import MusicLandHeader from "../../components/MusicLandHeader";
@@ -233,21 +243,26 @@ const SongReady = () => {
marginBottom: responsiveHeight(2),
}}
/>
<View style={{ gap: 16, marginTop: isWeb ? gutters * 3 : 0 }}>
{musicUrls.map((url, idx) => (
<FlatList
style={{ flex: 1 }}
data={musicUrls}
keyExtractor={(item, idx) => `${item || "song"}-${idx}`}
renderItem={({ item, index }) => (
<SongOptionCard
key={`${url || "song"}-${idx}`}
index={idx}
url={url}
isSelected={selectedIndex === idx}
index={index}
url={item}
isSelected={selectedIndex === index}
onSelect={setSelectedIndex}
registerPlayer={registerPlayer}
onTogglePlayback={handleTogglePlayback}
projectId={projectId}
selectedProject={selectedProject}
/>
))}
</View>
)}
contentContainerStyle={{ gap: 16, paddingBottom: gutters }}
showsVerticalScrollIndicator={false}
extraData={selectedIndex}
/>
</View>
<View
style={{
@@ -510,6 +525,18 @@ const SongOptionCard = ({
};
const RegenerateModal = ({ visible, onClose, onConfirm }) => {
const { width, height } = useWindowDimensions();
const isCompactWidth = width < 420;
const horizontalPadding = Math.max(isCompactWidth ? 16 : gutters, 12);
const verticalPadding = Math.max(isCompactWidth ? gutters : gutters * 1.5, 12);
const availableWidth = Math.max(width - horizontalPadding * 2, 0);
const contentWidth =
availableWidth > 0
? Math.min(REGENERATE_MODAL_MAX_WIDTH, availableWidth)
: undefined;
const contentGap = isCompactWidth ? 18 : 24;
const buttonGap = isCompactWidth ? 12 : 15;
return (
<Modal
animationType="fade"
@@ -520,60 +547,51 @@ const RegenerateModal = ({ visible, onClose, onConfirm }) => {
<View
style={{
flex: 1,
justifyContent: "center",
alignItems: "center",
paddingHorizontal: gutters,
paddingVertical: gutters * 1.5,
backgroundColor: "rgba(0, 0, 0, 0.6)",
}}
>
<CreateLyricsHeader
containerStyle={{
width: "100%",
maxWidth: REGENERATE_MODAL_MAX_WIDTH,
alignSelf: "center",
paddingVertical: 24,
paddingHorizontal: 24,
gap: 24,
<ScrollView
bounces={false}
contentContainerStyle={{
flexGrow: 1,
justifyContent: "center",
alignItems: "center",
paddingHorizontal: horizontalPadding,
paddingVertical: verticalPadding,
minHeight: height,
}}
keyboardShouldPersistTaps="handled"
showsVerticalScrollIndicator={false}
>
<View style={{ gap: 24, alignItems: "center" }}>
<View
style={{
gap: 12,
alignItems: "center",
paddingHorizontal: 12,
}}
>
<Text
style={{
fontSize: 22,
color: Palette.white,
fontFamily: FONT_FAMILY.InterSemiBold,
textAlign: "center",
}}
>
Re-générer le morceau ?
</Text>
<Text
style={{
fontSize: 16,
color: Palette.white,
fontFamily: FONT_FAMILY.InterRegular,
textAlign: "center",
}}
>
{`Tu vas pouvoir modifier tes choix pour re-générer ${SONG_OPTIONS_PER_GENERATION} nouveaux morceaux.`}
</Text>
<CreateLyricsHeader
containerStyle={{
width: contentWidth ?? "100%",
maxWidth: REGENERATE_MODAL_MAX_WIDTH,
alignSelf: "center",
paddingVertical: contentGap,
paddingHorizontal: contentGap,
gap: contentGap,
flexShrink: 1,
}}
>
<View style={{ gap: contentGap, alignItems: "center" }}>
<View
style={{
flexDirection: "row",
gap: isCompactWidth ? 10 : 12,
alignItems: "center",
justifyContent: "center",
flexWrap: "wrap",
gap: 6,
paddingHorizontal: isCompactWidth ? 4 : 12,
}}
>
<Text
style={{
fontSize: 22,
color: Palette.white,
fontFamily: FONT_FAMILY.InterSemiBold,
textAlign: "center",
}}
>
Re-générer le morceau ?
</Text>
<Text
style={{
fontSize: 16,
@@ -582,39 +600,65 @@ const RegenerateModal = ({ visible, onClose, onConfirm }) => {
textAlign: "center",
}}
>
Cette action coûte
{`Tu vas pouvoir modifier tes choix pour re-générer ${SONG_OPTIONS_PER_GENERATION} nouveaux morceaux.`}
</Text>
<CreditAmount
value={MUSIC_GENERATION_COIN_COST}
iconSize={18}
textStyle={{
<View
style={{
flexDirection: "row",
alignItems: "center",
justifyContent: "center",
flexWrap: "wrap",
gap: 6,
}}
>
<Text
style={{
fontSize: 16,
color: Palette.white,
fontFamily: FONT_FAMILY.InterRegular,
textAlign: "center",
}}
>
Cette action coûte
</Text>
<CreditAmount
value={MUSIC_GENERATION_COIN_COST}
iconSize={18}
textStyle={{
fontSize: 16,
color: Palette.white,
fontFamily: FONT_FAMILY.InterSemiBold,
textAlign: "center",
}}
/>
</View>
<Text
style={{
fontSize: 16,
color: Palette.white,
fontFamily: FONT_FAMILY.InterSemiBold,
fontFamily: FONT_FAMILY.InterRegular,
textAlign: "center",
}}
/>
>
Les crédits seront utilisés lors de l'étape de génération.
</Text>
</View>
<Text
<View
style={{
fontSize: 16,
color: Palette.white,
fontFamily: FONT_FAMILY.InterRegular,
textAlign: "center",
width: isCompactWidth ? "100%" : "85%",
alignSelf: "center",
gap: buttonGap,
}}
>
Les crédits seront utilisés lors de l'étape de génération.
</Text>
<GradientButton
title="Oui, modifier mes choix"
onPress={onConfirm}
/>
<BorderGradientButton title="Retour" onPress={onClose} />
</View>
</View>
<View style={{ width: "85%", alignSelf: "center", gap: 15 }}>
<GradientButton
title="Oui, modifier mes choix"
onPress={onConfirm}
/>
<BorderGradientButton title="Retour" onPress={onClose} />
</View>
</View>
</CreateLyricsHeader>
</CreateLyricsHeader>
</ScrollView>
</View>
</Modal>
);