Merge branch 'master-bug'

# Conflicts:
#	CHANGELOG.md
#	app/video/[bvid].tsx
#	components/DanmakuList.tsx
This commit is contained in:
Developer
2026-03-25 15:06:37 +08:00
14 changed files with 523 additions and 176 deletions

View File

@@ -8,6 +8,7 @@ import { useDownloadStore } from '../store/downloadStore';
import { useSettingsStore } from '../store/settingsStore';
import { useTheme } from '../utils/theme';
import { MiniPlayer } from '../components/MiniPlayer';
import { LiveMiniPlayer } from '../components/LiveMiniPlayer';
import * as Sentry from '@sentry/react-native';
import { ErrorBoundary } from '@sentry/react-native';
import { useFonts } from 'expo-font';
@@ -87,6 +88,7 @@ function RootLayout() {
</Stack>
</ErrorBoundary>
<MiniPlayer />
<LiveMiniPlayer />
</View>
</SafeAreaProvider>
);