Commit aee5b75c authored 1 year ago by Koen

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

parents fe02197b a1060a15

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/build.gradle 8 additions, 1 deletion

app/build.gradle
app/src/androidTest/java/com/futo/platformplayer/ManagedDBStoreTests.kt 368 additions, 0 deletions

...dTest/java/com/futo/platformplayer/ManagedDBStoreTests.kt
app/src/main/java/com/futo/platformplayer/Settings.kt 1 addition, 2 deletions

app/src/main/java/com/futo/platformplayer/Settings.kt
app/src/main/java/com/futo/platformplayer/SettingsDev.kt 153 additions, 7 deletions

app/src/main/java/com/futo/platformplayer/SettingsDev.kt
app/src/main/java/com/futo/platformplayer/activities/DeveloperActivity.kt 22 additions, 0 deletions

...a/com/futo/platformplayer/activities/DeveloperActivity.kt
app/src/main/java/com/futo/platformplayer/api/media/models/video/SerializedPlatformContent.kt 4 additions, 0 deletions

...layer/api/media/models/video/SerializedPlatformContent.kt
app/src/main/java/com/futo/platformplayer/api/media/models/video/SerializedPlatformLockedContent.kt 1 addition, 1 deletion

...api/media/models/video/SerializedPlatformLockedContent.kt
app/src/main/java/com/futo/platformplayer/api/media/models/video/SerializedPlatformNestedContent.kt 1 addition, 1 deletion

...api/media/models/video/SerializedPlatformNestedContent.kt
app/src/main/java/com/futo/platformplayer/api/media/models/video/SerializedPlatformPost.kt 2 additions, 1 deletion

...rmplayer/api/media/models/video/SerializedPlatformPost.kt
app/src/main/java/com/futo/platformplayer/api/media/models/video/SerializedPlatformVideo.kt 1 addition, 1 deletion

...mplayer/api/media/models/video/SerializedPlatformVideo.kt
app/src/main/java/com/futo/platformplayer/api/media/structures/AdhocPager.kt 31 additions, 0 deletions

...om/futo/platformplayer/api/media/structures/AdhocPager.kt
app/src/main/java/com/futo/platformplayer/background/BackgroundWorker.kt 1 addition, 1 deletion

...va/com/futo/platformplayer/background/BackgroundWorker.kt
app/src/main/java/com/futo/platformplayer/engine/packages/PackageHttp.kt 4 additions, 1 deletion

...va/com/futo/platformplayer/engine/packages/PackageHttp.kt
app/src/main/java/com/futo/platformplayer/fragment/channel/tab/ChannelContentsFragment.kt 3 additions, 3 deletions

...ormplayer/fragment/channel/tab/ChannelContentsFragment.kt
app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/FeedView.kt 7 additions, 0 deletions

...uto/platformplayer/fragment/mainactivity/main/FeedView.kt
app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/HistoryFragment.kt 2 additions, 1 deletion

...tformplayer/fragment/mainactivity/main/HistoryFragment.kt
app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/SubscriptionsFeedFragment.kt 21 additions, 8 deletions

...r/fragment/mainactivity/main/SubscriptionsFeedFragment.kt
app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt 34 additions, 14 deletions

...tformplayer/fragment/mainactivity/main/VideoDetailView.kt
app/src/main/java/com/futo/platformplayer/serializers/PlatformContentSerializer.kt 3 additions, 2 deletions

...o/platformplayer/serializers/PlatformContentSerializer.kt
app/src/main/java/com/futo/platformplayer/states/StateApp.kt 37 additions, 27 deletions

app/src/main/java/com/futo/platformplayer/states/StateApp.kt

with 704 additions and 71 deletions

Please register or to comment