diff --git a/app/src/main/assets/scripts/source.js b/app/src/main/assets/scripts/source.js index 9f38404d..20fb306d 100644 --- a/app/src/main/assets/scripts/source.js +++ b/app/src/main/assets/scripts/source.js @@ -707,11 +707,12 @@ class LiveEventViewCount extends LiveEvent { } } class LiveEventRaid extends LiveEvent { - constructor(targetUrl, targetName, targetThumbnail) { + constructor(targetUrl, targetName, targetThumbnail, isOutgoing) { super(100); this.targetUrl = targetUrl; this.targetName = targetName; this.targetThumbnail = targetThumbnail; + this.isOutgoing = isOutgoing; } } diff --git a/app/src/main/java/com/futo/platformplayer/api/media/models/live/LiveEventRaid.kt b/app/src/main/java/com/futo/platformplayer/api/media/models/live/LiveEventRaid.kt index f43a7c5b..6663852d 100644 --- a/app/src/main/java/com/futo/platformplayer/api/media/models/live/LiveEventRaid.kt +++ b/app/src/main/java/com/futo/platformplayer/api/media/models/live/LiveEventRaid.kt @@ -3,6 +3,7 @@ package com.futo.platformplayer.api.media.models.live import com.caoccao.javet.values.reference.V8ValueObject import com.futo.platformplayer.engine.IV8PluginConfig import com.futo.platformplayer.ensureIsBusy +import com.futo.platformplayer.getOrDefault import com.futo.platformplayer.getOrThrow class LiveEventRaid: IPlatformLiveEvent { @@ -11,11 +12,13 @@ class LiveEventRaid: IPlatformLiveEvent { val targetName: String; val targetThumbnail: String; val targetUrl: String; + val isOutgoing: Boolean; - constructor(name: String, url: String, thumbnail: String) { + constructor(name: String, url: String, thumbnail: String, isOutgoing: Boolean) { this.targetName = name; this.targetUrl = url; this.targetThumbnail = thumbnail; + this.isOutgoing = isOutgoing; } companion object { @@ -25,7 +28,8 @@ class LiveEventRaid: IPlatformLiveEvent { return LiveEventRaid( obj.getOrThrow(config, "targetName", contextName), obj.getOrThrow(config, "targetUrl", contextName), - obj.getOrThrow(config, "targetThumbnail", contextName)); + obj.getOrThrow(config, "targetThumbnail", contextName), + obj.getOrDefault(config, "isOutgoing", contextName, true) ?: true); } } } \ No newline at end of file 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 ea20bf74..a3a87946 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 @@ -14,9 +14,6 @@ import android.widget.ImageView import android.widget.LinearLayout import android.widget.TextView import androidx.constraintlayout.widget.ConstraintLayout -import androidx.core.graphics.blue -import androidx.core.graphics.green -import androidx.core.graphics.red import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearSmoothScroller import androidx.recyclerview.widget.RecyclerView @@ -70,7 +67,7 @@ class LiveChatOverlay : LinearLayout { private val _overlayRaid_Thumbnail: ImageView; private val _overlayRaid_ButtonGo: Button; - private val _overlayRaid_ButtonPrevent: Button; + private val _overlayRaid_ButtonDismiss: Button; private val _textViewers: TextView; @@ -151,7 +148,7 @@ class LiveChatOverlay : LinearLayout { _overlayRaid_Name = findViewById(R.id.raid_name); _overlayRaid_Thumbnail = findViewById(R.id.raid_thumbnail); _overlayRaid_ButtonGo = findViewById(R.id.raid_button_go); - _overlayRaid_ButtonPrevent = findViewById(R.id.raid_button_prevent); + _overlayRaid_ButtonDismiss = findViewById(R.id.raid_button_prevent); _overlayRaid.visibility = View.GONE; @@ -160,7 +157,7 @@ class LiveChatOverlay : LinearLayout { onRaidNow.emit(it); } } - _overlayRaid_ButtonPrevent.setOnClickListener { + _overlayRaid_ButtonDismiss.setOnClickListener { _currentRaid?.let { _currentRaid = null; _overlayRaid.visibility = View.GONE; @@ -373,6 +370,8 @@ class LiveChatOverlay : LinearLayout { } else _overlayRaid.visibility = View.GONE; + + _overlayRaid_ButtonGo.visibility = if (raid?.isOutgoing == true) View.VISIBLE else View.GONE } } fun setViewCount(viewCount: Int) { diff --git a/app/src/main/res/layout/overlay_livechat.xml b/app/src/main/res/layout/overlay_livechat.xml index 3e83d8e4..d4c13f6e 100644 --- a/app/src/main/res/layout/overlay_livechat.xml +++ b/app/src/main/res/layout/overlay_livechat.xml @@ -263,8 +263,8 @@ android:textSize="13dp" android:letterSpacing="0" android:fontFamily="@font/inter_regular" - android:layout_marginStart="20dp" - android:backgroundTint="#2F2F2F" + android:layout_marginStart="5dp" + android:backgroundTint="@color/colorPrimary" android:layout_marginEnd="5dp" android:text="@string/go_now"/>