mirror of
https://github.com/zimplexing/OrionTV.git
synced 2026-02-13 02:54:43 +08:00
Compare commits
4 Commits
store-refa
...
mobile
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
803fc87fd9 | ||
|
|
d42a3e014e | ||
|
|
83bf083a6f | ||
|
|
d8f7953109 |
@@ -107,7 +107,11 @@ yarn android-tv
|
|||||||
|
|
||||||
#### 使用 demo 地址
|
#### 使用 demo 地址
|
||||||
|
|
||||||
在设置中可以使用 demo 地址: https://orion-tv.vercel.app 需要代理且不保证稳定和可用性。
|
在设置中可以使用 demo 地址:https://orion-tv.edu.deal 不保证稳定和可用性。
|
||||||
|
|
||||||
|
## 其他
|
||||||
|
- 最低版本是android 7,可用,但是不推荐
|
||||||
|
- 如果使用https的后端接口无法访问,在确认服务没有问题的情况下,请检查https的TLS协议,Android 10 之后版本才支持 TLS1.3
|
||||||
|
|
||||||
## 📜 主要脚本
|
## 📜 主要脚本
|
||||||
|
|
||||||
|
|||||||
@@ -1,15 +1,17 @@
|
|||||||
import React, { useEffect, useState, useRef } from "react";
|
import React, { useEffect, useState, useRef } from "react";
|
||||||
import { View, Text, StyleSheet, Image, ScrollView, ActivityIndicator } from "react-native";
|
import { View, Text, StyleSheet, Image, ScrollView, ActivityIndicator, FlatList } from "react-native";
|
||||||
import { useLocalSearchParams, useRouter } from "expo-router";
|
import { useLocalSearchParams, useRouter } from "expo-router";
|
||||||
import { ThemedView } from "@/components/ThemedView";
|
import { ThemedView } from "@/components/ThemedView";
|
||||||
import { ThemedText } from "@/components/ThemedText";
|
import { ThemedText } from "@/components/ThemedText";
|
||||||
import { api, SearchResult } from "@/services/api";
|
import { api, SearchResult } from "@/services/api";
|
||||||
import { getResolutionFromM3U8 } from "@/services/m3u8";
|
import { getResolutionFromM3U8 } from "@/services/m3u8";
|
||||||
import { StyledButton } from "@/components/StyledButton";
|
import { StyledButton } from "@/components/StyledButton";
|
||||||
|
import { useResponsive } from "@/hooks/useResponsive";
|
||||||
|
|
||||||
export default function DetailScreen() {
|
export default function DetailScreen() {
|
||||||
const { source, q } = useLocalSearchParams();
|
const { source, q } = useLocalSearchParams();
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
|
const { isMobile, screenWidth, numColumns } = useResponsive();
|
||||||
const [searchResults, setSearchResults] = useState<(SearchResult & { resolution?: string | null })[]>([]);
|
const [searchResults, setSearchResults] = useState<(SearchResult & { resolution?: string | null })[]>([]);
|
||||||
const [detail, setDetail] = useState<(SearchResult & { resolution?: string | null }) | null>(null);
|
const [detail, setDetail] = useState<(SearchResult & { resolution?: string | null }) | null>(null);
|
||||||
const [loading, setLoading] = useState(true);
|
const [loading, setLoading] = useState(true);
|
||||||
@@ -147,9 +149,12 @@ export default function DetailScreen() {
|
|||||||
return (
|
return (
|
||||||
<ThemedView style={styles.container}>
|
<ThemedView style={styles.container}>
|
||||||
<ScrollView>
|
<ScrollView>
|
||||||
<View style={styles.topContainer}>
|
<View style={[styles.topContainer, isMobile && screenWidth < 600 && styles.topContainerMobile]}>
|
||||||
<Image source={{ uri: detail.poster }} style={styles.poster} />
|
<Image
|
||||||
<View style={styles.infoContainer}>
|
source={{ uri: detail.poster }}
|
||||||
|
style={[styles.poster, isMobile && screenWidth < 600 && styles.posterMobile]}
|
||||||
|
/>
|
||||||
|
<View style={[styles.infoContainer, isMobile && screenWidth < 600 && styles.infoContainerMobile]}>
|
||||||
<ThemedText style={styles.title} numberOfLines={1}>
|
<ThemedText style={styles.title} numberOfLines={1}>
|
||||||
{detail.title}
|
{detail.title}
|
||||||
</ThemedText>
|
</ThemedText>
|
||||||
@@ -197,17 +202,26 @@ export default function DetailScreen() {
|
|||||||
</View>
|
</View>
|
||||||
<View style={styles.episodesContainer}>
|
<View style={styles.episodesContainer}>
|
||||||
<ThemedText style={styles.episodesTitle}>播放列表</ThemedText>
|
<ThemedText style={styles.episodesTitle}>播放列表</ThemedText>
|
||||||
<ScrollView contentContainerStyle={styles.episodeList}>
|
<FlatList
|
||||||
{detail.episodes.map((episode, index) => (
|
data={detail.episodes}
|
||||||
|
renderItem={({ item, index }) => (
|
||||||
<StyledButton
|
<StyledButton
|
||||||
key={index}
|
|
||||||
style={styles.episodeButton}
|
style={styles.episodeButton}
|
||||||
onPress={() => handlePlay(episode, index)}
|
onPress={() => handlePlay(item, index)}
|
||||||
text={`第 ${index + 1} 集`}
|
text={`第 ${index + 1} 集`}
|
||||||
textStyle={styles.episodeButtonText}
|
textStyle={styles.episodeButtonText}
|
||||||
/>
|
/>
|
||||||
))}
|
)}
|
||||||
</ScrollView>
|
keyExtractor={(_item, index) => index.toString()}
|
||||||
|
numColumns={numColumns(80, 10)}
|
||||||
|
key={numColumns(80, 10)} // Re-render on column change
|
||||||
|
contentContainerStyle={styles.episodeList}
|
||||||
|
// The FlatList should not be scrollable itself, the parent ScrollView handles it.
|
||||||
|
// This can be achieved by making it non-scrollable and letting it expand.
|
||||||
|
// However, for performance, if the list is very long, a fixed height would be better.
|
||||||
|
// For now, we let the parent ScrollView handle scrolling.
|
||||||
|
scrollEnabled={false}
|
||||||
|
/>
|
||||||
</View>
|
</View>
|
||||||
</View>
|
</View>
|
||||||
</ScrollView>
|
</ScrollView>
|
||||||
@@ -222,16 +236,31 @@ const styles = StyleSheet.create({
|
|||||||
flexDirection: "row",
|
flexDirection: "row",
|
||||||
padding: 20,
|
padding: 20,
|
||||||
},
|
},
|
||||||
|
topContainerMobile: {
|
||||||
|
flexDirection: "column",
|
||||||
|
alignItems: "center",
|
||||||
|
},
|
||||||
poster: {
|
poster: {
|
||||||
width: 200,
|
width: 200,
|
||||||
height: 300,
|
height: 300,
|
||||||
borderRadius: 8,
|
borderRadius: 8,
|
||||||
},
|
},
|
||||||
|
posterMobile: {
|
||||||
|
width: "80%",
|
||||||
|
height: undefined,
|
||||||
|
aspectRatio: 2 / 3, // Maintain aspect ratio
|
||||||
|
marginBottom: 20,
|
||||||
|
},
|
||||||
infoContainer: {
|
infoContainer: {
|
||||||
flex: 1,
|
flex: 1,
|
||||||
marginLeft: 20,
|
marginLeft: 20,
|
||||||
justifyContent: "flex-start",
|
justifyContent: "flex-start",
|
||||||
},
|
},
|
||||||
|
infoContainerMobile: {
|
||||||
|
marginLeft: 0,
|
||||||
|
width: "100%",
|
||||||
|
alignItems: "center",
|
||||||
|
},
|
||||||
title: {
|
title: {
|
||||||
fontSize: 28,
|
fontSize: 28,
|
||||||
fontWeight: "bold",
|
fontWeight: "bold",
|
||||||
@@ -302,8 +331,7 @@ const styles = StyleSheet.create({
|
|||||||
marginBottom: 10,
|
marginBottom: 10,
|
||||||
},
|
},
|
||||||
episodeList: {
|
episodeList: {
|
||||||
flexDirection: "row",
|
// flexDirection is now handled by FlatList's numColumns
|
||||||
flexWrap: "wrap",
|
|
||||||
},
|
},
|
||||||
episodeButton: {
|
episodeButton: {
|
||||||
margin: 5,
|
margin: 5,
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import React, { useEffect, useCallback, useRef } from "react";
|
import React, { useEffect, useCallback, useRef } from "react";
|
||||||
import { View, StyleSheet, ActivityIndicator, FlatList, Pressable, Dimensions } from "react-native";
|
import { View, StyleSheet, ActivityIndicator, FlatList, Pressable } from "react-native";
|
||||||
import { ThemedView } from "@/components/ThemedView";
|
import { ThemedView } from "@/components/ThemedView";
|
||||||
import { ThemedText } from "@/components/ThemedText";
|
import { ThemedText } from "@/components/ThemedText";
|
||||||
import { api } from "@/services/api";
|
import { api } from "@/services/api";
|
||||||
@@ -10,16 +10,18 @@ import { SettingsModal } from "@/components/SettingsModal";
|
|||||||
import { StyledButton } from "@/components/StyledButton";
|
import { StyledButton } from "@/components/StyledButton";
|
||||||
import useHomeStore, { RowItem, Category } from "@/stores/homeStore";
|
import useHomeStore, { RowItem, Category } from "@/stores/homeStore";
|
||||||
import { useSettingsStore } from "@/stores/settingsStore";
|
import { useSettingsStore } from "@/stores/settingsStore";
|
||||||
|
import { useResponsive } from "@/hooks/useResponsive";
|
||||||
const NUM_COLUMNS = 5;
|
|
||||||
const { width } = Dimensions.get("window");
|
|
||||||
const ITEM_WIDTH = width / NUM_COLUMNS - 24;
|
|
||||||
|
|
||||||
export default function HomeScreen() {
|
export default function HomeScreen() {
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
|
const { isMobile, screenWidth, numColumns } = useResponsive();
|
||||||
const colorScheme = "dark";
|
const colorScheme = "dark";
|
||||||
const flatListRef = useRef<FlatList>(null);
|
const flatListRef = useRef<FlatList>(null);
|
||||||
|
|
||||||
|
// Calculate item width based on screen size and number of columns
|
||||||
|
const itemWidth = isMobile ? screenWidth / numColumns(150, 16) - 24 : screenWidth / 5 - 24;
|
||||||
|
const calculatedNumColumns = numColumns(150, 16);
|
||||||
|
|
||||||
const {
|
const {
|
||||||
categories,
|
categories,
|
||||||
selectedCategory,
|
selectedCategory,
|
||||||
@@ -64,7 +66,7 @@ export default function HomeScreen() {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const renderContentItem = ({ item }: { item: RowItem }) => (
|
const renderContentItem = ({ item }: { item: RowItem }) => (
|
||||||
<View style={styles.itemContainer}>
|
<View style={[styles.itemContainer, { width: itemWidth }]}>
|
||||||
<VideoCard
|
<VideoCard
|
||||||
id={item.id}
|
id={item.id}
|
||||||
source={item.source}
|
source={item.source}
|
||||||
@@ -136,7 +138,8 @@ export default function HomeScreen() {
|
|||||||
data={contentData}
|
data={contentData}
|
||||||
renderItem={renderContentItem}
|
renderItem={renderContentItem}
|
||||||
keyExtractor={(item, index) => `${item.source}-${item.id}-${index}`}
|
keyExtractor={(item, index) => `${item.source}-${item.id}-${index}`}
|
||||||
numColumns={NUM_COLUMNS}
|
numColumns={calculatedNumColumns}
|
||||||
|
key={calculatedNumColumns} // Re-render FlatList when numColumns changes
|
||||||
contentContainerStyle={styles.listContent}
|
contentContainerStyle={styles.listContent}
|
||||||
onEndReached={loadMoreData}
|
onEndReached={loadMoreData}
|
||||||
onEndReachedThreshold={0.5}
|
onEndReachedThreshold={0.5}
|
||||||
@@ -210,7 +213,7 @@ const styles = StyleSheet.create({
|
|||||||
},
|
},
|
||||||
itemContainer: {
|
itemContainer: {
|
||||||
margin: 8,
|
margin: 8,
|
||||||
width: ITEM_WIDTH,
|
// width is now set dynamically in renderContentItem
|
||||||
alignItems: "center",
|
alignItems: "center",
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|||||||
114
app/play.tsx
114
app/play.tsx
@@ -1,10 +1,13 @@
|
|||||||
import React, { useEffect, useRef } from "react";
|
import React, { useEffect, useRef } from "react";
|
||||||
import { View, StyleSheet, TouchableOpacity, ActivityIndicator, BackHandler } from "react-native";
|
import { View, StyleSheet, ActivityIndicator, BackHandler, Platform, SafeAreaView, Dimensions } from "react-native";
|
||||||
import { useLocalSearchParams, useRouter } from "expo-router";
|
import { useLocalSearchParams, useRouter } from "expo-router";
|
||||||
import { Video, ResizeMode } from "expo-av";
|
import { Video, ResizeMode } from "expo-av";
|
||||||
|
import * as ScreenOrientation from "expo-screen-orientation";
|
||||||
import { useKeepAwake } from "expo-keep-awake";
|
import { useKeepAwake } from "expo-keep-awake";
|
||||||
|
import { Gesture, GestureDetector } from "react-native-gesture-handler";
|
||||||
import { ThemedView } from "@/components/ThemedView";
|
import { ThemedView } from "@/components/ThemedView";
|
||||||
import { PlayerControls } from "@/components/PlayerControls";
|
import { PlayerControls } from "@/components/PlayerControls";
|
||||||
|
import { PlayerControlsMobile } from "@/components/PlayerControls.mobile";
|
||||||
import { EpisodeSelectionModal } from "@/components/EpisodeSelectionModal";
|
import { EpisodeSelectionModal } from "@/components/EpisodeSelectionModal";
|
||||||
import { SourceSelectionModal } from "@/components/SourceSelectionModal";
|
import { SourceSelectionModal } from "@/components/SourceSelectionModal";
|
||||||
import { SeekingBar } from "@/components/SeekingBar";
|
import { SeekingBar } from "@/components/SeekingBar";
|
||||||
@@ -12,11 +15,13 @@ import { NextEpisodeOverlay } from "@/components/NextEpisodeOverlay";
|
|||||||
import { LoadingOverlay } from "@/components/LoadingOverlay";
|
import { LoadingOverlay } from "@/components/LoadingOverlay";
|
||||||
import usePlayerStore from "@/stores/playerStore";
|
import usePlayerStore from "@/stores/playerStore";
|
||||||
import { useTVRemoteHandler } from "@/hooks/useTVRemoteHandler";
|
import { useTVRemoteHandler } from "@/hooks/useTVRemoteHandler";
|
||||||
|
import { useResponsive } from "@/hooks/useResponsive";
|
||||||
|
|
||||||
export default function PlayScreen() {
|
export default function PlayScreen() {
|
||||||
const videoRef = useRef<Video>(null);
|
const videoRef = useRef<Video>(null);
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
useKeepAwake();
|
useKeepAwake();
|
||||||
|
const { isMobile } = useResponsive();
|
||||||
const { source, id, episodeIndex, position } = useLocalSearchParams<{
|
const { source, id, episodeIndex, position } = useLocalSearchParams<{
|
||||||
source: string;
|
source: string;
|
||||||
id: string;
|
id: string;
|
||||||
@@ -48,6 +53,21 @@ export default function PlayScreen() {
|
|||||||
reset,
|
reset,
|
||||||
} = usePlayerStore();
|
} = usePlayerStore();
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
async function lockOrientation() {
|
||||||
|
if (isMobile) {
|
||||||
|
await ScreenOrientation.lockAsync(ScreenOrientation.OrientationLock.LANDSCAPE_RIGHT);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
lockOrientation();
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
if (isMobile) {
|
||||||
|
ScreenOrientation.unlockAsync();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}, [isMobile]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setVideoRef(videoRef);
|
setVideoRef(videoRef);
|
||||||
if (source && id) {
|
if (source && id) {
|
||||||
@@ -58,7 +78,37 @@ export default function PlayScreen() {
|
|||||||
};
|
};
|
||||||
}, [source, id, episodeIndex, position, setVideoRef, loadVideo, reset]);
|
}, [source, id, episodeIndex, position, setVideoRef, loadVideo, reset]);
|
||||||
|
|
||||||
const { onScreenPress } = useTVRemoteHandler();
|
const { onScreenPress: onTVScreenPress } = useTVRemoteHandler();
|
||||||
|
|
||||||
|
const handleScreenPress = () => {
|
||||||
|
if (isMobile) {
|
||||||
|
setShowControls(!showControls);
|
||||||
|
} else {
|
||||||
|
onTVScreenPress();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const singleTap = Gesture.Tap()
|
||||||
|
.onEnd(() => {
|
||||||
|
handleScreenPress();
|
||||||
|
})
|
||||||
|
.runOnJS(true);
|
||||||
|
|
||||||
|
const doubleTap = Gesture.Tap()
|
||||||
|
.numberOfTaps(2)
|
||||||
|
.onEnd((e) => {
|
||||||
|
if (!isMobile) return;
|
||||||
|
const tapPositionX = e.x;
|
||||||
|
const screenWidth = Dimensions.get("window").width;
|
||||||
|
if (tapPositionX < screenWidth / 2) {
|
||||||
|
seek(-10); // Seek back
|
||||||
|
} else {
|
||||||
|
seek(10); // Seek forward
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.runOnJS(true);
|
||||||
|
|
||||||
|
const composedGesture = Gesture.Exclusive(doubleTap, singleTap);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const backAction = () => {
|
const backAction = () => {
|
||||||
@@ -93,39 +143,45 @@ export default function PlayScreen() {
|
|||||||
|
|
||||||
const currentEpisode = episodes[currentEpisodeIndex];
|
const currentEpisode = episodes[currentEpisodeIndex];
|
||||||
|
|
||||||
|
const PlayerComponent = isMobile ? PlayerControlsMobile : PlayerControls;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ThemedView focusable style={styles.container}>
|
<SafeAreaView style={styles.container}>
|
||||||
<TouchableOpacity activeOpacity={1} style={styles.videoContainer} onPress={onScreenPress}>
|
<ThemedView focusable style={styles.container}>
|
||||||
<Video
|
<GestureDetector gesture={composedGesture}>
|
||||||
ref={videoRef}
|
<View style={styles.videoContainer}>
|
||||||
style={styles.videoPlayer}
|
<Video
|
||||||
source={{ uri: currentEpisode?.url }}
|
ref={videoRef}
|
||||||
resizeMode={ResizeMode.CONTAIN}
|
style={styles.videoPlayer}
|
||||||
onPlaybackStatusUpdate={handlePlaybackStatusUpdate}
|
source={{ uri: currentEpisode?.url }}
|
||||||
onLoad={() => {
|
resizeMode={ResizeMode.CONTAIN}
|
||||||
const jumpPosition = introEndTime || initialPosition;
|
onPlaybackStatusUpdate={handlePlaybackStatusUpdate}
|
||||||
if (jumpPosition > 0) {
|
onLoad={() => {
|
||||||
videoRef.current?.setPositionAsync(jumpPosition);
|
const jumpPosition = introEndTime || initialPosition;
|
||||||
}
|
if (jumpPosition > 0) {
|
||||||
usePlayerStore.setState({ isLoading: false });
|
videoRef.current?.setPositionAsync(jumpPosition);
|
||||||
}}
|
}
|
||||||
onLoadStart={() => usePlayerStore.setState({ isLoading: true })}
|
usePlayerStore.setState({ isLoading: false });
|
||||||
useNativeControls={false}
|
}}
|
||||||
shouldPlay
|
onLoadStart={() => usePlayerStore.setState({ isLoading: true })}
|
||||||
/>
|
useNativeControls={false}
|
||||||
|
shouldPlay
|
||||||
|
/>
|
||||||
|
|
||||||
{showControls && <PlayerControls showControls={showControls} setShowControls={setShowControls} />}
|
{showControls && <PlayerComponent showControls={showControls} setShowControls={setShowControls} />}
|
||||||
|
|
||||||
<SeekingBar />
|
<SeekingBar />
|
||||||
|
|
||||||
<LoadingOverlay visible={isLoading} />
|
<LoadingOverlay visible={isLoading} />
|
||||||
|
|
||||||
<NextEpisodeOverlay visible={showNextEpisodeOverlay} onCancel={() => setShowNextEpisodeOverlay(false)} />
|
<NextEpisodeOverlay visible={showNextEpisodeOverlay} onCancel={() => setShowNextEpisodeOverlay(false)} />
|
||||||
</TouchableOpacity>
|
</View>
|
||||||
|
</GestureDetector>
|
||||||
|
|
||||||
<EpisodeSelectionModal />
|
<EpisodeSelectionModal />
|
||||||
<SourceSelectionModal />
|
<SourceSelectionModal />
|
||||||
</ThemedView>
|
</ThemedView>
|
||||||
|
</SafeAreaView>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import VideoCard from "@/components/VideoCard.tv";
|
|||||||
import { api, SearchResult } from "@/services/api";
|
import { api, SearchResult } from "@/services/api";
|
||||||
import { Search } from "lucide-react-native";
|
import { Search } from "lucide-react-native";
|
||||||
import { StyledButton } from "@/components/StyledButton";
|
import { StyledButton } from "@/components/StyledButton";
|
||||||
|
import { useResponsive } from "@/hooks/useResponsive";
|
||||||
|
|
||||||
export default function SearchScreen() {
|
export default function SearchScreen() {
|
||||||
const [keyword, setKeyword] = useState("");
|
const [keyword, setKeyword] = useState("");
|
||||||
@@ -15,6 +16,10 @@ export default function SearchScreen() {
|
|||||||
const textInputRef = useRef<TextInput>(null);
|
const textInputRef = useRef<TextInput>(null);
|
||||||
const colorScheme = "dark"; // Replace with useColorScheme() if needed
|
const colorScheme = "dark"; // Replace with useColorScheme() if needed
|
||||||
const [isInputFocused, setIsInputFocused] = useState(false);
|
const [isInputFocused, setIsInputFocused] = useState(false);
|
||||||
|
const { isMobile, screenWidth, numColumns } = useResponsive();
|
||||||
|
|
||||||
|
const itemWidth = isMobile ? screenWidth / numColumns(150, 16) - 24 : screenWidth / 5 - 24;
|
||||||
|
const calculatedNumColumns = numColumns(150, 16);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
// Focus the text input when the screen loads
|
// Focus the text input when the screen loads
|
||||||
@@ -48,15 +53,17 @@ export default function SearchScreen() {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const renderItem = ({ item }: { item: SearchResult }) => (
|
const renderItem = ({ item }: { item: SearchResult }) => (
|
||||||
<VideoCard
|
<View style={{ width: itemWidth, margin: 8 }}>
|
||||||
id={item.id.toString()}
|
<VideoCard
|
||||||
source={item.source}
|
id={item.id.toString()}
|
||||||
title={item.title}
|
source={item.source}
|
||||||
poster={item.poster}
|
title={item.title}
|
||||||
year={item.year}
|
poster={item.poster}
|
||||||
sourceName={item.source_name}
|
year={item.year}
|
||||||
api={api}
|
sourceName={item.source_name}
|
||||||
/>
|
api={api}
|
||||||
|
/>
|
||||||
|
</View>
|
||||||
);
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -99,7 +106,8 @@ export default function SearchScreen() {
|
|||||||
data={results}
|
data={results}
|
||||||
renderItem={renderItem}
|
renderItem={renderItem}
|
||||||
keyExtractor={(item, index) => `${item.id}-${item.source}-${index}`}
|
keyExtractor={(item, index) => `${item.id}-${item.source}-${index}`}
|
||||||
numColumns={5} // Adjust based on your card size and desired layout
|
numColumns={calculatedNumColumns}
|
||||||
|
key={calculatedNumColumns}
|
||||||
contentContainerStyle={styles.listContent}
|
contentContainerStyle={styles.listContent}
|
||||||
ListEmptyComponent={
|
ListEmptyComponent={
|
||||||
<View style={styles.centerContainer}>
|
<View style={styles.centerContainer}>
|
||||||
|
|||||||
179
components/PlayerControls.mobile.tsx
Normal file
179
components/PlayerControls.mobile.tsx
Normal file
@@ -0,0 +1,179 @@
|
|||||||
|
import React from "react";
|
||||||
|
import { View, Text, StyleSheet, Pressable } from "react-native";
|
||||||
|
import { Pause, Play, SkipForward, List, Tv } from "lucide-react-native";
|
||||||
|
import { ThemedText } from "@/components/ThemedText";
|
||||||
|
import { MediaButton } from "@/components/MediaButton";
|
||||||
|
import usePlayerStore from "@/stores/playerStore";
|
||||||
|
|
||||||
|
interface PlayerControlsProps {
|
||||||
|
showControls: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const PlayerControlsMobile: React.FC<PlayerControlsProps> = ({ showControls }) => {
|
||||||
|
const {
|
||||||
|
detail,
|
||||||
|
currentEpisodeIndex,
|
||||||
|
currentSourceIndex,
|
||||||
|
status,
|
||||||
|
isSeeking,
|
||||||
|
seekPosition,
|
||||||
|
progressPosition,
|
||||||
|
togglePlayPause,
|
||||||
|
playEpisode,
|
||||||
|
setShowEpisodeModal,
|
||||||
|
setShowSourceModal,
|
||||||
|
} = usePlayerStore();
|
||||||
|
|
||||||
|
const videoTitle = detail?.videoInfo?.title || "";
|
||||||
|
const currentEpisode = detail?.episodes[currentEpisodeIndex];
|
||||||
|
const currentEpisodeTitle = currentEpisode?.title;
|
||||||
|
const hasNextEpisode = currentEpisodeIndex < (detail?.episodes.length || 0) - 1;
|
||||||
|
|
||||||
|
const formatTime = (milliseconds: number) => {
|
||||||
|
if (!milliseconds) return "00:00";
|
||||||
|
const totalSeconds = Math.floor(milliseconds / 1000);
|
||||||
|
const minutes = Math.floor(totalSeconds / 60);
|
||||||
|
const seconds = totalSeconds % 60;
|
||||||
|
return `${minutes.toString().padStart(2, "0")}:${seconds.toString().padStart(2, "0")}`;
|
||||||
|
};
|
||||||
|
|
||||||
|
const onPlayNextEpisode = () => {
|
||||||
|
if (hasNextEpisode) {
|
||||||
|
playEpisode(currentEpisodeIndex + 1);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<View style={styles.controlsOverlay}>
|
||||||
|
<View style={styles.topControls}>
|
||||||
|
<Text style={styles.controlTitle} numberOfLines={2}>
|
||||||
|
{videoTitle} {currentEpisodeTitle ? `- ${currentEpisodeTitle}` : ""}
|
||||||
|
</Text>
|
||||||
|
</View>
|
||||||
|
|
||||||
|
<View style={styles.middleControls}>
|
||||||
|
{/* This area can be used for gesture-based seeking indicators in the future */}
|
||||||
|
</View>
|
||||||
|
|
||||||
|
<View style={styles.bottomControlsContainer}>
|
||||||
|
<View style={styles.timeAndActions}>
|
||||||
|
<ThemedText style={styles.timeText}>
|
||||||
|
{status?.isLoaded
|
||||||
|
? `${formatTime(status.positionMillis)} / ${formatTime(status.durationMillis || 0)}`
|
||||||
|
: "00:00 / 00:00"}
|
||||||
|
</ThemedText>
|
||||||
|
<View style={styles.actions}>
|
||||||
|
<MediaButton onPress={() => setShowEpisodeModal(true)}>
|
||||||
|
<List color="white" size={22} />
|
||||||
|
</MediaButton>
|
||||||
|
<MediaButton onPress={() => setShowSourceModal(true)}>
|
||||||
|
<Tv color="white" size={22} />
|
||||||
|
</MediaButton>
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
|
||||||
|
<View style={styles.progressBarContainer}>
|
||||||
|
<View style={styles.progressBarBackground} />
|
||||||
|
<View
|
||||||
|
style={[
|
||||||
|
styles.progressBarFilled,
|
||||||
|
{
|
||||||
|
width: `${(isSeeking ? seekPosition : progressPosition) * 100}%`,
|
||||||
|
},
|
||||||
|
]}
|
||||||
|
/>
|
||||||
|
<Pressable style={styles.progressBarTouchable} />
|
||||||
|
</View>
|
||||||
|
|
||||||
|
<View style={styles.mainControls}>
|
||||||
|
<View style={styles.placeholder} />
|
||||||
|
<MediaButton onPress={togglePlayPause}>
|
||||||
|
{status?.isLoaded && status.isPlaying ? (
|
||||||
|
<Pause color="white" size={36} />
|
||||||
|
) : (
|
||||||
|
<Play color="white" size={36} />
|
||||||
|
)}
|
||||||
|
</MediaButton>
|
||||||
|
<MediaButton onPress={onPlayNextEpisode} disabled={!hasNextEpisode}>
|
||||||
|
<SkipForward color={hasNextEpisode ? "white" : "#666"} size={28} />
|
||||||
|
</MediaButton>
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
const styles = StyleSheet.create({
|
||||||
|
controlsOverlay: {
|
||||||
|
...StyleSheet.absoluteFillObject,
|
||||||
|
backgroundColor: "rgba(0, 0, 0, 0.4)",
|
||||||
|
justifyContent: "space-between",
|
||||||
|
paddingHorizontal: 15,
|
||||||
|
paddingVertical: 10,
|
||||||
|
},
|
||||||
|
topControls: {
|
||||||
|
flexDirection: "row",
|
||||||
|
justifyContent: "center",
|
||||||
|
},
|
||||||
|
controlTitle: {
|
||||||
|
color: "white",
|
||||||
|
fontSize: 14,
|
||||||
|
fontWeight: "bold",
|
||||||
|
textAlign: "center",
|
||||||
|
},
|
||||||
|
middleControls: {
|
||||||
|
flex: 1,
|
||||||
|
justifyContent: "center",
|
||||||
|
alignItems: "center",
|
||||||
|
},
|
||||||
|
bottomControlsContainer: {
|
||||||
|
width: "100%",
|
||||||
|
},
|
||||||
|
timeAndActions: {
|
||||||
|
flexDirection: "row",
|
||||||
|
justifyContent: "space-between",
|
||||||
|
alignItems: "center",
|
||||||
|
marginBottom: 5,
|
||||||
|
},
|
||||||
|
timeText: {
|
||||||
|
color: "white",
|
||||||
|
fontSize: 12,
|
||||||
|
},
|
||||||
|
actions: {
|
||||||
|
flexDirection: "row",
|
||||||
|
gap: 15,
|
||||||
|
},
|
||||||
|
progressBarContainer: {
|
||||||
|
width: "100%",
|
||||||
|
height: 4,
|
||||||
|
position: "relative",
|
||||||
|
marginVertical: 10,
|
||||||
|
},
|
||||||
|
progressBarBackground: {
|
||||||
|
...StyleSheet.absoluteFillObject,
|
||||||
|
backgroundColor: "rgba(255, 255, 255, 0.3)",
|
||||||
|
borderRadius: 2,
|
||||||
|
},
|
||||||
|
progressBarFilled: {
|
||||||
|
...StyleSheet.absoluteFillObject,
|
||||||
|
backgroundColor: "#ff0000",
|
||||||
|
borderRadius: 2,
|
||||||
|
},
|
||||||
|
progressBarTouchable: {
|
||||||
|
position: "absolute",
|
||||||
|
left: 0,
|
||||||
|
right: 0,
|
||||||
|
height: 20,
|
||||||
|
top: -8,
|
||||||
|
zIndex: 10,
|
||||||
|
},
|
||||||
|
mainControls: {
|
||||||
|
flexDirection: "row",
|
||||||
|
justifyContent: "space-around",
|
||||||
|
alignItems: "center",
|
||||||
|
marginTop: 5,
|
||||||
|
},
|
||||||
|
placeholder: {
|
||||||
|
width: 28, // to balance the skip forward button
|
||||||
|
},
|
||||||
|
});
|
||||||
@@ -3,6 +3,7 @@ import { Animated, Pressable, StyleSheet, StyleProp, ViewStyle, PressableProps,
|
|||||||
import { ThemedText } from "./ThemedText";
|
import { ThemedText } from "./ThemedText";
|
||||||
import { Colors } from "@/constants/Colors";
|
import { Colors } from "@/constants/Colors";
|
||||||
import { useButtonAnimation } from "@/hooks/useButtonAnimation";
|
import { useButtonAnimation } from "@/hooks/useButtonAnimation";
|
||||||
|
import { useResponsive } from "@/hooks/useResponsive";
|
||||||
|
|
||||||
interface StyledButtonProps extends PressableProps {
|
interface StyledButtonProps extends PressableProps {
|
||||||
children?: React.ReactNode;
|
children?: React.ReactNode;
|
||||||
@@ -26,6 +27,7 @@ export const StyledButton: React.FC<StyledButtonProps> = ({
|
|||||||
const colors = Colors[colorScheme];
|
const colors = Colors[colorScheme];
|
||||||
const [isFocused, setIsFocused] = React.useState(false);
|
const [isFocused, setIsFocused] = React.useState(false);
|
||||||
const animationStyle = useButtonAnimation(isFocused);
|
const animationStyle = useButtonAnimation(isFocused);
|
||||||
|
const { isMobile } = useResponsive();
|
||||||
|
|
||||||
const variantStyles = {
|
const variantStyles = {
|
||||||
default: StyleSheet.create({
|
default: StyleSheet.create({
|
||||||
@@ -81,8 +83,8 @@ export const StyledButton: React.FC<StyledButtonProps> = ({
|
|||||||
|
|
||||||
const styles = StyleSheet.create({
|
const styles = StyleSheet.create({
|
||||||
button: {
|
button: {
|
||||||
paddingHorizontal: 16,
|
paddingHorizontal: isMobile ? 12 : 16,
|
||||||
paddingVertical: 10,
|
paddingVertical: isMobile ? 8 : 10,
|
||||||
borderRadius: 8,
|
borderRadius: 8,
|
||||||
borderWidth: 2,
|
borderWidth: 2,
|
||||||
borderColor: "transparent",
|
borderColor: "transparent",
|
||||||
@@ -103,7 +105,7 @@ export const StyledButton: React.FC<StyledButtonProps> = ({
|
|||||||
backgroundColor: colors.tint,
|
backgroundColor: colors.tint,
|
||||||
},
|
},
|
||||||
text: {
|
text: {
|
||||||
fontSize: 16,
|
fontSize: isMobile ? 14 : 16,
|
||||||
fontWeight: "500",
|
fontWeight: "500",
|
||||||
color: colors.text,
|
color: colors.text,
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,22 +1,14 @@
|
|||||||
import {View, type ViewProps} from 'react-native';
|
import { View, type ViewProps } from "react-native";
|
||||||
|
|
||||||
import {useThemeColor} from '@/hooks/useThemeColor';
|
import { useThemeColor } from "@/hooks/useThemeColor";
|
||||||
|
|
||||||
export type ThemedViewProps = ViewProps & {
|
export type ThemedViewProps = ViewProps & {
|
||||||
lightColor?: string;
|
lightColor?: string;
|
||||||
darkColor?: string;
|
darkColor?: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
export function ThemedView({
|
export function ThemedView({ style, lightColor, darkColor, ...otherProps }: ThemedViewProps) {
|
||||||
style,
|
const backgroundColor = useThemeColor({ light: lightColor, dark: darkColor }, "background");
|
||||||
lightColor,
|
|
||||||
darkColor,
|
|
||||||
...otherProps
|
|
||||||
}: ThemedViewProps) {
|
|
||||||
const backgroundColor = useThemeColor(
|
|
||||||
{light: lightColor, dark: darkColor},
|
|
||||||
'background',
|
|
||||||
);
|
|
||||||
|
|
||||||
return <View style={[{backgroundColor}, style]} {...otherProps} />;
|
return <View style={[{ backgroundColor }, style]} {...otherProps} />;
|
||||||
}
|
}
|
||||||
|
|||||||
43
hooks/useResponsive.ts
Normal file
43
hooks/useResponsive.ts
Normal file
@@ -0,0 +1,43 @@
|
|||||||
|
import { useState, useEffect } from "react";
|
||||||
|
import { Dimensions, Platform } from "react-native";
|
||||||
|
|
||||||
|
const isMobile = Platform.OS === "android" || Platform.OS === "ios";
|
||||||
|
|
||||||
|
interface ResponsiveInfo {
|
||||||
|
isMobile: boolean;
|
||||||
|
screenWidth: number;
|
||||||
|
numColumns: (itemWidth: number, gap?: number) => number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useResponsive(): ResponsiveInfo {
|
||||||
|
const [screenWidth, setScreenWidth] = useState(Dimensions.get("window").width);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const onChange = (result: { window: { width: number } }) => {
|
||||||
|
setScreenWidth(result.window.width);
|
||||||
|
};
|
||||||
|
|
||||||
|
const subscription = Dimensions.addEventListener("change", onChange);
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
subscription.remove();
|
||||||
|
};
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const calculateNumColumns = (itemWidth: number, gap: number = 16) => {
|
||||||
|
if (!isMobile) {
|
||||||
|
// For TV, you might want a fixed number or a different logic
|
||||||
|
return 5;
|
||||||
|
}
|
||||||
|
const containerPadding = 16; // Horizontal padding of the container
|
||||||
|
const availableWidth = screenWidth - containerPadding * 2;
|
||||||
|
const num = Math.floor(availableWidth / (itemWidth + gap));
|
||||||
|
return Math.max(1, num); // Ensure at least one column
|
||||||
|
};
|
||||||
|
|
||||||
|
return {
|
||||||
|
isMobile,
|
||||||
|
screenWidth,
|
||||||
|
numColumns: calculateNumColumns,
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -36,6 +36,7 @@
|
|||||||
"expo-font": "~12.0.7",
|
"expo-font": "~12.0.7",
|
||||||
"expo-linking": "~6.3.1",
|
"expo-linking": "~6.3.1",
|
||||||
"expo-router": "~3.5.16",
|
"expo-router": "~3.5.16",
|
||||||
|
"expo-screen-orientation": "6",
|
||||||
"expo-splash-screen": "~0.27.5",
|
"expo-splash-screen": "~0.27.5",
|
||||||
"expo-status-bar": "~1.12.1",
|
"expo-status-bar": "~1.12.1",
|
||||||
"expo-system-ui": "~3.0.6",
|
"expo-system-ui": "~3.0.6",
|
||||||
@@ -44,7 +45,7 @@
|
|||||||
"react": "18.2.0",
|
"react": "18.2.0",
|
||||||
"react-dom": "18.2.0",
|
"react-dom": "18.2.0",
|
||||||
"react-native": "npm:react-native-tvos@~0.74.2-0",
|
"react-native": "npm:react-native-tvos@~0.74.2-0",
|
||||||
"react-native-gesture-handler": "~2.16.1",
|
"react-native-gesture-handler": "^2.27.1",
|
||||||
"react-native-media-console": "*",
|
"react-native-media-console": "*",
|
||||||
"react-native-reanimated": "~3.10.1",
|
"react-native-reanimated": "~3.10.1",
|
||||||
"react-native-safe-area-context": "4.10.1",
|
"react-native-safe-area-context": "4.10.1",
|
||||||
|
|||||||
61
yarn.lock
61
yarn.lock
@@ -4004,6 +4004,11 @@ expo-router@~3.5.16:
|
|||||||
react-native-helmet-async "2.0.4"
|
react-native-helmet-async "2.0.4"
|
||||||
schema-utils "^4.0.1"
|
schema-utils "^4.0.1"
|
||||||
|
|
||||||
|
expo-screen-orientation@6:
|
||||||
|
version "6.4.1"
|
||||||
|
resolved "https://registry.yarnpkg.com/expo-screen-orientation/-/expo-screen-orientation-6.4.1.tgz#1c4428a058921e48b5caa45367e626b8bec10e24"
|
||||||
|
integrity sha512-VM0C9ORNL1aT6Dr2OUeryzV519n0FjtXI2m+HlijOMi1QT2bPg4tBkCd7HLgywU4dZ1Esa46ewUudmk+fOqmMQ==
|
||||||
|
|
||||||
expo-splash-screen@0.27.7, expo-splash-screen@~0.27.5:
|
expo-splash-screen@0.27.7, expo-splash-screen@~0.27.5:
|
||||||
version "0.27.7"
|
version "0.27.7"
|
||||||
resolved "https://registry.yarnpkg.com/expo-splash-screen/-/expo-splash-screen-0.27.7.tgz#52171be54d8c008880d928e802819d767fbd3c12"
|
resolved "https://registry.yarnpkg.com/expo-splash-screen/-/expo-splash-screen-0.27.7.tgz#52171be54d8c008880d928e802819d767fbd3c12"
|
||||||
@@ -5850,7 +5855,7 @@ lodash.throttle@^4.1.1:
|
|||||||
resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4"
|
resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4"
|
||||||
integrity sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==
|
integrity sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==
|
||||||
|
|
||||||
lodash@^4.17.10, lodash@^4.17.13, lodash@^4.17.19, lodash@^4.17.21:
|
lodash@^4.17.10, lodash@^4.17.13, lodash@^4.17.19:
|
||||||
version "4.17.21"
|
version "4.17.21"
|
||||||
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
|
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
|
||||||
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
|
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
|
||||||
@@ -5879,7 +5884,7 @@ logkitty@^0.7.1:
|
|||||||
dayjs "^1.8.15"
|
dayjs "^1.8.15"
|
||||||
yargs "^15.1.0"
|
yargs "^15.1.0"
|
||||||
|
|
||||||
loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0:
|
loose-envify@^1.0.0, loose-envify@^1.1.0:
|
||||||
version "1.4.0"
|
version "1.4.0"
|
||||||
resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
|
resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
|
||||||
integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
|
integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
|
||||||
@@ -6920,15 +6925,6 @@ prompts@^2.0.1, prompts@^2.2.1, prompts@^2.3.2, prompts@^2.4.2:
|
|||||||
kleur "^3.0.3"
|
kleur "^3.0.3"
|
||||||
sisteransi "^1.0.5"
|
sisteransi "^1.0.5"
|
||||||
|
|
||||||
prop-types@^15.7.2:
|
|
||||||
version "15.8.1"
|
|
||||||
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
|
|
||||||
integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
|
|
||||||
dependencies:
|
|
||||||
loose-envify "^1.4.0"
|
|
||||||
object-assign "^4.1.1"
|
|
||||||
react-is "^16.13.1"
|
|
||||||
|
|
||||||
psl@^1.1.33:
|
psl@^1.1.33:
|
||||||
version "1.15.0"
|
version "1.15.0"
|
||||||
resolved "https://registry.yarnpkg.com/psl/-/psl-1.15.0.tgz#bdace31896f1d97cec6a79e8224898ce93d974c6"
|
resolved "https://registry.yarnpkg.com/psl/-/psl-1.15.0.tgz#bdace31896f1d97cec6a79e8224898ce93d974c6"
|
||||||
@@ -7037,7 +7033,7 @@ react-freeze@^1.0.0:
|
|||||||
resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.3.1.tgz#e83557dc12eae63a99e003a46388b1dcbb44db7e"
|
resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.3.1.tgz#e83557dc12eae63a99e003a46388b1dcbb44db7e"
|
||||||
integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==
|
integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==
|
||||||
|
|
||||||
react-is@^16.13.0, react-is@^16.13.1, react-is@^16.7.0, react-is@^16.8.4:
|
react-is@^16.13.0, react-is@^16.7.0, react-is@^16.8.4:
|
||||||
version "16.13.1"
|
version "16.13.1"
|
||||||
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
|
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
|
||||||
integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
|
integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
|
||||||
@@ -7047,16 +7043,14 @@ react-is@^17.0.1:
|
|||||||
resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
|
resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
|
||||||
integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
|
integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
|
||||||
|
|
||||||
react-native-gesture-handler@~2.16.1:
|
react-native-gesture-handler@^2.27.1:
|
||||||
version "2.16.2"
|
version "2.27.1"
|
||||||
resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-2.16.2.tgz#032bd2a07334292d7f6cff1dc9d1ec928f72e26d"
|
resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-2.27.1.tgz#8865b2345f4c65536517f20cedc420481fc72d49"
|
||||||
integrity sha512-vGFlrDKlmyI+BT+FemqVxmvO7nqxU33cgXVsn6IKAFishvlG3oV2Ds67D5nPkHMea8T+s1IcuMm0bF8ntZtAyg==
|
integrity sha512-57TUWerhdz589OcDD21e/YlL923Ma4OIpyWsP0hy7gItBCPm5d7qIUW7Yo/cS2wo1qDdOhJaNlvlBD1lDou1fA==
|
||||||
dependencies:
|
dependencies:
|
||||||
"@egjs/hammerjs" "^2.0.17"
|
"@egjs/hammerjs" "^2.0.17"
|
||||||
hoist-non-react-statics "^3.3.0"
|
hoist-non-react-statics "^3.3.0"
|
||||||
invariant "^2.2.4"
|
invariant "^2.2.4"
|
||||||
lodash "^4.17.21"
|
|
||||||
prop-types "^15.7.2"
|
|
||||||
|
|
||||||
react-native-helmet-async@2.0.4:
|
react-native-helmet-async@2.0.4:
|
||||||
version "2.0.4"
|
version "2.0.4"
|
||||||
@@ -7914,7 +7908,16 @@ string-length@^5.0.1:
|
|||||||
char-regex "^2.0.0"
|
char-regex "^2.0.0"
|
||||||
strip-ansi "^7.0.1"
|
strip-ansi "^7.0.1"
|
||||||
|
|
||||||
"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
|
"string-width-cjs@npm:string-width@^4.2.0":
|
||||||
|
version "4.2.3"
|
||||||
|
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
|
||||||
|
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
|
||||||
|
dependencies:
|
||||||
|
emoji-regex "^8.0.0"
|
||||||
|
is-fullwidth-code-point "^3.0.0"
|
||||||
|
strip-ansi "^6.0.1"
|
||||||
|
|
||||||
|
string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
|
||||||
version "4.2.3"
|
version "4.2.3"
|
||||||
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
|
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
|
||||||
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
|
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
|
||||||
@@ -7978,7 +7981,7 @@ string_decoder@~1.1.1:
|
|||||||
dependencies:
|
dependencies:
|
||||||
safe-buffer "~5.1.0"
|
safe-buffer "~5.1.0"
|
||||||
|
|
||||||
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
|
"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
|
||||||
version "6.0.1"
|
version "6.0.1"
|
||||||
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
|
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
|
||||||
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
|
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
|
||||||
@@ -7992,6 +7995,13 @@ strip-ansi@^5.0.0, strip-ansi@^5.2.0:
|
|||||||
dependencies:
|
dependencies:
|
||||||
ansi-regex "^4.1.0"
|
ansi-regex "^4.1.0"
|
||||||
|
|
||||||
|
strip-ansi@^6.0.0, strip-ansi@^6.0.1:
|
||||||
|
version "6.0.1"
|
||||||
|
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
|
||||||
|
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
|
||||||
|
dependencies:
|
||||||
|
ansi-regex "^5.0.1"
|
||||||
|
|
||||||
strip-ansi@^7.0.1:
|
strip-ansi@^7.0.1:
|
||||||
version "7.1.0"
|
version "7.1.0"
|
||||||
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
|
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
|
||||||
@@ -8739,7 +8749,7 @@ wonka@^6.3.2:
|
|||||||
resolved "https://registry.yarnpkg.com/wonka/-/wonka-6.3.5.tgz#33fa54ea700ff3e87b56fe32202112a9e8fea1a2"
|
resolved "https://registry.yarnpkg.com/wonka/-/wonka-6.3.5.tgz#33fa54ea700ff3e87b56fe32202112a9e8fea1a2"
|
||||||
integrity sha512-SSil+ecw6B4/Dm7Pf2sAshKQ5hWFvfyGlfPbEd6A14dOH6VDjrmbY86u6nZvy9omGwwIPFR8V41+of1EezgoUw==
|
integrity sha512-SSil+ecw6B4/Dm7Pf2sAshKQ5hWFvfyGlfPbEd6A14dOH6VDjrmbY86u6nZvy9omGwwIPFR8V41+of1EezgoUw==
|
||||||
|
|
||||||
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
|
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
|
||||||
version "7.0.0"
|
version "7.0.0"
|
||||||
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
|
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
|
||||||
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
|
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
|
||||||
@@ -8757,6 +8767,15 @@ wrap-ansi@^6.2.0:
|
|||||||
string-width "^4.1.0"
|
string-width "^4.1.0"
|
||||||
strip-ansi "^6.0.0"
|
strip-ansi "^6.0.0"
|
||||||
|
|
||||||
|
wrap-ansi@^7.0.0:
|
||||||
|
version "7.0.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
|
||||||
|
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
|
||||||
|
dependencies:
|
||||||
|
ansi-styles "^4.0.0"
|
||||||
|
string-width "^4.1.0"
|
||||||
|
strip-ansi "^6.0.0"
|
||||||
|
|
||||||
wrap-ansi@^8.1.0:
|
wrap-ansi@^8.1.0:
|
||||||
version "8.1.0"
|
version "8.1.0"
|
||||||
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
|
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
|
||||||
|
|||||||
Reference in New Issue
Block a user