Commit a4ff47d8 authored 1 year ago by Kelvin

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

parents 982d2511 8820a0ec

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

app/src/main/java/com/futo/platformplayer/UISlideOverlays.kt 13 additions, 7 deletions

app/src/main/java/com/futo/platformplayer/UISlideOverlays.kt
app/src/main/java/com/futo/platformplayer/activities/MainActivity.kt 1 addition, 3 deletions

...n/java/com/futo/platformplayer/activities/MainActivity.kt
app/src/main/java/com/futo/platformplayer/api/media/models/comments/PolycentricPlatformComment.kt 5 additions, 2 deletions

...r/api/media/models/comments/PolycentricPlatformComment.kt
app/src/main/java/com/futo/platformplayer/dialogs/CommentDialog.kt 2 additions, 1 deletion

...ain/java/com/futo/platformplayer/dialogs/CommentDialog.kt
app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/CommentsFragment.kt 12 additions, 0 deletions

...formplayer/fragment/mainactivity/main/CommentsFragment.kt
app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailFragment.kt 3 additions, 3 deletions

...mplayer/fragment/mainactivity/main/VideoDetailFragment.kt
app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt 2 additions, 2 deletions

...tformplayer/fragment/mainactivity/main/VideoDetailView.kt
app/src/main/java/com/futo/platformplayer/states/StatePolycentric.kt 76 additions, 2 deletions

...n/java/com/futo/platformplayer/states/StatePolycentric.kt
app/src/main/java/com/futo/platformplayer/views/adapters/CommentWithReferenceViewHolder.kt 6 additions, 0 deletions

...rmplayer/views/adapters/CommentWithReferenceViewHolder.kt
app/src/main/java/com/futo/platformplayer/views/behavior/GestureControlView.kt 100 additions, 16 deletions

.../futo/platformplayer/views/behavior/GestureControlView.kt
app/src/main/java/com/futo/platformplayer/views/overlays/RepliesOverlay.kt 163 additions, 1 deletion

.../com/futo/platformplayer/views/overlays/RepliesOverlay.kt
app/src/main/java/com/futo/platformplayer/views/segments/CommentsList.kt 3 additions, 6 deletions

...va/com/futo/platformplayer/views/segments/CommentsList.kt
app/src/main/java/com/futo/platformplayer/views/video/FutoVideoPlayer.kt 7 additions, 0 deletions

...va/com/futo/platformplayer/views/video/FutoVideoPlayer.kt
app/src/main/java/com/futo/platformplayer/views/video/FutoVideoPlayerBase.kt 9 additions, 0 deletions

...om/futo/platformplayer/views/video/FutoVideoPlayerBase.kt
app/src/main/res/drawable/background_primary_border.xml 5 additions, 0 deletions

app/src/main/res/drawable/background_primary_border.xml
app/src/main/res/layout/fragment_comments.xml 5 additions, 4 deletions

app/src/main/res/layout/fragment_comments.xml
app/src/main/res/layout/overlay_loader.xml 2 additions, 1 deletion

app/src/main/res/layout/overlay_loader.xml
app/src/main/res/layout/overlay_replies.xml 10 additions, 3 deletions

app/src/main/res/layout/overlay_replies.xml
app/src/main/res/layout/view_gesture_controls.xml 18 additions, 0 deletions

app/src/main/res/layout/view_gesture_controls.xml

with 442 additions and 51 deletions

Please register or to comment