diff --git a/src/assets/UI/studioBG.png b/src/assets/UI/studioBG.png index be7179f..17b2495 100644 Binary files a/src/assets/UI/studioBG.png and b/src/assets/UI/studioBG.png differ diff --git a/src/assets/icons/close.png b/src/assets/icons/close.png new file mode 100644 index 0000000..3a969f7 Binary files /dev/null and b/src/assets/icons/close.png differ diff --git a/src/assets/index.js b/src/assets/index.js index 1130b91..38aea19 100644 --- a/src/assets/index.js +++ b/src/assets/index.js @@ -65,6 +65,7 @@ import play from "./icons/play.png"; import disk from "./icons/disk.png"; import stars from "./icons/stars.png"; import musicLandLogo from "./icons/musicLandLogo.png"; +import close from "./icons/close.png"; export const icons = { bell, @@ -117,6 +118,7 @@ export const icons = { disk, stars, musicLandLogo, + close, }; import triangle from "./art/triangle.png"; diff --git a/src/components/BorderGradientButton.js b/src/components/BorderGradientButton.js index e2e152c..1768a38 100644 --- a/src/components/BorderGradientButton.js +++ b/src/components/BorderGradientButton.js @@ -5,7 +5,7 @@ import { Palette, Style } from "../styles"; import { BlurView } from "expo-blur"; import { FONT_FAMILY } from "../styles/Fonts"; -const BorderGradientButton = () => { +const BorderGradientButton = ({ title = "J’ai déjà mes paroles" }) => { return ( { fontFamily: FONT_FAMILY.InterMedium, }} > - J’ai déjà mes paroles + {title} diff --git a/src/components/GradientButton.js b/src/components/GradientButton.js index dc6c169..b5bd989 100644 --- a/src/components/GradientButton.js +++ b/src/components/GradientButton.js @@ -9,9 +9,10 @@ const GradientButton = ({ colors = ["#F94697", "#7023F7"], onPress, props, + containerStyle = {}, }) => { return ( - + { +const ProgressBar = ({ + progress = 0, + containerStyle = {}, + gradient = false, +}) => { return ( { ...containerStyle, }} > - + {gradient ? ( + + ) : ( + + )} ); }; diff --git a/src/data/data.js b/src/data/data.js index 05d03a0..cfb4ba0 100644 --- a/src/data/data.js +++ b/src/data/data.js @@ -7,3 +7,30 @@ export const GOALS = [ "Pour mon entreprise", "Envoyer un message politique", ]; + +export const EMOTION_CONVEY = [ + { + title: "La Joie", + description: + "expose un bonheur profond, l'émerveillement, la gratitude, satisfaction intense, énergie positive", + color: ["#FBFF00", "#99999900"], + }, + { + title: "L’Amour", + description: + "sous entends un sentiment profond d'attachement et d'attraction vers une personne, désir de bien-être et de proximité. Inconditionnel, compassion, ouverture du coeur.", + color: ["#FD88EA", "#99999900"], + }, + { + title: "La Tristesse", + description: + "évoque une émotion face à une perte, une déception ou une douleur. Invitation au repli, à l’introspection.", + color: ["#1D2DC4", "#99999900"], + }, + { + title: "La Colère", + description: + "déclare une frustration, ressentiment, énergie tournée vers la révolte.", + color: ["#FF0000", "#99999900"], + }, +]; diff --git a/src/navigation/MainStack.js b/src/navigation/MainStack.js index c9ddd0a..c37091f 100644 --- a/src/navigation/MainStack.js +++ b/src/navigation/MainStack.js @@ -18,6 +18,10 @@ import PrivacyPolicy from "../screens/PrivacyPolicy"; import Writing from "../screens/Writing/Writing"; import WritingLyrics from "../screens/Writing/WritingLyrics"; import CreateLyricsWithAi from "../screens/Writing/CreateLyricsWithAi"; +import Lyrics from "../screens/Writing/Lyrics"; +import FinishedWriting from "../screens/Writing/FinishedWriting"; +import Studio from "../screens/Studio/Studio"; +import ComposeSong from "../screens/Studio/ComposeSong"; const screenOptions = { headerShown: false, @@ -69,11 +73,26 @@ const screens = [ name: Routes.WritingLyrics, component: WritingLyrics, }, - { name: Routes.CreateLyricsWithAi, component: CreateLyricsWithAi, }, + { + name: Routes.Lyrics, + component: Lyrics, + }, + { + name: Routes.FinishedWriting, + component: FinishedWriting, + }, + { + name: Routes.Studio, + component: Studio, + }, + { + name: Routes.ComposeSong, + component: ComposeSong, + }, ]; export default function Main() { diff --git a/src/navigation/Routes.js b/src/navigation/Routes.js index f4fb077..27eed84 100644 --- a/src/navigation/Routes.js +++ b/src/navigation/Routes.js @@ -26,4 +26,9 @@ export const Routes = { Writing: "Writing", WritingLyrics: "WritingLyrics", CreateLyricsWithAi: "CreateLyricsWithAi", + Lyrics: "Lyrics", + FinishedWriting: "FinishedWriting", + + Studio: "Studio", + ComposeSong: "ComposeSong", }; diff --git a/src/screens/Onboarding.js b/src/screens/Onboarding.js index 618aeb5..4b4409f 100644 --- a/src/screens/Onboarding.js +++ b/src/screens/Onboarding.js @@ -16,6 +16,7 @@ export default ({ navigation }) => { }} >