leonm/musicland
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Task: #92

Browse Source
This commit is contained in:
Philip Cesar Garay
2025-09-09 18:16:30 +08:00
parent 11f65023b7
commit f007b1f213
39 changed files with 230 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/AppActionSheet.js
+4 -4
View File
@@ -19,7 +19,7 @@ const AppActionSheet = ({ children, props }) => {
{...props}
>
<BlurView
intensity={20}
intensity={Platform.OS === "ios" ? 20 : 10}
style={{
paddingTop: 36,
paddingHorizontal: 14,
@@ -29,9 +29,9 @@ const AppActionSheet = ({ children, props }) => {
borderTopRightRadius: 20,
overflow: "hidden",
}}
experimentalBlurMethod={
Platform.OS !== "ios" ? "dimezisBlurView" : "none"
}
// experimentalBlurMethod={
// Platform.OS !== "ios" ? "dimezisBlurView" : "none"
// }
>
{children}
</BlurView>
src/components/BlurItemButton.js
+4 -4
View File
@@ -17,11 +17,11 @@ const BlurItemButton = ({ onPress, title = "" }) => {
return (
<Pressable onPress={onPress}>
<BlurView
intensity={20}
intensity={Platform.OS === "ios" ? 20 : 10}
style={styles.buttonContainer}
experimentalBlurMethod={
Platform.OS !== "ios" ? "dimezisBlurView" : "none"
}
// experimentalBlurMethod={
// Platform.OS !== "ios" ? "dimezisBlurView" : "none"
// }
>
<Text style={styles.buttonText}>{title}</Text>
<Image
src/components/BorderGradientButton.js
+4 -4
View File
@@ -45,7 +45,7 @@ const BorderGradientButton = ({
}}
>
<BlurView
intensity={40}
intensity={Platform.OS === "ios" ? 40 : 10}
tint={tint}
style={{
width: "100%",
@@ -55,9 +55,9 @@ const BorderGradientButton = ({
borderRadius: 14,
gap: 11,
}}
experimentalBlurMethod={
Platform.OS !== "ios" ? "dimezisBlurView" : "none"
}
// experimentalBlurMethod={
// Platform.OS !== "ios" ? "dimezisBlurView" : "none"
// }
>
{icon && <Image source={icon} style={size({ size: 16 })} />}
<Text
src/components/ChatInput.js
+4 -4
View File
@@ -62,12 +62,12 @@ const ChatInput = ({
}}
>
<BlurView
intensity={30}
intensity={Platform.OS !== "ios" ? 10 : 30}
tint="dark"
style={{ flex: 1, justifyContent: "center" }}
experimentalBlurMethod={
Platform.OS !== "ios" ? "dimezisBlurView" : "none"
}
// experimentalBlurMethod={
// Platform.OS !== "ios" ? "dimezisBlurView" : "none"
// }
>
<FilesPreview
files={files}
src/components/Input.js
+3 -3
View File
@@ -91,9 +91,9 @@ const Input = ({
<ContainerView
tint="dark"
experimentalBlurMethod={
Platform.OS !== "ios" ? "dimezisBlurView" : "none"
}
// experimentalBlurMethod={
// Platform.OS !== "ios" ? "dimezisBlurView" : "none"
// }
style={{
...Style.containerRow,
...(isRoundedRectangle
src/components/ItemContainer/ItemContainer.js
+4 -4
View File
@@ -35,12 +35,12 @@ const ItemContainer = ({
>
<View style={styles.blurContainer}>
<BlurView
intensity={40}
intensity={Platform.OS !== "ios" ? 10 : 40}
tint="dark"
style={{ flex: 1, padding: 6 }}
experimentalBlurMethod={
Platform.OS !== "ios" ? "dimezisBlurView" : "none"
}
// experimentalBlurMethod={
// Platform.OS !== "ios" ? "dimezisBlurView" : "none"
// }
>
{children}
</BlurView>
src/components/ItemContainer/ItemContainer.web.js
+4 -4
View File
@@ -46,7 +46,7 @@ const ItemContainer = ({
}}
>
<BlurView
intensity={40}
intensity={Platform.OS !== "ios" ? 10 : 40}
tint="dark"
style={{
padding: 6,
@@ -55,9 +55,9 @@ const ItemContainer = ({
alignSelf: "center",
height: "99.2%",
}}
experimentalBlurMethod={
Platform.OS !== "ios" ? "dimezisBlurView" : "none"
}
// experimentalBlurMethod={
// Platform.OS !== "ios" ? "dimezisBlurView" : "none"
// }
>
{children}
</BlurView>
src/components/MoreMenu.js
+12 -12
View File
@@ -89,7 +89,7 @@ const MoreMenu = ({
{inPlaylist && (
<Pressable onPress={removeFromPlaylist}>
<BlurView
intensity={20}
intensity={Platform.OS !== "ios" ? 10 : 20}
style={{
paddingHorizontal: 12,
paddingVertical: 10,
@@ -97,9 +97,9 @@ const MoreMenu = ({
borderRadius: 12,
overflow: "hidden",
}}
experimentalBlurMethod={
Platform.OS !== "ios" ? "dimezisBlurView" : "none"
}
// experimentalBlurMethod={
// Platform.OS !== "ios" ? "dimezisBlurView" : "none"
// }
>
<Text
style={{
@@ -116,7 +116,7 @@ const MoreMenu = ({
<Pressable onPress={addToPlaylist}>
<BlurView
intensity={20}
intensity={Platform.OS !== "ios" ? 10 : 20}
style={{
paddingHorizontal: 12,
paddingVertical: 10,
@@ -124,9 +124,9 @@ const MoreMenu = ({
borderRadius: 12,
overflow: "hidden",
}}
experimentalBlurMethod={
Platform.OS !== "ios" ? "dimezisBlurView" : "none"
}
// experimentalBlurMethod={
// Platform.OS !== "ios" ? "dimezisBlurView" : "none"
// }
>
<Text
style={{
@@ -153,7 +153,7 @@ const MoreMenu = ({
}}
>
<BlurView
intensity={20}
intensity={Platform.OS !== "ios" ? 10 : 20}
style={{
paddingHorizontal: 12,
paddingVertical: 10,
@@ -161,9 +161,9 @@ const MoreMenu = ({
borderRadius: 12,
overflow: "hidden",
}}
experimentalBlurMethod={
Platform.OS !== "ios" ? "dimezisBlurView" : "none"
}
// experimentalBlurMethod={
// Platform.OS !== "ios" ? "dimezisBlurView" : "none"
// }
>
<Text
style={{
src/components/Overlay.js
+3 -3
View File
@@ -55,9 +55,9 @@ const Overlay = ({
...StyleSheet.absoluteFillObject,
...contentContainerStyle,
}}
experimentalBlurMethod={
Platform.OS !== "ios" ? "dimezisBlurView" : "none"
}
// experimentalBlurMethod={
// Platform.OS !== "ios" ? "dimezisBlurView" : "none"
// }
>
<Pressable
style={{
src/components/SearchBar.js
+3 -3
View File
@@ -20,9 +20,9 @@ const SearchBar = ({
gap: 10,
...Style.containerRow,
}}
experimentalBlurMethod={
Platform.OS !== "ios" ? "dimezisBlurView" : "none"
}
// experimentalBlurMethod={
// Platform.OS !== "ios" ? "dimezisBlurView" : "none"
// }
>
<Image source={icons.search} />
<TextInput
src/components/bottomsheets/CommentsBottomSheet.js
+8 -8
View File
@@ -195,16 +195,16 @@ const CommentsBottomSheet = () => {
}}
>
<BlurView
intensity={20}
intensity={Platform.OS !== "ios" ? 10 : 20}
style={{
flex: 1,
backgroundColor: Palette.glass,
borderTopLeftRadius: 16,
borderTopRightRadius: 16,
}}
experimentalBlurMethod={
Platform.OS !== "ios" ? "dimezisBlurView" : "none"
}
// experimentalBlurMethod={
// Platform.OS !== "ios" ? "dimezisBlurView" : "none"
// }
>
<View style={{ paddingTop: 10, paddingBottom: 8 }}>
<Pressable
@@ -322,7 +322,7 @@ const CommentsBottomSheet = () => {
{/* INPUT en bas du contenu */}
<View style={{ height: 12 }} />
<BlurView
intensity={20}
intensity={Platform.OS !== "ios" ? 10 : 20}
style={{
flexDirection: "row",
alignItems: "center",
@@ -333,9 +333,9 @@ const CommentsBottomSheet = () => {
height: 54,
borderRadius: 16,
}}
experimentalBlurMethod={
Platform.OS !== "ios" ? "dimezisBlurView" : "none"
}
// experimentalBlurMethod={
// Platform.OS !== "ios" ? "dimezisBlurView" : "none"
// }
>
<TextInput
placeholder="Ajouter un commentaire"
src/screens/CreatePassword.js
+1 -1
View File
@@ -53,7 +53,7 @@ const CreatePassword = () => {
title="Inscription"
>
<View style={{ flex: 1, paddingTop: 20 }}>
<ItemContainer height={300}>
<ItemContainer height={300} disableKeyboardHeight>
<View style={{ gap: 32, paddingTop: 5, paddingHorizontal: 5 }}>
<View style={{ gap: 16 }}>
<View style={{ gap: 2 }}>
src/screens/CreateSongs.js
+16 -10
View File
@@ -18,13 +18,15 @@ const CreateSongs = () => {
const { userProjects = [] } = useUser();
const projects = useMemo(
() => (Array.isArray(userProjects) ? userProjects.slice(0, 3) : []),
[userProjects],
[userProjects]
);
const fmtDate = (ts) => {
try {
const d = ts?.toDate ? ts.toDate() : ts ? new Date(ts) : null;
if (!d || Number.isNaN(d.getTime())) return "";
const dd = `${d.getDate().toString().padStart(2, "0")}/${(d.getMonth() + 1)
const dd = `${d.getDate().toString().padStart(2, "0")}/${(
d.getMonth() + 1
)
.toString()
.padStart(2, "0")}`;
return dd;
@@ -67,7 +69,7 @@ const CreateSongs = () => {
resizeMode="contain"
/>
<BlurView
intensity={40}
intensity={Platform.OS !== "ios" ? 10 : 40}
style={{
flex: 1,
borderRadius: 20,
@@ -79,9 +81,9 @@ const CreateSongs = () => {
gap: 20,
paddingVertical: 20,
}}
experimentalBlurMethod={
Platform.OS !== "ios" ? "dimezisBlurView" : "none"
}
// experimentalBlurMethod={
// Platform.OS !== "ios" ? "dimezisBlurView" : "none"
// }
>
<Pressable
style={{
@@ -144,9 +146,9 @@ const CreateSongs = () => {
backgroundColor: Palette.glass,
overflow: "hidden",
}}
experimentalBlurMethod={
Platform.OS !== "ios" ? "dimezisBlurView" : "none"
}
// experimentalBlurMethod={
// Platform.OS !== "ios" ? "dimezisBlurView" : "none"
// }
>
<View>
<Text
@@ -194,7 +196,11 @@ const CreateSongs = () => {
))}
</View>
<GradientButton
title={selectedIndex !== null ? "Poursuivre la création" : "Créer un texte"}
title={
selectedIndex !== null
? "Poursuivre la création"
: "Créer un texte"
}
containerStyle={{
width: "80%",
alignSelf: "center",
src/screens/HitParade/components/PlaybacksCard.js
+4 -4
View File
@@ -16,7 +16,7 @@ const PlaybacksCard = ({
return (
<Pressable onPress={onPress}>
<BlurView
intensity={20}
intensity={Platform.OS !== "ios" ? 10 : 20}
tint="dark"
style={{
...Style.containerSpaceBetween,
@@ -26,9 +26,9 @@ const PlaybacksCard = ({
backgroundColor: Palette.glass,
overflow: "hidden",
}}
experimentalBlurMethod={
Platform.OS !== "ios" ? "dimezisBlurView" : "none"
}
// experimentalBlurMethod={
// Platform.OS !== "ios" ? "dimezisBlurView" : "none"
// }
>
<View
style={{
src/screens/HitParade/components/SongCard.js
+18 -6
View File
@@ -1,4 +1,10 @@
import { View, Text, Platform, Pressable, Image as RNImage } from "react-native";
import {
View,
Text,
Platform,
Pressable,
Image as RNImage,
} from "react-native";
import { Image as ExpoImage } from "expo-image";
import React from "react";
import { img } from "../../../assets";
@@ -8,7 +14,13 @@ import { Palette } from "../../../styles";
import { FONT_FAMILY } from "../../../styles/Fonts";
import CoinBadge from "./CoinBadge";
const SongCard = ({ rank = 1, title = "Sans titre", artist = "MusicLand", coverUrl = null, onPress = null }) => {
const SongCard = ({
rank = 1,
title = "Sans titre",
artist = "MusicLand",
coverUrl = null,
onPress = null,
}) => {
return (
<Pressable
onPress={onPress || undefined}
@@ -33,7 +45,7 @@ const SongCard = ({ rank = 1, title = "Sans titre", artist = "MusicLand", coverU
/>
)}
<BlurView
intensity={20}
intensity={Platform.OS !== "ios" ? 10 : 20}
style={{
flex: 1,
borderRadius: 12,
@@ -44,9 +56,9 @@ const SongCard = ({ rank = 1, title = "Sans titre", artist = "MusicLand", coverU
...Style.containerRow,
}}
tint="dark"
experimentalBlurMethod={
Platform.OS !== "ios" ? "dimezisBlurView" : "none"
}
// experimentalBlurMethod={
// Platform.OS !== "ios" ? "dimezisBlurView" : "none"
// }
>
<View style={{ flex: 1, ...Style.containerRow, gap: 15 }}>
<Text
src/screens/Home.js
+7 -9
View File
@@ -20,7 +20,7 @@ const Home = () => {
const { userProjects = [], resetSelectedProject, selectProject } = useUser();
const projects = useMemo(
() => (Array.isArray(userProjects) ? userProjects : []),
[userProjects],
[userProjects]
);
const [, setTooltip] = useGlobal("_tooltip");
const [menuTop, setMenuTop] = useState(0);
@@ -42,7 +42,7 @@ const Home = () => {
}}
>
<BlurView
intensity={20}
intensity={Platform.OS !== "ios" ? 10 : 20}
style={{
flex: 1,
borderRadius: 20,
@@ -51,9 +51,9 @@ const Home = () => {
padding: 12,
gap: 8,
}}
experimentalBlurMethod={
Platform.OS !== "ios" ? "dimezisBlurView" : "none"
}
// experimentalBlurMethod={
// Platform.OS !== "ios" ? "dimezisBlurView" : "none"
// }
>
<Text
style={{
@@ -110,9 +110,7 @@ const Home = () => {
onPress: async () => {
try {
if (!menuProjectId) return;
await projectsRef
.doc(menuProjectId)
.delete();
await projectsRef.doc(menuProjectId).delete();
setTooltip({
type: "success",
text: "Projet supprimé",
@@ -126,7 +124,7 @@ const Home = () => {
},
},
],
{ cancelable: true },
{ cancelable: true }
),
},
]}
src/screens/Library/AllMyPlaylist.js
+4 -4
View File
@@ -45,15 +45,15 @@ const AllMyPlaylist = () => {
>
<View style={{ borderRadius: 12, overflow: "hidden" }}>
<BlurView
intensity={20}
intensity={Platform.OS !== "ios" ? 10 : 20}
style={{
...Style.containerSpaceBetween,
height: 59,
paddingHorizontal: 10,
}}
experimentalBlurMethod={
Platform.OS !== "ios" ? "dimezisBlurView" : "none"
}
// experimentalBlurMethod={
// Platform.OS !== "ios" ? "dimezisBlurView" : "none"
// }
>
<Text
style={{
src/screens/Library/components/MusicCard.js
+4 -4
View File
@@ -104,15 +104,15 @@ const MusicCard = ({
)}
<View style={styles.blurContainer}>
<BlurView
intensity={20}
intensity={Platform.OS === "ios" ? 20 : 10}
style={{
flex: 1,
...Style.containerSpaceBetween,
paddingHorizontal: 8,
}}
experimentalBlurMethod={
Platform.OS !== "ios" ? "dimezisBlurView" : "none"
}
// experimentalBlurMethod={
// Platform.OS !== "ios" ? "dimezisBlurView" : "none"
// }
>
<View>
<Text numberOfLines={2} style={styles.title}>
src/screens/Library/components/MyPlaylist.js
+4 -4
View File
@@ -30,15 +30,15 @@ const MyPlaylist = () => {
}
>
<BlurView
intensity={20}
intensity={Platform.OS !== "ios" ? 10 : 20}
style={{
...Style.containerSpaceBetween,
height: 59,
paddingHorizontal: 10,
}}
experimentalBlurMethod={
Platform.OS !== "ios" ? "dimezisBlurView" : "none"
}
// experimentalBlurMethod={
// Platform.OS !== "ios" ? "dimezisBlurView" : "none"
// }
>
<Text
style={{
src/screens/Library/components/ResearchHeader.js
+4 -4
View File
@@ -43,11 +43,11 @@ const ResearchHeader = ({
/>
<View style={styles.blurContainer}>
<BlurView
intensity={20}
intensity={Platform.OS !== "ios" ? 10 : 20}
style={styles.blurView}
experimentalBlurMethod={
Platform.OS !== "ios" ? "dimezisBlurView" : "none"
}
// experimentalBlurMethod={
// Platform.OS !== "ios" ? "dimezisBlurView" : "none"
// }
>
<Text style={styles.menu}>{item}</Text>
</BlurView>
src/screens/Login.js
+1 -1
View File
@@ -173,7 +173,7 @@ export default ({ navigation }) => {
hideBackButton
>
<View style={{ flex: 1, paddingTop: 20 }}>
<ItemContainer height={600}>
<ItemContainer height={600} disableKeyboardHeight>
<View style={{ gap: 30, paddingTop: 5, paddingHorizontal: 5 }}>
<View style={{ gap: 2 }}>
<Text
src/screens/NewMusicOptions.js
+4 -4
View File
@@ -122,7 +122,7 @@ const NewMusicOptions = () => {
<Pressable key={index} onPress={() => onPressOption(index, item)}>
<BlurView
tint="dark"
intensity={20}
intensity={Platform.OS !== "ios" ? 10 : 20}
style={{
position: "absolute",
zIndex: 1,
@@ -135,9 +135,9 @@ const NewMusicOptions = () => {
overflow: "hidden",
backgroundColor: Palette.glass,
}}
experimentalBlurMethod={
Platform.OS !== "ios" ? "dimezisBlurView" : "none"
}
// experimentalBlurMethod={
// Platform.OS !== "ios" ? "dimezisBlurView" : "none"
// }
>
<Text
style={{
src/screens/Playback/CreatingDecor.js
+4 -4
View File
@@ -70,12 +70,12 @@ const CreatingDecor = () => {
}}
>
<BlurView
intensity={40}
intensity={Platform.OS !== "ios" ? 10 : 40}
tint="dark"
style={{ flex: 1, padding: 10, paddingBottom: 20 }}
experimentalBlurMethod={
Platform.OS !== "ios" ? "dimezisBlurView" : "none"
}
// experimentalBlurMethod={
// Platform.OS !== "ios" ? "dimezisBlurView" : "none"
// }
>
<View style={{ flex: 1, justifyContent: "flex-end", gap: 20 }}>
<View>
src/screens/Playbacks.js
+10 -9
View File
@@ -282,7 +282,7 @@ const PlaybackItem = ({ item, isActive, userCache, getUserByUid }) => {
>
<BlurView
tint="dark"
intensity={20}
intensity={Platform.OS !== "ios" ? 10 : 20}
style={{
paddingVertical: 6,
paddingHorizontal: 12,
@@ -292,9 +292,9 @@ const PlaybackItem = ({ item, isActive, userCache, getUserByUid }) => {
overflow: "hidden",
backgroundColor: isFollowing ? "#FFFFFF1A" : undefined,
}}
experimentalBlurMethod={
Platform.OS !== "ios" ? "dimezisBlurView" : "none"
}
// experimentalBlurMethod={
// Platform.OS !== "ios" ? "dimezisBlurView" : "none"
// }
>
<Text
style={{
@@ -385,7 +385,7 @@ const PlaybackItem = ({ item, isActive, userCache, getUserByUid }) => {
<View style={{ paddingHorizontal: 28 }}>
<BlurView
tint="dark"
intensity={20}
intensity={Platform.OS !== "ios" ? 10 : 20}
style={{
paddingHorizontal: 14,
paddingVertical: 8,
@@ -393,9 +393,9 @@ const PlaybackItem = ({ item, isActive, userCache, getUserByUid }) => {
backgroundColor: Palette.glass,
overflow: "hidden",
}}
experimentalBlurMethod={
Platform.OS !== "ios" ? "dimezisBlurView" : "none"
}
// experimentalBlurMethod={
// Platform.OS !== "ios" ? "dimezisBlurView" : "none"
// }
>
{alignedWords?.length > 0 ? (
<KaraokeLyrics
@@ -424,7 +424,8 @@ const Playbacks = () => {
const [activeIndex, setActiveIndex] = useState(0);
const carouselRef = useRef(null);
const route = useRoute();
const focusProjectId = route?.params?.projectId || route?.params?.focusId || null;
const focusProjectId =
route?.params?.projectId || route?.params?.focusId || null;
const userCache = useRef(new Map());
const { getUserByUid } = useUser() || {};
const isFocused = useIsFocused();
src/screens/Production/DownloadSongs.js
+8 -8
View File
@@ -122,11 +122,11 @@ const DownloadSongs = ({ route }) => {
>
<BlurView
style={styles.blurView}
intensity={40}
intensity={Platform.OS !== "ios" ? 10 : 40}
tint="dark"
experimentalBlurMethod={
Platform.OS !== "ios" ? "dimezisBlurView" : "none"
}
// experimentalBlurMethod={
// Platform.OS !== "ios" ? "dimezisBlurView" : "none"
// }
>
<Text style={styles.label}>
Télécharger{" "}
@@ -145,11 +145,11 @@ const DownloadSongs = ({ route }) => {
>
<BlurView
style={styles.blurView}
intensity={40}
intensity={Platform.OS !== "ios" ? 10 : 40}
tint="dark"
experimentalBlurMethod={
Platform.OS !== "ios" ? "dimezisBlurView" : "none"
}
// experimentalBlurMethod={
// Platform.OS !== "ios" ? "dimezisBlurView" : "none"
// }
>
<Text style={styles.label}>
Diffuser{" "}
src/screens/Profile/ChangeEmailAddress.js
+5 -5
View File
@@ -57,7 +57,7 @@ const ChangeEmailAddress = () => {
try {
const credential = firebase.auth.EmailAuthProvider.credential(
user.email,
currentPassword,
currentPassword
);
await user.reauthenticateWithCredential(credential);
} catch (reauthErr) {
@@ -96,7 +96,7 @@ const ChangeEmailAddress = () => {
>
<View style={{ flex: 1, marginTop: responsiveHeight(2) }}>
<BlurView
intensity={20}
intensity={Platform.OS !== "ios" ? 10 : 20}
style={{
paddingHorizontal: 20,
paddingVertical: 23,
@@ -104,9 +104,9 @@ const ChangeEmailAddress = () => {
overflow: "hidden",
backgroundColor: Palette.glass,
}}
experimentalBlurMethod={
Platform.OS !== "ios" ? "dimezisBlurView" : "none"
}
// experimentalBlurMethod={
// Platform.OS !== "ios" ? "dimezisBlurView" : "none"
// }
>
<EditInput
placeholder="Adresse mail"
src/screens/Profile/ChangePassword.js
+5 -5
View File
@@ -30,7 +30,7 @@ const ChangePassword = () => {
const credential = firebase.auth.EmailAuthProvider.credential(
user.email,
oldVal,
oldVal
);
await user.reauthenticateWithCredential(credential);
await user.updatePassword(newVal);
@@ -58,7 +58,7 @@ const ChangePassword = () => {
>
<View style={{ flex: 1, marginTop: responsiveHeight(2) }}>
<BlurView
intensity={20}
intensity={Platform.OS !== "ios" ? 10 : 20}
style={{
paddingHorizontal: 20,
paddingVertical: 16,
@@ -67,9 +67,9 @@ const ChangePassword = () => {
backgroundColor: Palette.glass,
gap: 4,
}}
experimentalBlurMethod={
Platform.OS !== "ios" ? "dimezisBlurView" : "none"
}
// experimentalBlurMethod={
// Platform.OS !== "ios" ? "dimezisBlurView" : "none"
// }
>
<EditInput
placeholder="Mot de passe actuel"
src/screens/Profile/EditProfile.js
+11 -5
View File
@@ -1,7 +1,13 @@
import { BlurView } from "expo-blur";
import * as ImagePicker from "expo-image-picker";
import React, { useEffect, useState } from "react";
import { Platform, Pressable, Text, View, Image as RNImage } from "react-native";
import {
Platform,
Pressable,
Text,
View,
Image as RNImage,
} from "react-native";
import { Image as ExpoImage } from "expo-image";
import { responsiveHeight } from "react-native-responsive-dimensions";
import { useGlobal } from "reactn";
@@ -132,7 +138,7 @@ const EditProfile = () => {
>
<View style={{ flex: 1, marginTop: responsiveHeight(2) }}>
<BlurView
intensity={20}
intensity={Platform.OS !== "ios" ? 10 : 20}
style={{
paddingVertical: 14,
backgroundColor: Palette.glass,
@@ -141,9 +147,9 @@ const EditProfile = () => {
overflow: "hidden",
gap: 24,
}}
experimentalBlurMethod={
Platform.OS !== "ios" ? "dimezisBlurView" : "none"
}
// experimentalBlurMethod={
// Platform.OS !== "ios" ? "dimezisBlurView" : "none"
// }
>
<Pressable style={{ alignItems: "center" }} onPress={onChangePicture}>
<ExpoImage
src/screens/Profile/Language.js
+4 -4
View File
@@ -28,7 +28,7 @@ const Language = () => {
>
<View style={{ flex: 1, marginTop: responsiveHeight(2) }}>
<BlurView
intensity={20}
intensity={Platform.OS !== "ios" ? 10 : 20}
style={{
paddingVertical: 10,
paddingHorizontal: 20,
@@ -37,9 +37,9 @@ const Language = () => {
borderRadius: 20,
overflow: "hidden",
}}
experimentalBlurMethod={
Platform.OS !== "ios" ? "dimezisBlurView" : "none"
}
// experimentalBlurMethod={
// Platform.OS !== "ios" ? "dimezisBlurView" : "none"
// }
>
<Text
style={{
src/screens/Profile/Notifications.js
+8 -5
View File
@@ -31,7 +31,10 @@ export default (props) => {
setTooltip({ type: "success", text: "Préférence enregistrée" });
} catch (e) {
setIsSwitch(!next);
setTooltip({ type: "error", text: e?.message || "Enregistrement impossible" });
setTooltip({
type: "error",
text: e?.message || "Enregistrement impossible",
});
}
};
@@ -49,7 +52,7 @@ export default (props) => {
>
<View style={{ flex: 1, marginTop: responsiveHeight(2) }}>
<BlurView
intensity={20}
intensity={Platform.OS !== "ios" ? 10 : 20}
style={{
gap: 12,
paddingVertical: 15,
@@ -58,9 +61,9 @@ export default (props) => {
overflow: "hidden",
backgroundColor: Palette.glass,
}}
experimentalBlurMethod={
Platform.OS !== "ios" ? "dimezisBlurView" : "none"
}
// experimentalBlurMethod={
// Platform.OS !== "ios" ? "dimezisBlurView" : "none"
// }
>
<View style={Style.containerSpaceBetween}>
<Text
src/screens/Profile/Profile.js
+8 -8
View File
@@ -248,15 +248,15 @@ const Profile = () => {
<View style={{ flex: 1, marginTop: responsiveHeight(2), gap: 20 }}>
<View style={{ borderRadius: 20, overflow: "hidden" }}>
<BlurView
intensity={20}
intensity={Platform.OS === "ios" ? 20 : 10}
style={{
paddingVertical: 14,
backgroundColor: Palette.glass,
paddingHorizontal: 20,
}}
experimentalBlurMethod={
Platform.OS !== "ios" ? "dimezisBlurView" : "none"
}
// experimentalBlurMethod={
// Platform.OS !== "ios" ? "dimezisBlurView" : "none"
// }
>
<View style={{ alignItems: "center" }}>
<ExpoImage
@@ -389,11 +389,11 @@ const Profile = () => {
/>
<View style={styles.blurContainer}>
<BlurView
intensity={20}
intensity={Platform.OS === "ios" ? 20 : 10}
style={styles.blurView}
experimentalBlurMethod={
Platform.OS !== "ios" ? "dimezisBlurView" : "none"
}
// experimentalBlurMethod={
// Platform.OS !== "ios" ? "dimezisBlurView" : "none"
// }
>
<Text style={styles.menu}>{item}</Text>
</BlurView>
src/screens/Profile/components/EditInput.js
+11 -5
View File
@@ -12,7 +12,13 @@ import { FONT_FAMILY } from "../../../styles/Fonts";
import { BlurView } from "expo-blur";
import { icons } from "../../../assets";
const EditInput = ({ label = "", placeholder = "", type = "default", value = "", setValue = () => {} }) => {
const EditInput = ({
label = "",
placeholder = "",
type = "default",
value = "",
setValue = () => {},
}) => {
const [showPassword, setShowPassword] = useState(false);
return (
@@ -42,7 +48,7 @@ const EditInput = ({ label = "", placeholder = "", type = "default", value = "",
</Text>
</View>
<BlurView
intensity={20}
intensity={Platform.OS !== "ios" ? 10 : 20}
style={{
paddingHorizontal: 12,
borderRadius: 12,
@@ -51,9 +57,9 @@ const EditInput = ({ label = "", placeholder = "", type = "default", value = "",
height: 52,
...Style.containerRow,
}}
experimentalBlurMethod={
Platform.OS !== "ios" ? "dimezisBlurView" : "none"
}
// experimentalBlurMethod={
// Platform.OS !== "ios" ? "dimezisBlurView" : "none"
// }
>
<TextInput
placeholder={placeholder}
src/screens/Register.js
+1 -1
View File
@@ -20,7 +20,7 @@ const Register = () => {
title="Inscription"
>
<View style={{ flex: 1, paddingTop: 20 }}>
<ItemContainer height={360}>
<ItemContainer height={360} disableKeyboardHeight>
<View style={{ gap: 32, paddingTop: 5, paddingHorizontal: 5 }}>
<Text
style={{
src/screens/Studio/CreatingSong.js
+6 -6
View File
@@ -71,7 +71,7 @@ const CreatingSong = ({ active, config }) => {
const elapsed = moment().diff(moment(startDate));
const pct = Math.max(
0,
Math.min(100, Math.floor((elapsed / totalMs) * 100)),
Math.min(100, Math.floor((elapsed / totalMs) * 100))
);
setProgress(pct);
if (pct >= 100) {
@@ -130,7 +130,7 @@ const CreatingSong = ({ active, config }) => {
firebase.firestore.FieldValue.serverTimestamp(),
updatedAt: firebase.firestore.FieldValue.serverTimestamp(),
},
{ merge: true },
{ merge: true }
);
}
} catch (e) {
@@ -184,12 +184,12 @@ const CreatingSong = ({ active, config }) => {
}}
>
<BlurView
intensity={40}
intensity={Platform.OS !== "ios" ? 10 : 40}
tint="dark"
style={{ flex: 1, padding: 10, paddingBottom: 20 }}
experimentalBlurMethod={
Platform.OS !== "ios" ? "dimezisBlurView" : "none"
}
// experimentalBlurMethod={
// Platform.OS !== "ios" ? "dimezisBlurView" : "none"
// }
>
<Pressable
style={{
src/screens/Studio/GeneratingSong.js
+9 -13
View File
@@ -194,11 +194,7 @@ const GeneratingSong = () => {
{ text: "Oui", onPress: () => startMusicGenerationOnce() },
]);
}
}, [
isFocused,
selectedProject?.title,
selectedProject?.musicStatus,
]);
}, [isFocused, selectedProject?.title, selectedProject?.musicStatus]);
return (
<Page headerType="NONE" backgroundImg={background.studioBG2}>
@@ -236,7 +232,7 @@ const GeneratingSong = () => {
/>
</View>
<BlurView
intensity={40}
intensity={Platform.OS !== "ios" ? 10 : 40}
tint="dark"
style={{
flex: 1,
@@ -245,18 +241,18 @@ const GeneratingSong = () => {
padding: 12,
backgroundColor: "#FFFFFF0A",
}}
experimentalBlurMethod={
Platform.OS !== "ios" ? "dimezisBlurView" : "none"
}
// experimentalBlurMethod={
// Platform.OS !== "ios" ? "dimezisBlurView" : "none"
// }
>
<View style={{ flex: 1 }}>
<BlurView
intensity={40}
intensity={Platform.OS !== "ios" ? 10 : 40}
tint="dark"
style={{ flex: 1, padding: 10, paddingBottom: 20 }}
experimentalBlurMethod={
Platform.OS !== "ios" ? "dimezisBlurView" : "none"
}
// experimentalBlurMethod={
// Platform.OS !== "ios" ? "dimezisBlurView" : "none"
// }
>
<View style={{ flex: 1, justifyContent: "flex-end", gap: 20 }}>
<Text
src/screens/Studio/SongReady.js
+4 -4
View File
@@ -193,7 +193,7 @@ const SongReady = () => {
{[0, 1].map((idx) => (
<BlurView
key={idx}
intensity={40}
intensity={Platform.OS !== "ios" ? 10 : 40}
tint="dark"
style={{
borderRadius: 16,
@@ -201,9 +201,9 @@ const SongReady = () => {
padding: 12,
backgroundColor: "#FFFFFF0A",
}}
experimentalBlurMethod={
Platform.OS !== "ios" ? "dimezisBlurView" : "none"
}
// experimentalBlurMethod={
// Platform.OS !== "ios" ? "dimezisBlurView" : "none"
// }
>
<View
style={{ flexDirection: "row", alignItems: "center", gap: 12 }}
src/screens/Writing/CreatingLyrics.js
+4 -4
View File
@@ -153,12 +153,12 @@ const CreatingLyrics = ({ active, config, selections }) => {
}}
>
<BlurView
intensity={40}
intensity={Platform.OS !== "ios" ? 10 : 40}
tint="dark"
style={{ flex: 1, padding: 10, paddingBottom: 20 }}
experimentalBlurMethod={
Platform.OS !== "ios" ? "dimezisBlurView" : "none"
}
// experimentalBlurMethod={
// Platform.OS !== "ios" ? "dimezisBlurView" : "none"
// }
>
<View style={{ flex: 1, justifyContent: "flex-end", gap: 20 }}>
<Text
src/screens/Writing/CustomizeSongStructure.js
+9 -4
View File
@@ -45,9 +45,9 @@ const CustomizeSongStructure = ({ baseStructure = [], onChange }) => {
const Row = ({ item: rowData }) => (
<View style={styles.itemContainer}>
<BlurView
intensity={30}
intensity={Platform.OS !== "ios" ? 10 : 30}
style={styles.rowBlur}
experimentalBlurMethod={Platform.OS !== "ios" ? "dimezisBlurView" : "none"}
// experimentalBlurMethod={Platform.OS !== "ios" ? "dimezisBlurView" : "none"}
>
<View style={{ ...Style.containerSpaceBetween, alignItems: "center" }}>
<View>
@@ -79,7 +79,10 @@ const CustomizeSongStructure = ({ baseStructure = [], onChange }) => {
title="Personnalise la structure de ta chanson"
subTitle="Réorganise par glisser-déposer"
/>
<View style={{ flex: 1 }} onLayout={(e) => setContainerLayout(e.nativeEvent.layout)}>
<View
style={{ flex: 1 }}
onLayout={(e) => setContainerLayout(e.nativeEvent.layout)}
>
<Animated.ScrollView
ref={scrollRef}
contentContainerStyle={{ paddingVertical: 4, paddingBottom: 24 }}
@@ -94,7 +97,9 @@ const CustomizeSongStructure = ({ baseStructure = [], onChange }) => {
// Enable auto-scroll when dragging near edges
scrollableRef={scrollRef}
onDragEnd={({ data: newData }) => {
const values = (newData || []).map((it) => it?.value).filter(Boolean);
const values = (newData || [])
.map((it) => it?.value)
.filter(Boolean);
onChange?.(values);
}}
/>
src/screens/Writing/components/CreateLyricsHeader.js
+3 -3
View File
@@ -100,9 +100,9 @@ const CreateLyricsHeader = ({
gap: 4,
...blurViewStyle,
}}
experimentalBlurMethod={
Platform.OS !== "ios" ? "dimezisBlurView" : "none"
}
// experimentalBlurMethod={
// Platform.OS !== "ios" ? "dimezisBlurView" : "none"
// }
>
{title && (
<Text