Merge branch 'master' into 'subscription-submission-modal'
# Conflicts: # app/src/main/res/values/strings.xml
No related branches found
No related tags found
Showing
- CONTRIBUTION.md 16 additions, 2 deletionsCONTRIBUTION.md
- README.md 19 additions, 16 deletionsREADME.md
- app/src/main/AndroidManifest.xml 0 additions, 4 deletionsapp/src/main/AndroidManifest.xml
- app/src/main/java/com/futo/platformplayer/Settings.kt 16 additions, 7 deletionsapp/src/main/java/com/futo/platformplayer/Settings.kt
- app/src/main/java/com/futo/platformplayer/UIDialogs.kt 7 additions, 0 deletionsapp/src/main/java/com/futo/platformplayer/UIDialogs.kt
- app/src/main/java/com/futo/platformplayer/UISlideOverlays.kt 21 additions, 21 deletionsapp/src/main/java/com/futo/platformplayer/UISlideOverlays.kt
- app/src/main/java/com/futo/platformplayer/activities/MainActivity.kt 4 additions, 4 deletions...n/java/com/futo/platformplayer/activities/MainActivity.kt
- app/src/main/java/com/futo/platformplayer/api/media/platforms/js/SourcePluginConfig.kt 2 additions, 1 deletion...atformplayer/api/media/platforms/js/SourcePluginConfig.kt
- app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/JSPager.kt 2 additions, 0 deletions...o/platformplayer/api/media/platforms/js/models/JSPager.kt
- app/src/main/java/com/futo/platformplayer/dialogs/AutomaticBackupDialog.kt 9 additions, 0 deletions.../com/futo/platformplayer/dialogs/AutomaticBackupDialog.kt
- app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/BuyFragment.kt 2 additions, 2 deletions.../platformplayer/fragment/mainactivity/main/BuyFragment.kt
- app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/SubscriptionGroupFragment.kt 6 additions, 4 deletions...r/fragment/mainactivity/main/SubscriptionGroupFragment.kt
- app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/SubscriptionGroupListFragment.kt 14 additions, 4 deletions...agment/mainactivity/main/SubscriptionGroupListFragment.kt
- app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/SubscriptionsFeedFragment.kt 2 additions, 0 deletions...r/fragment/mainactivity/main/SubscriptionsFeedFragment.kt
- app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailFragment.kt 2 additions, 2 deletions...mplayer/fragment/mainactivity/main/VideoDetailFragment.kt
- app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt 108 additions, 32 deletions...tformplayer/fragment/mainactivity/main/VideoDetailView.kt
- app/src/main/java/com/futo/platformplayer/helpers/VideoHelper.kt 4 additions, 4 deletions.../main/java/com/futo/platformplayer/helpers/VideoHelper.kt
- app/src/main/java/com/futo/platformplayer/mdns/MDNSListener.kt 4 additions, 1 deletion...rc/main/java/com/futo/platformplayer/mdns/MDNSListener.kt
- app/src/main/java/com/futo/platformplayer/mdns/ServiceDiscoverer.kt 4 additions, 1 deletion...in/java/com/futo/platformplayer/mdns/ServiceDiscoverer.kt
- app/src/main/java/com/futo/platformplayer/mdns/ServiceRecordAggregator.kt 23 additions, 22 deletions...a/com/futo/platformplayer/mdns/ServiceRecordAggregator.kt
Loading
Please register or sign in to comment