diff --git a/app/src/main/java/com/futo/platformplayer/views/overlays/LiveChatOverlay.kt b/app/src/main/java/com/futo/platformplayer/views/overlays/LiveChatOverlay.kt
index a3a87946..a2ed19ef 100644
--- a/app/src/main/java/com/futo/platformplayer/views/overlays/LiveChatOverlay.kt
+++ b/app/src/main/java/com/futo/platformplayer/views/overlays/LiveChatOverlay.kt
@@ -64,6 +64,7 @@ class LiveChatOverlay : LinearLayout {
private val _overlayRaid: ConstraintLayout;
private val _overlayRaid_Name: TextView;
+ private val _overlayRaid_Message: TextView;
private val _overlayRaid_Thumbnail: ImageView;
private val _overlayRaid_ButtonGo: Button;
@@ -146,6 +147,7 @@ class LiveChatOverlay : LinearLayout {
_overlayRaid = findViewById(R.id.overlay_raid);
_overlayRaid_Name = findViewById(R.id.raid_name);
+ _overlayRaid_Message = findViewById(R.id.textRaidMessage);
_overlayRaid_Thumbnail = findViewById(R.id.raid_thumbnail);
_overlayRaid_ButtonGo = findViewById(R.id.raid_button_go);
_overlayRaid_ButtonDismiss = findViewById(R.id.raid_button_prevent);
@@ -371,7 +373,14 @@ class LiveChatOverlay : LinearLayout {
else
_overlayRaid.visibility = View.GONE;
- _overlayRaid_ButtonGo.visibility = if (raid?.isOutgoing == true) View.VISIBLE else View.GONE
+ if(raid?.isOutgoing ?: false) {
+ _overlayRaid_ButtonGo.visibility = View.VISIBLE
+ _overlayRaid_Message.text = "Viewers are raiding";
+ }
+ else {
+ _overlayRaid_ButtonGo.visibility = View.GONE;
+ _overlayRaid_Message.text = "Raid incoming from";
+ }
}
}
fun setViewCount(viewCount: Int) {
diff --git a/app/src/main/java/com/futo/platformplayer/views/video/FutoVideoPlayer.kt b/app/src/main/java/com/futo/platformplayer/views/video/FutoVideoPlayer.kt
index a497ab72..350ef6b0 100644
--- a/app/src/main/java/com/futo/platformplayer/views/video/FutoVideoPlayer.kt
+++ b/app/src/main/java/com/futo/platformplayer/views/video/FutoVideoPlayer.kt
@@ -909,6 +909,10 @@ class FutoVideoPlayer : FutoVideoPlayerBase {
duration = expectedDurationMs.toLong()
addUpdateListener { anim ->
loaderDeterminate.progress = anim.animatedValue as Int
+ if(loaderDeterminate.progress > loaderDeterminate.max - 10) {
+ setLoading(true);
+ }
+
}
start()
};
diff --git a/app/src/main/res/drawable/progress_bar.xml b/app/src/main/res/drawable/progress_bar.xml
index c6641d2c..d459af14 100644
--- a/app/src/main/res/drawable/progress_bar.xml
+++ b/app/src/main/res/drawable/progress_bar.xml
@@ -7,8 +7,8 @@
android:angle="270"
android:centerColor="#ff5a5d5a"
android:centerY="0.75"
- android:endColor="#ff747674"
- android:startColor="#ff9d9e9d" />
+ android:endColor="#ff5a5d5a"
+ android:startColor="#ff5a5d5a" />
@@ -20,7 +20,7 @@
android:angle="270"
android:centerColor="#80ffb600"
android:centerY="0.75"
- android:endColor="#a0ffcb00"
+ android:endColor="#80ffd300"
android:startColor="#80ffd300" />
@@ -31,7 +31,7 @@
diff --git a/app/src/stable/assets/sources/youtube b/app/src/stable/assets/sources/youtube
index 2036f9b6..f793e625 160000
--- a/app/src/stable/assets/sources/youtube
+++ b/app/src/stable/assets/sources/youtube
@@ -1 +1 @@
-Subproject commit 2036f9b68255d2f9ef4e1232b4ad556e11cafb9a
+Subproject commit f793e625641195f5fe60d94a829e7f44a93325a6
diff --git a/app/src/unstable/assets/sources/youtube b/app/src/unstable/assets/sources/youtube
index 2036f9b6..f793e625 160000
--- a/app/src/unstable/assets/sources/youtube
+++ b/app/src/unstable/assets/sources/youtube
@@ -1 +1 @@
-Subproject commit 2036f9b68255d2f9ef4e1232b4ad556e11cafb9a
+Subproject commit f793e625641195f5fe60d94a829e7f44a93325a6