From be908cdf0ef932fa85b343e846572ab16ce5a8be Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 18 Oct 2023 17:05:41 +0200
Subject: [PATCH] Started proto for IMDNs display

---
 .../chat/adapter/ConversationEventAdapter.kt  |  8 ++
 .../chat/fragment/ConversationFragment.kt     | 10 ++
 .../chat/model/ChatMessageDeliveryModel.kt    | 14 +++
 .../ui/main/chat/model/ChatMessageModel.kt    | 40 +++++++-
 .../ui/main/chat/model/ParticipantModel.kt    |  1 -
 ....xml => shape_bottom_sheet_background.xml} |  0
 .../main/res/layout/chat_bubble_incoming.xml  |  7 +-
 .../main/res/layout/chat_bubble_outgoing.xml  |  2 -
 .../res/layout/chat_conversation_fragment.xml |  4 +
 .../res/layout/chat_delivery_list_cell.xml    | 94 +++++++++++++++++++
 .../chat_message_delivery_bottom_sheet.xml    | 88 +++++++++++++++++
 app/src/main/res/layout/start_call_numpad.xml |  2 +-
 12 files changed, 260 insertions(+), 10 deletions(-)
 create mode 100644 app/src/main/java/org/linphone/ui/main/chat/model/ChatMessageDeliveryModel.kt
 rename app/src/main/res/drawable/{shape_numpad_background.xml => shape_bottom_sheet_background.xml} (100%)
 create mode 100644 app/src/main/res/layout/chat_delivery_list_cell.xml
 create mode 100644 app/src/main/res/layout/chat_message_delivery_bottom_sheet.xml

