From f774c535ab85bd95a4fdd604746017bb06c59396 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 21 May 2021 11:59:56 +0200
Subject: [PATCH] Improved chat rooms list while forward is pending

---
 .../chat/fragments/MasterChatRoomsFragment.kt     | 10 ++++++++++
 .../chat/viewmodels/ChatRoomsListViewModel.kt     |  2 ++
 .../layout-sw533dp/chat_room_master_fragment.xml  | 15 +++++++++++++++
 .../main/res/layout/chat_room_master_fragment.xml | 15 +++++++++++++++
 4 files changed, 42 insertions(+)

diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt
index 719cc7ad6..4911fc9ac 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt
@@ -171,6 +171,13 @@ class MasterChatRoomsFragment : MasterFragment<ChatRoomMasterFragmentBinding, Ch
             listSelectionViewModel.isEditionEnabled.value = true
         }
 
+        binding.setCancelForwardClickListener {
+            sharedViewModel.messageToForwardEvent.value?.consume {
+                Log.i("[Chat] Cancelling message forward")
+            }
+            listViewModel.forwardPending.value = false
+        }
+
         binding.setNewOneToOneChatRoomClickListener {
             sharedViewModel.chatRoomParticipants.value = arrayListOf()
             navigateToChatRoomCreation(false)
@@ -221,9 +228,12 @@ class MasterChatRoomsFragment : MasterFragment<ChatRoomMasterFragmentBinding, Ch
             sharedViewModel.messageToForwardEvent.observe(viewLifecycleOwner, {
                 if (!it.consumed()) {
                     Log.i("[Chat] Found chat message to transfer")
+                    listViewModel.forwardPending.value = true
 
                     val activity = requireActivity() as MainActivity
                     activity.showSnackBar(R.string.chat_room_toast_choose_for_sharing)
+                } else {
+                    listViewModel.forwardPending.value = false
                 }
             })
 
diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomsListViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomsListViewModel.kt
index 3a26de4e6..a5f0f95ad 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomsListViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomsListViewModel.kt
@@ -39,6 +39,8 @@ class ChatRoomsListViewModel : ErrorReportingViewModel() {
         MutableLiveData<Event<Boolean>>()
     }
 
+    val forwardPending = MutableLiveData<Boolean>()
+
     val groupChatAvailable: Boolean = LinphoneUtils.isGroupChatAvailable()
 
     private val contactsUpdatedListener = object : ContactsUpdatedListenerStub() {
diff --git a/app/src/main/res/layout-sw533dp/chat_room_master_fragment.xml b/app/src/main/res/layout-sw533dp/chat_room_master_fragment.xml
index 62118c5f5..013f3e278 100644
--- a/app/src/main/res/layout-sw533dp/chat_room_master_fragment.xml
+++ b/app/src/main/res/layout-sw533dp/chat_room_master_fragment.xml
@@ -14,6 +14,9 @@
         <variable
             name="editClickListener"
             type="android.view.View.OnClickListener"/>
+        <variable
+            name="cancelForwardClickListener"
+            type="android.view.View.OnClickListener" />
         <variable
             name="viewModel"
             type="org.linphone.activities.main.chat.viewmodels.ChatRoomsListViewModel" />
@@ -40,6 +43,17 @@
                     android:background="?attr/lightToolbarBackgroundColor"
                     android:orientation="horizontal">
 
+                    <ImageView
+                        android:onClick="@{cancelForwardClickListener}"
+                        android:visibility="@{viewModel.forwardPending ? View.VISIBLE : View.GONE}"
+                        android:contentDescription="@string/content_description_cancel_contact_edit"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="0.2"
+                        android:background="?attr/button_background_drawable"
+                        android:padding="15dp"
+                        android:src="@drawable/cancel_edit" />
+
                     <ImageView
                         android:onClick="@{newOneToOneChatRoomClickListener}"
                         android:contentDescription="@string/content_description_create_one_to_one_chat_room"
@@ -69,6 +83,7 @@
                     <ImageView
                         android:onClick="@{editClickListener}"
                         android:enabled="@{!viewModel.chatRooms.empty}"
+                        android:visibility="@{viewModel.forwardPending ? View.GONE : View.VISIBLE}"
                         android:contentDescription="@string/content_description_enter_edition_mode"
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/chat_room_master_fragment.xml b/app/src/main/res/layout/chat_room_master_fragment.xml
index 199837f42..51179afe2 100644
--- a/app/src/main/res/layout/chat_room_master_fragment.xml
+++ b/app/src/main/res/layout/chat_room_master_fragment.xml
@@ -13,6 +13,9 @@
         <variable
             name="editClickListener"
             type="android.view.View.OnClickListener"/>
+        <variable
+            name="cancelForwardClickListener"
+            type="android.view.View.OnClickListener" />
         <variable
             name="viewModel"
             type="org.linphone.activities.main.chat.viewmodels.ChatRoomsListViewModel" />
@@ -29,6 +32,17 @@
             android:background="?attr/lightToolbarBackgroundColor"
             android:orientation="horizontal">
 
+            <ImageView
+                android:onClick="@{cancelForwardClickListener}"
+                android:visibility="@{viewModel.forwardPending ? View.VISIBLE : View.GONE}"
+                android:contentDescription="@string/content_description_cancel_contact_edit"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.2"
+                android:background="?attr/button_background_drawable"
+                android:padding="15dp"
+                android:src="@drawable/cancel_edit" />
+
             <ImageView
                 android:onClick="@{newOneToOneChatRoomClickListener}"
                 android:contentDescription="@string/content_description_create_one_to_one_chat_room"
@@ -58,6 +72,7 @@
             <ImageView
                 android:onClick="@{editClickListener}"
                 android:enabled="@{!viewModel.chatRooms.empty}"
+                android:visibility="@{viewModel.forwardPending ? View.GONE : View.VISIBLE}"
                 android:contentDescription="@string/content_description_enter_edition_mode"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"