diff --git a/src/assets/icons/musicLandAccueil.png b/src/assets/icons/musicLandAccueil.png new file mode 100644 index 0000000..d7a4788 Binary files /dev/null and b/src/assets/icons/musicLandAccueil.png differ diff --git a/src/assets/icons/musicLandProduction.png b/src/assets/icons/musicLandProduction.png new file mode 100644 index 0000000..3a2e05d Binary files /dev/null and b/src/assets/icons/musicLandProduction.png differ diff --git a/src/assets/icons/musicLandStudio.png b/src/assets/icons/musicLandStudio.png new file mode 100644 index 0000000..9679de1 Binary files /dev/null and b/src/assets/icons/musicLandStudio.png differ diff --git a/src/assets/icons/musicLandVideo.png b/src/assets/icons/musicLandVideo.png new file mode 100644 index 0000000..93e905f Binary files /dev/null and b/src/assets/icons/musicLandVideo.png differ diff --git a/src/assets/icons/musicLandWriting.png b/src/assets/icons/musicLandWriting.png new file mode 100644 index 0000000..68a8b12 Binary files /dev/null and b/src/assets/icons/musicLandWriting.png differ diff --git a/src/assets/index.js b/src/assets/index.js index b06dce9..e1a8950 100644 --- a/src/assets/index.js +++ b/src/assets/index.js @@ -71,7 +71,12 @@ import heart from "./icons/heart.png"; import heartOutline from "./icons/heartOutline.png"; import hitParadeLogo from "./icons/hitParadeLogo.png"; import more from "./icons/more.png"; +import musicLandAccueil from "./icons/musicLandAccueil.png"; import musicLandLogo from "./icons/musicLandLogo.png"; +import musicLandProduction from "./icons/musicLandProduction.png"; +import musicLandStudio from "./icons/musicLandStudio.png"; +import musicLandVideo from "./icons/musicLandVideo.png"; +import musicLandWriting from "./icons/musicLandWriting.png"; import pause from "./icons/pause.png"; import play from "./icons/play.png"; import share from "./icons/share.png"; @@ -179,6 +184,11 @@ export const icons = { disk, stars, musicLandLogo, + musicLandWriting, + musicLandProduction, + musicLandStudio, + musicLandVideo, + musicLandAccueil, close, heart, heartOutline, diff --git a/src/components/MusicLandHeader.js b/src/components/MusicLandHeader.js index abb3230..38dec44 100644 --- a/src/components/MusicLandHeader.js +++ b/src/components/MusicLandHeader.js @@ -10,11 +10,12 @@ const MusicLandHeader = ({ onPressSkip, showSkip = false, progress = 1, + logo = null, }) => { return ( diff --git a/src/screens/Studio/Compose.js b/src/screens/Studio/Compose.js index cf6d7f9..2d0a146 100644 --- a/src/screens/Studio/Compose.js +++ b/src/screens/Studio/Compose.js @@ -1,20 +1,24 @@ -import { View, StyleSheet, Image } from "react-native"; import React, { useState } from "react"; -import { ai, background } from "../../assets"; -import Page from "../../layouts/Page"; -import { goBack, navigate } from "../../navigation/NavigationService"; -import MusicLandHeader from "../../components/MusicLandHeader"; -import { Routes } from "../../navigation"; -import GradientButton from "../../components/GradientButton"; -import { gutters } from "../../styles"; +import { Image, StyleSheet, View } from "react-native"; +import { ai, background, icons } from "../../assets"; 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"; const Compose = () => { const [showIntro, setShowIntro] = useState(true); return ( - + diff --git a/src/screens/Studio/ComposeSong.js b/src/screens/Studio/ComposeSong.js index 4393016..e405002 100644 --- a/src/screens/Studio/ComposeSong.js +++ b/src/screens/Studio/ComposeSong.js @@ -1,7 +1,7 @@ import React, { useMemo, useRef, useState } from "react"; import { Dimensions, View } from "react-native"; import SwiperFlatList from "react-native-swiper-flatlist"; -import { background } from "../../assets"; +import { background, icons } from "../../assets"; import GradientButton from "../../components/GradientButton"; import MusicLandHeader from "../../components/MusicLandHeader"; import firebase from "../../config/firebase"; @@ -128,7 +128,11 @@ const ComposeSong = () => { return ( - + { return ( - + { navigate(Routes.Home)} progress={63} + logo={icons.musicLandStudio} /> { keyboardVerticalOffset={Platform.OS === "ios" ? 64 : 100} backgroundImg={background.writingBG} > - + { offset: containerWidth * index, index, }), - [containerWidth], + [containerWidth] ); // Sync scroll position and progress with selectedIndex @@ -440,7 +440,11 @@ const CreateLyricsWithAi = () => { keyboardVerticalOffset={Platform.OS === "ios" ? 64 : 100} backgroundImg={background.writingBgWeb} > - + { navigate(Routes.Home)} progress={95} + logo={icons.musicLandWriting} /> { headerType="NONE" > - +