mirror of
https://github.com/tapframe/NuvioStreaming.git
synced 2026-03-16 15:56:31 +00:00
Resolved conflicts in: - src/components/player/AndroidVideoPlayer.tsx (Kept upstream imports) - src/navigation/AppNavigator.tsx (Merged MAL and Simkl screens/imports) - src/screens/CalendarScreen.tsx (Merged AniList source support with upstream filtering) - src/screens/LibraryScreen.tsx (Merged MAL and Simkl rendering/filters) - src/screens/SettingsScreen.tsx (Merged MAL and Simkl settings items) - src/screens/streams/useStreamsScreen.ts (Resolved streamProvider declaration) - src/services/pluginService.ts (Merged testPlugin feature with upstream safety/sandboxing) - src/services/stremioService.ts (Merged imports) - src/services/watchedService.ts (Merged MAL and Simkl sync logic) |
||
|---|---|---|
| .. | ||
| libs | ||
| src | ||
| build.gradle | ||
| debug.keystore | ||
| proguard-rules.pro | ||