mirrors/grayjay
0
0
Fork 0
mirror of https://gitlab.futo.org/videostreaming/grayjay.git synced 2025-08-23 19:01:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Koen J 2025-07-07 16:12:33 +02:00
commit 73ad783881
10 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/JSPager.kt
View file

@ -41,7 +41,7 @@ abstract class JSPager<T> : IPager<T> {
} }
override fun hasMorePages(): Boolean { override fun hasMorePages(): Boolean {
return _hasMorePages; return _hasMorePages && !pager.isClosed;
} }
override fun nextPage() { override fun nextPage() {

8
app/src/main/java/com/futo/platformplayer/views/TargetTapLoaderView.kt
View file

@ -41,8 +41,8 @@ class TargetTapLoaderView @JvmOverloads constructor(
private val particles = mutableListOf<Particle>() private val particles = mutableListOf<Particle>()
private val textPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { private val textPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
color = Color.WHITE color = Color.argb(0.7f, 1f, 1f, 1f)
textSize = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, 18f, resources.displayMetrics) textSize = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, 12f, resources.displayMetrics)
textAlign = Paint.Align.LEFT textAlign = Paint.Align.LEFT
setShadowLayer(4f, 0f, 0f, Color.BLACK) setShadowLayer(4f, 0f, 0f, Color.BLACK)
typeface = Typeface.DEFAULT_BOLD typeface = Typeface.DEFAULT_BOLD
@ -236,8 +236,8 @@ class TargetTapLoaderView @JvmOverloads constructor(
if (isPlaying) { if (isPlaying) {
val margin = 24f val margin = 24f
val scoreTxt = "Score $score" val scoreTxt = "Score: $score"
val speedTxt = "Speed ${"%.2f".format(spawnRate)}/s" val speedTxt = "Speed: ${"%.2f".format(spawnRate)}/s"
val maxWidth = width - margin val maxWidth = width - margin
val needRight = max(textPaint.measureText(scoreTxt), textPaint.measureText(speedTxt)) > maxWidth val needRight = max(textPaint.measureText(scoreTxt), textPaint.measureText(speedTxt)) > maxWidth

2
app/src/stable/assets/sources/dailymotion

@ -1 +1 @@
Subproject commit d11543001150f96f3383d83fec3341d9321746b8 Subproject commit 850eb8122dd8348904d55ceb9c3a26b49bcb8a45

2
app/src/stable/assets/sources/odysee

@ -1 +1 @@
Subproject commit d37268abe2b32a4677c583ee252d9e439c56a38e Subproject commit 736c6b953a4613145e32010ff5ee5b08be1baac6

2
app/src/stable/assets/sources/twitch

@ -1 +1 @@
Subproject commit f526ce1b7690c0e077279edca601c3e1dab14f15 Subproject commit 8de3ab18f5a154f49f02e2bee1b126a302df260d

2
app/src/stable/assets/sources/youtube

@ -1 +1 @@
Subproject commit 98255d1773d288bfa567f122993c7b2845f37ea5 Subproject commit 2b724f21a727c3fefe16adb38f06aa8730b1b8ec

2
app/src/unstable/assets/sources/dailymotion

@ -1 +1 @@
Subproject commit d11543001150f96f3383d83fec3341d9321746b8 Subproject commit 850eb8122dd8348904d55ceb9c3a26b49bcb8a45

2
app/src/unstable/assets/sources/odysee

@ -1 +1 @@
Subproject commit d37268abe2b32a4677c583ee252d9e439c56a38e Subproject commit 736c6b953a4613145e32010ff5ee5b08be1baac6

2
app/src/unstable/assets/sources/twitch

@ -1 +1 @@
Subproject commit f526ce1b7690c0e077279edca601c3e1dab14f15 Subproject commit 8de3ab18f5a154f49f02e2bee1b126a302df260d

2
app/src/unstable/assets/sources/youtube

@ -1 +1 @@
Subproject commit 98255d1773d288bfa567f122993c7b2845f37ea5 Subproject commit 2b724f21a727c3fefe16adb38f06aa8730b1b8ec