paregi12 540f364c82 Merge remote-tracking branch 'upstream/main' into Mal ... 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)		2026-01-27 13:24:53 +05:30
..
app	Merge remote-tracking branch 'upstream/main' into Mal	2026-01-27 13:24:53 +05:30
gradle/wrapper	test	2025-10-15 01:51:57 +05:30
.gitignore	icon changes	2025-07-05 19:55:02 +05:30
build.gradle	added hwdec options to choose from	2025-12-27 17:50:09 +05:30
gradle.properties	ci: optimize android build time	2026-01-17 17:54:13 +05:30
gradlew	test	2025-10-15 01:51:57 +05:30
gradlew.bat	test	2025-10-15 01:51:57 +05:30
sentry.properties	1.2.11 26	2025-12-15 03:11:26 +05:30
settings.gradle	Add files via upload	2026-01-18 11:57:03 +05:30