diff --git a/app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/JSPager.kt b/app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/JSPager.kt index f363a011..731d0e51 100644 --- a/app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/JSPager.kt +++ b/app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/JSPager.kt @@ -41,7 +41,7 @@ abstract class JSPager : IPager { } override fun hasMorePages(): Boolean { - return _hasMorePages; + return _hasMorePages && !pager.isClosed; } override fun nextPage() { diff --git a/app/src/main/java/com/futo/platformplayer/views/TargetTapLoaderView.kt b/app/src/main/java/com/futo/platformplayer/views/TargetTapLoaderView.kt index 6778ea0a..bf9d3150 100644 --- a/app/src/main/java/com/futo/platformplayer/views/TargetTapLoaderView.kt +++ b/app/src/main/java/com/futo/platformplayer/views/TargetTapLoaderView.kt @@ -41,8 +41,8 @@ class TargetTapLoaderView @JvmOverloads constructor( private val particles = mutableListOf() private val textPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { - color = Color.WHITE - textSize = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, 18f, resources.displayMetrics) + color = Color.argb(0.7f, 1f, 1f, 1f) + textSize = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, 12f, resources.displayMetrics) textAlign = Paint.Align.LEFT setShadowLayer(4f, 0f, 0f, Color.BLACK) typeface = Typeface.DEFAULT_BOLD @@ -236,8 +236,8 @@ class TargetTapLoaderView @JvmOverloads constructor( if (isPlaying) { val margin = 24f - val scoreTxt = "Score $score" - val speedTxt = "Speed ${"%.2f".format(spawnRate)}/s" + val scoreTxt = "Score: $score" + val speedTxt = "Speed: ${"%.2f".format(spawnRate)}/s" val maxWidth = width - margin val needRight = max(textPaint.measureText(scoreTxt), textPaint.measureText(speedTxt)) > maxWidth diff --git a/app/src/stable/assets/sources/dailymotion b/app/src/stable/assets/sources/dailymotion index d1154300..850eb812 160000 --- a/app/src/stable/assets/sources/dailymotion +++ b/app/src/stable/assets/sources/dailymotion @@ -1 +1 @@ -Subproject commit d11543001150f96f3383d83fec3341d9321746b8 +Subproject commit 850eb8122dd8348904d55ceb9c3a26b49bcb8a45 diff --git a/app/src/stable/assets/sources/odysee b/app/src/stable/assets/sources/odysee index d37268ab..736c6b95 160000 --- a/app/src/stable/assets/sources/odysee +++ b/app/src/stable/assets/sources/odysee @@ -1 +1 @@ -Subproject commit d37268abe2b32a4677c583ee252d9e439c56a38e +Subproject commit 736c6b953a4613145e32010ff5ee5b08be1baac6 diff --git a/app/src/stable/assets/sources/twitch b/app/src/stable/assets/sources/twitch index f526ce1b..8de3ab18 160000 --- a/app/src/stable/assets/sources/twitch +++ b/app/src/stable/assets/sources/twitch @@ -1 +1 @@ -Subproject commit f526ce1b7690c0e077279edca601c3e1dab14f15 +Subproject commit 8de3ab18f5a154f49f02e2bee1b126a302df260d diff --git a/app/src/stable/assets/sources/youtube b/app/src/stable/assets/sources/youtube index 98255d17..2b724f21 160000 --- a/app/src/stable/assets/sources/youtube +++ b/app/src/stable/assets/sources/youtube @@ -1 +1 @@ -Subproject commit 98255d1773d288bfa567f122993c7b2845f37ea5 +Subproject commit 2b724f21a727c3fefe16adb38f06aa8730b1b8ec diff --git a/app/src/unstable/assets/sources/dailymotion b/app/src/unstable/assets/sources/dailymotion index d1154300..850eb812 160000 --- a/app/src/unstable/assets/sources/dailymotion +++ b/app/src/unstable/assets/sources/dailymotion @@ -1 +1 @@ -Subproject commit d11543001150f96f3383d83fec3341d9321746b8 +Subproject commit 850eb8122dd8348904d55ceb9c3a26b49bcb8a45 diff --git a/app/src/unstable/assets/sources/odysee b/app/src/unstable/assets/sources/odysee index d37268ab..736c6b95 160000 --- a/app/src/unstable/assets/sources/odysee +++ b/app/src/unstable/assets/sources/odysee @@ -1 +1 @@ -Subproject commit d37268abe2b32a4677c583ee252d9e439c56a38e +Subproject commit 736c6b953a4613145e32010ff5ee5b08be1baac6 diff --git a/app/src/unstable/assets/sources/twitch b/app/src/unstable/assets/sources/twitch index f526ce1b..8de3ab18 160000 --- a/app/src/unstable/assets/sources/twitch +++ b/app/src/unstable/assets/sources/twitch @@ -1 +1 @@ -Subproject commit f526ce1b7690c0e077279edca601c3e1dab14f15 +Subproject commit 8de3ab18f5a154f49f02e2bee1b126a302df260d diff --git a/app/src/unstable/assets/sources/youtube b/app/src/unstable/assets/sources/youtube index 98255d17..2b724f21 160000 --- a/app/src/unstable/assets/sources/youtube +++ b/app/src/unstable/assets/sources/youtube @@ -1 +1 @@ -Subproject commit 98255d1773d288bfa567f122993c7b2845f37ea5 +Subproject commit 2b724f21a727c3fefe16adb38f06aa8730b1b8ec