diff --git a/app/src/main/java/org/linphone/ui/main/chat/adapter/ConversationEventAdapter.kt b/app/src/main/java/org/linphone/ui/main/chat/adapter/ConversationEventAdapter.kt
index 0ea3bc097..733acd17d 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/adapter/ConversationEventAdapter.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/adapter/ConversationEventAdapter.kt
@@ -47,6 +47,10 @@ class ConversationEventAdapter(
 
     val chatMessageLongPressEvent = MutableLiveData<Event<ChatMessageModel>>()
 
+    val showDeliveryForChatMessageModelEvent: MutableLiveData<Event<ChatMessageModel>> by lazy {
+        MutableLiveData<Event<ChatMessageModel>>()
+    }
+
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         return when (viewType) {
             INCOMING_CHAT_MESSAGE -> createIncomingChatBubble(parent)
@@ -116,6 +120,10 @@ class ConversationEventAdapter(
                     true
                 }
 
+                setShowDeliveryInfoClickListener {
+                    showDeliveryForChatMessageModelEvent.value = Event(message)
+                }
+
                 lifecycleOwner = viewLifecycleOwner
                 executePendingBindings()
             }
diff --git a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt
index a362c0615..d0ecb681e 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt
@@ -177,6 +177,16 @@ class ConversationFragment : GenericFragment() {
         emojisBottomSheetBehavior.state = BottomSheetBehavior.STATE_COLLAPSED
         emojisBottomSheetBehavior.isDraggable = false // To allow scrolling through the emojis
 
+        val imdnBottomSheetBehavior = BottomSheetBehavior.from(binding.deliveryBottomSheet.root)
+        imdnBottomSheetBehavior.state = BottomSheetBehavior.STATE_COLLAPSED
+
+        adapter.showDeliveryForChatMessageModelEvent.observe(viewLifecycleOwner) {
+            it.consume { model ->
+                binding.deliveryBottomSheet.model = model
+                imdnBottomSheetBehavior.state = BottomSheetBehavior.STATE_EXPANDED
+            }
+        }
+
         binding.setOpenFilePickerClickListener {
             Log.i("$TAG Opening media picker")
             pickMedia.launch(
diff --git a/app/src/main/java/org/linphone/ui/main/chat/model/ChatMessageDeliveryModel.kt b/app/src/main/java/org/linphone/ui/main/chat/model/ChatMessageDeliveryModel.kt
new file mode 100644
index 000000000..bb04024bc
--- /dev/null
+++ b/app/src/main/java/org/linphone/ui/main/chat/model/ChatMessageDeliveryModel.kt
@@ -0,0 +1,14 @@
+package org.linphone.ui.main.chat.model
+
+import androidx.annotation.WorkerThread
+import org.linphone.core.Friend
+import org.linphone.core.ParticipantImdnState
+import org.linphone.ui.main.contacts.model.ContactAvatarModel
+import org.linphone.utils.TimestampUtils
+
+class ChatMessageDeliveryModel @WorkerThread constructor(
+    friend: Friend,
+    imdnState: ParticipantImdnState
+) : ContactAvatarModel(friend) {
+    val time = TimestampUtils.toString(imdnState.stateChangeTime)
+}
diff --git a/app/src/main/java/org/linphone/ui/main/chat/model/ChatMessageModel.kt b/app/src/main/java/org/linphone/ui/main/chat/model/ChatMessageModel.kt
index 34b4b1b49..b54093edb 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/model/ChatMessageModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/model/ChatMessageModel.kt
@@ -28,6 +28,7 @@ import org.linphone.core.Address
 import org.linphone.core.ChatMessage
 import org.linphone.core.ChatMessageListenerStub
 import org.linphone.core.ChatMessageReaction
+import org.linphone.core.ParticipantImdnState
 import org.linphone.core.tools.Log
 import org.linphone.ui.main.contacts.model.ContactAvatarModel
 import org.linphone.utils.Event
@@ -59,6 +60,8 @@ class ChatMessageModel @WorkerThread constructor(
 
     val chatRoomIsReadOnly = chatMessage.chatRoom.isReadOnly
 
+    val deliveryModels = MutableLiveData<ArrayList<ChatMessageDeliveryModel>>()
+
     val dismissLongPressMenuEvent: MutableLiveData<Event<Boolean>> by lazy {
         MutableLiveData<Event<Boolean>>()
     }
@@ -85,6 +88,8 @@ class ChatMessageModel @WorkerThread constructor(
     init {
         chatMessage.addListener(chatMessageListener)
         computeStatusIcon(chatMessage.state)
+
+        computeDeliveryStatus()
     }
 
     @WorkerThread
@@ -102,10 +107,6 @@ class ChatMessageModel @WorkerThread constructor(
         }
     }
 
-    @UiThread
-    fun showDeliveryInfo() {
-    }
-
     @WorkerThread
     private fun computeStatusIcon(state: ChatMessage.State) {
         val icon = when (state) {
@@ -127,4 +128,35 @@ class ChatMessageModel @WorkerThread constructor(
         }
         statusIcon.postValue(icon)
     }
+
+    @WorkerThread
+    private fun computeDeliveryStatus() {
+        val list = arrayListOf<ChatMessageDeliveryModel>()
+
+        for (participant in chatMessage.getParticipantsByImdnState(ChatMessage.State.Displayed)) {
+            list.add(getDeliveryModelForAddress(participant))
+        }
+
+        deliveryModels.postValue(list)
+    }
+
+    @WorkerThread
+    private fun getDeliveryModelForAddress(participantImdnState: ParticipantImdnState): ChatMessageDeliveryModel {
+        val address = participantImdnState.participant.address
+        Log.i("$TAG Looking for participant model with address [${address.asStringUriOnly()}]")
+
+        val clone = address.clone()
+        clone.clean()
+
+        val friend = coreContext.contactsManager.findContactByAddress(clone)
+        val avatar = if (friend != null) {
+            ChatMessageDeliveryModel(friend, participantImdnState)
+        } else {
+            val fakeFriend = coreContext.core.createFriend()
+            fakeFriend.address = clone
+            ChatMessageDeliveryModel(fakeFriend, participantImdnState)
+        }
+
+        return avatar
+    }
 }
diff --git a/app/src/main/java/org/linphone/ui/main/chat/model/ParticipantModel.kt b/app/src/main/java/org/linphone/ui/main/chat/model/ParticipantModel.kt
index d91feb56b..61b1c49ec 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/model/ParticipantModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/model/ParticipantModel.kt
@@ -33,7 +33,6 @@ class ParticipantModel @WorkerThread constructor(
     val isParticipantAdmin: Boolean,
     private val onMenuClicked: ((view: View, model: ParticipantModel) -> Unit)? = null
 ) : ContactAvatarModel(friend) {
-
     val sipUri = address.asStringUriOnly()
 
     @UiThread
diff --git a/app/src/main/res/drawable/shape_numpad_background.xml b/app/src/main/res/drawable/shape_bottom_sheet_background.xml
similarity index 100%
rename from app/src/main/res/drawable/shape_numpad_background.xml
rename to app/src/main/res/drawable/shape_bottom_sheet_background.xml
diff --git a/app/src/main/res/layout/chat_bubble_incoming.xml b/app/src/main/res/layout/chat_bubble_incoming.xml
index d41d00e07..b4c3db503 100644
--- a/app/src/main/res/layout/chat_bubble_incoming.xml
+++ b/app/src/main/res/layout/chat_bubble_incoming.xml
@@ -10,6 +10,9 @@
         <variable
             name="onLongClickListener"
             type="View.OnLongClickListener" />
+        <variable
+            name="showDeliveryInfoClickListener"
+            type="View.OnClickListener" />
         <variable
             name="model"
             type="org.linphone.ui.main.chat.model.ChatMessageModel" />
@@ -86,7 +89,7 @@
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style_300"
             android:id="@+id/date_time"
-            android:onClick="@{() -> model.showDeliveryInfo()}"
+            android:onClick="@{showDeliveryInfoClickListener}"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="5dp"
@@ -100,7 +103,7 @@
         <ImageView
             style="@style/default_text_style_300"
             android:id="@+id/delivery_status"
-            android:onClick="@{() -> model.showDeliveryInfo()}"
+            android:onClick="@{showDeliveryInfoClickListener}"
             android:layout_width="@dimen/small_icon_size"
             android:layout_height="@dimen/small_icon_size"
             android:layout_marginStart="5dp"
diff --git a/app/src/main/res/layout/chat_bubble_outgoing.xml b/app/src/main/res/layout/chat_bubble_outgoing.xml
index 5d615b685..ad21828fe 100644
--- a/app/src/main/res/layout/chat_bubble_outgoing.xml
+++ b/app/src/main/res/layout/chat_bubble_outgoing.xml
@@ -75,7 +75,6 @@
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style_300"
             android:id="@+id/date_time"
-            android:onClick="@{() -> model.showDeliveryInfo()}"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="5dp"
@@ -91,7 +90,6 @@
         <ImageView
             style="@style/default_text_style_300"
             android:id="@+id/delivery_status"
-            android:onClick="@{() -> model.showDeliveryInfo()}"
             android:layout_width="@dimen/small_icon_size"
             android:layout_height="@dimen/small_icon_size"
             android:layout_marginEnd="18dp"
diff --git a/app/src/main/res/layout/chat_conversation_fragment.xml b/app/src/main/res/layout/chat_conversation_fragment.xml
index 4cfec0cae..528b6c829 100644
--- a/app/src/main/res/layout/chat_conversation_fragment.xml
+++ b/app/src/main/res/layout/chat_conversation_fragment.xml
@@ -222,6 +222,10 @@
             android:visibility="@{viewModel.isReadOnly ? View.GONE : View.VISIBLE}"
             layout="@layout/chat_conversation_send_area"/>
 
+        <include
+            android:id="@+id/delivery_bottom_sheet"
+            layout="@layout/chat_message_delivery_bottom_sheet" />
+
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_delivery_list_cell.xml b/app/src/main/res/layout/chat_delivery_list_cell.xml
new file mode 100644
index 000000000..b3d4fb556
--- /dev/null
+++ b/app/src/main/res/layout/chat_delivery_list_cell.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+        <import type="android.view.View" />
+        <import type="org.linphone.core.ConsolidatedPresence" />
+        <import type="org.linphone.core.ChatRoom.SecurityLevel" />
+        <variable
+            name="model"
+            type="org.linphone.ui.main.chat.model.ChatMessageDeliveryModel" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/primary_cell_background"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp">
+
+        <com.google.android.material.imageview.ShapeableImageView
+            style="@style/avatar_imageview"
+            android:id="@+id/avatar"
+            android:layout_width="@dimen/avatar_list_cell_size"
+            android:layout_height="@dimen/avatar_list_cell_size"
+            android:layout_marginTop="5dp"
+            android:layout_marginBottom="5dp"
+            coilAvatar="@{model}"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <ImageView
+            android:id="@+id/presence_badge"
+            android:layout_width="@dimen/avatar_presence_badge_size"
+            android:layout_height="@dimen/avatar_presence_badge_size"
+            android:layout_marginEnd="@dimen/avatar_presence_badge_end_margin"
+            android:background="@drawable/led_background"
+            android:padding="@dimen/avatar_presence_badge_padding"
+            app:presenceIcon="@{model.presenceStatus}"
+            android:visibility="@{model.presenceStatus == ConsolidatedPresence.Offline ? View.GONE : View.VISIBLE}"
+            app:layout_constraintEnd_toEndOf="@id/avatar"
+            app:layout_constraintBottom_toBottomOf="@id/avatar"/>
+
+        <ImageView
+            android:id="@+id/trust_badge"
+            android:layout_width="@dimen/avatar_presence_badge_size"
+            android:layout_height="@dimen/avatar_presence_badge_size"
+            android:src="@{model.trust == SecurityLevel.Safe ? @drawable/trusted : @drawable/not_trusted, default=@drawable/trusted}"
+            android:visibility="@{model.trust == SecurityLevel.Safe || model.trust == SecurityLevel.Unsafe ? View.VISIBLE : View.GONE}"
+            app:layout_constraintStart_toStartOf="@id/avatar"
+            app:layout_constraintBottom_toBottomOf="@id/avatar"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/default_text_style"
+            android:id="@+id/name"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:text="@{model.name, default=`John Doe`}"
+            android:textSize="14sp"
+            android:layout_marginStart="10dp"
+            app:layout_constraintVertical_chainStyle="packed"
+            app:layout_constraintStart_toEndOf="@id/avatar"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/date_time"
+            app:layout_constraintBottom_toBottomOf="parent"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/default_text_style_300"
+            android:id="@+id/date_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="16dp"
+            android:text="@{model.time, default=`16:18`}"
+            android:textSize="12sp"
+            android:textColor="@color/gray_main2_600"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/name"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent" />
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_marginEnd="10dp"
+            android:background="@color/gray_main2_200"
+            app:layout_constraintStart_toStartOf="@id/name"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_message_delivery_bottom_sheet.xml b/app/src/main/res/layout/chat_message_delivery_bottom_sheet.xml
new file mode 100644
index 000000000..ec5ed16e3
--- /dev/null
+++ b/app/src/main/res/layout/chat_message_delivery_bottom_sheet.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+        <import type="android.view.View" />
+        <variable
+            name="handleClickedListener"
+            type="View.OnClickListener" />
+        <variable
+            name="model"
+            type="org.linphone.ui.main.chat.model.ChatMessageModel" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/shape_bottom_sheet_background"
+        android:clickable="true"
+        android:focusable="true"
+        app:behavior_hideable="true"
+        app:behavior_peekHeight="0dp"
+        app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
+
+        <com.google.android.material.bottomsheet.BottomSheetDragHandleView
+            android:id="@+id/handle"
+            android:onClick="@{handleClickedListener}"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:padding="11dp"
+            android:src="@drawable/shape_drawer_handle"
+            app:tint="@color/gray_main2_300"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
+
+        <com.google.android.material.tabs.TabLayout
+            android:id="@+id/tabs"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/transparent_color"
+            app:layout_constraintTop_toBottomOf="@id/handle"
+            app:tabMode="fixed"
+            app:tabGravity="fill"
+            app:tabPadding="0dp"
+            app:tabInlineLabel="true"
+            app:tabTextColor="@color/gray_main2_400"
+            app:tabSelectedTextColor="@color/gray_main2_600">
+
+            <com.google.android.material.tabs.TabItem
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="Lu" />
+
+            <com.google.android.material.tabs.TabItem
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="Reçu" />
+
+            <com.google.android.material.tabs.TabItem
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="Envoyé" />
+
+            <com.google.android.material.tabs.TabItem
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="Erreur" />
+
+        </com.google.android.material.tabs.TabLayout>
+
+        <androidx.core.widget.NestedScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toBottomOf="@id/tabs">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                entries="@{model.deliveryModels}"
+                layout="@{@layout/chat_delivery_list_cell}" />
+
+        </androidx.core.widget.NestedScrollView>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/start_call_numpad.xml b/app/src/main/res/layout/start_call_numpad.xml
index be00a17a8..52721839e 100644
--- a/app/src/main/res/layout/start_call_numpad.xml
+++ b/app/src/main/res/layout/start_call_numpad.xml
@@ -15,7 +15,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/shape_numpad_background"
+        android:background="@drawable/shape_bottom_sheet_background"
         android:clickable="true"
         android:focusable="true"
         app:behavior_hideable="true"