diff --git a/src/components/modal/ShareModal.js b/src/components/modal/ShareModal.js index 4599baf..4562b54 100644 --- a/src/components/modal/ShareModal.js +++ b/src/components/modal/ShareModal.js @@ -231,13 +231,13 @@ const ShareModal = ({ payload }) => { intensity={40} {...blurProps} > - - + */} {heading} diff --git a/src/components/modal/ShareQrModal.js b/src/components/modal/ShareQrModal.js index 63aca82..d339263 100644 --- a/src/components/modal/ShareQrModal.js +++ b/src/components/modal/ShareQrModal.js @@ -1,4 +1,3 @@ -import { Feather } from "@expo/vector-icons"; import { Portal } from "@gorhom/portal"; import { BlurView } from "expo-blur"; import React, { useMemo } from "react"; @@ -36,13 +35,13 @@ const ShareQrModal = ({ tint="dark" style={styles.modalCard} > - - + */} {title} diff --git a/src/screens/Home/Home.js b/src/screens/Home/Home.js index ed3b989..fbc0960 100644 --- a/src/screens/Home/Home.js +++ b/src/screens/Home/Home.js @@ -6,6 +6,7 @@ import React, { useState, } from "react"; import { Alert, Platform, StyleSheet, View } from "react-native"; +import useMinuit from "react-native-minuit/src/hooks/useMinuit.js"; import { background } from "../../assets"; import BorderGradientButton from "../../components/BorderGradientButton"; import FeatureCarousel from "../../components/FeatureCarousel/FeatureCarousel"; @@ -13,10 +14,10 @@ import GradientButton from "../../components/GradientButton"; import MoreMenu from "../../components/MoreMenu"; import ProjectDropDown from "../../components/ProjectDropDown/ProjectDropDown"; import ShareBtn from "../../components/ShareBtn/ShareBtn"; +import { projectsRef } from "../../config/firebase"; import { isWeb } from "../../hooks/useLayoutType.js"; import Page from "../../layouts/Page"; import { navigate } from "../../navigation/NavigationService"; -import { projectsRef } from "../../config/firebase"; import { useUser } from "../../providers/UserDataProvider"; import { gutters, Palette } from "../../styles"; import { @@ -24,7 +25,6 @@ import { getCreationStageStates, getStageAction, } from "../../utils/projectStages"; -import useMinuit from "react-native-minuit/src/hooks/useMinuit.js"; const Home = () => { const { @@ -38,7 +38,7 @@ const Home = () => { const projects = useMemo( () => (Array.isArray(userProjects) ? userProjects : []), - [userProjects], + [userProjects] ); const currentProject = useMemo(() => { @@ -71,7 +71,7 @@ const Home = () => { const stageStates = useMemo( () => getCreationStageStates(currentProject), - [currentProject], + [currentProject] ); const firstUnlockedIndex = useMemo(() => { @@ -105,7 +105,7 @@ const Home = () => { selectProject(project.id); setActiveStageIndex(findFirstUnlockedStageIndex(project)); }, - [selectProject], + [selectProject] ); const handleCloseMenu = useCallback(() => { @@ -173,7 +173,7 @@ const Home = () => { }, }, ], - { cancelable: true }, + { cancelable: true } ), }, ]; @@ -219,7 +219,7 @@ const Home = () => { const songwriterAction = useMemo( () => getStageAction("songwriter", null), - [], + [] ); const handleStartNew = useCallback(() => { @@ -229,7 +229,7 @@ const Home = () => { console.log( "navigating to", songwriterAction.route, - songwriterAction.params, + songwriterAction.params ); navigate(songwriterAction.route, songwriterAction.params); } @@ -303,6 +303,12 @@ const Home = () => { onPress={handleStageAction} disabled={continueDisabled} /> + {/* navigate(Routes.SongReady)} + disabled={continueDisabled} + /> */} diff --git a/src/screens/Playbacks/components/PlaybackItem.web.js b/src/screens/Playbacks/components/PlaybackItem.web.js index 4818d29..43afa09 100644 --- a/src/screens/Playbacks/components/PlaybackItem.web.js +++ b/src/screens/Playbacks/components/PlaybackItem.web.js @@ -54,7 +54,7 @@ const PlaybackItem = ({ width: viewportWidth, height: viewportHeight, }); - const [openComments, setOpenComments] = useState(false); + const [openComments, setOpenComments] = useState(true); const commentInputRef = useRef(null); const { currentUID, followUser, unfollowUser } = useUser() || {}; @@ -594,9 +594,7 @@ const PlaybackItem = ({ )} { - setOpenComments((v) => !v); - }} + onPress={() => {}} style={[styles.actionButton, styles.actionSpacing]} > { }, [player0, player1]); return ( - + { try { diff --git a/src/screens/Writing/Goals.js b/src/screens/Writing/Goals.js index 2d7f287..ab12df3 100644 --- a/src/screens/Writing/Goals.js +++ b/src/screens/Writing/Goals.js @@ -1,5 +1,5 @@ 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 ListSelection from "../../components/ListSelection/ListSelection"; import { GOALS, OTHER_OBJECTIVE_OPTION } from "../../data/data"; @@ -56,6 +56,7 @@ const Goals = ({ placeholder="Décrire l’objectif" value={otherObjective} setValue={handleOtherObjectiveChange} + height={Platform.OS === "web" ? 160 : undefined} /> );