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

f344dbf3

Commit f344dbf3 authored 1 year ago by Kelvin

Downloads
- Plain Diff

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

parents a04acbd4 bd48aba8

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/FeedView.kt 6 additions, 0 deletions

...uto/platformplayer/fragment/mainactivity/main/FeedView.kt
app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/ImportSubscriptionsFragment.kt 15 additions, 0 deletions

...fragment/mainactivity/main/ImportSubscriptionsFragment.kt
app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/SubscriptionsFeedFragment.kt 7 additions, 1 deletion

...r/fragment/mainactivity/main/SubscriptionsFeedFragment.kt
app/src/main/java/com/futo/platformplayer/images/PolycentricModelLoader.java 14 additions, 2 deletions

...om/futo/platformplayer/images/PolycentricModelLoader.java
app/src/main/res/layout/fragment_feed.xml 27 additions, 12 deletions

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

with 69 additions and 15 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