mirror of
https://github.com/tapframe/NuvioStreaming.git
synced 2026-03-15 15:36:01 +00:00
540f364c82
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) |
||
|---|---|---|
| .. | ||
| android | ||
| AppIcons/android | ||
| bootsplash | ||
| fonts | ||
| ios | ||
| lottie | ||
| rating-icons | ||
| Ripple loading animation 2 | ||
| adaptive-icon.png | ||
| dog-running.zip | ||
| favicon.png | ||
| icon.png | ||
| nuviotext.png | ||
| Progress of loading hand.zip | ||
| Ripple loading animation.zip | ||
| simkl-favicon.png | ||
| simkl-logo.png | ||
| splash-icon.png | ||
| support_me_on_kofi_red.png | ||
| titlelogo.png | ||
| trakt-favicon.png | ||
| trakt-logo.png | ||
