diff --git a/src/assets/UI/homeBG.png b/src/assets/UI/homeBG.png new file mode 100644 index 0000000..e4f0dd5 Binary files /dev/null and b/src/assets/UI/homeBG.png differ diff --git a/src/assets/index.js b/src/assets/index.js index f253a41..82383e8 100644 --- a/src/assets/index.js +++ b/src/assets/index.js @@ -84,6 +84,7 @@ import pause from "./icons/pause.png"; import share from "./icons/share.png"; import hitParadeLogo from "./icons/hitParadeLogo.png"; import calendar from "./icons/calendar.png"; +import coin from "./icons/coin.png"; export const icons = { bell, @@ -145,6 +146,7 @@ export const icons = { share, hitParadeLogo, calendar, + coin, }; import triangle from "./art/triangle.png"; @@ -152,7 +154,6 @@ import circle from "./art/circle.png"; import square from "./art/square.png"; import gradientTriangle from "./art/gradientTriangle.png"; -import coin from "./art/coin.png"; import threeCoins from "./art/threeCoins.png"; import boost from "./art/boost.png"; import boostBig from "./art/boostBig.png"; @@ -162,7 +163,6 @@ export const art = { circle, square, gradientTriangle, - coin, threeCoins, boost, boostBig, @@ -199,6 +199,7 @@ import libraryBG from "./UI/libraryBG.png"; import libraryBG2 from "./UI/libraryBG2.png"; import profileBG from "./UI/profileBG.png"; import hitParadeBG from "./UI/hitParadeBG.png"; +import homeBG from "./UI/homeBG.png"; export const background = { writingBG, @@ -212,6 +213,7 @@ export const background = { libraryBG2, profileBG, hitParadeBG, + homeBG, }; import nathalie from "./UI/nathalie.png"; diff --git a/src/navigation/BottomTab.js b/src/navigation/BottomTab.js index 0914603..11c9279 100644 --- a/src/navigation/BottomTab.js +++ b/src/navigation/BottomTab.js @@ -20,6 +20,7 @@ import SettingsStack from "./SettingsStack"; import Library from "../screens/Library/Library.js"; import Profile from "../screens/Profile/Profile.js"; import HitParade from "../screens/HitParade/HitParade.js"; +import Playbacks from "../screens/Playbacks.js"; const bottomTabStyles = StyleSheet.create({ icon: { @@ -73,7 +74,7 @@ export const BottomTabScreen = () => { /> { const [selected, setSelected] = useState("Chansons"); @@ -71,6 +74,36 @@ const HitParade = () => { /> ))} + {selected === "Chansons" && ( + } + /> + )} + {selected === "Playbacks" && ( + } + /> + )} + {selected === "Clips" && ( + } + /> + )} diff --git a/src/screens/HitParade/components/CoinBadge.js b/src/screens/HitParade/components/CoinBadge.js new file mode 100644 index 0000000..53bd186 --- /dev/null +++ b/src/screens/HitParade/components/CoinBadge.js @@ -0,0 +1,37 @@ +import { View, Text, Image } from "react-native"; +import React from "react"; +import { Palette, Style } from "../../../styles"; +import { icons } from "../../../assets"; +import { size } from "../../../styles/Style"; +import { FONT_FAMILY } from "../../../styles/Fonts"; + +const CoinBadge = () => { + return ( + + + + 100 + + + + + ); +}; + +export default CoinBadge; diff --git a/src/screens/HitParade/components/PlaybacksCard.js b/src/screens/HitParade/components/PlaybacksCard.js new file mode 100644 index 0000000..e9fb3b7 --- /dev/null +++ b/src/screens/HitParade/components/PlaybacksCard.js @@ -0,0 +1,68 @@ +import { View, Text, Image } from "react-native"; +import React from "react"; +import { BlurView } from "expo-blur"; +import { img } from "../../../assets"; +import { Palette, Style } from "../../../styles"; +import { FONT_FAMILY } from "../../../styles/Fonts"; +import CoinBadge from "./CoinBadge"; + +const PlaybacksCard = () => { + return ( + + + + 1 + + + + + Alors on danse + + + Stromae + + + + + + ); +}; + +export default PlaybacksCard; diff --git a/src/screens/HitParade/components/SongCard.js b/src/screens/HitParade/components/SongCard.js new file mode 100644 index 0000000..c960af1 --- /dev/null +++ b/src/screens/HitParade/components/SongCard.js @@ -0,0 +1,72 @@ +import { View, Text, Image } from "react-native"; +import React from "react"; +import { img } from "../../../assets"; +import { BlurView } from "expo-blur"; +import Style, { size } from "../../../styles/Style"; +import { Palette } from "../../../styles"; +import { FONT_FAMILY } from "../../../styles/Fonts"; +import CoinBadge from "./CoinBadge"; + +const SongCard = () => { + return ( + + + + + + 1 + + + + Alors on danse + + + Stromae + + + + + + + ); +}; + +export default SongCard; diff --git a/src/screens/Home.js b/src/screens/Home.js index a64f2f6..b234193 100644 --- a/src/screens/Home.js +++ b/src/screens/Home.js @@ -15,6 +15,7 @@ import DocumentDropZone from "../components/DocumentDropZone"; import FilesPreview from "../components/FilesPreview"; import { documentsRef } from "../config/firebase"; +import { background } from "../assets"; const accountTypeList = { INDIVIDUAL: "Particulier", @@ -157,68 +158,6 @@ export default ({ containerStyle = {} }) => { }; return ( - ( -