Merge branch 'master' of gitlab.futo.org:videostreaming/grayjay

parents 422cceb2 76f59622

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/src/main/java/com/futo/platformplayer/Extensions_Content.kt 15 additions, 2 deletions

...c/main/java/com/futo/platformplayer/Extensions_Content.kt
app/src/main/java/com/futo/platformplayer/PresetImages.kt 20 additions, 0 deletions

app/src/main/java/com/futo/platformplayer/PresetImages.kt
app/src/main/java/com/futo/platformplayer/Settings.kt 13 additions, 10 deletions

app/src/main/java/com/futo/platformplayer/Settings.kt
app/src/main/java/com/futo/platformplayer/UISlideOverlays.kt 64 additions, 2 deletions

app/src/main/java/com/futo/platformplayer/UISlideOverlays.kt
app/src/main/java/com/futo/platformplayer/activities/MainActivity.kt 9 additions, 0 deletions

...n/java/com/futo/platformplayer/activities/MainActivity.kt
app/src/main/java/com/futo/platformplayer/activities/ManageTabsActivity.kt 2 additions, 2 deletions

.../com/futo/platformplayer/activities/ManageTabsActivity.kt
app/src/main/java/com/futo/platformplayer/api/media/models/modifier/AdhocRequestModifier.kt 14 additions, 0 deletions

...mplayer/api/media/models/modifier/AdhocRequestModifier.kt
app/src/main/java/com/futo/platformplayer/api/media/models/modifier/IModifierOptions.kt 6 additions, 0 deletions

...tformplayer/api/media/models/modifier/IModifierOptions.kt
app/src/main/java/com/futo/platformplayer/api/media/models/modifier/IRequest.kt 6 additions, 0 deletions

...futo/platformplayer/api/media/models/modifier/IRequest.kt
app/src/main/java/com/futo/platformplayer/api/media/models/modifier/IRequestModifier.kt 7 additions, 0 deletions

...tformplayer/api/media/models/modifier/IRequestModifier.kt
app/src/main/java/com/futo/platformplayer/api/media/platforms/js/DevJSClient.kt 2 additions, 2 deletions

...futo/platformplayer/api/media/platforms/js/DevJSClient.kt
app/src/main/java/com/futo/platformplayer/api/media/platforms/js/JSClient.kt 27 additions, 19 deletions

...om/futo/platformplayer/api/media/platforms/js/JSClient.kt
app/src/main/java/com/futo/platformplayer/api/media/platforms/js/SourcePluginDescriptor.kt 4 additions, 2 deletions

...rmplayer/api/media/platforms/js/SourcePluginDescriptor.kt
app/src/main/java/com/futo/platformplayer/api/media/platforms/js/internal/JSHttpClient.kt 72 additions, 9 deletions

...ormplayer/api/media/platforms/js/internal/JSHttpClient.kt
app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/IJSContent.kt 4 additions, 2 deletions

...latformplayer/api/media/platforms/js/models/IJSContent.kt
app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/IJSContentDetails.kt 5 additions, 4 deletions

...player/api/media/platforms/js/models/IJSContentDetails.kt
app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/JSChannelPager.kt 2 additions, 1 deletion

...ormplayer/api/media/platforms/js/models/JSChannelPager.kt
app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/JSComment.kt 3 additions, 1 deletion

...platformplayer/api/media/platforms/js/models/JSComment.kt
app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/JSCommentPager.kt 3 additions, 2 deletions

...ormplayer/api/media/platforms/js/models/JSCommentPager.kt
app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/JSContentPager.kt 3 additions, 2 deletions

...ormplayer/api/media/platforms/js/models/JSContentPager.kt

with 281 additions and 60 deletions

Please register or to comment