fix
This commit is contained in:
@@ -17,10 +17,8 @@ import { useUser } from "../../providers/UserDataProvider";
|
|||||||
import { Palette, Style } from "../../styles";
|
import { Palette, Style } from "../../styles";
|
||||||
import { FONT_FAMILY } from "../../styles/Fonts";
|
import { FONT_FAMILY } from "../../styles/Fonts";
|
||||||
import BackTracks from "./components/BackTracks";
|
import BackTracks from "./components/BackTracks";
|
||||||
import LikedClips from "./components/LikedClips";
|
|
||||||
import LikedMusic from "./components/LikedMusic";
|
import LikedMusic from "./components/LikedMusic";
|
||||||
import LikedPlayback from "./components/LikedPlayback";
|
import LikedPlayback from "./components/LikedPlayback";
|
||||||
import MyClips from "./components/MyClips";
|
|
||||||
import MyMusic from "./components/MyMusic";
|
import MyMusic from "./components/MyMusic";
|
||||||
import MyPlaylist from "./components/MyPlaylist";
|
import MyPlaylist from "./components/MyPlaylist";
|
||||||
const Library = () => {
|
const Library = () => {
|
||||||
@@ -104,14 +102,6 @@ const Library = () => {
|
|||||||
<BackTracks />
|
<BackTracks />
|
||||||
</View>
|
</View>
|
||||||
)}
|
)}
|
||||||
{hasMyClips && (
|
|
||||||
<View style={{ flex: 1 }}>
|
|
||||||
<MyClips />
|
|
||||||
</View>
|
|
||||||
)}
|
|
||||||
</View>
|
|
||||||
|
|
||||||
<View style={{ flexDirection: "row", gap: 20 }}>
|
|
||||||
{hasLikedMusic && (
|
{hasLikedMusic && (
|
||||||
<View style={{ flex: 1 }}>
|
<View style={{ flex: 1 }}>
|
||||||
<LikedMusic />
|
<LikedMusic />
|
||||||
@@ -124,8 +114,6 @@ const Library = () => {
|
|||||||
)}
|
)}
|
||||||
</View>
|
</View>
|
||||||
|
|
||||||
{hasLikedClips && <LikedClips />}
|
|
||||||
|
|
||||||
{!hasAnySection && (
|
{!hasAnySection && (
|
||||||
<View
|
<View
|
||||||
style={{
|
style={{
|
||||||
|
|||||||
@@ -6,21 +6,26 @@ import {
|
|||||||
View,
|
View,
|
||||||
useWindowDimensions,
|
useWindowDimensions,
|
||||||
} from "react-native";
|
} from "react-native";
|
||||||
|
import useLayoutType from "../../../hooks/useLayoutType";
|
||||||
import { Routes } from "../../../navigation";
|
import { Routes } from "../../../navigation";
|
||||||
import { navigate } from "../../../navigation/NavigationService";
|
import { navigate } from "../../../navigation/NavigationService";
|
||||||
import { useUserData } from "../../../providers/UserDataProvider";
|
import { useUserData } from "../../../providers/UserDataProvider";
|
||||||
import CardContainer from "./CardContainer";
|
import CardContainer from "./CardContainer";
|
||||||
const BackTracks = () => {
|
const BackTracks = () => {
|
||||||
const { userPlaybacks } = useUserData();
|
const { userPlaybacks } = useUserData();
|
||||||
const items = Array.isArray(userPlaybacks) ? userPlaybacks.slice(0, 3) : [];
|
const { isWeb } = useLayoutType();
|
||||||
|
const items = Array.isArray(userPlaybacks)
|
||||||
|
? userPlaybacks.slice(0, isWeb ? 2 : 3)
|
||||||
|
: [];
|
||||||
const { width: screenWidth } = useWindowDimensions();
|
const { width: screenWidth } = useWindowDimensions();
|
||||||
const [containerWidth, setContainerWidth] = useState(screenWidth);
|
const [containerWidth, setContainerWidth] = useState(screenWidth);
|
||||||
const numColumns = 3;
|
const numColumns = isWeb ? 2 : 3;
|
||||||
const gap = 8;
|
const gap = 8;
|
||||||
const itemWidth = Math.max(
|
const itemWidth = Math.max(
|
||||||
0,
|
0,
|
||||||
Math.floor((containerWidth - gap * (numColumns - 1)) / numColumns)
|
Math.floor((containerWidth - gap * (numColumns - 1)) / numColumns)
|
||||||
);
|
);
|
||||||
|
console.log("BackTracks items:", items);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<CardContainer
|
<CardContainer
|
||||||
@@ -50,7 +55,7 @@ const BackTracks = () => {
|
|||||||
}
|
}
|
||||||
>
|
>
|
||||||
<Image
|
<Image
|
||||||
source={{ uri: item.coverUrl || "" }}
|
source={{ uri: item?.thumbnailUrl || item?.coverUrl || "" }}
|
||||||
style={{
|
style={{
|
||||||
width: "100%",
|
width: "100%",
|
||||||
height: Math.round((itemWidth * 16) / 9),
|
height: Math.round((itemWidth * 16) / 9),
|
||||||
|
|||||||
@@ -6,19 +6,20 @@ import {
|
|||||||
View,
|
View,
|
||||||
useWindowDimensions,
|
useWindowDimensions,
|
||||||
} from "react-native";
|
} from "react-native";
|
||||||
|
import useLayoutType from "../../../hooks/useLayoutType";
|
||||||
import { Routes } from "../../../navigation";
|
import { Routes } from "../../../navigation";
|
||||||
import { navigate } from "../../../navigation/NavigationService";
|
import { navigate } from "../../../navigation/NavigationService";
|
||||||
import { useUserData } from "../../../providers/UserDataProvider";
|
import { useUserData } from "../../../providers/UserDataProvider";
|
||||||
import CardContainer from "./CardContainer";
|
import CardContainer from "./CardContainer";
|
||||||
|
|
||||||
const LikedPlayback = () => {
|
const LikedPlayback = () => {
|
||||||
|
const { isWeb } = useLayoutType();
|
||||||
const { userLikedPlaybacks } = useUserData();
|
const { userLikedPlaybacks } = useUserData();
|
||||||
const items = Array.isArray(userLikedPlaybacks)
|
const items = Array.isArray(userLikedPlaybacks)
|
||||||
? userLikedPlaybacks.slice(0, 3)
|
? userLikedPlaybacks.slice(0, isWeb ? 2 : 3)
|
||||||
: [];
|
: [];
|
||||||
const { width: screenWidth } = useWindowDimensions();
|
const { width: screenWidth } = useWindowDimensions();
|
||||||
const [containerWidth, setContainerWidth] = useState(screenWidth);
|
const [containerWidth, setContainerWidth] = useState(screenWidth);
|
||||||
const numColumns = 3;
|
const numColumns = isWeb ? 2 : 3;
|
||||||
const gap = 8;
|
const gap = 8;
|
||||||
const itemWidth = Math.max(
|
const itemWidth = Math.max(
|
||||||
0,
|
0,
|
||||||
@@ -52,7 +53,7 @@ const LikedPlayback = () => {
|
|||||||
}
|
}
|
||||||
>
|
>
|
||||||
<Image
|
<Image
|
||||||
source={{ uri: item.coverUrl || "" }}
|
source={{ uri: item?.thumbnailUrl || item?.coverUrl || "" }}
|
||||||
style={{
|
style={{
|
||||||
width: "100%",
|
width: "100%",
|
||||||
height: Math.round((itemWidth * 16) / 9),
|
height: Math.round((itemWidth * 16) / 9),
|
||||||
|
|||||||
Reference in New Issue
Block a user