From 2530c6eb5895055743783afcca11ade5aca98573 Mon Sep 17 00:00:00 2001
From: Kelvin <kelvin@futo.org>
Date: Thu, 23 Nov 2023 16:35:13 +0100
Subject: [PATCH] Live chat improvements and fixes

---
 .../futo/platformplayer/views/overlays/LiveChatOverlay.kt | 8 ++++++++
 app/src/main/res/drawable/background_donation.xml         | 7 +++++++
 app/src/main/res/layout/list_donation.xml                 | 6 +++---
 app/src/main/res/layout/overlay_livechat.xml              | 5 ++---
 4 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/res/drawable/background_donation.xml

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 ae7561bc..385be76d 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
@@ -308,13 +308,21 @@ class LiveChatOverlay : LinearLayout {
             }
         };
     }
+    private var _dedupHackfix = "";
     fun addDonation(donation: LiveEventDonation) {
+        val uniqueIdentifier = "${donation.name}${donation.amount}${donation.message}";
         if(donation.hasExpired()) {
             Logger.i(TAG, "Donation that is already expired: [${donation.amount}]" + donation.name + ":" + donation.message + " EXPIRE: ${donation.expire}");
             return;
         }
+        else if(_dedupHackfix == uniqueIdentifier) {
+            Logger.i(TAG, "Donation duplicate found, ignoring");
+            return;
+        }
         else
             Logger.i(TAG, "Donation Added: [${donation.amount}]" + donation.name + ":" + donation.message + " EXPIRE: ${donation.expire}");
+        _dedupHackfix = uniqueIdentifier;
+
         val view = LiveChatDonationPill(context, donation);
         view.setOnClickListener {
             showDonation(donation);
diff --git a/app/src/main/res/drawable/background_donation.xml b/app/src/main/res/drawable/background_donation.xml
new file mode 100644
index 00000000..7112c768
--- /dev/null
+++ b/app/src/main/res/drawable/background_donation.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#2A2A2A" />
+    <corners android:radius="500dp" />
+    <size android:height="20dp" />
+    <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_donation.xml b/app/src/main/res/layout/list_donation.xml
index 0eddfc30..921cd87a 100644
--- a/app/src/main/res/layout/list_donation.xml
+++ b/app/src/main/res/layout/list_donation.xml
@@ -9,7 +9,7 @@
     android:paddingStart="7dp"
     android:paddingEnd="12dp"
     android:layout_marginEnd="5dp"
-    android:background="@drawable/background_pill"
+    android:background="@drawable/background_donation"
     android:orientation="vertical"
     android:id="@+id/root">
 
@@ -24,7 +24,7 @@
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
             android:layout_marginRight="5dp"
-            android:layout_marginLeft="5dp"
+            android:layout_marginLeft="0dp"
             android:scaleType="fitCenter"
             app:srcCompat="@drawable/placeholder_profile" />
 
@@ -32,7 +32,7 @@
             android:id="@+id/donation_amount"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_marginLeft="5dp"
+            android:layout_marginLeft="3dp"
             app:layout_constraintLeft_toRightOf="@id/donation_author_image"
             app:layout_constraintTop_toTopOf="parent"
             android:textColor="@color/white"
diff --git a/app/src/main/res/layout/overlay_livechat.xml b/app/src/main/res/layout/overlay_livechat.xml
index 8f4ff524..9339c9a5 100644
--- a/app/src/main/res/layout/overlay_livechat.xml
+++ b/app/src/main/res/layout/overlay_livechat.xml
@@ -46,10 +46,9 @@
             app:layout_constraintLeft_toRightOf="@id/ic_viewers"
             tools:text="1536 viewers"/>
 
-        <ScrollView
+        <HorizontalScrollView
             android:layout_width="match_parent"
             android:layout_height="35dp"
-            android:orientation="horizontal"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent">
@@ -61,7 +60,7 @@
                 android:layout_height="match_parent">
 
             </LinearLayout>
-        </ScrollView>
+        </HorizontalScrollView>
 
         <ImageView
             android:id="@+id/button_close"