From c076dcb2c79cc00a38b4406a398c6319d330ea56 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 16 Oct 2023 11:33:28 +0200
Subject: [PATCH] Fixed account profile avatar not being updated when
 set/removed + started chat event display

---
 .../linphone/ui/main/chat/model/EventModel.kt |  4 ++-
 .../viewmodel/AccountProfileViewModel.kt      |  6 ++++-
 .../res/drawable/shape_line_main2_200.xml     |  5 ++++
 app/src/main/res/layout/chat_event.xml        | 25 +++++++++++++++----
 4 files changed, 33 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/res/drawable/shape_line_main2_200.xml

diff --git a/app/src/main/java/org/linphone/ui/main/chat/model/EventModel.kt b/app/src/main/java/org/linphone/ui/main/chat/model/EventModel.kt
index d24131afd..72be4b6bb 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/model/EventModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/model/EventModel.kt
@@ -22,4 +22,6 @@ package org.linphone.ui.main.chat.model
 import androidx.annotation.WorkerThread
 import org.linphone.core.EventLog
 
-class EventModel @WorkerThread constructor(eventLog: EventLog)
+class EventModel @WorkerThread constructor(eventLog: EventLog) {
+    val text = eventLog.type.name // TODO FIXME: use proper translated string instead
+}
diff --git a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountProfileViewModel.kt b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountProfileViewModel.kt
index 92cb9a800..64f995c6b 100644
--- a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountProfileViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountProfileViewModel.kt
@@ -170,7 +170,11 @@ class AccountProfileViewModel @UiThread constructor() : ViewModel() {
                     copy.pictureUri = null
                 }
 
-                accountModel.value?.images?.postValue(arrayListOf(path))
+                // Create a new model to force UI to update
+                val newModel = AccountModel(account)
+                newModel.images.postValue(arrayListOf(path))
+                accountModel.postValue(newModel)
+
                 account.params = copy
                 account.refreshRegister()
             }
diff --git a/app/src/main/res/drawable/shape_line_main2_200.xml b/app/src/main/res/drawable/shape_line_main2_200.xml
new file mode 100644
index 000000000..532840742
--- /dev/null
+++ b/app/src/main/res/drawable/shape_line_main2_200.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="line">
+    <stroke android:width="1dp" android:color="@color/gray_main2_200"/>
+    <size android:height="1dp" android:width="50dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_event.xml b/app/src/main/res/layout/chat_event.xml
index f190bcaa4..9fbbf998e 100644
--- a/app/src/main/res/layout/chat_event.xml
+++ b/app/src/main/res/layout/chat_event.xml
@@ -10,15 +10,30 @@
             type="org.linphone.ui.main.chat.model.EventModel" />
     </data>
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="5dp"
-        android:layout_marginStart="10dp"
-        android:layout_marginEnd="10dp">
+        android:layout_marginBottom="5dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:background="@drawable/shape_line_main2_200"
+        android:gravity="center"
+        android:orientation="horizontal">
 
+        <!-- Ugly hack to prevent last character to be missing half of it, don't know why yet -->
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/default_text_style_300"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@color/white"
+            android:paddingLeft="25dp"
+            android:paddingRight="25dp"
+            android:text="@{model.text + ` `, default=`You have left the group`}"
+            android:textColor="@color/gray_main2_500"
+            android:textSize="12sp"
+            android:textStyle="italic" />
 
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
+    </LinearLayout>
 
 </layout>
\ No newline at end of file