Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

G

Grayjay
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

7cdded8f

Commit 7cdded8f authored 3 months ago by Kelvin

Downloads
- Plain Diff

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

parents 8c9d045e 178d874b

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

app/src/main/AndroidManifest.xml 1 addition, 1 deletion

app/src/main/AndroidManifest.xml
app/src/main/java/com/futo/platformplayer/dialogs/CommentDialog.kt 33 additions, 3 deletions

...ain/java/com/futo/platformplayer/dialogs/CommentDialog.kt
app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/CreatorsFragment.kt 17 additions, 2 deletions

...formplayer/fragment/mainactivity/main/CreatorsFragment.kt
app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt 10 additions, 7 deletions

...tformplayer/fragment/mainactivity/main/VideoDetailView.kt
app/src/main/java/com/futo/platformplayer/others/PlatformLinkMovementMethod.kt 83 additions, 44 deletions

.../futo/platformplayer/others/PlatformLinkMovementMethod.kt
app/src/main/java/com/futo/platformplayer/states/StateSync.kt 13 additions, 8 deletions

...src/main/java/com/futo/platformplayer/states/StateSync.kt
app/src/main/java/com/futo/platformplayer/views/behavior/NonScrollingTextView.kt 77 additions, 37 deletions

...uto/platformplayer/views/behavior/NonScrollingTextView.kt
app/src/main/java/com/futo/platformplayer/views/segments/CommentsList.kt 8 additions, 3 deletions

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

...va/com/futo/platformplayer/views/video/FutoVideoPlayer.kt
app/src/main/res/values/strings.xml 1 addition, 0 deletions

app/src/main/res/values/strings.xml
deploy-playstore.sh 1 addition, 0 deletions

deploy-playstore.sh

with 249 additions and 105 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment