From 4dab5156e1fabf42c597260bea921355ddbd90f0 Mon Sep 17 00:00:00 2001
From: kosyak <kosyak@narayana.im>
Date: Sun, 1 Sep 2024 22:57:59 +0200
Subject: [PATCH] small muc subject improvements

---
 .../eu/siacs/conversations/ui/ConversationFragment.java  | 2 +-
 src/main/res/drawable/ic_subject_black.xml               | 9 +++++++++
 src/main/res/drawable/ic_subject_white.xml               | 9 +++++++++
 src/main/res/layout/fragment_conversation.xml            | 2 +-
 src/main/res/values/attrs.xml                            | 1 +
 src/main/res/values/themes.xml                           | 2 ++
 6 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 src/main/res/drawable/ic_subject_black.xml
 create mode 100644 src/main/res/drawable/ic_subject_white.xml

diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 457ff8807..ebea2bc31 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -3610,7 +3610,7 @@ public class ConversationFragment extends XmppFragment
                 conversation.refreshSessions();
 
 
-                if (conversation != null && conversation.getMode() == Conversational.MODE_MULTI) {
+                if (conversation != null && conversation.getMode() == Conversational.MODE_MULTI && conversation.getNextCounterpart() == null) {
                     String subject = conversation.getMucOptions().getSubject();
                     Boolean hidden = conversation.getMucOptions().subjectHidden();
 
diff --git a/src/main/res/drawable/ic_subject_black.xml b/src/main/res/drawable/ic_subject_black.xml
new file mode 100644
index 000000000..6edbae1ae
--- /dev/null
+++ b/src/main/res/drawable/ic_subject_black.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M160,760L160,680L560,680L560,760L160,760ZM160,600L160,520L800,520L800,600L160,600ZM160,440L160,360L800,360L800,440L160,440ZM160,280L160,200L800,200L800,280L160,280Z"/>
+</vector>
diff --git a/src/main/res/drawable/ic_subject_white.xml b/src/main/res/drawable/ic_subject_white.xml
new file mode 100644
index 000000000..8c6262226
--- /dev/null
+++ b/src/main/res/drawable/ic_subject_white.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M160,760L160,680L560,680L560,760L160,760ZM160,600L160,520L800,520L800,600L160,600ZM160,440L160,360L800,360L800,440L160,440ZM160,280L160,200L800,200L800,280L160,280Z"/>
+</vector>
diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index 870d2fb85..0da157c37 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -54,7 +54,7 @@
                     <ImageView
                         android:layout_width="24dp"
                         android:layout_height="24dp"
-                        android:src="?attr/ic_pin"
+                        android:src="?attr/ic_subject"
                         android:layout_marginEnd="8dp"
                         />
 
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 19d4166c8..6f9eccd42 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -40,6 +40,7 @@
     <attr name="ic_send_voice_offline" format="reference" />
 
     <attr name="ic_pin" format="reference" />
+    <attr name="ic_subject" format="reference" />
     <attr name="ic_close" format="reference" />
     <attr name="ic_attach_camera" format="reference" />
     <attr name="ic_attach_videocam" format="reference" />
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 8eb113795..74462aa2f 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -59,6 +59,7 @@
         <item name="ic_attach_videocam" type="reference">@drawable/ic_attach_videocam</item>
         <item name="ic_attach_document" type="reference">@drawable/ic_attach_document</item>
         <item name="ic_pin" type="reference">@drawable/ic_pin_black</item>
+        <item name="ic_subject" type="reference">@drawable/ic_subject_black</item>
         <item name="ic_close" type="reference">@drawable/ic_close_24dp_black</item>
         <item name="ic_attach_location" type="reference">@drawable/ic_attach_location</item>
         <item name="ic_attach_photo" type="reference">@drawable/ic_attach_photo</item>
@@ -239,6 +240,7 @@
         <item name="ic_attach_videocam" type="reference">@drawable/ic_attach_videocam_white</item>
         <item name="ic_attach_document" type="reference">@drawable/ic_attach_document_white</item>
         <item name="ic_pin" type="reference">@drawable/ic_pin_white</item>
+        <item name="ic_subject" type="reference">@drawable/ic_subject_white</item>
         <item name="ic_close" type="reference">@drawable/ic_close_24dp</item>
         <item name="ic_attach_location" type="reference">@drawable/ic_attach_location_white</item>
         <item name="ic_attach_photo" type="reference">@drawable/ic_attach_photo_white</item>