From 27d6e271ad73a809983099f5e50314b92cdd2947 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Tue, 16 Nov 2021 16:33:04 +0100
Subject: [PATCH 01/52] Add a debug layout to see social login buttons

For AS preview only
---
 .../debug/res/layout/debug_social_login.xml   | 113 ++++++++++++++++++
 1 file changed, 113 insertions(+)
 create mode 100644 library/ui-styles/src/debug/res/layout/debug_social_login.xml

diff --git a/library/ui-styles/src/debug/res/layout/debug_social_login.xml b/library/ui-styles/src/debug/res/layout/debug_social_login.xml
new file mode 100644
index 0000000000..895ecddad4
--- /dev/null
+++ b/library/ui-styles/src/debug/res/layout/debug_social_login.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#DDD"
+    android:orientation="vertical"
+    android:padding="16dp"
+    tools:ignore="HardcodedText">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Light" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:background="@color/element_background_light"
+        android:orientation="vertical"
+        android:padding="16dp">
+
+        <Button
+            style="@style/Widget.Vector.Button.Outlined.SocialLogin.Google.Light"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Continue with XXX" />
+
+        <Button
+            style="@style/Widget.Vector.Button.Outlined.SocialLogin.Facebook.Light"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Continue with XXX" />
+
+        <Button
+            style="@style/Widget.Vector.Button.Outlined.SocialLogin.Github.Light"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Continue with XXX" />
+
+        <Button
+            style="@style/Widget.Vector.Button.Outlined.SocialLogin.Gitlab.Light"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Continue with XXX" />
+
+        <Button
+            style="@style/Widget.Vector.Button.Outlined.SocialLogin.Apple.Light"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Continue with XXX" />
+
+        <Button
+            style="@style/Widget.Vector.Button.Outlined.SocialLogin.Twitter.Light"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Continue with XXX" />
+
+    </LinearLayout>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:text="Dark" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:background="@color/element_background_dark"
+        android:orientation="vertical"
+        android:padding="16dp">
+
+        <Button
+            style="@style/Widget.Vector.Button.Outlined.SocialLogin.Google.Dark"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Continue with XXX" />
+
+        <Button
+            style="@style/Widget.Vector.Button.Outlined.SocialLogin.Facebook.Dark"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Continue with XXX" />
+
+        <Button
+            style="@style/Widget.Vector.Button.Outlined.SocialLogin.Github.Dark"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Continue with XXX" />
+
+        <Button
+            style="@style/Widget.Vector.Button.Outlined.SocialLogin.Gitlab.Dark"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Continue with XXX" />
+
+        <Button
+            style="@style/Widget.Vector.Button.Outlined.SocialLogin.Apple.Dark"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Continue with XXX" />
+
+        <Button
+            style="@style/Widget.Vector.Button.Outlined.SocialLogin.Twitter.Dark"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Continue with XXX" />
+
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file

From 03b96a8a42f17dad267b9c814e394456d8e9eed5 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Tue, 16 Nov 2021 16:33:28 +0100
Subject: [PATCH 02/52] Update padding (#4285)

---
 library/ui-styles/src/main/res/values/styles_social_login.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/ui-styles/src/main/res/values/styles_social_login.xml b/library/ui-styles/src/main/res/values/styles_social_login.xml
index b527d5bfdc..f601f36480 100644
--- a/library/ui-styles/src/main/res/values/styles_social_login.xml
+++ b/library/ui-styles/src/main/res/values/styles_social_login.xml
@@ -9,7 +9,7 @@
         <item name="iconGravity">start</item>
         <item name="android:textSize">14sp</item>
         <item name="android:textAlignment">center</item>
-        <item name="android:paddingStart">2dp</item>
+        <item name="android:paddingStart">4dp</item>
         <!-- Compensate icon size to center text correctly-->
         <item name="android:paddingEnd">38dp</item>
         <item name="android:clipToPadding">false</item>

From 940fe634c4b00d174a6e3c7c00890be39ffc7cc9 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Thu, 18 Nov 2021 12:43:11 +0000
Subject: [PATCH 03/52] fixing notifications not dismissing when the in memory
 state becomes out of sync - lazily loads the initial notification state as we
 rely on a current session to exist - extracts all the notification state
 manipulation to a separate state class

---
 .../java/im/vector/app/VectorApplication.kt   |   3 +-
 .../im/vector/app/features/MainActivity.kt    |   1 -
 .../NotificationDrawerManager.kt              | 130 +++++-------------
 .../notifications/NotificationState.kt        | 121 ++++++++++++++++
 4 files changed, 155 insertions(+), 100 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/notifications/NotificationState.kt

diff --git a/vector/src/main/java/im/vector/app/VectorApplication.kt b/vector/src/main/java/im/vector/app/VectorApplication.kt
index c1d9eef125..46f155a8d9 100644
--- a/vector/src/main/java/im/vector/app/VectorApplication.kt
+++ b/vector/src/main/java/im/vector/app/VectorApplication.kt
@@ -175,8 +175,7 @@ class VectorApplication :
             }
 
             override fun onPause(owner: LifecycleOwner) {
-                Timber.i("App entered background") // call persistInfo
-                notificationDrawerManager.persistInfo()
+                Timber.i("App entered background")
                 FcmHelper.onEnterBackground(appContext, vectorPreferences, activeSessionHolder)
             }
         })
diff --git a/vector/src/main/java/im/vector/app/features/MainActivity.kt b/vector/src/main/java/im/vector/app/features/MainActivity.kt
index 8e0995b426..f4c737c942 100644
--- a/vector/src/main/java/im/vector/app/features/MainActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/MainActivity.kt
@@ -116,7 +116,6 @@ class MainActivity : VectorBaseActivity<ActivityMainBinding>(), UnlockedActivity
     private fun clearNotifications() {
         // Dismiss all notifications
         notificationDrawerManager.clearAllEvents()
-        notificationDrawerManager.persistInfo()
 
         // Also clear the dynamic shortcuts
         shortcutsHandler.clearShortcuts()
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
index e86a65c3fe..2d65aa0c24 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
@@ -29,8 +29,6 @@ import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.content.ContentUrlResolver
 import org.matrix.android.sdk.api.util.toMatrixItem
 import timber.log.Timber
-import java.io.File
-import java.io.FileOutputStream
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -50,42 +48,24 @@ class NotificationDrawerManager @Inject constructor(private val context: Context
     private val handlerThread: HandlerThread = HandlerThread("NotificationDrawerManager", Thread.MIN_PRIORITY)
     private var backgroundHandler: Handler
 
-    init {
-        handlerThread.start()
-        backgroundHandler = Handler(handlerThread.looper)
-    }
-
-    /**
-     * The notifiable events to render
-     * this is our source of truth for notifications, any changes to this list will be rendered as notifications
-     * when events are removed the previously rendered notifications will be cancelled
-     * when adding or updating, the notifications will be notified
-     *
-     * Events are unique by their properties, we should be careful not to insert multiple events with the same event-id
-     */
-    private val queuedEvents = loadEventInfo()
-
-    /**
-     * The last known rendered notifiable events
-     * we keep track of them in order to know which events have been removed from the eventList
-     * allowing us to cancel any notifications previous displayed by now removed events
-     */
-    private var renderedEvents = emptyList<ProcessedEvent<NotifiableEvent>>()
-    private val avatarSize = context.resources.getDimensionPixelSize(R.dimen.profile_avatar_size)
-    private var currentRoomId: String? = null
-
     // TODO Multi-session: this will have to be improved
     private val currentSession: Session?
         get() = activeSessionDataSource.currentValue?.orNull()
 
+    /**
+     * Lazily initializes the NotificationState as we rely on having a current session in order to fetch the persisted queue of events
+     */
+    private val notificationState by lazy { NotificationState.createInitialNotificationState(context, currentSession) }
+    private val avatarSize = context.resources.getDimensionPixelSize(R.dimen.profile_avatar_size)
+    private var currentRoomId: String? = null
+    private val firstThrottler = FirstThrottler(200)
+
     private var useCompleteNotificationFormat = vectorPreferences.useCompleteNotificationFormat()
 
-    /**
-     * An in memory FIFO cache of the seen events.
-     * Acts as a notification debouncer to stop already dismissed push notifications from
-     * displaying again when the /sync response is delayed.
-     */
-    private val seenEventIds = CircularCache.create<String>(cacheSize = 25)
+    init {
+        handlerThread.start()
+        backgroundHandler = Handler(handlerThread.looper)
+    }
 
     /**
     Should be called as soon as a new event is ready to be displayed.
@@ -106,7 +86,7 @@ class NotificationDrawerManager @Inject constructor(private val context: Context
             Timber.d("onNotifiableEventReceived(): is push: ${notifiableEvent.canBeReplaced}")
         }
 
-        add(notifiableEvent, seenEventIds)
+        add(notifiableEvent, notificationState.seenEventIds)
     }
 
     /**
@@ -142,14 +122,12 @@ class NotificationDrawerManager @Inject constructor(private val context: Context
     }
 
     fun updateEvents(action: NotificationDrawerManager.(NotificationEventQueue) -> Unit) {
-        synchronized(queuedEvents) {
-            action(this, queuedEvents)
+        notificationState.updateQueuedEvents(this) { queuedEvents, _ ->
+            action(queuedEvents)
         }
         refreshNotificationDrawer()
     }
 
-    private var firstThrottler = FirstThrottler(200)
-
     private fun refreshNotificationDrawer() {
         // Implement last throttler
         val canHandle = firstThrottler.canHandle()
@@ -171,85 +149,43 @@ class NotificationDrawerManager @Inject constructor(private val context: Context
     @WorkerThread
     private fun refreshNotificationDrawerBg() {
         Timber.v("refreshNotificationDrawerBg()")
-        val eventsToRender = synchronized(queuedEvents) {
+        val eventsToRender = notificationState.updateQueuedEvents(this) { queuedEvents, renderedEvents ->
             notifiableEventProcessor.process(queuedEvents.rawEvents(), currentRoomId, renderedEvents).also {
                 queuedEvents.clearAndAdd(it.onlyKeptEvents())
             }
         }
 
-        if (renderedEvents == eventsToRender) {
+        if (notificationState.hasAlreadyRendered(eventsToRender)) {
             Timber.d("Skipping notification update due to event list not changing")
         } else {
-            renderedEvents = eventsToRender
+            notificationState.clearAndAddRenderedEvents(eventsToRender)
             val session = currentSession ?: return
-            val user = session.getUser(session.myUserId)
-            // myUserDisplayName cannot be empty else NotificationCompat.MessagingStyle() will crash
-            val myUserDisplayName = user?.toMatrixItem()?.getBestName() ?: session.myUserId
-            val myUserAvatarUrl = session.contentUrlResolver().resolveThumbnail(
-                    contentUrl = user?.avatarUrl,
-                    width = avatarSize,
-                    height = avatarSize,
-                    method = ContentUrlResolver.ThumbnailMethod.SCALE
-            )
-            notificationRenderer.render(session.myUserId, myUserDisplayName, myUserAvatarUrl, useCompleteNotificationFormat, eventsToRender)
+            renderEvents(session, eventsToRender)
+            notificationState.persistState(context, session)
         }
     }
 
+    private fun renderEvents(session: Session, eventsToRender: List<ProcessedEvent<NotifiableEvent>>) {
+        val user = session.getUser(session.myUserId)
+        // myUserDisplayName cannot be empty else NotificationCompat.MessagingStyle() will crash
+        val myUserDisplayName = user?.toMatrixItem()?.getBestName() ?: session.myUserId
+        val myUserAvatarUrl = session.contentUrlResolver().resolveThumbnail(
+                contentUrl = user?.avatarUrl,
+                width = avatarSize,
+                height = avatarSize,
+                method = ContentUrlResolver.ThumbnailMethod.SCALE
+        )
+        notificationRenderer.render(session.myUserId, myUserDisplayName, myUserAvatarUrl, useCompleteNotificationFormat, eventsToRender)
+    }
+
     fun shouldIgnoreMessageEventInRoom(roomId: String?): Boolean {
         return currentRoomId != null && roomId == currentRoomId
     }
 
-    fun persistInfo() {
-        synchronized(queuedEvents) {
-            if (queuedEvents.isEmpty()) {
-                deleteCachedRoomNotifications()
-                return
-            }
-            try {
-                val file = File(context.applicationContext.cacheDir, ROOMS_NOTIFICATIONS_FILE_NAME)
-                if (!file.exists()) file.createNewFile()
-                FileOutputStream(file).use {
-                    currentSession?.securelyStoreObject(queuedEvents.rawEvents(), KEY_ALIAS_SECRET_STORAGE, it)
-                }
-            } catch (e: Throwable) {
-                Timber.e(e, "## Failed to save cached notification info")
-            }
-        }
-    }
-
-    private fun loadEventInfo(): NotificationEventQueue {
-        try {
-            val file = File(context.applicationContext.cacheDir, ROOMS_NOTIFICATIONS_FILE_NAME)
-            if (file.exists()) {
-                file.inputStream().use {
-                    val events: ArrayList<NotifiableEvent>? = currentSession?.loadSecureSecret(it, KEY_ALIAS_SECRET_STORAGE)
-                    if (events != null) {
-                        return NotificationEventQueue(events.toMutableList())
-                    }
-                }
-            }
-        } catch (e: Throwable) {
-            Timber.e(e, "## Failed to load cached notification info")
-        }
-        return NotificationEventQueue()
-    }
-
-    private fun deleteCachedRoomNotifications() {
-        val file = File(context.applicationContext.cacheDir, ROOMS_NOTIFICATIONS_FILE_NAME)
-        if (file.exists()) {
-            file.delete()
-        }
-    }
-
     companion object {
         const val SUMMARY_NOTIFICATION_ID = 0
         const val ROOM_MESSAGES_NOTIFICATION_ID = 1
         const val ROOM_EVENT_NOTIFICATION_ID = 2
         const val ROOM_INVITATION_NOTIFICATION_ID = 3
-
-        // TODO Mutliaccount
-        private const val ROOMS_NOTIFICATIONS_FILE_NAME = "im.vector.notifications.cache"
-
-        private const val KEY_ALIAS_SECRET_STORAGE = "notificationMgr"
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationState.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationState.kt
new file mode 100644
index 0000000000..62a64b1d96
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationState.kt
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.notifications
+
+import android.content.Context
+import org.matrix.android.sdk.api.session.Session
+import timber.log.Timber
+import java.io.File
+import java.io.FileOutputStream
+
+// TODO Mutliaccount
+private const val ROOMS_NOTIFICATIONS_FILE_NAME = "im.vector.notifications.cache"
+private const val KEY_ALIAS_SECRET_STORAGE = "notificationMgr"
+
+class NotificationState(
+        /**
+         * The notifiable events to render
+         * this is our source of truth for notifications, any changes to this list will be rendered as notifications
+         * when events are removed the previously rendered notifications will be cancelled
+         * when adding or updating, the notifications will be notified
+         *
+         * Events are unique by their properties, we should be careful not to insert multiple events with the same event-id
+         */
+        private val queuedEvents: NotificationEventQueue,
+
+        /**
+         * The last known rendered notifiable events
+         * we keep track of them in order to know which events have been removed from the eventList
+         * allowing us to cancel any notifications previous displayed by now removed events
+         */
+        private val renderedEvents: MutableList<ProcessedEvent<NotifiableEvent>>,
+
+        /**
+         * An in memory FIFO cache of the seen events.
+         * Acts as a notification debouncer to stop already dismissed push notifications from
+         * displaying again when the /sync response is delayed.
+         */
+        val seenEventIds: CircularCache<String>
+) {
+
+    fun <T> updateQueuedEvents(drawerManager: NotificationDrawerManager, action: NotificationDrawerManager.(NotificationEventQueue, List<ProcessedEvent<NotifiableEvent>>) -> T): T {
+        return synchronized(queuedEvents) {
+            action(drawerManager, queuedEvents, renderedEvents)
+        }
+    }
+
+    fun clearAndAddRenderedEvents(eventsToRender: List<ProcessedEvent<NotifiableEvent>>) {
+        renderedEvents.clear()
+        renderedEvents.addAll(eventsToRender)
+    }
+
+    fun hasAlreadyRendered(eventsToRender: List<ProcessedEvent<NotifiableEvent>>) = renderedEvents == eventsToRender
+
+    fun persistState(context: Context, currentSession: Session) {
+        synchronized(queuedEvents) {
+            if (queuedEvents.isEmpty()) {
+                deleteCachedRoomNotifications(context)
+                return
+            }
+            try {
+                val file = File(context.applicationContext.cacheDir, ROOMS_NOTIFICATIONS_FILE_NAME)
+                if (!file.exists()) file.createNewFile()
+                FileOutputStream(file).use {
+                    currentSession.securelyStoreObject(queuedEvents.rawEvents(), KEY_ALIAS_SECRET_STORAGE, it)
+                }
+            } catch (e: Throwable) {
+                Timber.e(e, "## Failed to save cached notification info")
+            }
+        }
+    }
+
+    private fun deleteCachedRoomNotifications(context: Context) {
+        val file = File(context.applicationContext.cacheDir, ROOMS_NOTIFICATIONS_FILE_NAME)
+        if (file.exists()) {
+            file.delete()
+        }
+    }
+
+    companion object {
+
+        fun createInitialNotificationState(context: Context, currentSession: Session?): NotificationState {
+            val queuedEvents = loadEventInfo(context, currentSession)
+            return NotificationState(
+                    queuedEvents = queuedEvents,
+                    renderedEvents = queuedEvents.rawEvents().map { ProcessedEvent(ProcessedEvent.Type.KEEP, it) }.toMutableList(),
+                    seenEventIds = CircularCache.create(cacheSize = 25)
+            )
+        }
+
+        private fun loadEventInfo(context: Context, currentSession: Session?): NotificationEventQueue {
+            try {
+                val file = File(context.applicationContext.cacheDir, ROOMS_NOTIFICATIONS_FILE_NAME)
+                if (file.exists()) {
+                    file.inputStream().use {
+                        val events: ArrayList<NotifiableEvent>? = currentSession?.loadSecureSecret(it, KEY_ALIAS_SECRET_STORAGE)
+                        if (events != null) {
+                            return NotificationEventQueue(events.toMutableList())
+                        }
+                    }
+                }
+            } catch (e: Throwable) {
+                Timber.e(e, "## Failed to load cached notification info")
+            }
+            return NotificationEventQueue()
+        }
+    }
+}

From fb5e3cdfcd4ee4f7c646a4f3f1342898c4d6110b Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Thu, 18 Nov 2021 13:17:41 +0000
Subject: [PATCH 04/52] extracting the queued notification events persistence
 to its own file

---
 .../NotificationDrawerManager.kt              |  2 +-
 .../NotificationEventPersistence.kt           | 72 +++++++++++++++++++
 .../notifications/NotificationState.kt        | 52 ++------------
 3 files changed, 77 insertions(+), 49 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/notifications/NotificationEventPersistence.kt

diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
index 2d65aa0c24..696e965963 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
@@ -161,7 +161,7 @@ class NotificationDrawerManager @Inject constructor(private val context: Context
             notificationState.clearAndAddRenderedEvents(eventsToRender)
             val session = currentSession ?: return
             renderEvents(session, eventsToRender)
-            notificationState.persistState(context, session)
+            notificationState.persist(context, session)
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationEventPersistence.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationEventPersistence.kt
new file mode 100644
index 0000000000..65a3203d50
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationEventPersistence.kt
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.notifications
+
+import android.content.Context
+import org.matrix.android.sdk.api.session.Session
+import timber.log.Timber
+import java.io.File
+import java.io.FileOutputStream
+
+// TODO Multi-account
+private const val ROOMS_NOTIFICATIONS_FILE_NAME = "im.vector.notifications.cache"
+private const val KEY_ALIAS_SECRET_STORAGE = "notificationMgr"
+
+object NotificationEventPersistence {
+
+    fun loadEvents(context: Context, currentSession: Session?): NotificationEventQueue {
+        try {
+            val file = File(context.applicationContext.cacheDir, ROOMS_NOTIFICATIONS_FILE_NAME)
+            if (file.exists()) {
+                file.inputStream().use {
+                    val events: ArrayList<NotifiableEvent>? = currentSession?.loadSecureSecret(it, KEY_ALIAS_SECRET_STORAGE)
+                    if (events != null) {
+                        return NotificationEventQueue(events.toMutableList())
+                    }
+                }
+            }
+        } catch (e: Throwable) {
+            Timber.e(e, "## Failed to load cached notification info")
+        }
+        return NotificationEventQueue()
+    }
+
+    fun persistEvents(queuedEvents: NotificationEventQueue, context: Context, currentSession: Session) {
+        synchronized(queuedEvents) {
+            if (queuedEvents.isEmpty()) {
+                deleteCachedRoomNotifications(context)
+                return
+            }
+            try {
+                val file = File(context.applicationContext.cacheDir, ROOMS_NOTIFICATIONS_FILE_NAME)
+                if (!file.exists()) file.createNewFile()
+                FileOutputStream(file).use {
+                    currentSession.securelyStoreObject(queuedEvents.rawEvents(), KEY_ALIAS_SECRET_STORAGE, it)
+                }
+            } catch (e: Throwable) {
+                Timber.e(e, "## Failed to save cached notification info")
+            }
+        }
+    }
+
+    private fun deleteCachedRoomNotifications(context: Context) {
+        val file = File(context.applicationContext.cacheDir, ROOMS_NOTIFICATIONS_FILE_NAME)
+        if (file.exists()) {
+            file.delete()
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationState.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationState.kt
index 62a64b1d96..4cb44609c0 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationState.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationState.kt
@@ -18,13 +18,6 @@ package im.vector.app.features.notifications
 
 import android.content.Context
 import org.matrix.android.sdk.api.session.Session
-import timber.log.Timber
-import java.io.File
-import java.io.FileOutputStream
-
-// TODO Mutliaccount
-private const val ROOMS_NOTIFICATIONS_FILE_NAME = "im.vector.notifications.cache"
-private const val KEY_ALIAS_SECRET_STORAGE = "notificationMgr"
 
 class NotificationState(
         /**
@@ -65,57 +58,20 @@ class NotificationState(
 
     fun hasAlreadyRendered(eventsToRender: List<ProcessedEvent<NotifiableEvent>>) = renderedEvents == eventsToRender
 
-    fun persistState(context: Context, currentSession: Session) {
-        synchronized(queuedEvents) {
-            if (queuedEvents.isEmpty()) {
-                deleteCachedRoomNotifications(context)
-                return
-            }
-            try {
-                val file = File(context.applicationContext.cacheDir, ROOMS_NOTIFICATIONS_FILE_NAME)
-                if (!file.exists()) file.createNewFile()
-                FileOutputStream(file).use {
-                    currentSession.securelyStoreObject(queuedEvents.rawEvents(), KEY_ALIAS_SECRET_STORAGE, it)
-                }
-            } catch (e: Throwable) {
-                Timber.e(e, "## Failed to save cached notification info")
-            }
-        }
-    }
-
-    private fun deleteCachedRoomNotifications(context: Context) {
-        val file = File(context.applicationContext.cacheDir, ROOMS_NOTIFICATIONS_FILE_NAME)
-        if (file.exists()) {
-            file.delete()
-        }
+    fun persist(context: Context, session: Session) {
+        NotificationEventPersistence.persistEvents(queuedEvents, context, session)
     }
 
     companion object {
 
         fun createInitialNotificationState(context: Context, currentSession: Session?): NotificationState {
-            val queuedEvents = loadEventInfo(context, currentSession)
+            val queuedEvents = NotificationEventPersistence.loadEvents(context, currentSession)
             return NotificationState(
                     queuedEvents = queuedEvents,
                     renderedEvents = queuedEvents.rawEvents().map { ProcessedEvent(ProcessedEvent.Type.KEEP, it) }.toMutableList(),
                     seenEventIds = CircularCache.create(cacheSize = 25)
             )
         }
-
-        private fun loadEventInfo(context: Context, currentSession: Session?): NotificationEventQueue {
-            try {
-                val file = File(context.applicationContext.cacheDir, ROOMS_NOTIFICATIONS_FILE_NAME)
-                if (file.exists()) {
-                    file.inputStream().use {
-                        val events: ArrayList<NotifiableEvent>? = currentSession?.loadSecureSecret(it, KEY_ALIAS_SECRET_STORAGE)
-                        if (events != null) {
-                            return NotificationEventQueue(events.toMutableList())
-                        }
-                    }
-                }
-            } catch (e: Throwable) {
-                Timber.e(e, "## Failed to load cached notification info")
-            }
-            return NotificationEventQueue()
-        }
     }
 }
+

From f61474cb83409f834dbc1c4404e1ab5ab20a2171 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Thu, 18 Nov 2021 13:31:28 +0000
Subject: [PATCH 05/52] lifting the seenIds cache to the event queue rather
 than chaining it through, allows us to simplify the state model

---
 .../NotificationDrawerManager.kt              |  2 +-
 .../NotificationEventPersistence.kt           |  6 ++---
 .../notifications/NotificationEventQueue.kt   | 11 ++++++++--
 .../notifications/NotificationState.kt        | 22 ++++++-------------
 .../NotificationEventQueueTest.kt             | 14 ++++++------
 5 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
index 696e965963..81db029d8b 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
@@ -86,7 +86,7 @@ class NotificationDrawerManager @Inject constructor(private val context: Context
             Timber.d("onNotifiableEventReceived(): is push: ${notifiableEvent.canBeReplaced}")
         }
 
-        add(notifiableEvent, notificationState.seenEventIds)
+        add(notifiableEvent)
     }
 
     /**
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationEventPersistence.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationEventPersistence.kt
index 65a3203d50..11cc247b48 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationEventPersistence.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationEventPersistence.kt
@@ -28,21 +28,21 @@ private const val KEY_ALIAS_SECRET_STORAGE = "notificationMgr"
 
 object NotificationEventPersistence {
 
-    fun loadEvents(context: Context, currentSession: Session?): NotificationEventQueue {
+    fun loadEvents(context: Context, currentSession: Session?, factory: (List<NotifiableEvent>) -> NotificationEventQueue): NotificationEventQueue {
         try {
             val file = File(context.applicationContext.cacheDir, ROOMS_NOTIFICATIONS_FILE_NAME)
             if (file.exists()) {
                 file.inputStream().use {
                     val events: ArrayList<NotifiableEvent>? = currentSession?.loadSecureSecret(it, KEY_ALIAS_SECRET_STORAGE)
                     if (events != null) {
-                        return NotificationEventQueue(events.toMutableList())
+                        return factory(events)
                     }
                 }
             }
         } catch (e: Throwable) {
             Timber.e(e, "## Failed to load cached notification info")
         }
-        return NotificationEventQueue()
+        return factory(emptyList())
     }
 
     fun persistEvents(queuedEvents: NotificationEventQueue, context: Context, currentSession: Session) {
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationEventQueue.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationEventQueue.kt
index 83beb4fa02..2dc86f0aa0 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationEventQueue.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationEventQueue.kt
@@ -19,7 +19,14 @@ package im.vector.app.features.notifications
 import timber.log.Timber
 
 class NotificationEventQueue(
-        private val queue: MutableList<NotifiableEvent> = mutableListOf()
+        private val queue: MutableList<NotifiableEvent> = mutableListOf(),
+
+        /**
+         * An in memory FIFO cache of the seen events.
+         * Acts as a notification debouncer to stop already dismissed push notifications from
+         * displaying again when the /sync response is delayed.
+         */
+        private val seenEventIds: CircularCache<String>
 ) {
 
     fun markRedacted(eventIds: List<String>) {
@@ -57,7 +64,7 @@ class NotificationEventQueue(
         queue.clear()
     }
 
-    fun add(notifiableEvent: NotifiableEvent, seenEventIds: CircularCache<String>) {
+    fun add(notifiableEvent: NotifiableEvent) {
         val existing = findExistingById(notifiableEvent)
         val edited = findEdited(notifiableEvent)
         when {
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationState.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationState.kt
index 4cb44609c0..d772aaa749 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationState.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationState.kt
@@ -21,7 +21,8 @@ import org.matrix.android.sdk.api.session.Session
 
 class NotificationState(
         /**
-         * The notifiable events to render
+         * The notifiable events queued for rendering or currently rendered
+         *
          * this is our source of truth for notifications, any changes to this list will be rendered as notifications
          * when events are removed the previously rendered notifications will be cancelled
          * when adding or updating, the notifications will be notified
@@ -36,13 +37,6 @@ class NotificationState(
          * allowing us to cancel any notifications previous displayed by now removed events
          */
         private val renderedEvents: MutableList<ProcessedEvent<NotifiableEvent>>,
-
-        /**
-         * An in memory FIFO cache of the seen events.
-         * Acts as a notification debouncer to stop already dismissed push notifications from
-         * displaying again when the /sync response is delayed.
-         */
-        val seenEventIds: CircularCache<String>
 ) {
 
     fun <T> updateQueuedEvents(drawerManager: NotificationDrawerManager, action: NotificationDrawerManager.(NotificationEventQueue, List<ProcessedEvent<NotifiableEvent>>) -> T): T {
@@ -65,13 +59,11 @@ class NotificationState(
     companion object {
 
         fun createInitialNotificationState(context: Context, currentSession: Session?): NotificationState {
-            val queuedEvents = NotificationEventPersistence.loadEvents(context, currentSession)
-            return NotificationState(
-                    queuedEvents = queuedEvents,
-                    renderedEvents = queuedEvents.rawEvents().map { ProcessedEvent(ProcessedEvent.Type.KEEP, it) }.toMutableList(),
-                    seenEventIds = CircularCache.create(cacheSize = 25)
-            )
+            val queuedEvents = NotificationEventPersistence.loadEvents(context, currentSession, factory = { rawEvents ->
+                NotificationEventQueue(rawEvents.toMutableList(), seenEventIds = CircularCache.create(cacheSize = 25))
+            })
+            val renderedEvents = queuedEvents.rawEvents().map { ProcessedEvent(ProcessedEvent.Type.KEEP, it) }.toMutableList()
+            return NotificationState(queuedEvents, renderedEvents)
         }
     }
 }
-
diff --git a/vector/src/test/java/im/vector/app/features/notifications/NotificationEventQueueTest.kt b/vector/src/test/java/im/vector/app/features/notifications/NotificationEventQueueTest.kt
index 26c0030d26..3429f882f8 100644
--- a/vector/src/test/java/im/vector/app/features/notifications/NotificationEventQueueTest.kt
+++ b/vector/src/test/java/im/vector/app/features/notifications/NotificationEventQueueTest.kt
@@ -126,7 +126,7 @@ class NotificationEventQueueTest {
     fun `given no events when adding then adds event`() {
         val queue = givenQueue(listOf())
 
-        queue.add(aSimpleNotifiableEvent(), seenEventIds = seenIdsCache)
+        queue.add(aSimpleNotifiableEvent())
 
         queue.rawEvents() shouldBeEqualTo listOf(aSimpleNotifiableEvent())
     }
@@ -137,7 +137,7 @@ class NotificationEventQueueTest {
         val notifiableEvent = aSimpleNotifiableEvent()
         seenIdsCache.put(notifiableEvent.eventId)
 
-        queue.add(notifiableEvent, seenEventIds = seenIdsCache)
+        queue.add(notifiableEvent)
 
         queue.rawEvents() shouldBeEqualTo emptyList()
     }
@@ -148,7 +148,7 @@ class NotificationEventQueueTest {
         val updatedEvent = replaceableEvent.copy(title = "updated title")
         val queue = givenQueue(listOf(replaceableEvent))
 
-        queue.add(updatedEvent, seenEventIds = seenIdsCache)
+        queue.add(updatedEvent)
 
         queue.rawEvents() shouldBeEqualTo listOf(updatedEvent)
     }
@@ -159,7 +159,7 @@ class NotificationEventQueueTest {
         val updatedEvent = nonReplaceableEvent.copy(title = "updated title")
         val queue = givenQueue(listOf(nonReplaceableEvent))
 
-        queue.add(updatedEvent, seenEventIds = seenIdsCache)
+        queue.add(updatedEvent)
 
         queue.rawEvents() shouldBeEqualTo listOf(nonReplaceableEvent)
     }
@@ -170,7 +170,7 @@ class NotificationEventQueueTest {
         val updatedEvent = editedEvent.copy(eventId = "1", editedEventId = "id-to-edit", title = "updated title")
         val queue = givenQueue(listOf(editedEvent))
 
-        queue.add(updatedEvent, seenEventIds = seenIdsCache)
+        queue.add(updatedEvent)
 
         queue.rawEvents() shouldBeEqualTo listOf(updatedEvent)
     }
@@ -181,7 +181,7 @@ class NotificationEventQueueTest {
         val updatedEvent = editedEvent.copy(eventId = "1", editedEventId = "id-to-edit", title = "updated title")
         val queue = givenQueue(listOf(editedEvent))
 
-        queue.add(updatedEvent, seenEventIds = seenIdsCache)
+        queue.add(updatedEvent)
 
         queue.rawEvents() shouldBeEqualTo listOf(updatedEvent)
     }
@@ -212,5 +212,5 @@ class NotificationEventQueueTest {
         queue.rawEvents() shouldBeEqualTo listOf(anInviteNotifiableEvent(roomId = roomId))
     }
 
-    private fun givenQueue(events: List<NotifiableEvent>) = NotificationEventQueue(events.toMutableList())
+    private fun givenQueue(events: List<NotifiableEvent>) = NotificationEventQueue(events.toMutableList(), seenEventIds = seenIdsCache)
 }

From fef604bfb9e8bcd7fdbe88850bd4223e4ed205bd Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Thu, 18 Nov 2021 13:45:01 +0000
Subject: [PATCH 06/52] fixing line lengths

---
 .../im/vector/app/features/notifications/NotificationState.kt  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationState.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationState.kt
index d772aaa749..c880b99db5 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationState.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationState.kt
@@ -39,7 +39,8 @@ class NotificationState(
         private val renderedEvents: MutableList<ProcessedEvent<NotifiableEvent>>,
 ) {
 
-    fun <T> updateQueuedEvents(drawerManager: NotificationDrawerManager, action: NotificationDrawerManager.(NotificationEventQueue, List<ProcessedEvent<NotifiableEvent>>) -> T): T {
+    fun <T> updateQueuedEvents(drawerManager: NotificationDrawerManager,
+                               action: NotificationDrawerManager.(NotificationEventQueue, List<ProcessedEvent<NotifiableEvent>>) -> T): T {
         return synchronized(queuedEvents) {
             action(drawerManager, queuedEvents, renderedEvents)
         }

From f0ef9e97066f5d8cbfb4d20161763b00c137a455 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Thu, 11 Nov 2021 14:15:01 +0000
Subject: [PATCH 07/52] inverting and splitting the voice message view into
 logic and views - creates a display entry point which will be called
 externally

---
 .../home/room/detail/RoomDetailFragment.kt    |   5 +-
 .../composer/voice/DraggableStateProcessor.kt | 112 ++++++
 .../voice/VoiceMessageRecorderView.kt         | 233 ++++++++++++
 .../composer/voice/VoiceMessageViews.kt       | 358 ++++++++++++++++++
 .../main/res/layout/fragment_room_detail.xml  |   2 +-
 5 files changed, 706 insertions(+), 4 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/DraggableStateProcessor.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index f0d7c6157e..230c68cb31 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -138,7 +138,7 @@ import im.vector.app.features.home.room.detail.composer.TextComposerView
 import im.vector.app.features.home.room.detail.composer.TextComposerViewEvents
 import im.vector.app.features.home.room.detail.composer.TextComposerViewModel
 import im.vector.app.features.home.room.detail.composer.TextComposerViewState
-import im.vector.app.features.home.room.detail.composer.VoiceMessageRecorderView
+import im.vector.app.features.home.room.detail.composer.voice.VoiceMessageRecorderView
 import im.vector.app.features.home.room.detail.readreceipts.DisplayReadReceiptsBottomSheet
 import im.vector.app.features.home.room.detail.timeline.TimelineEventController
 import im.vector.app.features.home.room.detail.timeline.action.EventSharedAction
@@ -692,8 +692,7 @@ class RoomDetailFragment @Inject constructor(
     }
 
     private fun setupVoiceMessageView() {
-        views.voiceMessageRecorderView.voiceMessagePlaybackTracker = voiceMessagePlaybackTracker
-
+        voiceMessagePlaybackTracker.track(VoiceMessagePlaybackTracker.RECORDING_ID, views.voiceMessageRecorderView)
         views.voiceMessageRecorderView.callback = object : VoiceMessageRecorderView.Callback {
             override fun onVoiceRecordingStarted(): Boolean {
                 return if (checkPermissions(PERMISSIONS_FOR_VOICE_MESSAGE, requireActivity(), permissionVoiceMessageLauncher)) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/DraggableStateProcessor.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/DraggableStateProcessor.kt
new file mode 100644
index 0000000000..4cbb96a703
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/DraggableStateProcessor.kt
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home.room.detail.composer.voice
+
+import android.content.res.Resources
+import android.view.MotionEvent
+import im.vector.app.R
+import im.vector.app.core.utils.DimensionConverter
+import im.vector.app.features.home.room.detail.composer.voice.VoiceMessageRecorderView.DraggingState
+import im.vector.app.features.home.room.detail.composer.voice.VoiceMessageRecorderView.RecordingState
+import kotlin.math.abs
+
+class DraggableStateProcessor(
+        resources: Resources,
+        dimensionConverter: DimensionConverter,
+) {
+
+    private val minimumMove = dimensionConverter.dpToPx(16)
+    private val distanceToLock = dimensionConverter.dpToPx(48).toFloat()
+    private val distanceToCancel = dimensionConverter.dpToPx(120).toFloat()
+    private val rtlXMultiplier = resources.getInteger(R.integer.rtl_x_multiplier)
+
+    private var firstX: Float = 0f
+    private var firstY: Float = 0f
+    private var lastX: Float = 0f
+    private var lastY: Float = 0f
+    private var lastDistanceX: Float = 0f
+    private var lastDistanceY: Float = 0f
+
+    fun reset(event: MotionEvent) {
+        firstX = event.rawX
+        firstY = event.rawY
+        lastX = firstX
+        lastY = firstY
+        lastDistanceX = 0F
+        lastDistanceY = 0F
+    }
+
+    fun process(event: MotionEvent, recordingState: RecordingState): RecordingState {
+        val currentX = event.rawX
+        val currentY = event.rawY
+        val distanceX = abs(firstX - currentX)
+        val distanceY = abs(firstY - currentY)
+        return nextRecordingState(recordingState, currentX, currentY, distanceX, distanceY).also {
+            lastX = currentX
+            lastY = currentY
+            lastDistanceX = distanceX
+            lastDistanceY = distanceY
+        }
+    }
+
+    private fun nextRecordingState(recordingState: RecordingState, currentX: Float, currentY: Float, distanceX: Float, distanceY: Float): RecordingState {
+        return when (recordingState) {
+            RecordingState.Started      -> {
+                // Determine if cancelling or locking for the first move action.
+                if (((currentX < firstX && rtlXMultiplier == 1) || (currentX > firstX && rtlXMultiplier == -1)) && distanceX > distanceY && distanceX > lastDistanceX) {
+                    DraggingState.Cancelling(distanceX)
+                } else if (currentY < firstY && distanceY > distanceX && distanceY > lastDistanceY) {
+                    DraggingState.Locking(distanceY)
+                } else {
+                    recordingState
+                }
+            }
+            is DraggingState.Cancelling -> {
+                // Check if cancelling conditions met, also check if it should be initial state
+                if (distanceX < minimumMove && distanceX < lastDistanceX) {
+                    RecordingState.Started
+                } else if (shouldCancelRecording(distanceX)) {
+                    RecordingState.Cancelled
+                } else {
+                    DraggingState.Cancelling(distanceX)
+                }
+            }
+            is DraggingState.Locking    -> {
+                // Check if locking conditions met, also check if it should be initial state
+                if (distanceY < minimumMove && distanceY < lastDistanceY) {
+                    RecordingState.Started
+                } else if (shouldLockRecording(distanceY)) {
+                    RecordingState.Locked
+                } else {
+                    DraggingState.Locking(distanceY)
+                }
+            }
+            else                        -> {
+                recordingState
+            }
+        }
+    }
+
+    private fun shouldCancelRecording(distanceX: Float): Boolean {
+        return distanceX >= distanceToCancel
+    }
+
+    private fun shouldLockRecording(distanceY: Float): Boolean {
+        return distanceY >= distanceToLock
+    }
+}
+
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
new file mode 100644
index 0000000000..6bd55d4400
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
@@ -0,0 +1,233 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home.room.detail.composer.voice
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import androidx.constraintlayout.widget.ConstraintLayout
+import im.vector.app.BuildConfig
+import im.vector.app.R
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.hardware.vibrate
+import im.vector.app.core.utils.CountUpTimer
+import im.vector.app.core.utils.DimensionConverter
+import im.vector.app.databinding.ViewVoiceMessageRecorderBinding
+import im.vector.app.features.home.room.detail.timeline.helper.VoiceMessagePlaybackTracker
+import org.matrix.android.sdk.api.extensions.orFalse
+import kotlin.math.floor
+
+/**
+ * Encapsulates the voice message recording view and animations.
+ */
+class VoiceMessageRecorderView @JvmOverloads constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr), VoiceMessagePlaybackTracker.Listener {
+
+    interface Callback {
+        // Return true if the recording is started
+        fun onVoiceRecordingStarted(): Boolean
+        fun onVoiceRecordingEnded(isCancelled: Boolean)
+        fun onVoiceRecordingPlaybackModeOn()
+        fun onVoicePlaybackButtonClicked()
+    }
+
+    // We need to define views as lateinit var to be able to check if initialized for the bug fix on api 21 and 22.
+    @Suppress("UNNECESSARY_LATEINIT")
+    private lateinit var voiceMessageViews: VoiceMessageViews
+
+    var callback: Callback? = null
+
+    private var recordingState: RecordingState = RecordingState.None
+    private var recordingTicker: CountUpTimer? = null
+
+    init {
+        inflate(this.context, R.layout.view_voice_message_recorder, this)
+        val dimensionConverter = DimensionConverter(this.context.resources)
+        voiceMessageViews = VoiceMessageViews(
+                this.context.resources,
+                ViewVoiceMessageRecorderBinding.bind(this),
+                dimensionConverter
+        )
+        initVoiceRecordingViews()
+        initListeners()
+    }
+
+    override fun onVisibilityChanged(changedView: View, visibility: Int) {
+        super.onVisibilityChanged(changedView, visibility)
+        // onVisibilityChanged is called by constructor on api 21 and 22.
+        if (!this::voiceMessageViews.isInitialized) return
+        val parentChanged = changedView == this
+        voiceMessageViews.renderVisibilityChanged(parentChanged, visibility)
+    }
+
+    fun initVoiceRecordingViews() {
+        recordingState = RecordingState.None
+        stopRecordingTicker()
+        voiceMessageViews.initViews(onVoiceRecordingEnded = {})
+    }
+
+    private fun initListeners() {
+        voiceMessageViews.start(object : VoiceMessageViews.Actions {
+            override fun onRequestRecording() {
+                if (callback?.onVoiceRecordingStarted().orFalse()) {
+                    display(RecordingState.Started)
+                }
+            }
+
+            override fun onRecordingStopped() {
+                if (recordingState != RecordingState.Locked && recordingState != RecordingState.None) {
+                    display(RecordingState.None)
+                }
+            }
+
+            override fun isActive() = recordingState != RecordingState.Cancelled
+
+            override fun updateState(updater: (RecordingState) -> RecordingState) {
+                updater(recordingState).also {
+                    display(it)
+                }
+            }
+
+            override fun sendMessage() {
+                display(RecordingState.None)
+            }
+
+            override fun delete() {
+                // this was previously marked as cancelled true
+                display(RecordingState.None)
+            }
+
+            override fun waveformClicked() {
+                display(RecordingState.Playback)
+            }
+
+            override fun onVoicePlaybackButtonClicked() {
+                callback?.onVoicePlaybackButtonClicked()
+            }
+        })
+    }
+
+    fun display(recordingState: RecordingState) {
+        val previousState = this.recordingState
+        val stateHasChanged = recordingState != this.recordingState
+        this.recordingState = recordingState
+
+        if (stateHasChanged) {
+            when (recordingState) {
+                RecordingState.None      -> {
+                    val isCancelled = previousState == RecordingState.Cancelled
+                    voiceMessageViews.hideRecordingViews(recordingState, isCancelled = isCancelled) { callback?.onVoiceRecordingEnded(it) }
+                    stopRecordingTicker()
+                }
+                RecordingState.Started   -> {
+                    startRecordingTicker()
+                    voiceMessageViews.renderToast(context.getString(R.string.voice_message_release_to_send_toast))
+                    voiceMessageViews.showRecordingViews()
+                }
+                RecordingState.Cancelled -> {
+                    voiceMessageViews.hideRecordingViews(recordingState, isCancelled = true) { callback?.onVoiceRecordingEnded(it) }
+                    vibrate(context)
+                }
+                RecordingState.Locked    -> {
+                    voiceMessageViews.renderLocked()
+                    postDelayed({
+                        voiceMessageViews.showRecordingLockedViews(recordingState) { callback?.onVoiceRecordingEnded(it) }
+                    }, 500)
+                }
+                RecordingState.Playback  -> {
+                    stopRecordingTicker()
+                    voiceMessageViews.showPlaybackViews()
+                    callback?.onVoiceRecordingPlaybackModeOn()
+                }
+                is DraggingState         -> when (recordingState) {
+                    is DraggingState.Cancelling -> voiceMessageViews.renderCancelling(recordingState.distanceX)
+                    is DraggingState.Locking    -> voiceMessageViews.renderLocking(recordingState.distanceY)
+                }.exhaustive
+            }
+        }
+    }
+
+    private fun startRecordingTicker() {
+        recordingTicker?.stop()
+        recordingTicker = CountUpTimer().apply {
+            tickListener = object : CountUpTimer.TickListener {
+                override fun onTick(milliseconds: Long) {
+                    onRecordingTick(milliseconds)
+                }
+            }
+            resume()
+        }
+        onRecordingTick(0L)
+    }
+
+    private fun onRecordingTick(milliseconds: Long) {
+        voiceMessageViews.renderRecordingTimer(recordingState, milliseconds / 1_000)
+        val timeDiffToRecordingLimit = BuildConfig.VOICE_MESSAGE_DURATION_LIMIT_MS - milliseconds
+        if (timeDiffToRecordingLimit <= 0) {
+            post {
+                display(RecordingState.Playback)
+            }
+        } else if (timeDiffToRecordingLimit in 10_000..10_999) {
+            post {
+                voiceMessageViews.renderToast(context.getString(R.string.voice_message_n_seconds_warning_toast, floor(timeDiffToRecordingLimit / 1000f).toInt()))
+                vibrate(context)
+            }
+        }
+    }
+
+    private fun stopRecordingTicker() {
+        recordingTicker?.stop()
+        recordingTicker = null
+    }
+
+    /**
+     * Returns true if the voice message is recording or is in playback mode
+     */
+    fun isActive() = recordingState !in listOf(RecordingState.None, RecordingState.Cancelled)
+
+    override fun onUpdate(state: VoiceMessagePlaybackTracker.Listener.State) {
+        when (state) {
+            is VoiceMessagePlaybackTracker.Listener.State.Recording -> {
+                voiceMessageViews.renderRecordingWaveform(state.amplitudeList.toTypedArray())
+            }
+            is VoiceMessagePlaybackTracker.Listener.State.Playing   -> {
+                voiceMessageViews.renderPlaying(state)
+            }
+            is VoiceMessagePlaybackTracker.Listener.State.Paused,
+            is VoiceMessagePlaybackTracker.Listener.State.Idle      -> {
+                voiceMessageViews.renderIdle()
+            }
+        }
+    }
+
+    sealed interface RecordingState {
+        object None : RecordingState
+        object Started : RecordingState
+        object Cancelled : RecordingState
+        object Locked : RecordingState
+        object Playback : RecordingState
+    }
+
+    sealed interface DraggingState : RecordingState {
+        data class Cancelling(val distanceX: Float) : DraggingState
+        data class Locking(val distanceY: Float) : DraggingState
+    }
+}
+
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt
new file mode 100644
index 0000000000..d9f5f9675b
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt
@@ -0,0 +1,358 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home.room.detail.composer.voice
+
+import android.annotation.SuppressLint
+import android.content.res.Resources
+import android.text.format.DateUtils
+import android.view.MotionEvent
+import android.view.View
+import android.view.ViewGroup
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.view.isInvisible
+import androidx.core.view.isVisible
+import androidx.core.view.updateLayoutParams
+import im.vector.app.R
+import im.vector.app.core.extensions.setAttributeBackground
+import im.vector.app.core.extensions.setAttributeTintedBackground
+import im.vector.app.core.extensions.setAttributeTintedImageResource
+import im.vector.app.core.utils.DimensionConverter
+import im.vector.app.databinding.ViewVoiceMessageRecorderBinding
+import im.vector.app.features.home.room.detail.composer.voice.VoiceMessageRecorderView.RecordingState
+import im.vector.app.features.home.room.detail.timeline.helper.VoiceMessagePlaybackTracker
+import org.matrix.android.sdk.api.extensions.orFalse
+
+class VoiceMessageViews(
+        private val resources: Resources,
+        private val views: ViewVoiceMessageRecorderBinding,
+        private val dimensionConverter: DimensionConverter,
+) {
+
+    private val distanceToLock = dimensionConverter.dpToPx(48).toFloat()
+    private val distanceToCancel = dimensionConverter.dpToPx(120).toFloat()
+    private val rtlXMultiplier = resources.getInteger(R.integer.rtl_x_multiplier)
+
+    fun start(actions: Actions) {
+        views.voiceMessageSendButton.setOnClickListener {
+            views.voiceMessageSendButton.isVisible = false
+            actions.sendMessage()
+        }
+
+        views.voiceMessageDeletePlayback.setOnClickListener {
+            views.voiceMessageSendButton.isVisible = false
+            actions.delete()
+        }
+
+        views.voicePlaybackWaveform.setOnClickListener {
+            actions.waveformClicked()
+        }
+
+        views.voicePlaybackControlButton.setOnClickListener {
+            actions.onVoicePlaybackButtonClicked()
+        }
+        observeMicButton(actions)
+    }
+
+    @SuppressLint("ClickableViewAccessibility")
+    private fun observeMicButton(actions: Actions) {
+        val positions = DraggableStateProcessor(resources, dimensionConverter)
+        views.voiceMessageMicButton.setOnTouchListener { _, event ->
+            when (event.action) {
+                MotionEvent.ACTION_DOWN -> {
+                    positions.reset(event)
+                    actions.onRequestRecording()
+                    true
+                }
+                MotionEvent.ACTION_UP   -> {
+                    actions.onRecordingStopped()
+                    true
+                }
+                MotionEvent.ACTION_MOVE -> {
+                    if (actions.isActive()) {
+                        actions.updateState { currentState -> positions.process(event, currentState) }
+                        true
+                    } else {
+                        false
+                    }
+                }
+                else                    -> false
+            }
+        }
+    }
+
+    fun renderStarted(distanceX: Float) {
+        val translationAmount = distanceX.coerceAtMost(distanceToCancel)
+        views.voiceMessageMicButton.translationX = -translationAmount * rtlXMultiplier
+        views.voiceMessageSlideToCancel.translationX = -translationAmount / 2 * rtlXMultiplier
+    }
+
+    fun renderLocked() {
+        views.voiceMessageLockImage.setImageResource(R.drawable.ic_voice_message_locked)
+    }
+
+    fun renderLocking(distanceY: Float) {
+        views.voiceMessageLockImage.setAttributeTintedImageResource(R.drawable.ic_voice_message_locked, R.attr.colorPrimary)
+        val translationAmount = -distanceY.coerceIn(0F, distanceToLock)
+        views.voiceMessageMicButton.translationY = translationAmount
+        views.voiceMessageLockArrow.translationY = translationAmount
+        views.voiceMessageLockArrow.alpha = 1 - (-translationAmount / distanceToLock)
+        // Reset X translations
+        views.voiceMessageMicButton.translationX = 0F
+        views.voiceMessageSlideToCancel.translationX = 0F
+    }
+
+    fun renderCancelling(distanceX: Float) {
+        val translationAmount = distanceX.coerceAtMost(distanceToCancel)
+        views.voiceMessageMicButton.translationX = -translationAmount * rtlXMultiplier
+        views.voiceMessageSlideToCancel.translationX = -translationAmount / 2 * rtlXMultiplier
+        val reducedAlpha = (1 - translationAmount / distanceToCancel / 1.5).toFloat()
+        views.voiceMessageSlideToCancel.alpha = reducedAlpha
+        views.voiceMessageTimerIndicator.alpha = reducedAlpha
+        views.voiceMessageTimer.alpha = reducedAlpha
+        views.voiceMessageLockBackground.isVisible = false
+        views.voiceMessageLockImage.isVisible = false
+        views.voiceMessageLockArrow.isVisible = false
+        // Reset Y translations
+        views.voiceMessageMicButton.translationY = 0F
+        views.voiceMessageLockArrow.translationY = 0F
+    }
+
+    fun showRecordingViews() {
+        views.voiceMessageMicButton.setImageResource(R.drawable.ic_voice_mic_recording)
+        views.voiceMessageMicButton.setAttributeTintedBackground(R.drawable.circle_with_halo, R.attr.colorPrimary)
+        views.voiceMessageMicButton.updateLayoutParams<ViewGroup.MarginLayoutParams> {
+            setMargins(0, 0, 0, 0)
+        }
+        views.voiceMessageMicButton.animate().scaleX(1.5f).scaleY(1.5f).setDuration(300).start()
+
+        views.voiceMessageLockBackground.isVisible = true
+        views.voiceMessageLockBackground.animate().setDuration(300).translationY(-dimensionConverter.dpToPx(180).toFloat()).start()
+        views.voiceMessageLockImage.isVisible = true
+        views.voiceMessageLockImage.setImageResource(R.drawable.ic_voice_message_unlocked)
+        views.voiceMessageLockImage.animate().setDuration(500).translationY(-dimensionConverter.dpToPx(180).toFloat()).start()
+        views.voiceMessageLockArrow.isVisible = true
+        views.voiceMessageLockArrow.alpha = 1f
+        views.voiceMessageSlideToCancel.isVisible = true
+        views.voiceMessageTimerIndicator.isVisible = true
+        views.voiceMessageTimer.isVisible = true
+        views.voiceMessageSlideToCancel.alpha = 1f
+        views.voiceMessageTimerIndicator.alpha = 1f
+        views.voiceMessageTimer.alpha = 1f
+        views.voiceMessageSendButton.isVisible = false
+    }
+
+    fun hideRecordingViews(recordingState: RecordingState, isCancelled: Boolean?, onVoiceRecordingEnded: (Boolean) -> Unit) {
+        // We need to animate the lock image first
+        if (recordingState != RecordingState.Locked || isCancelled.orFalse()) {
+            views.voiceMessageLockImage.isVisible = false
+            views.voiceMessageLockImage.animate().translationY(0f).start()
+            views.voiceMessageLockBackground.isVisible = false
+            views.voiceMessageLockBackground.animate().translationY(0f).start()
+        } else {
+            animateLockImageWithBackground()
+        }
+        views.voiceMessageLockArrow.isVisible = false
+        views.voiceMessageLockArrow.animate().translationY(0f).start()
+        views.voiceMessageSlideToCancel.isVisible = false
+        views.voiceMessageSlideToCancel.animate().translationX(0f).translationY(0f).start()
+        views.voiceMessagePlaybackLayout.isVisible = false
+
+        if (recordingState != RecordingState.Locked) {
+            views.voiceMessageMicButton
+                    .animate()
+                    .scaleX(1f)
+                    .scaleY(1f)
+                    .translationX(0f)
+                    .translationY(0f)
+                    .setDuration(150)
+                    .withEndAction {
+                        views.voiceMessageTimerIndicator.isVisible = false
+                        views.voiceMessageTimer.isVisible = false
+                        resetMicButtonUi()
+                        isCancelled?.let {
+                            onVoiceRecordingEnded(it)
+                        }
+                    }
+                    .start()
+        } else {
+            views.voiceMessageTimerIndicator.isVisible = false
+            views.voiceMessageTimer.isVisible = false
+            views.voiceMessageMicButton.apply {
+                scaleX = 1f
+                scaleY = 1f
+                translationX = 0f
+                translationY = 0f
+            }
+            isCancelled?.let {
+                onVoiceRecordingEnded(it)
+            }
+        }
+
+        // Hide toasts if user cancelled recording before the timeout of the toast.
+        if (recordingState == RecordingState.Cancelled || recordingState == RecordingState.None) {
+            hideToast()
+        }
+    }
+
+    fun animateLockImageWithBackground() {
+        views.voiceMessageLockBackground.updateLayoutParams {
+            height = dimensionConverter.dpToPx(78)
+        }
+        views.voiceMessageLockBackground.apply {
+            animate()
+                    .scaleX(0f)
+                    .scaleY(0f)
+                    .setDuration(400L)
+                    .withEndAction {
+                        updateLayoutParams {
+                            height = dimensionConverter.dpToPx(180)
+                        }
+                        isVisible = false
+                        scaleX = 1f
+                        scaleY = 1f
+                        animate().translationY(0f).start()
+                    }
+                    .start()
+        }
+
+        // Lock image animation
+        views.voiceMessageMicButton.isInvisible = true
+        views.voiceMessageLockImage.apply {
+            isVisible = true
+            animate()
+                    .scaleX(0f)
+                    .scaleY(0f)
+                    .setDuration(400L)
+                    .withEndAction {
+                        isVisible = false
+                        scaleX = 1f
+                        scaleY = 1f
+                        translationY = 0f
+                        resetMicButtonUi()
+                    }
+                    .start()
+        }
+    }
+
+    fun resetMicButtonUi() {
+        views.voiceMessageMicButton.isVisible = true
+        views.voiceMessageMicButton.setImageResource(R.drawable.ic_voice_mic)
+        views.voiceMessageMicButton.setAttributeBackground(android.R.attr.selectableItemBackgroundBorderless)
+        views.voiceMessageMicButton.updateLayoutParams<ViewGroup.MarginLayoutParams> {
+            if (rtlXMultiplier == -1) {
+                // RTL
+                setMargins(dimensionConverter.dpToPx(12), 0, 0, dimensionConverter.dpToPx(12))
+            } else {
+                setMargins(0, 0, dimensionConverter.dpToPx(12), dimensionConverter.dpToPx(12))
+            }
+        }
+    }
+
+    fun hideToast() {
+        views.voiceMessageToast.isVisible = false
+    }
+
+    fun showRecordingLockedViews(recordingState: RecordingState, onVoiceRecordingEnded: (Boolean) -> Unit) {
+        hideRecordingViews(recordingState, null, onVoiceRecordingEnded)
+        views.voiceMessagePlaybackLayout.isVisible = true
+        views.voiceMessagePlaybackTimerIndicator.isVisible = true
+        views.voicePlaybackControlButton.isVisible = false
+        views.voiceMessageSendButton.isVisible = true
+        views.voicePlaybackWaveform.importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_YES
+        renderToast(resources.getString(R.string.voice_message_tap_to_stop_toast))
+    }
+
+    fun showPlaybackViews() {
+        views.voiceMessagePlaybackTimerIndicator.isVisible = false
+        views.voicePlaybackControlButton.isVisible = true
+        views.voicePlaybackWaveform.importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_NO
+    }
+
+    fun initViews(onVoiceRecordingEnded: (Boolean) -> Unit) {
+        hideRecordingViews(RecordingState.None, null, onVoiceRecordingEnded)
+        views.voiceMessageMicButton.isVisible = true
+        views.voiceMessageSendButton.isVisible = false
+        views.voicePlaybackWaveform.post { views.voicePlaybackWaveform.recreate() }
+    }
+
+    fun renderPlaying(state: VoiceMessagePlaybackTracker.Listener.State.Playing) {
+        views.voicePlaybackControlButton.setImageResource(R.drawable.ic_play_pause_pause)
+        views.voicePlaybackControlButton.contentDescription = resources.getString(R.string.a11y_pause_voice_message)
+        val formattedTimerText = DateUtils.formatElapsedTime((state.playbackTime / 1000).toLong())
+        views.voicePlaybackTime.text = formattedTimerText
+    }
+
+    fun renderIdle() {
+        views.voicePlaybackControlButton.setImageResource(R.drawable.ic_play_pause_play)
+        views.voicePlaybackControlButton.contentDescription = resources.getString(R.string.a11y_play_voice_message)
+    }
+
+    fun renderToast(message: String) {
+        views.voiceMessageToast.removeCallbacks(hideToastRunnable)
+        views.voiceMessageToast.text = message
+        views.voiceMessageToast.isVisible = true
+        views.voiceMessageToast.postDelayed(hideToastRunnable, 2_000)
+    }
+
+    private val hideToastRunnable = Runnable {
+        views.voiceMessageToast.isVisible = false
+    }
+
+    fun renderRecordingTimer(recordingState: RecordingState, recordingTimeMillis: Long) {
+        val formattedTimerText = DateUtils.formatElapsedTime(recordingTimeMillis)
+        if (recordingState == RecordingState.Locked) {
+            views.voicePlaybackTime.apply {
+                post {
+                    text = formattedTimerText
+                }
+            }
+        } else {
+            views.voiceMessageTimer.post {
+                views.voiceMessageTimer.text = formattedTimerText
+            }
+        }
+    }
+
+    fun renderRecordingWaveform(amplitudeList: Array<Int>) {
+        views.voicePlaybackWaveform.post {
+            views.voicePlaybackWaveform.apply {
+                amplitudeList.iterator().forEach {
+                    update(it)
+                }
+            }
+        }
+    }
+
+    fun renderVisibilityChanged(parentChanged: Boolean, visibility: Int) {
+        if (parentChanged && visibility == ConstraintLayout.VISIBLE) {
+            views.voiceMessageMicButton.contentDescription = resources.getString(R.string.a11y_start_voice_message)
+        } else {
+            views.voiceMessageMicButton.contentDescription = ""
+        }
+    }
+
+    interface Actions {
+        fun onRequestRecording()
+        fun onRecordingStopped()
+        fun isActive(): Boolean
+        fun updateState(updater: (RecordingState) -> RecordingState)
+        fun sendMessage()
+        fun delete()
+        fun waveformClicked()
+        fun onVoicePlaybackButtonClicked()
+    }
+}
diff --git a/vector/src/main/res/layout/fragment_room_detail.xml b/vector/src/main/res/layout/fragment_room_detail.xml
index c0ac3170e5..1b73e0e91d 100644
--- a/vector/src/main/res/layout/fragment_room_detail.xml
+++ b/vector/src/main/res/layout/fragment_room_detail.xml
@@ -212,7 +212,7 @@
         app:layout_constraintStart_toStartOf="parent"
         tools:visibility="visible" />
 
-    <im.vector.app.features.home.room.detail.composer.VoiceMessageRecorderView
+    <im.vector.app.features.home.room.detail.composer.voice.VoiceMessageRecorderView
         android:id="@+id/voiceMessageRecorderView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"

From f2690552a242c0bd82243fb19a636c5446aeed58 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Thu, 11 Nov 2021 14:50:35 +0000
Subject: [PATCH 08/52] lifting voice display logic out of the view and to the
 layer above

---
 .../home/room/detail/RoomDetailFragment.kt    |  36 ++++-
 .../composer/voice/DraggableStateProcessor.kt |  16 +--
 .../voice/VoiceMessageRecorderView.kt         | 130 +++++++++---------
 .../composer/voice/VoiceMessageViews.kt       |  20 +--
 4 files changed, 114 insertions(+), 88 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index 230c68cb31..e1dab55979 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -139,6 +139,7 @@ import im.vector.app.features.home.room.detail.composer.TextComposerViewEvents
 import im.vector.app.features.home.room.detail.composer.TextComposerViewModel
 import im.vector.app.features.home.room.detail.composer.TextComposerViewState
 import im.vector.app.features.home.room.detail.composer.voice.VoiceMessageRecorderView
+import im.vector.app.features.home.room.detail.composer.voice.VoiceMessageRecorderView.RecordingUiState
 import im.vector.app.features.home.room.detail.readreceipts.DisplayReadReceiptsBottomSheet
 import im.vector.app.features.home.room.detail.timeline.TimelineEventController
 import im.vector.app.features.home.room.detail.timeline.action.EventSharedAction
@@ -694,15 +695,15 @@ class RoomDetailFragment @Inject constructor(
     private fun setupVoiceMessageView() {
         voiceMessagePlaybackTracker.track(VoiceMessagePlaybackTracker.RECORDING_ID, views.voiceMessageRecorderView)
         views.voiceMessageRecorderView.callback = object : VoiceMessageRecorderView.Callback {
-            override fun onVoiceRecordingStarted(): Boolean {
-                return if (checkPermissions(PERMISSIONS_FOR_VOICE_MESSAGE, requireActivity(), permissionVoiceMessageLauncher)) {
+
+            private var currentUiState: RecordingUiState = RecordingUiState.None
+
+            override fun onVoiceRecordingStarted() {
+                if (checkPermissions(PERMISSIONS_FOR_VOICE_MESSAGE, requireActivity(), permissionVoiceMessageLauncher)) {
                     roomDetailViewModel.handle(RoomDetailAction.StartRecordingVoiceMessage)
                     textComposerViewModel.handle(TextComposerAction.OnVoiceRecordingStateChanged(true))
                     vibrate(requireContext())
-                    true
-                } else {
-                    // Permission dialog is displayed
-                    false
+                    views.voiceMessageRecorderView.display(RecordingUiState.Started)
                 }
             }
 
@@ -718,6 +719,29 @@ class RoomDetailFragment @Inject constructor(
             override fun onVoicePlaybackButtonClicked() {
                 roomDetailViewModel.handle(RoomDetailAction.PlayOrPauseRecordingPlayback)
             }
+
+            override fun onRecordingStopped() {
+                if (currentUiState != RecordingUiState.Locked && currentUiState != RecordingUiState.None) {
+                    views.voiceMessageRecorderView.display(RecordingUiState.None)
+                }
+            }
+
+            override fun onUiStateChanged(state: RecordingUiState) {
+                currentUiState = state
+                views.voiceMessageRecorderView.display(state)
+            }
+
+            override fun sendVoiceMessage() {
+                views.voiceMessageRecorderView.display(RecordingUiState.None)
+            }
+
+            override fun deleteVoiceMessage() {
+                views.voiceMessageRecorderView.display(RecordingUiState.None)
+            }
+
+            override fun onRecordingLimitReached() {
+                views.voiceMessageRecorderView.display(RecordingUiState.Playback)
+            }
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/DraggableStateProcessor.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/DraggableStateProcessor.kt
index 4cbb96a703..5825e60ecf 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/DraggableStateProcessor.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/DraggableStateProcessor.kt
@@ -21,7 +21,7 @@ import android.view.MotionEvent
 import im.vector.app.R
 import im.vector.app.core.utils.DimensionConverter
 import im.vector.app.features.home.room.detail.composer.voice.VoiceMessageRecorderView.DraggingState
-import im.vector.app.features.home.room.detail.composer.voice.VoiceMessageRecorderView.RecordingState
+import im.vector.app.features.home.room.detail.composer.voice.VoiceMessageRecorderView.RecordingUiState
 import kotlin.math.abs
 
 class DraggableStateProcessor(
@@ -50,7 +50,7 @@ class DraggableStateProcessor(
         lastDistanceY = 0F
     }
 
-    fun process(event: MotionEvent, recordingState: RecordingState): RecordingState {
+    fun process(event: MotionEvent, recordingState: RecordingUiState): RecordingUiState {
         val currentX = event.rawX
         val currentY = event.rawY
         val distanceX = abs(firstX - currentX)
@@ -63,9 +63,9 @@ class DraggableStateProcessor(
         }
     }
 
-    private fun nextRecordingState(recordingState: RecordingState, currentX: Float, currentY: Float, distanceX: Float, distanceY: Float): RecordingState {
+    private fun nextRecordingState(recordingState: RecordingUiState, currentX: Float, currentY: Float, distanceX: Float, distanceY: Float): RecordingUiState {
         return when (recordingState) {
-            RecordingState.Started      -> {
+            RecordingUiState.Started    -> {
                 // Determine if cancelling or locking for the first move action.
                 if (((currentX < firstX && rtlXMultiplier == 1) || (currentX > firstX && rtlXMultiplier == -1)) && distanceX > distanceY && distanceX > lastDistanceX) {
                     DraggingState.Cancelling(distanceX)
@@ -78,9 +78,9 @@ class DraggableStateProcessor(
             is DraggingState.Cancelling -> {
                 // Check if cancelling conditions met, also check if it should be initial state
                 if (distanceX < minimumMove && distanceX < lastDistanceX) {
-                    RecordingState.Started
+                    RecordingUiState.Started
                 } else if (shouldCancelRecording(distanceX)) {
-                    RecordingState.Cancelled
+                    RecordingUiState.Cancelled
                 } else {
                     DraggingState.Cancelling(distanceX)
                 }
@@ -88,9 +88,9 @@ class DraggableStateProcessor(
             is DraggingState.Locking    -> {
                 // Check if locking conditions met, also check if it should be initial state
                 if (distanceY < minimumMove && distanceY < lastDistanceY) {
-                    RecordingState.Started
+                    RecordingUiState.Started
                 } else if (shouldLockRecording(distanceY)) {
-                    RecordingState.Locked
+                    RecordingUiState.Locked
                 } else {
                     DraggingState.Locking(distanceY)
                 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
index 6bd55d4400..79898dad32 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
@@ -28,7 +28,6 @@ import im.vector.app.core.utils.CountUpTimer
 import im.vector.app.core.utils.DimensionConverter
 import im.vector.app.databinding.ViewVoiceMessageRecorderBinding
 import im.vector.app.features.home.room.detail.timeline.helper.VoiceMessagePlaybackTracker
-import org.matrix.android.sdk.api.extensions.orFalse
 import kotlin.math.floor
 
 /**
@@ -41,11 +40,15 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
 ) : ConstraintLayout(context, attrs, defStyleAttr), VoiceMessagePlaybackTracker.Listener {
 
     interface Callback {
-        // Return true if the recording is started
-        fun onVoiceRecordingStarted(): Boolean
+        fun onVoiceRecordingStarted()
         fun onVoiceRecordingEnded(isCancelled: Boolean)
         fun onVoiceRecordingPlaybackModeOn()
         fun onVoicePlaybackButtonClicked()
+        fun onRecordingStopped()
+        fun onUiStateChanged(state: RecordingUiState)
+        fun sendVoiceMessage()
+        fun deleteVoiceMessage()
+        fun onRecordingLimitReached()
     }
 
     // We need to define views as lateinit var to be able to check if initialized for the bug fix on api 21 and 22.
@@ -54,7 +57,7 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
 
     var callback: Callback? = null
 
-    private var recordingState: RecordingState = RecordingState.None
+    private var currentUiState: RecordingUiState = RecordingUiState.None
     private var recordingTicker: CountUpTimer? = null
 
     init {
@@ -78,7 +81,6 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
     }
 
     fun initVoiceRecordingViews() {
-        recordingState = RecordingState.None
         stopRecordingTicker()
         voiceMessageViews.initViews(onVoiceRecordingEnded = {})
     }
@@ -86,36 +88,39 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
     private fun initListeners() {
         voiceMessageViews.start(object : VoiceMessageViews.Actions {
             override fun onRequestRecording() {
-                if (callback?.onVoiceRecordingStarted().orFalse()) {
-                    display(RecordingState.Started)
-                }
+                callback?.onVoiceRecordingStarted()
             }
 
             override fun onRecordingStopped() {
-                if (recordingState != RecordingState.Locked && recordingState != RecordingState.None) {
-                    display(RecordingState.None)
-                }
+                callback?.onRecordingStopped()
             }
 
-            override fun isActive() = recordingState != RecordingState.Cancelled
+            override fun isActive() = currentUiState != RecordingUiState.Cancelled
 
-            override fun updateState(updater: (RecordingState) -> RecordingState) {
-                updater(recordingState).also {
-                    display(it)
+            override fun updateState(updater: (RecordingUiState) -> RecordingUiState) {
+                updater(currentUiState).also { newState ->
+                    when (newState) {
+                        is DraggingState -> display(newState)
+                        else             -> {
+                            if (newState != currentUiState) {
+                                callback?.onUiStateChanged(newState)
+                            }
+                        }
+                    }
                 }
             }
 
             override fun sendMessage() {
-                display(RecordingState.None)
+                callback?.sendVoiceMessage()
             }
 
             override fun delete() {
                 // this was previously marked as cancelled true
-                display(RecordingState.None)
+                callback?.deleteVoiceMessage()
             }
 
             override fun waveformClicked() {
-                display(RecordingState.Playback)
+                display(RecordingUiState.Playback)
             }
 
             override fun onVoicePlaybackButtonClicked() {
@@ -124,43 +129,41 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
         })
     }
 
-    fun display(recordingState: RecordingState) {
-        val previousState = this.recordingState
-        val stateHasChanged = recordingState != this.recordingState
-        this.recordingState = recordingState
+    fun display(recordingState: RecordingUiState) {
+        if (recordingState == this.currentUiState) return
 
-        if (stateHasChanged) {
-            when (recordingState) {
-                RecordingState.None      -> {
-                    val isCancelled = previousState == RecordingState.Cancelled
-                    voiceMessageViews.hideRecordingViews(recordingState, isCancelled = isCancelled) { callback?.onVoiceRecordingEnded(it) }
-                    stopRecordingTicker()
-                }
-                RecordingState.Started   -> {
-                    startRecordingTicker()
-                    voiceMessageViews.renderToast(context.getString(R.string.voice_message_release_to_send_toast))
-                    voiceMessageViews.showRecordingViews()
-                }
-                RecordingState.Cancelled -> {
-                    voiceMessageViews.hideRecordingViews(recordingState, isCancelled = true) { callback?.onVoiceRecordingEnded(it) }
-                    vibrate(context)
-                }
-                RecordingState.Locked    -> {
-                    voiceMessageViews.renderLocked()
-                    postDelayed({
-                        voiceMessageViews.showRecordingLockedViews(recordingState) { callback?.onVoiceRecordingEnded(it) }
-                    }, 500)
-                }
-                RecordingState.Playback  -> {
-                    stopRecordingTicker()
-                    voiceMessageViews.showPlaybackViews()
-                    callback?.onVoiceRecordingPlaybackModeOn()
-                }
-                is DraggingState         -> when (recordingState) {
-                    is DraggingState.Cancelling -> voiceMessageViews.renderCancelling(recordingState.distanceX)
-                    is DraggingState.Locking    -> voiceMessageViews.renderLocking(recordingState.distanceY)
-                }.exhaustive
+        val previousState = this.currentUiState
+        this.currentUiState = recordingState
+        when (recordingState) {
+            RecordingUiState.None      -> {
+                val isCancelled = previousState == RecordingUiState.Cancelled
+                voiceMessageViews.hideRecordingViews(recordingState, isCancelled = isCancelled) { callback?.onVoiceRecordingEnded(it) }
+                stopRecordingTicker()
             }
+            RecordingUiState.Started   -> {
+                startRecordingTicker()
+                voiceMessageViews.renderToast(context.getString(R.string.voice_message_release_to_send_toast))
+                voiceMessageViews.showRecordingViews()
+            }
+            RecordingUiState.Cancelled -> {
+                voiceMessageViews.hideRecordingViews(recordingState, isCancelled = true) { callback?.onVoiceRecordingEnded(it) }
+                vibrate(context)
+            }
+            RecordingUiState.Locked    -> {
+                voiceMessageViews.renderLocked()
+                postDelayed({
+                    voiceMessageViews.showRecordingLockedViews(recordingState) { callback?.onVoiceRecordingEnded(it) }
+                }, 500)
+            }
+            RecordingUiState.Playback  -> {
+                stopRecordingTicker()
+                voiceMessageViews.showPlaybackViews()
+                callback?.onVoiceRecordingPlaybackModeOn()
+            }
+            is DraggingState           -> when (recordingState) {
+                is DraggingState.Cancelling -> voiceMessageViews.renderCancelling(recordingState.distanceX)
+                is DraggingState.Locking    -> voiceMessageViews.renderLocking(recordingState.distanceY)
+            }.exhaustive
         }
     }
 
@@ -178,11 +181,11 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
     }
 
     private fun onRecordingTick(milliseconds: Long) {
-        voiceMessageViews.renderRecordingTimer(recordingState, milliseconds / 1_000)
+        voiceMessageViews.renderRecordingTimer(currentUiState, milliseconds / 1_000)
         val timeDiffToRecordingLimit = BuildConfig.VOICE_MESSAGE_DURATION_LIMIT_MS - milliseconds
         if (timeDiffToRecordingLimit <= 0) {
             post {
-                display(RecordingState.Playback)
+                callback?.onRecordingLimitReached()
             }
         } else if (timeDiffToRecordingLimit in 10_000..10_999) {
             post {
@@ -200,7 +203,7 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
     /**
      * Returns true if the voice message is recording or is in playback mode
      */
-    fun isActive() = recordingState !in listOf(RecordingState.None, RecordingState.Cancelled)
+    fun isActive() = currentUiState !in listOf(RecordingUiState.None, RecordingUiState.Cancelled)
 
     override fun onUpdate(state: VoiceMessagePlaybackTracker.Listener.State) {
         when (state) {
@@ -217,17 +220,16 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
         }
     }
 
-    sealed interface RecordingState {
-        object None : RecordingState
-        object Started : RecordingState
-        object Cancelled : RecordingState
-        object Locked : RecordingState
-        object Playback : RecordingState
+    sealed interface RecordingUiState {
+        object None : RecordingUiState
+        object Started : RecordingUiState
+        object Cancelled : RecordingUiState
+        object Locked : RecordingUiState
+        object Playback : RecordingUiState
     }
 
-    sealed interface DraggingState : RecordingState {
+    sealed interface DraggingState : RecordingUiState {
         data class Cancelling(val distanceX: Float) : DraggingState
         data class Locking(val distanceY: Float) : DraggingState
     }
 }
-
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt
index d9f5f9675b..ce4ec4b519 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt
@@ -32,7 +32,7 @@ import im.vector.app.core.extensions.setAttributeTintedBackground
 import im.vector.app.core.extensions.setAttributeTintedImageResource
 import im.vector.app.core.utils.DimensionConverter
 import im.vector.app.databinding.ViewVoiceMessageRecorderBinding
-import im.vector.app.features.home.room.detail.composer.voice.VoiceMessageRecorderView.RecordingState
+import im.vector.app.features.home.room.detail.composer.voice.VoiceMessageRecorderView.RecordingUiState
 import im.vector.app.features.home.room.detail.timeline.helper.VoiceMessagePlaybackTracker
 import org.matrix.android.sdk.api.extensions.orFalse
 
@@ -155,9 +155,9 @@ class VoiceMessageViews(
         views.voiceMessageSendButton.isVisible = false
     }
 
-    fun hideRecordingViews(recordingState: RecordingState, isCancelled: Boolean?, onVoiceRecordingEnded: (Boolean) -> Unit) {
+    fun hideRecordingViews(recordingState: RecordingUiState, isCancelled: Boolean?, onVoiceRecordingEnded: (Boolean) -> Unit) {
         // We need to animate the lock image first
-        if (recordingState != RecordingState.Locked || isCancelled.orFalse()) {
+        if (recordingState != RecordingUiState.Locked || isCancelled.orFalse()) {
             views.voiceMessageLockImage.isVisible = false
             views.voiceMessageLockImage.animate().translationY(0f).start()
             views.voiceMessageLockBackground.isVisible = false
@@ -171,7 +171,7 @@ class VoiceMessageViews(
         views.voiceMessageSlideToCancel.animate().translationX(0f).translationY(0f).start()
         views.voiceMessagePlaybackLayout.isVisible = false
 
-        if (recordingState != RecordingState.Locked) {
+        if (recordingState != RecordingUiState.Locked) {
             views.voiceMessageMicButton
                     .animate()
                     .scaleX(1f)
@@ -203,7 +203,7 @@ class VoiceMessageViews(
         }
 
         // Hide toasts if user cancelled recording before the timeout of the toast.
-        if (recordingState == RecordingState.Cancelled || recordingState == RecordingState.None) {
+        if (recordingState == RecordingUiState.Cancelled || recordingState == RecordingUiState.None) {
             hideToast()
         }
     }
@@ -266,7 +266,7 @@ class VoiceMessageViews(
         views.voiceMessageToast.isVisible = false
     }
 
-    fun showRecordingLockedViews(recordingState: RecordingState, onVoiceRecordingEnded: (Boolean) -> Unit) {
+    fun showRecordingLockedViews(recordingState: RecordingUiState, onVoiceRecordingEnded: (Boolean) -> Unit) {
         hideRecordingViews(recordingState, null, onVoiceRecordingEnded)
         views.voiceMessagePlaybackLayout.isVisible = true
         views.voiceMessagePlaybackTimerIndicator.isVisible = true
@@ -283,7 +283,7 @@ class VoiceMessageViews(
     }
 
     fun initViews(onVoiceRecordingEnded: (Boolean) -> Unit) {
-        hideRecordingViews(RecordingState.None, null, onVoiceRecordingEnded)
+        hideRecordingViews(RecordingUiState.None, null, onVoiceRecordingEnded)
         views.voiceMessageMicButton.isVisible = true
         views.voiceMessageSendButton.isVisible = false
         views.voicePlaybackWaveform.post { views.voicePlaybackWaveform.recreate() }
@@ -312,9 +312,9 @@ class VoiceMessageViews(
         views.voiceMessageToast.isVisible = false
     }
 
-    fun renderRecordingTimer(recordingState: RecordingState, recordingTimeMillis: Long) {
+    fun renderRecordingTimer(recordingState: RecordingUiState, recordingTimeMillis: Long) {
         val formattedTimerText = DateUtils.formatElapsedTime(recordingTimeMillis)
-        if (recordingState == RecordingState.Locked) {
+        if (recordingState == RecordingUiState.Locked) {
             views.voicePlaybackTime.apply {
                 post {
                     text = formattedTimerText
@@ -349,7 +349,7 @@ class VoiceMessageViews(
         fun onRequestRecording()
         fun onRecordingStopped()
         fun isActive(): Boolean
-        fun updateState(updater: (RecordingState) -> RecordingState)
+        fun updateState(updater: (RecordingUiState) -> RecordingUiState)
         fun sendMessage()
         fun delete()
         fun waveformClicked()

From 40d762c37d384f670f80be4e26bc4b4bbfcc40c4 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Thu, 11 Nov 2021 15:50:00 +0000
Subject: [PATCH 09/52] lifting current recording state out of the view

---
 .../home/room/detail/RoomDetailFragment.kt    |  36 +-
 .../composer/VoiceMessageRecorderView.kt      | 551 ------------------
 .../voice/VoiceMessageRecorderView.kt         |  58 +-
 .../composer/voice/VoiceMessageViews.kt       |   4 +-
 4 files changed, 49 insertions(+), 600 deletions(-)
 delete mode 100644 vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.kt

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index e1dab55979..ba45348cab 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -506,7 +506,7 @@ class RoomDetailFragment @Inject constructor(
 
     private fun onCannotRecord() {
         // Update the UI, cancel the animation
-        views.voiceMessageRecorderView.initVoiceRecordingViews()
+        views.voiceMessageRecorderView.display(RecordingUiState.None)
     }
 
     private fun acceptIncomingCall(event: RoomDetailViewEvents.DisplayAndAcceptCall) {
@@ -698,12 +698,16 @@ class RoomDetailFragment @Inject constructor(
 
             private var currentUiState: RecordingUiState = RecordingUiState.None
 
+            init {
+                display(currentUiState)
+            }
+
             override fun onVoiceRecordingStarted() {
                 if (checkPermissions(PERMISSIONS_FOR_VOICE_MESSAGE, requireActivity(), permissionVoiceMessageLauncher)) {
                     roomDetailViewModel.handle(RoomDetailAction.StartRecordingVoiceMessage)
                     textComposerViewModel.handle(TextComposerAction.OnVoiceRecordingStateChanged(true))
                     vibrate(requireContext())
-                    views.voiceMessageRecorderView.display(RecordingUiState.Started)
+                    display(RecordingUiState.Started)
                 }
             }
 
@@ -721,27 +725,39 @@ class RoomDetailFragment @Inject constructor(
             }
 
             override fun onRecordingStopped() {
-                if (currentUiState != RecordingUiState.Locked && currentUiState != RecordingUiState.None) {
-                    views.voiceMessageRecorderView.display(RecordingUiState.None)
+                if (currentUiState != RecordingUiState.Locked) {
+                    display(RecordingUiState.None)
                 }
             }
 
             override fun onUiStateChanged(state: RecordingUiState) {
-                currentUiState = state
-                views.voiceMessageRecorderView.display(state)
+                display(state)
             }
 
             override fun sendVoiceMessage() {
-                views.voiceMessageRecorderView.display(RecordingUiState.None)
+                display(RecordingUiState.None)
             }
 
             override fun deleteVoiceMessage() {
-                views.voiceMessageRecorderView.display(RecordingUiState.None)
+                display(RecordingUiState.Cancelled)
             }
 
             override fun onRecordingLimitReached() {
-                views.voiceMessageRecorderView.display(RecordingUiState.Playback)
+                display(RecordingUiState.Playback)
             }
+
+            override fun recordingWaveformClicked() {
+                display(RecordingUiState.Playback)
+            }
+
+            private fun display(state: RecordingUiState) {
+                if (currentUiState != state) {
+                    views.voiceMessageRecorderView.display(state)
+                }
+                currentUiState = state
+            }
+
+            override fun currentState() = currentUiState
         }
     }
 
@@ -1132,7 +1148,7 @@ class RoomDetailFragment @Inject constructor(
 
         // We should improve the UX to support going into playback mode when paused and delete the media when the view is destroyed.
         roomDetailViewModel.handle(RoomDetailAction.EndAllVoiceActions(deleteRecord = false))
-        views.voiceMessageRecorderView.initVoiceRecordingViews()
+        views.voiceMessageRecorderView.display(RecordingUiState.None)
     }
 
     private val attachmentFileActivityResultLauncher = registerStartForActivityResult {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.kt
deleted file mode 100644
index f7b8cead37..0000000000
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.kt
+++ /dev/null
@@ -1,551 +0,0 @@
-/*
- * Copyright (c) 2021 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package im.vector.app.features.home.room.detail.composer
-
-import android.content.Context
-import android.text.format.DateUtils
-import android.util.AttributeSet
-import android.view.MotionEvent
-import android.view.View
-import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.core.view.isInvisible
-import androidx.core.view.isVisible
-import androidx.core.view.updateLayoutParams
-import im.vector.app.BuildConfig
-import im.vector.app.R
-import im.vector.app.core.extensions.setAttributeBackground
-import im.vector.app.core.extensions.setAttributeTintedBackground
-import im.vector.app.core.extensions.setAttributeTintedImageResource
-import im.vector.app.core.hardware.vibrate
-import im.vector.app.core.utils.CountUpTimer
-import im.vector.app.core.utils.DimensionConverter
-import im.vector.app.databinding.ViewVoiceMessageRecorderBinding
-import im.vector.app.features.home.room.detail.timeline.helper.VoiceMessagePlaybackTracker
-import org.matrix.android.sdk.api.extensions.orFalse
-import timber.log.Timber
-import kotlin.math.abs
-import kotlin.math.floor
-
-/**
- * Encapsulates the voice message recording view and animations.
- */
-class VoiceMessageRecorderView : ConstraintLayout, VoiceMessagePlaybackTracker.Listener {
-
-    interface Callback {
-        // Return true if the recording is started
-        fun onVoiceRecordingStarted(): Boolean
-        fun onVoiceRecordingEnded(isCancelled: Boolean)
-        fun onVoiceRecordingPlaybackModeOn()
-        fun onVoicePlaybackButtonClicked()
-    }
-
-    private lateinit var views: ViewVoiceMessageRecorderBinding
-
-    var callback: Callback? = null
-    var voiceMessagePlaybackTracker: VoiceMessagePlaybackTracker? = null
-        set(value) {
-            field = value
-            value?.track(VoiceMessagePlaybackTracker.RECORDING_ID, this)
-        }
-
-    private var recordingState: RecordingState = RecordingState.NONE
-
-    private var firstX: Float = 0f
-    private var firstY: Float = 0f
-    private var lastX: Float = 0f
-    private var lastY: Float = 0f
-    private var lastDistanceX: Float = 0f
-    private var lastDistanceY: Float = 0f
-
-    private var recordingTicker: CountUpTimer? = null
-
-    private val dimensionConverter = DimensionConverter(context.resources)
-    private val minimumMove = dimensionConverter.dpToPx(16)
-    private val distanceToLock = dimensionConverter.dpToPx(48).toFloat()
-    private val distanceToCancel = dimensionConverter.dpToPx(120).toFloat()
-    private val rtlXMultiplier = context.resources.getInteger(R.integer.rtl_x_multiplier)
-
-    // Don't convert to primary constructor.
-    // We need to define views as lateinit var to be able to check if initialized for the bug fix on api 21 and 22.
-    @JvmOverloads constructor(
-            context: Context,
-            attrs: AttributeSet? = null,
-            defStyleAttr: Int = 0
-    ) : super(context, attrs, defStyleAttr) {
-        initialize()
-    }
-
-    fun initialize() {
-        inflate(context, R.layout.view_voice_message_recorder, this)
-        views = ViewVoiceMessageRecorderBinding.bind(this)
-
-        initVoiceRecordingViews()
-        initListeners()
-    }
-
-    override fun onVisibilityChanged(changedView: View, visibility: Int) {
-        super.onVisibilityChanged(changedView, visibility)
-        // onVisibilityChanged is called by constructor on api 21 and 22.
-        if (!this::views.isInitialized) return
-
-        if (changedView == this && visibility == VISIBLE) {
-            views.voiceMessageMicButton.contentDescription = context.getString(R.string.a11y_start_voice_message)
-        } else {
-            views.voiceMessageMicButton.contentDescription = ""
-        }
-    }
-
-    fun initVoiceRecordingViews() {
-        recordingState = RecordingState.NONE
-
-        hideRecordingViews(null)
-        stopRecordingTicker()
-
-        views.voiceMessageMicButton.isVisible = true
-        views.voiceMessageSendButton.isVisible = false
-
-        views.voicePlaybackWaveform.post { views.voicePlaybackWaveform.recreate() }
-    }
-
-    private fun initListeners() {
-        views.voiceMessageSendButton.setOnClickListener {
-            stopRecordingTicker()
-            hideRecordingViews(isCancelled = false)
-            views.voiceMessageSendButton.isVisible = false
-            recordingState = RecordingState.NONE
-        }
-
-        views.voiceMessageDeletePlayback.setOnClickListener {
-            stopRecordingTicker()
-            hideRecordingViews(isCancelled = true)
-            views.voiceMessageSendButton.isVisible = false
-            recordingState = RecordingState.NONE
-        }
-
-        views.voicePlaybackWaveform.setOnClickListener {
-            if (recordingState != RecordingState.PLAYBACK) {
-                recordingState = RecordingState.PLAYBACK
-                showPlaybackViews()
-            }
-        }
-
-        views.voicePlaybackControlButton.setOnClickListener {
-            callback?.onVoicePlaybackButtonClicked()
-        }
-
-        views.voiceMessageMicButton.setOnTouchListener { _, event ->
-            when (event.action) {
-                MotionEvent.ACTION_DOWN -> {
-                    handleMicActionDown(event)
-                    true
-                }
-                MotionEvent.ACTION_UP   -> {
-                    handleMicActionUp()
-                    true
-                }
-                MotionEvent.ACTION_MOVE -> {
-                    if (recordingState == RecordingState.CANCELLED) return@setOnTouchListener false
-                    handleMicActionMove(event)
-                    true
-                }
-                else                    ->
-                    false
-            }
-        }
-    }
-
-    private fun handleMicActionDown(event: MotionEvent) {
-        val recordingStarted = callback?.onVoiceRecordingStarted().orFalse()
-        if (recordingStarted) {
-            startRecordingTicker()
-            renderToast(context.getString(R.string.voice_message_release_to_send_toast))
-            recordingState = RecordingState.STARTED
-            showRecordingViews()
-
-            firstX = event.rawX
-            firstY = event.rawY
-            lastX = firstX
-            lastY = firstY
-            lastDistanceX = 0F
-            lastDistanceY = 0F
-        }
-    }
-
-    private fun handleMicActionUp() {
-        if (recordingState != RecordingState.LOCKED && recordingState != RecordingState.NONE) {
-            stopRecordingTicker()
-            val isCancelled = recordingState == RecordingState.NONE || recordingState == RecordingState.CANCELLED
-            recordingState = RecordingState.NONE
-            hideRecordingViews(isCancelled = isCancelled)
-        }
-    }
-
-    private fun handleMicActionMove(event: MotionEvent) {
-        val currentX = event.rawX
-        val currentY = event.rawY
-
-        val distanceX = abs(firstX - currentX)
-        val distanceY = abs(firstY - currentY)
-
-        val isRecordingStateChanged = updateRecordingState(currentX, currentY, distanceX, distanceY)
-
-        when (recordingState) {
-            RecordingState.CANCELLING -> {
-                val translationAmount = distanceX.coerceAtMost(distanceToCancel)
-                views.voiceMessageMicButton.translationX = -translationAmount * rtlXMultiplier
-                views.voiceMessageSlideToCancel.translationX = -translationAmount / 2 * rtlXMultiplier
-                val reducedAlpha = (1 - translationAmount / distanceToCancel / 1.5).toFloat()
-                views.voiceMessageSlideToCancel.alpha = reducedAlpha
-                views.voiceMessageTimerIndicator.alpha = reducedAlpha
-                views.voiceMessageTimer.alpha = reducedAlpha
-                views.voiceMessageLockBackground.isVisible = false
-                views.voiceMessageLockImage.isVisible = false
-                views.voiceMessageLockArrow.isVisible = false
-                // Reset Y translations
-                views.voiceMessageMicButton.translationY = 0F
-                views.voiceMessageLockArrow.translationY = 0F
-            }
-            RecordingState.LOCKING    -> {
-                views.voiceMessageLockImage.setAttributeTintedImageResource(R.drawable.ic_voice_message_locked, R.attr.colorPrimary)
-                val translationAmount = -distanceY.coerceIn(0F, distanceToLock)
-                views.voiceMessageMicButton.translationY = translationAmount
-                views.voiceMessageLockArrow.translationY = translationAmount
-                views.voiceMessageLockArrow.alpha = 1 - (-translationAmount / distanceToLock)
-                // Reset X translations
-                views.voiceMessageMicButton.translationX = 0F
-                views.voiceMessageSlideToCancel.translationX = 0F
-            }
-            RecordingState.CANCELLED  -> {
-                hideRecordingViews(isCancelled = true)
-                vibrate(context)
-            }
-            RecordingState.LOCKED     -> {
-                if (isRecordingStateChanged) { // Do not update views if it was already in locked state.
-                    views.voiceMessageLockImage.setImageResource(R.drawable.ic_voice_message_locked)
-                    views.voiceMessageLockImage.postDelayed({
-                        showRecordingLockedViews()
-                    }, 500)
-                }
-            }
-            RecordingState.STARTED    -> {
-                showRecordingViews()
-                val translationAmount = distanceX.coerceAtMost(distanceToCancel)
-                views.voiceMessageMicButton.translationX = -translationAmount * rtlXMultiplier
-                views.voiceMessageSlideToCancel.translationX = -translationAmount / 2 * rtlXMultiplier
-            }
-            RecordingState.NONE       -> Timber.d("VoiceMessageRecorderView shouldn't be in NONE state while moving.")
-            RecordingState.PLAYBACK   -> Timber.d("VoiceMessageRecorderView shouldn't be in PLAYBACK state while moving.")
-        }
-        lastX = currentX
-        lastY = currentY
-        lastDistanceX = distanceX
-        lastDistanceY = distanceY
-    }
-
-    private fun updateRecordingState(currentX: Float, currentY: Float, distanceX: Float, distanceY: Float): Boolean {
-        val previousRecordingState = recordingState
-        if (recordingState == RecordingState.STARTED) {
-            // Determine if cancelling or locking for the first move action.
-            if (((currentX < firstX && rtlXMultiplier == 1) || (currentX > firstX && rtlXMultiplier == -1)) &&
-                    distanceX > distanceY && distanceX > lastDistanceX) {
-                recordingState = RecordingState.CANCELLING
-            } else if (currentY < firstY && distanceY > distanceX && distanceY > lastDistanceY) {
-                recordingState = RecordingState.LOCKING
-            }
-        } else if (recordingState == RecordingState.CANCELLING) {
-            // Check if cancelling conditions met, also check if it should be initial state
-            if (distanceX < minimumMove && distanceX < lastDistanceX) {
-                recordingState = RecordingState.STARTED
-            } else if (shouldCancelRecording(distanceX)) {
-                recordingState = RecordingState.CANCELLED
-            }
-        } else if (recordingState == RecordingState.LOCKING) {
-            // Check if locking conditions met, also check if it should be initial state
-            if (distanceY < minimumMove && distanceY < lastDistanceY) {
-                recordingState = RecordingState.STARTED
-            } else if (shouldLockRecording(distanceY)) {
-                recordingState = RecordingState.LOCKED
-            }
-        }
-        return previousRecordingState != recordingState
-    }
-
-    private fun shouldCancelRecording(distanceX: Float): Boolean {
-        return distanceX >= distanceToCancel
-    }
-
-    private fun shouldLockRecording(distanceY: Float): Boolean {
-        return distanceY >= distanceToLock
-    }
-
-    private fun startRecordingTicker() {
-        recordingTicker?.stop()
-        recordingTicker = CountUpTimer().apply {
-            tickListener = object : CountUpTimer.TickListener {
-                override fun onTick(milliseconds: Long) {
-                    onRecordingTick(milliseconds)
-                }
-            }
-            resume()
-        }
-        onRecordingTick(0L)
-    }
-
-    private fun onRecordingTick(milliseconds: Long) {
-        renderRecordingTimer(milliseconds / 1_000)
-        val timeDiffToRecordingLimit = BuildConfig.VOICE_MESSAGE_DURATION_LIMIT_MS - milliseconds
-        if (timeDiffToRecordingLimit <= 0) {
-            views.voiceMessageRecordingLayout.post {
-                recordingState = RecordingState.PLAYBACK
-                showPlaybackViews()
-                stopRecordingTicker()
-            }
-        } else if (timeDiffToRecordingLimit in 10_000..10_999) {
-            views.voiceMessageRecordingLayout.post {
-                renderToast(context.getString(R.string.voice_message_n_seconds_warning_toast, floor(timeDiffToRecordingLimit / 1000f).toInt()))
-                vibrate(context)
-            }
-        }
-    }
-
-    private fun renderToast(message: String) {
-        views.voiceMessageToast.removeCallbacks(hideToastRunnable)
-        views.voiceMessageToast.text = message
-        views.voiceMessageToast.isVisible = true
-        views.voiceMessageToast.postDelayed(hideToastRunnable, 2_000)
-    }
-
-    private fun hideToast() {
-        views.voiceMessageToast.isVisible = false
-    }
-
-    private val hideToastRunnable = Runnable {
-        views.voiceMessageToast.isVisible = false
-    }
-
-    private fun renderRecordingTimer(recordingTimeMillis: Long) {
-        val formattedTimerText = DateUtils.formatElapsedTime(recordingTimeMillis)
-        if (recordingState == RecordingState.LOCKED) {
-            views.voicePlaybackTime.apply {
-                post {
-                    text = formattedTimerText
-                }
-            }
-        } else {
-            views.voiceMessageTimer.post {
-                views.voiceMessageTimer.text = formattedTimerText
-            }
-        }
-    }
-
-    private fun renderRecordingWaveform(amplitudeList: Array<Int>) {
-        post {
-            views.voicePlaybackWaveform.apply {
-                amplitudeList.iterator().forEach {
-                    update(it)
-                }
-            }
-        }
-    }
-
-    private fun stopRecordingTicker() {
-        recordingTicker?.stop()
-        recordingTicker = null
-    }
-
-    private fun showRecordingViews() {
-        views.voiceMessageMicButton.setImageResource(R.drawable.ic_voice_mic_recording)
-        views.voiceMessageMicButton.setAttributeTintedBackground(R.drawable.circle_with_halo, R.attr.colorPrimary)
-        views.voiceMessageMicButton.updateLayoutParams<MarginLayoutParams> {
-            setMargins(0, 0, 0, 0)
-        }
-        views.voiceMessageMicButton.animate().scaleX(1.5f).scaleY(1.5f).setDuration(300).start()
-
-        views.voiceMessageLockBackground.isVisible = true
-        views.voiceMessageLockBackground.animate().setDuration(300).translationY(-dimensionConverter.dpToPx(180).toFloat()).start()
-        views.voiceMessageLockImage.isVisible = true
-        views.voiceMessageLockImage.setImageResource(R.drawable.ic_voice_message_unlocked)
-        views.voiceMessageLockImage.animate().setDuration(500).translationY(-dimensionConverter.dpToPx(180).toFloat()).start()
-        views.voiceMessageLockArrow.isVisible = true
-        views.voiceMessageLockArrow.alpha = 1f
-        views.voiceMessageSlideToCancel.isVisible = true
-        views.voiceMessageTimerIndicator.isVisible = true
-        views.voiceMessageTimer.isVisible = true
-        views.voiceMessageSlideToCancel.alpha = 1f
-        views.voiceMessageTimerIndicator.alpha = 1f
-        views.voiceMessageTimer.alpha = 1f
-        views.voiceMessageSendButton.isVisible = false
-    }
-
-    private fun hideRecordingViews(isCancelled: Boolean?) {
-        // We need to animate the lock image first
-        if (recordingState != RecordingState.LOCKED || isCancelled.orFalse()) {
-            views.voiceMessageLockImage.isVisible = false
-            views.voiceMessageLockImage.animate().translationY(0f).start()
-            views.voiceMessageLockBackground.isVisible = false
-            views.voiceMessageLockBackground.animate().translationY(0f).start()
-        } else {
-            animateLockImageWithBackground()
-        }
-        views.voiceMessageLockArrow.isVisible = false
-        views.voiceMessageLockArrow.animate().translationY(0f).start()
-        views.voiceMessageSlideToCancel.isVisible = false
-        views.voiceMessageSlideToCancel.animate().translationX(0f).translationY(0f).start()
-        views.voiceMessagePlaybackLayout.isVisible = false
-
-        if (recordingState != RecordingState.LOCKED) {
-            views.voiceMessageMicButton
-                    .animate()
-                    .scaleX(1f)
-                    .scaleY(1f)
-                    .translationX(0f)
-                    .translationY(0f)
-                    .setDuration(150)
-                    .withEndAction {
-                        views.voiceMessageTimerIndicator.isVisible = false
-                        views.voiceMessageTimer.isVisible = false
-                        resetMicButtonUi()
-                        isCancelled?.let {
-                            callback?.onVoiceRecordingEnded(it)
-                        }
-                    }
-                    .start()
-        } else {
-            views.voiceMessageTimerIndicator.isVisible = false
-            views.voiceMessageTimer.isVisible = false
-            views.voiceMessageMicButton.apply {
-                scaleX = 1f
-                scaleY = 1f
-                translationX = 0f
-                translationY = 0f
-            }
-            isCancelled?.let {
-                callback?.onVoiceRecordingEnded(it)
-            }
-        }
-
-        // Hide toasts if user cancelled recording before the timeout of the toast.
-        if (recordingState == RecordingState.CANCELLED || recordingState == RecordingState.NONE) {
-            hideToast()
-        }
-    }
-
-    private fun resetMicButtonUi() {
-        views.voiceMessageMicButton.isVisible = true
-        views.voiceMessageMicButton.setImageResource(R.drawable.ic_voice_mic)
-        views.voiceMessageMicButton.setAttributeBackground(android.R.attr.selectableItemBackgroundBorderless)
-        views.voiceMessageMicButton.updateLayoutParams<MarginLayoutParams> {
-            if (rtlXMultiplier == -1) {
-                // RTL
-                setMargins(dimensionConverter.dpToPx(12), 0, 0, dimensionConverter.dpToPx(12))
-            } else {
-                setMargins(0, 0, dimensionConverter.dpToPx(12), dimensionConverter.dpToPx(12))
-            }
-        }
-    }
-
-    private fun animateLockImageWithBackground() {
-        views.voiceMessageLockBackground.updateLayoutParams {
-            height = dimensionConverter.dpToPx(78)
-        }
-        views.voiceMessageLockBackground.apply {
-            animate()
-                    .scaleX(0f)
-                    .scaleY(0f)
-                    .setDuration(400L)
-                    .withEndAction {
-                        updateLayoutParams {
-                            height = dimensionConverter.dpToPx(180)
-                        }
-                        isVisible = false
-                        scaleX = 1f
-                        scaleY = 1f
-                        animate().translationY(0f).start()
-                    }
-                    .start()
-        }
-
-        // Lock image animation
-        views.voiceMessageMicButton.isInvisible = true
-        views.voiceMessageLockImage.apply {
-            isVisible = true
-            animate()
-                    .scaleX(0f)
-                    .scaleY(0f)
-                    .setDuration(400L)
-                    .withEndAction {
-                        isVisible = false
-                        scaleX = 1f
-                        scaleY = 1f
-                        translationY = 0f
-                        resetMicButtonUi()
-                    }
-                    .start()
-        }
-    }
-
-    private fun showRecordingLockedViews() {
-        hideRecordingViews(null)
-        views.voiceMessagePlaybackLayout.isVisible = true
-        views.voiceMessagePlaybackTimerIndicator.isVisible = true
-        views.voicePlaybackControlButton.isVisible = false
-        views.voiceMessageSendButton.isVisible = true
-        views.voicePlaybackWaveform.importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_YES
-        renderToast(context.getString(R.string.voice_message_tap_to_stop_toast))
-    }
-
-    private fun showPlaybackViews() {
-        views.voiceMessagePlaybackTimerIndicator.isVisible = false
-        views.voicePlaybackControlButton.isVisible = true
-        views.voicePlaybackWaveform.importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_NO
-        callback?.onVoiceRecordingPlaybackModeOn()
-    }
-
-    private enum class RecordingState {
-        NONE,
-        STARTED,
-        CANCELLING,
-        CANCELLED,
-        LOCKING,
-        LOCKED,
-        PLAYBACK
-    }
-
-    /**
-     * Returns true if the voice message is recording or is in playback mode
-     */
-    fun isActive() = recordingState !in listOf(RecordingState.NONE, RecordingState.CANCELLED)
-
-    override fun onUpdate(state: VoiceMessagePlaybackTracker.Listener.State) {
-        when (state) {
-            is VoiceMessagePlaybackTracker.Listener.State.Recording -> {
-                renderRecordingWaveform(state.amplitudeList.toTypedArray())
-            }
-            is VoiceMessagePlaybackTracker.Listener.State.Playing   -> {
-                views.voicePlaybackControlButton.setImageResource(R.drawable.ic_play_pause_pause)
-                views.voicePlaybackControlButton.contentDescription = context.getString(R.string.a11y_pause_voice_message)
-                val formattedTimerText = DateUtils.formatElapsedTime((state.playbackTime / 1000).toLong())
-                views.voicePlaybackTime.text = formattedTimerText
-            }
-            is VoiceMessagePlaybackTracker.Listener.State.Paused,
-            is VoiceMessagePlaybackTracker.Listener.State.Idle      -> {
-                views.voicePlaybackControlButton.setImageResource(R.drawable.ic_play_pause_play)
-                views.voicePlaybackControlButton.contentDescription = context.getString(R.string.a11y_play_voice_message)
-            }
-        }
-    }
-}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
index 79898dad32..2227405507 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
@@ -49,15 +49,15 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
         fun sendVoiceMessage()
         fun deleteVoiceMessage()
         fun onRecordingLimitReached()
+        fun recordingWaveformClicked()
+        fun currentState(): RecordingUiState
     }
 
     // We need to define views as lateinit var to be able to check if initialized for the bug fix on api 21 and 22.
     @Suppress("UNNECESSARY_LATEINIT")
     private lateinit var voiceMessageViews: VoiceMessageViews
+    lateinit var callback: Callback
 
-    var callback: Callback? = null
-
-    private var currentUiState: RecordingUiState = RecordingUiState.None
     private var recordingTicker: CountUpTimer? = null
 
     init {
@@ -68,7 +68,6 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
                 ViewVoiceMessageRecorderBinding.bind(this),
                 dimensionConverter
         )
-        initVoiceRecordingViews()
         initListeners()
     }
 
@@ -80,65 +79,49 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
         voiceMessageViews.renderVisibilityChanged(parentChanged, visibility)
     }
 
-    fun initVoiceRecordingViews() {
-        stopRecordingTicker()
-        voiceMessageViews.initViews(onVoiceRecordingEnded = {})
-    }
-
     private fun initListeners() {
         voiceMessageViews.start(object : VoiceMessageViews.Actions {
             override fun onRequestRecording() {
-                callback?.onVoiceRecordingStarted()
+                callback.onVoiceRecordingStarted()
             }
 
             override fun onRecordingStopped() {
-                callback?.onRecordingStopped()
+                callback.onRecordingStopped()
             }
 
-            override fun isActive() = currentUiState != RecordingUiState.Cancelled
+            override fun isActive() = callback.currentState() != RecordingUiState.Cancelled
 
             override fun updateState(updater: (RecordingUiState) -> RecordingUiState) {
-                updater(currentUiState).also { newState ->
-                    when (newState) {
-                        is DraggingState -> display(newState)
-                        else             -> {
-                            if (newState != currentUiState) {
-                                callback?.onUiStateChanged(newState)
-                            }
-                        }
-                    }
+                updater(callback.currentState()).also { newState ->
+                    callback.onUiStateChanged(newState)
                 }
             }
 
             override fun sendMessage() {
-                callback?.sendVoiceMessage()
+                callback.sendVoiceMessage()
             }
 
             override fun delete() {
                 // this was previously marked as cancelled true
-                callback?.deleteVoiceMessage()
+                callback.deleteVoiceMessage()
             }
 
             override fun waveformClicked() {
-                display(RecordingUiState.Playback)
+                callback.recordingWaveformClicked()
             }
 
             override fun onVoicePlaybackButtonClicked() {
-                callback?.onVoicePlaybackButtonClicked()
+                callback.onVoicePlaybackButtonClicked()
             }
         })
     }
 
     fun display(recordingState: RecordingUiState) {
-        if (recordingState == this.currentUiState) return
-
-        val previousState = this.currentUiState
-        this.currentUiState = recordingState
         when (recordingState) {
             RecordingUiState.None      -> {
-                val isCancelled = previousState == RecordingUiState.Cancelled
-                voiceMessageViews.hideRecordingViews(recordingState, isCancelled = isCancelled) { callback?.onVoiceRecordingEnded(it) }
                 stopRecordingTicker()
+                voiceMessageViews.initViews()
+                callback.onVoiceRecordingEnded(false)
             }
             RecordingUiState.Started   -> {
                 startRecordingTicker()
@@ -146,19 +129,20 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
                 voiceMessageViews.showRecordingViews()
             }
             RecordingUiState.Cancelled -> {
-                voiceMessageViews.hideRecordingViews(recordingState, isCancelled = true) { callback?.onVoiceRecordingEnded(it) }
+                stopRecordingTicker()
+                voiceMessageViews.hideRecordingViews(recordingState, isCancelled = true) { callback.onVoiceRecordingEnded(it) }
                 vibrate(context)
             }
             RecordingUiState.Locked    -> {
                 voiceMessageViews.renderLocked()
                 postDelayed({
-                    voiceMessageViews.showRecordingLockedViews(recordingState) { callback?.onVoiceRecordingEnded(it) }
+                    voiceMessageViews.showRecordingLockedViews(recordingState) { callback.onVoiceRecordingEnded(it) }
                 }, 500)
             }
             RecordingUiState.Playback  -> {
                 stopRecordingTicker()
                 voiceMessageViews.showPlaybackViews()
-                callback?.onVoiceRecordingPlaybackModeOn()
+                callback.onVoiceRecordingPlaybackModeOn()
             }
             is DraggingState           -> when (recordingState) {
                 is DraggingState.Cancelling -> voiceMessageViews.renderCancelling(recordingState.distanceX)
@@ -181,11 +165,11 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
     }
 
     private fun onRecordingTick(milliseconds: Long) {
-        voiceMessageViews.renderRecordingTimer(currentUiState, milliseconds / 1_000)
+        voiceMessageViews.renderRecordingTimer(callback.currentState(), milliseconds / 1_000)
         val timeDiffToRecordingLimit = BuildConfig.VOICE_MESSAGE_DURATION_LIMIT_MS - milliseconds
         if (timeDiffToRecordingLimit <= 0) {
             post {
-                callback?.onRecordingLimitReached()
+                callback.onRecordingLimitReached()
             }
         } else if (timeDiffToRecordingLimit in 10_000..10_999) {
             post {
@@ -203,7 +187,7 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
     /**
      * Returns true if the voice message is recording or is in playback mode
      */
-    fun isActive() = currentUiState !in listOf(RecordingUiState.None, RecordingUiState.Cancelled)
+    fun isActive() = callback.currentState() !in listOf(RecordingUiState.None, RecordingUiState.Cancelled)
 
     override fun onUpdate(state: VoiceMessagePlaybackTracker.Listener.State) {
         when (state) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt
index ce4ec4b519..63b5dc17ee 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt
@@ -282,8 +282,8 @@ class VoiceMessageViews(
         views.voicePlaybackWaveform.importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_NO
     }
 
-    fun initViews(onVoiceRecordingEnded: (Boolean) -> Unit) {
-        hideRecordingViews(RecordingUiState.None, null, onVoiceRecordingEnded)
+    fun initViews() {
+        hideRecordingViews(RecordingUiState.None, null, onVoiceRecordingEnded = {})
         views.voiceMessageMicButton.isVisible = true
         views.voiceMessageSendButton.isVisible = false
         views.voicePlaybackWaveform.post { views.voicePlaybackWaveform.recreate() }

From 2ad121e96e6f809ce4b7f1ed07bf72f1509a8d96 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Thu, 11 Nov 2021 16:57:06 +0000
Subject: [PATCH 10/52] moving the recording ui state to the textcomposer view
 model and state

---
 .../home/room/detail/RoomDetailFragment.kt    | 24 +++++--------------
 .../detail/composer/TextComposerAction.kt     |  3 ++-
 .../detail/composer/TextComposerViewModel.kt  | 22 ++++++++---------
 .../detail/composer/TextComposerViewState.kt  | 15 ++++++++++--
 .../composer/voice/DraggableStateProcessor.kt | 10 ++++----
 .../voice/VoiceMessageRecorderView.kt         | 19 +++++++++------
 .../composer/voice/VoiceMessageViews.kt       |  2 ++
 7 files changed, 50 insertions(+), 45 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index ba45348cab..844de4c980 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -696,26 +696,14 @@ class RoomDetailFragment @Inject constructor(
         voiceMessagePlaybackTracker.track(VoiceMessagePlaybackTracker.RECORDING_ID, views.voiceMessageRecorderView)
         views.voiceMessageRecorderView.callback = object : VoiceMessageRecorderView.Callback {
 
-            private var currentUiState: RecordingUiState = RecordingUiState.None
-
-            init {
-                display(currentUiState)
-            }
-
             override fun onVoiceRecordingStarted() {
                 if (checkPermissions(PERMISSIONS_FOR_VOICE_MESSAGE, requireActivity(), permissionVoiceMessageLauncher)) {
                     roomDetailViewModel.handle(RoomDetailAction.StartRecordingVoiceMessage)
-                    textComposerViewModel.handle(TextComposerAction.OnVoiceRecordingStateChanged(true))
                     vibrate(requireContext())
                     display(RecordingUiState.Started)
                 }
             }
 
-            override fun onVoiceRecordingEnded(isCancelled: Boolean) {
-                roomDetailViewModel.handle(RoomDetailAction.EndRecordingVoiceMessage(isCancelled))
-                textComposerViewModel.handle(TextComposerAction.OnVoiceRecordingStateChanged(false))
-            }
-
             override fun onVoiceRecordingPlaybackModeOn() {
                 roomDetailViewModel.handle(RoomDetailAction.PauseRecordingVoiceMessage)
             }
@@ -725,7 +713,8 @@ class RoomDetailFragment @Inject constructor(
             }
 
             override fun onRecordingStopped() {
-                if (currentUiState != RecordingUiState.Locked) {
+                roomDetailViewModel.handle(RoomDetailAction.EndRecordingVoiceMessage(isCancelled = true))
+                if (currentState() != RecordingUiState.Locked) {
                     display(RecordingUiState.None)
                 }
             }
@@ -739,6 +728,7 @@ class RoomDetailFragment @Inject constructor(
             }
 
             override fun deleteVoiceMessage() {
+                roomDetailViewModel.handle(RoomDetailAction.EndRecordingVoiceMessage(isCancelled = true))
                 display(RecordingUiState.Cancelled)
             }
 
@@ -751,13 +741,10 @@ class RoomDetailFragment @Inject constructor(
             }
 
             private fun display(state: RecordingUiState) {
-                if (currentUiState != state) {
-                    views.voiceMessageRecorderView.display(state)
-                }
-                currentUiState = state
+                textComposerViewModel.handle(TextComposerAction.OnVoiceRecordingUiStateChanged(state))
             }
 
-            override fun currentState() = currentUiState
+            override fun currentState() = withState(textComposerViewModel) { it.voiceRecordingUiState }
         }
     }
 
@@ -1444,6 +1431,7 @@ class RoomDetailFragment @Inject constructor(
                 views.composerLayout.isInvisible = !textComposerState.isComposerVisible
                 views.voiceMessageRecorderView.isVisible = textComposerState.isVoiceMessageRecorderVisible
                 views.composerLayout.views.sendButton.isInvisible = !textComposerState.isSendButtonVisible
+                views.voiceMessageRecorderView.display(textComposerState.voiceRecordingUiState)
                 views.composerLayout.setRoomEncrypted(summary.isEncrypted)
                 // views.composerLayout.alwaysShowSendButton = false
                 if (textComposerState.canSendMessage) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerAction.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerAction.kt
index 7725400187..4f85b78226 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerAction.kt
@@ -17,6 +17,7 @@
 package im.vector.app.features.home.room.detail.composer
 
 import im.vector.app.core.platform.VectorViewModelAction
+import im.vector.app.features.home.room.detail.composer.voice.VoiceMessageRecorderView
 
 sealed class TextComposerAction : VectorViewModelAction {
     data class SaveDraft(val draft: String) : TextComposerAction()
@@ -27,5 +28,5 @@ sealed class TextComposerAction : VectorViewModelAction {
     data class EnterRegularMode(val text: String, val fromSharing: Boolean) : TextComposerAction()
     data class UserIsTyping(val isTyping: Boolean) : TextComposerAction()
     data class OnTextChanged(val text: CharSequence) : TextComposerAction()
-    data class OnVoiceRecordingStateChanged(val isRecording: Boolean) : TextComposerAction()
+    data class OnVoiceRecordingUiStateChanged(val uiState: VoiceMessageRecorderView.RecordingUiState) : TextComposerAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerViewModel.kt
index 66d49f9819..2ff8ef6618 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerViewModel.kt
@@ -77,20 +77,20 @@ class TextComposerViewModel @AssistedInject constructor(
     override fun handle(action: TextComposerAction) {
         Timber.v("Handle action: $action")
         when (action) {
-            is TextComposerAction.EnterEditMode                -> handleEnterEditMode(action)
-            is TextComposerAction.EnterQuoteMode               -> handleEnterQuoteMode(action)
-            is TextComposerAction.EnterRegularMode             -> handleEnterRegularMode(action)
-            is TextComposerAction.EnterReplyMode               -> handleEnterReplyMode(action)
-            is TextComposerAction.SaveDraft                    -> handleSaveDraft(action)
-            is TextComposerAction.SendMessage                  -> handleSendMessage(action)
-            is TextComposerAction.UserIsTyping                 -> handleUserIsTyping(action)
-            is TextComposerAction.OnTextChanged                -> handleOnTextChanged(action)
-            is TextComposerAction.OnVoiceRecordingStateChanged -> handleOnVoiceRecordingStateChanged(action)
+            is TextComposerAction.EnterEditMode                  -> handleEnterEditMode(action)
+            is TextComposerAction.EnterQuoteMode                 -> handleEnterQuoteMode(action)
+            is TextComposerAction.EnterRegularMode               -> handleEnterRegularMode(action)
+            is TextComposerAction.EnterReplyMode                 -> handleEnterReplyMode(action)
+            is TextComposerAction.SaveDraft                      -> handleSaveDraft(action)
+            is TextComposerAction.SendMessage                    -> handleSendMessage(action)
+            is TextComposerAction.UserIsTyping                   -> handleUserIsTyping(action)
+            is TextComposerAction.OnTextChanged                  -> handleOnTextChanged(action)
+            is TextComposerAction.OnVoiceRecordingUiStateChanged -> handleOnVoiceRecordingUiStateChanged(action)
         }
     }
 
-    private fun handleOnVoiceRecordingStateChanged(action: TextComposerAction.OnVoiceRecordingStateChanged) = setState {
-        copy(isVoiceRecording = action.isRecording)
+    private fun handleOnVoiceRecordingUiStateChanged(action: TextComposerAction.OnVoiceRecordingUiStateChanged) = setState {
+        copy(voiceRecordingUiState = action.uiState)
     }
 
     private fun handleOnTextChanged(action: TextComposerAction.OnTextChanged) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerViewState.kt
index 199fb1b82d..99cd4b0e30 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerViewState.kt
@@ -18,6 +18,7 @@ package im.vector.app.features.home.room.detail.composer
 
 import com.airbnb.mvrx.MavericksState
 import im.vector.app.features.home.room.detail.RoomDetailArgs
+import im.vector.app.features.home.room.detail.composer.voice.VoiceMessageRecorderView
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 
 /**
@@ -44,11 +45,21 @@ sealed class SendMode(open val text: String) {
 data class TextComposerViewState(
         val roomId: String,
         val canSendMessage: Boolean = true,
-        val isVoiceRecording: Boolean = false,
         val isSendButtonVisible: Boolean = false,
-        val sendMode: SendMode = SendMode.REGULAR("", false)
+        val sendMode: SendMode = SendMode.REGULAR("", false),
+        val voiceRecordingUiState: VoiceMessageRecorderView.RecordingUiState = VoiceMessageRecorderView.RecordingUiState.None
 ) : MavericksState {
 
+    val isVoiceRecording = when (voiceRecordingUiState) {
+        VoiceMessageRecorderView.RecordingUiState.None,
+        VoiceMessageRecorderView.RecordingUiState.Cancelled,
+        VoiceMessageRecorderView.RecordingUiState.Playback -> false
+        is VoiceMessageRecorderView.DraggingState.Cancelling,
+        is VoiceMessageRecorderView.DraggingState.Locking,
+        VoiceMessageRecorderView.RecordingUiState.Locked,
+        VoiceMessageRecorderView.RecordingUiState.Started  -> true
+    }
+
     val isComposerVisible = canSendMessage && !isVoiceRecording
     val isVoiceMessageRecorderVisible = canSendMessage && !isSendButtonVisible
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/DraggableStateProcessor.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/DraggableStateProcessor.kt
index 5825e60ecf..41c9f83a97 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/DraggableStateProcessor.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/DraggableStateProcessor.kt
@@ -77,12 +77,10 @@ class DraggableStateProcessor(
             }
             is DraggingState.Cancelling -> {
                 // Check if cancelling conditions met, also check if it should be initial state
-                if (distanceX < minimumMove && distanceX < lastDistanceX) {
-                    RecordingUiState.Started
-                } else if (shouldCancelRecording(distanceX)) {
-                    RecordingUiState.Cancelled
-                } else {
-                    DraggingState.Cancelling(distanceX)
+                when {
+                    distanceX < minimumMove && distanceX < lastDistanceX -> RecordingUiState.Started
+                    shouldCancelRecording(distanceX)                     -> RecordingUiState.Cancelled
+                    else                                                 -> DraggingState.Cancelling(distanceX)
                 }
             }
             is DraggingState.Locking    -> {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
index 2227405507..8c3eadca1c 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
@@ -41,7 +41,6 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
 
     interface Callback {
         fun onVoiceRecordingStarted()
-        fun onVoiceRecordingEnded(isCancelled: Boolean)
         fun onVoiceRecordingPlaybackModeOn()
         fun onVoicePlaybackButtonClicked()
         fun onRecordingStopped()
@@ -59,6 +58,7 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
     lateinit var callback: Callback
 
     private var recordingTicker: CountUpTimer? = null
+    private var lastKnownState: RecordingUiState? = null
 
     init {
         inflate(this.context, R.layout.view_voice_message_recorder, this)
@@ -92,8 +92,11 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
             override fun isActive() = callback.currentState() != RecordingUiState.Cancelled
 
             override fun updateState(updater: (RecordingUiState) -> RecordingUiState) {
-                updater(callback.currentState()).also { newState ->
-                    callback.onUiStateChanged(newState)
+                updater(lastKnownState ?: RecordingUiState.None).also { newState ->
+                    when (newState) {
+                        is DraggingState -> display(newState)
+                        else             -> callback.onUiStateChanged(newState)
+                    }
                 }
             }
 
@@ -102,7 +105,6 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
             }
 
             override fun delete() {
-                // this was previously marked as cancelled true
                 callback.deleteVoiceMessage()
             }
 
@@ -117,11 +119,12 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
     }
 
     fun display(recordingState: RecordingUiState) {
+        if (lastKnownState == recordingState) return
+        lastKnownState = recordingState
         when (recordingState) {
             RecordingUiState.None      -> {
                 stopRecordingTicker()
                 voiceMessageViews.initViews()
-                callback.onVoiceRecordingEnded(false)
             }
             RecordingUiState.Started   -> {
                 startRecordingTicker()
@@ -130,13 +133,15 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
             }
             RecordingUiState.Cancelled -> {
                 stopRecordingTicker()
-                voiceMessageViews.hideRecordingViews(recordingState, isCancelled = true) { callback.onVoiceRecordingEnded(it) }
+                voiceMessageViews.hideRecordingViews(recordingState, isCancelled = true) { callback.deleteVoiceMessage() }
                 vibrate(context)
             }
             RecordingUiState.Locked    -> {
                 voiceMessageViews.renderLocked()
                 postDelayed({
-                    voiceMessageViews.showRecordingLockedViews(recordingState) { callback.onVoiceRecordingEnded(it) }
+                    voiceMessageViews.showRecordingLockedViews(recordingState) {
+                        // do nothing
+                    }
                 }, 500)
             }
             RecordingUiState.Playback  -> {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt
index 63b5dc17ee..938ae74983 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt
@@ -19,6 +19,7 @@ package im.vector.app.features.home.room.detail.composer.voice
 import android.annotation.SuppressLint
 import android.content.res.Resources
 import android.text.format.DateUtils
+import android.util.Log
 import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
@@ -73,6 +74,7 @@ class VoiceMessageViews(
         views.voiceMessageMicButton.setOnTouchListener { _, event ->
             when (event.action) {
                 MotionEvent.ACTION_DOWN -> {
+                    Log.e("!!!", "event down: $event")
                     positions.reset(event)
                     actions.onRequestRecording()
                     true

From e895dbd923555c89bf3d35ddbecba291abebb949 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Wed, 17 Nov 2021 13:27:22 +0000
Subject: [PATCH 11/52] replacing chained ifs with when

---
 .../composer/voice/DraggableStateProcessor.kt | 29 +++++++++----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/DraggableStateProcessor.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/DraggableStateProcessor.kt
index 41c9f83a97..23e973afda 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/DraggableStateProcessor.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/DraggableStateProcessor.kt
@@ -22,7 +22,6 @@ import im.vector.app.R
 import im.vector.app.core.utils.DimensionConverter
 import im.vector.app.features.home.room.detail.composer.voice.VoiceMessageRecorderView.DraggingState
 import im.vector.app.features.home.room.detail.composer.voice.VoiceMessageRecorderView.RecordingUiState
-import kotlin.math.abs
 
 class DraggableStateProcessor(
         resources: Resources,
@@ -53,8 +52,8 @@ class DraggableStateProcessor(
     fun process(event: MotionEvent, recordingState: RecordingUiState): RecordingUiState {
         val currentX = event.rawX
         val currentY = event.rawY
-        val distanceX = abs(firstX - currentX)
-        val distanceY = abs(firstY - currentY)
+        val distanceX = firstX - currentX
+        val distanceY = firstY - currentY
         return nextRecordingState(recordingState, currentX, currentY, distanceX, distanceY).also {
             lastX = currentX
             lastY = currentY
@@ -67,12 +66,10 @@ class DraggableStateProcessor(
         return when (recordingState) {
             RecordingUiState.Started    -> {
                 // Determine if cancelling or locking for the first move action.
-                if (((currentX < firstX && rtlXMultiplier == 1) || (currentX > firstX && rtlXMultiplier == -1)) && distanceX > distanceY && distanceX > lastDistanceX) {
-                    DraggingState.Cancelling(distanceX)
-                } else if (currentY < firstY && distanceY > distanceX && distanceY > lastDistanceY) {
-                    DraggingState.Locking(distanceY)
-                } else {
-                    recordingState
+                when {
+                    (isSlidingToCancel(currentX)) && distanceX > distanceY && distanceX > lastDistanceX -> DraggingState.Cancelling(distanceX)
+                    isSlidingToLock(currentY) && distanceY > distanceX && distanceY > lastDistanceY     -> DraggingState.Locking(distanceY)
+                    else                                                                                -> recordingState
                 }
             }
             is DraggingState.Cancelling -> {
@@ -85,12 +82,10 @@ class DraggableStateProcessor(
             }
             is DraggingState.Locking    -> {
                 // Check if locking conditions met, also check if it should be initial state
-                if (distanceY < minimumMove && distanceY < lastDistanceY) {
-                    RecordingUiState.Started
-                } else if (shouldLockRecording(distanceY)) {
-                    RecordingUiState.Locked
-                } else {
-                    DraggingState.Locking(distanceY)
+                when {
+                    distanceY < minimumMove && distanceY < lastDistanceY -> RecordingUiState.Started
+                    shouldLockRecording(distanceY)                       -> RecordingUiState.Locked
+                    else                                                 -> DraggingState.Locking(distanceY)
                 }
             }
             else                        -> {
@@ -99,6 +94,10 @@ class DraggableStateProcessor(
         }
     }
 
+    private fun isSlidingToLock(currentY: Float) = currentY < firstY
+
+    private fun isSlidingToCancel(currentX: Float) = (currentX < firstX && rtlXMultiplier == 1) || (currentX > firstX && rtlXMultiplier == -1)
+
     private fun shouldCancelRecording(distanceX: Float): Boolean {
         return distanceX >= distanceToCancel
     }

From 9ae03b76cdba2c90bcd2131caf67c73d8e28acab Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Wed, 17 Nov 2021 15:31:41 +0000
Subject: [PATCH 12/52] allows locking and cancelling to occur after choosing
 either option - fixes other quirks caused by porting to the inverted display
 logic

---
 .../home/room/detail/RoomDetailFragment.kt    | 15 +++---
 .../detail/composer/TextComposerViewState.kt  |  6 +++
 .../composer/voice/DraggableStateProcessor.kt | 47 ++++++++-----------
 .../voice/VoiceMessageRecorderView.kt         | 44 ++++++++++-------
 .../composer/voice/VoiceMessageViews.kt       | 23 ++++-----
 .../layout/view_voice_message_recorder.xml    |  1 +
 6 files changed, 69 insertions(+), 67 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index 844de4c980..271bb9b775 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -712,9 +712,10 @@ class RoomDetailFragment @Inject constructor(
                 roomDetailViewModel.handle(RoomDetailAction.PlayOrPauseRecordingPlayback)
             }
 
-            override fun onRecordingStopped() {
-                roomDetailViewModel.handle(RoomDetailAction.EndRecordingVoiceMessage(isCancelled = true))
-                if (currentState() != RecordingUiState.Locked) {
+            override fun onVoiceRecordingEnded(lastKnownState: RecordingUiState?) {
+                if (lastKnownState != RecordingUiState.Locked) {
+                    val isCancelled = lastKnownState == RecordingUiState.Cancelled
+                    roomDetailViewModel.handle(RoomDetailAction.EndRecordingVoiceMessage(isCancelled = isCancelled))
                     display(RecordingUiState.None)
                 }
             }
@@ -729,7 +730,7 @@ class RoomDetailFragment @Inject constructor(
 
             override fun deleteVoiceMessage() {
                 roomDetailViewModel.handle(RoomDetailAction.EndRecordingVoiceMessage(isCancelled = true))
-                display(RecordingUiState.Cancelled)
+                display(RecordingUiState.None)
             }
 
             override fun onRecordingLimitReached() {
@@ -743,8 +744,6 @@ class RoomDetailFragment @Inject constructor(
             private fun display(state: RecordingUiState) {
                 textComposerViewModel.handle(TextComposerAction.OnVoiceRecordingUiStateChanged(state))
             }
-
-            override fun currentState() = withState(textComposerViewModel) { it.voiceRecordingUiState }
         }
     }
 
@@ -1986,7 +1985,7 @@ class RoomDetailFragment @Inject constructor(
                 roomDetailViewModel.handle(RoomDetailAction.UpdateQuickReactAction(action.eventId, action.clickedOn, action.add))
             }
             is EventSharedAction.Edit                       -> {
-                if (!views.voiceMessageRecorderView.isActive()) {
+                if (withState(textComposerViewModel) { it.isVoiceMessageIdle }) {
                     textComposerViewModel.handle(TextComposerAction.EnterEditMode(action.eventId, views.composerLayout.text.toString()))
                 } else {
                     requireActivity().toast(R.string.error_voice_message_cannot_reply_or_edit)
@@ -1996,7 +1995,7 @@ class RoomDetailFragment @Inject constructor(
                 textComposerViewModel.handle(TextComposerAction.EnterQuoteMode(action.eventId, views.composerLayout.text.toString()))
             }
             is EventSharedAction.Reply                      -> {
-                if (!views.voiceMessageRecorderView.isActive()) {
+                if (withState(textComposerViewModel) { it.isVoiceMessageIdle }) {
                     textComposerViewModel.handle(TextComposerAction.EnterReplyMode(action.eventId, views.composerLayout.text.toString()))
                 } else {
                     requireActivity().toast(R.string.error_voice_message_cannot_reply_or_edit)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerViewState.kt
index 99cd4b0e30..4eb70138bb 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerViewState.kt
@@ -60,8 +60,14 @@ data class TextComposerViewState(
         VoiceMessageRecorderView.RecordingUiState.Started  -> true
     }
 
+    val isVoiceMessageIdle = when (voiceRecordingUiState) {
+        VoiceMessageRecorderView.RecordingUiState.None, VoiceMessageRecorderView.RecordingUiState.Cancelled -> false
+        else                                                                                                -> true
+    }
+
     val isComposerVisible = canSendMessage && !isVoiceRecording
     val isVoiceMessageRecorderVisible = canSendMessage && !isSendButtonVisible
 
+    @Suppress("UNUSED") // needed by mavericks
     constructor(args: RoomDetailArgs) : this(roomId = args.roomId)
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/DraggableStateProcessor.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/DraggableStateProcessor.kt
index 23e973afda..a8b19d6f6a 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/DraggableStateProcessor.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/DraggableStateProcessor.kt
@@ -28,23 +28,18 @@ class DraggableStateProcessor(
         dimensionConverter: DimensionConverter,
 ) {
 
-    private val minimumMove = dimensionConverter.dpToPx(16)
     private val distanceToLock = dimensionConverter.dpToPx(48).toFloat()
     private val distanceToCancel = dimensionConverter.dpToPx(120).toFloat()
     private val rtlXMultiplier = resources.getInteger(R.integer.rtl_x_multiplier)
 
     private var firstX: Float = 0f
     private var firstY: Float = 0f
-    private var lastX: Float = 0f
-    private var lastY: Float = 0f
     private var lastDistanceX: Float = 0f
     private var lastDistanceY: Float = 0f
 
-    fun reset(event: MotionEvent) {
+    fun initialize(event: MotionEvent) {
         firstX = event.rawX
         firstY = event.rawY
-        lastX = firstX
-        lastY = firstY
         lastDistanceX = 0F
         lastDistanceY = 0F
     }
@@ -54,49 +49,48 @@ class DraggableStateProcessor(
         val currentY = event.rawY
         val distanceX = firstX - currentX
         val distanceY = firstY - currentY
-        return nextRecordingState(recordingState, currentX, currentY, distanceX, distanceY).also {
-            lastX = currentX
-            lastY = currentY
+        return recordingState.nextRecordingState(currentX, currentY, distanceX, distanceY).also {
             lastDistanceX = distanceX
             lastDistanceY = distanceY
         }
     }
 
-    private fun nextRecordingState(recordingState: RecordingUiState, currentX: Float, currentY: Float, distanceX: Float, distanceY: Float): RecordingUiState {
-        return when (recordingState) {
+    private fun RecordingUiState.nextRecordingState(currentX: Float, currentY: Float, distanceX: Float, distanceY: Float): RecordingUiState {
+        return when (this) {
             RecordingUiState.Started    -> {
-                // Determine if cancelling or locking for the first move action.
                 when {
-                    (isSlidingToCancel(currentX)) && distanceX > distanceY && distanceX > lastDistanceX -> DraggingState.Cancelling(distanceX)
-                    isSlidingToLock(currentY) && distanceY > distanceX && distanceY > lastDistanceY     -> DraggingState.Locking(distanceY)
-                    else                                                                                -> recordingState
+                    isDraggingToCancel(currentX, distanceX, distanceY) -> DraggingState.Cancelling(distanceX)
+                    isDraggingToLock(currentY, distanceX, distanceY)   -> DraggingState.Locking(distanceY)
+                    else                                               -> this
                 }
             }
             is DraggingState.Cancelling -> {
-                // Check if cancelling conditions met, also check if it should be initial state
                 when {
-                    distanceX < minimumMove && distanceX < lastDistanceX -> RecordingUiState.Started
-                    shouldCancelRecording(distanceX)                     -> RecordingUiState.Cancelled
-                    else                                                 -> DraggingState.Cancelling(distanceX)
+                    isDraggingToLock(currentY, distanceX, distanceY) -> DraggingState.Locking(distanceY)
+                    shouldCancelRecording(distanceX)                 -> RecordingUiState.Cancelled
+                    else                                             -> DraggingState.Cancelling(distanceX)
                 }
             }
             is DraggingState.Locking    -> {
-                // Check if locking conditions met, also check if it should be initial state
                 when {
-                    distanceY < minimumMove && distanceY < lastDistanceY -> RecordingUiState.Started
-                    shouldLockRecording(distanceY)                       -> RecordingUiState.Locked
-                    else                                                 -> DraggingState.Locking(distanceY)
+                    isDraggingToCancel(currentX, distanceX, distanceY) -> DraggingState.Cancelling(distanceX)
+                    shouldLockRecording(distanceY)                     -> RecordingUiState.Locked
+                    else                                               -> DraggingState.Locking(distanceY)
                 }
             }
             else                        -> {
-                recordingState
+                this
             }
         }
     }
 
-    private fun isSlidingToLock(currentY: Float) = currentY < firstY
+    private fun isDraggingToLock(currentY: Float, distanceX: Float, distanceY: Float) = (currentY < firstY) &&
+            distanceY > distanceX && distanceY > lastDistanceY
 
-    private fun isSlidingToCancel(currentX: Float) = (currentX < firstX && rtlXMultiplier == 1) || (currentX > firstX && rtlXMultiplier == -1)
+    private fun isDraggingToCancel(currentX: Float, distanceX: Float, distanceY: Float) = isDraggingHorizontal(currentX) &&
+            distanceX > distanceY && distanceX > lastDistanceX
+
+    private fun isDraggingHorizontal(currentX: Float) = (currentX < firstX && rtlXMultiplier == 1) || (currentX > firstX && rtlXMultiplier == -1)
 
     private fun shouldCancelRecording(distanceX: Float): Boolean {
         return distanceX >= distanceToCancel
@@ -106,4 +100,3 @@ class DraggableStateProcessor(
         return distanceY >= distanceToLock
     }
 }
-
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
index 8c3eadca1c..cd784dd9b6 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
@@ -43,13 +43,12 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
         fun onVoiceRecordingStarted()
         fun onVoiceRecordingPlaybackModeOn()
         fun onVoicePlaybackButtonClicked()
-        fun onRecordingStopped()
         fun onUiStateChanged(state: RecordingUiState)
         fun sendVoiceMessage()
         fun deleteVoiceMessage()
         fun onRecordingLimitReached()
         fun recordingWaveformClicked()
-        fun currentState(): RecordingUiState
+        fun onVoiceRecordingEnded(lastKnownState: RecordingUiState?)
     }
 
     // We need to define views as lateinit var to be able to check if initialized for the bug fix on api 21 and 22.
@@ -85,17 +84,23 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
                 callback.onVoiceRecordingStarted()
             }
 
-            override fun onRecordingStopped() {
-                callback.onRecordingStopped()
+            override fun onMicButtonReleased() {
+                callback.onVoiceRecordingEnded(lastKnownState)
             }
 
-            override fun isActive() = callback.currentState() != RecordingUiState.Cancelled
-
             override fun updateState(updater: (RecordingUiState) -> RecordingUiState) {
-                updater(lastKnownState ?: RecordingUiState.None).also { newState ->
-                    when (newState) {
-                        is DraggingState -> display(newState)
-                        else             -> callback.onUiStateChanged(newState)
+                when (val currentState = lastKnownState) {
+                    null, RecordingUiState.None -> {
+                        // ignore drag events when the view is idle
+                    }
+                    else                        -> {
+                        updater(currentState).also { newState ->
+                            when (newState) {
+                                // display drag events directly without leaving the view for faster UI feedback
+                                is DraggingState -> display(newState)
+                                else             -> callback.onUiStateChanged(newState)
+                            }
+                        }
                     }
                 }
             }
@@ -120,6 +125,7 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
 
     fun display(recordingState: RecordingUiState) {
         if (lastKnownState == recordingState) return
+        val previousState = lastKnownState
         lastKnownState = recordingState
         when (recordingState) {
             RecordingUiState.None      -> {
@@ -151,7 +157,12 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
             }
             is DraggingState           -> when (recordingState) {
                 is DraggingState.Cancelling -> voiceMessageViews.renderCancelling(recordingState.distanceX)
-                is DraggingState.Locking    -> voiceMessageViews.renderLocking(recordingState.distanceY)
+                is DraggingState.Locking    -> {
+                    if (previousState is DraggingState.Cancelling) {
+                        voiceMessageViews.showRecordingViews()
+                    }
+                    voiceMessageViews.renderLocking(recordingState.distanceY)
+                }
             }.exhaustive
         }
     }
@@ -170,7 +181,8 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
     }
 
     private fun onRecordingTick(milliseconds: Long) {
-        voiceMessageViews.renderRecordingTimer(callback.currentState(), milliseconds / 1_000)
+        val currentState = lastKnownState ?: return
+        voiceMessageViews.renderRecordingTimer(currentState, milliseconds / 1_000)
         val timeDiffToRecordingLimit = BuildConfig.VOICE_MESSAGE_DURATION_LIMIT_MS - milliseconds
         if (timeDiffToRecordingLimit <= 0) {
             post {
@@ -178,7 +190,8 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
             }
         } else if (timeDiffToRecordingLimit in 10_000..10_999) {
             post {
-                voiceMessageViews.renderToast(context.getString(R.string.voice_message_n_seconds_warning_toast, floor(timeDiffToRecordingLimit / 1000f).toInt()))
+                val secondsRemaining = floor(timeDiffToRecordingLimit / 1000f).toInt()
+                voiceMessageViews.renderToast(context.getString(R.string.voice_message_n_seconds_warning_toast, secondsRemaining))
                 vibrate(context)
             }
         }
@@ -189,11 +202,6 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
         recordingTicker = null
     }
 
-    /**
-     * Returns true if the voice message is recording or is in playback mode
-     */
-    fun isActive() = callback.currentState() !in listOf(RecordingUiState.None, RecordingUiState.Cancelled)
-
     override fun onUpdate(state: VoiceMessagePlaybackTracker.Listener.State) {
         when (state) {
             is VoiceMessagePlaybackTracker.Listener.State.Recording -> {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt
index 938ae74983..0b2696931c 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt
@@ -19,7 +19,6 @@ package im.vector.app.features.home.room.detail.composer.voice
 import android.annotation.SuppressLint
 import android.content.res.Resources
 import android.text.format.DateUtils
-import android.util.Log
 import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
@@ -74,22 +73,17 @@ class VoiceMessageViews(
         views.voiceMessageMicButton.setOnTouchListener { _, event ->
             when (event.action) {
                 MotionEvent.ACTION_DOWN -> {
-                    Log.e("!!!", "event down: $event")
-                    positions.reset(event)
+                    positions.initialize(event)
                     actions.onRequestRecording()
                     true
                 }
                 MotionEvent.ACTION_UP   -> {
-                    actions.onRecordingStopped()
+                    actions.onMicButtonReleased()
                     true
                 }
                 MotionEvent.ACTION_MOVE -> {
-                    if (actions.isActive()) {
-                        actions.updateState { currentState -> positions.process(event, currentState) }
-                        true
-                    } else {
-                        false
-                    }
+                    actions.updateState { currentState -> positions.process(event, currentState) }
+                    true
                 }
                 else                    -> false
             }
@@ -128,6 +122,7 @@ class VoiceMessageViews(
         views.voiceMessageLockBackground.isVisible = false
         views.voiceMessageLockImage.isVisible = false
         views.voiceMessageLockArrow.isVisible = false
+        views.voiceMessageSlideToCancelDivider.isVisible = true
         // Reset Y translations
         views.voiceMessageMicButton.translationY = 0F
         views.voiceMessageLockArrow.translationY = 0F
@@ -167,11 +162,14 @@ class VoiceMessageViews(
         } else {
             animateLockImageWithBackground()
         }
+        views.voiceMessageSlideToCancelDivider.isVisible = false
         views.voiceMessageLockArrow.isVisible = false
         views.voiceMessageLockArrow.animate().translationY(0f).start()
         views.voiceMessageSlideToCancel.isVisible = false
         views.voiceMessageSlideToCancel.animate().translationX(0f).translationY(0f).start()
         views.voiceMessagePlaybackLayout.isVisible = false
+        views.voiceMessageTimerIndicator.isVisible = false
+        views.voiceMessageTimer.isVisible = false
 
         if (recordingState != RecordingUiState.Locked) {
             views.voiceMessageMicButton
@@ -182,8 +180,6 @@ class VoiceMessageViews(
                     .translationY(0f)
                     .setDuration(150)
                     .withEndAction {
-                        views.voiceMessageTimerIndicator.isVisible = false
-                        views.voiceMessageTimer.isVisible = false
                         resetMicButtonUi()
                         isCancelled?.let {
                             onVoiceRecordingEnded(it)
@@ -349,8 +345,7 @@ class VoiceMessageViews(
 
     interface Actions {
         fun onRequestRecording()
-        fun onRecordingStopped()
-        fun isActive(): Boolean
+        fun onMicButtonReleased()
         fun updateState(updater: (RecordingUiState) -> RecordingUiState)
         fun sendMessage()
         fun delete()
diff --git a/vector/src/main/res/layout/view_voice_message_recorder.xml b/vector/src/main/res/layout/view_voice_message_recorder.xml
index 051928b73d..81d9c64e33 100644
--- a/vector/src/main/res/layout/view_voice_message_recorder.xml
+++ b/vector/src/main/res/layout/view_voice_message_recorder.xml
@@ -95,6 +95,7 @@
 
     <!-- Slide to cancel text should go under this view -->
     <View
+        android:id="@+id/voiceMessageSlideToCancelDivider"
         android:layout_width="48dp"
         android:layout_height="0dp"
         android:background="?android:colorBackground"

From be685bc56ae339216bcf5e26760360b8fe1721e8 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Thu, 18 Nov 2021 14:59:06 +0000
Subject: [PATCH 13/52] aligning the locked recording view to the send message
 button without the margin, fixes the layout jumping when the mic button
 switches to a send

---
 vector/src/main/res/layout/view_voice_message_recorder.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/vector/src/main/res/layout/view_voice_message_recorder.xml b/vector/src/main/res/layout/view_voice_message_recorder.xml
index 81d9c64e33..53be4f07f6 100644
--- a/vector/src/main/res/layout/view_voice_message_recorder.xml
+++ b/vector/src/main/res/layout/view_voice_message_recorder.xml
@@ -136,11 +136,10 @@
         android:id="@+id/voiceMessagePlaybackLayout"
         android:layout_width="0dp"
         android:layout_height="44dp"
-        android:layout_marginEnd="16dp"
         android:layout_marginBottom="4dp"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/voiceMessageMicButton"
+        app:layout_constraintEnd_toStartOf="@id/voiceMessageSendButton"
         app:layout_constraintStart_toStartOf="parent"
         tools:layout_marginBottom="120dp"
         tools:visibility="visible">

From dfc67b832ca1de0949c687313ad10a154678f940 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Thu, 18 Nov 2021 15:06:43 +0000
Subject: [PATCH 14/52] updating the state rather than calling display directly

---
 .../vector/app/features/home/room/detail/RoomDetailFragment.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index 271bb9b775..befca5cd7d 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -506,7 +506,7 @@ class RoomDetailFragment @Inject constructor(
 
     private fun onCannotRecord() {
         // Update the UI, cancel the animation
-        views.voiceMessageRecorderView.display(RecordingUiState.None)
+        textComposerViewModel.handle(TextComposerAction.OnVoiceRecordingUiStateChanged(RecordingUiState.None))
     }
 
     private fun acceptIncomingCall(event: RoomDetailViewEvents.DisplayAndAcceptCall) {

From bf374371b8c1cb289c2e511f82cfe8b009e0ef81 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Thu, 18 Nov 2021 15:14:46 +0000
Subject: [PATCH 15/52] removing no longer needed cancelled status check

---
 .../voice/VoiceMessageRecorderView.kt         |  6 ++----
 .../composer/voice/VoiceMessageViews.kt       | 19 +++++++------------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
index cd784dd9b6..7f6f9505f0 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
@@ -139,15 +139,13 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
             }
             RecordingUiState.Cancelled -> {
                 stopRecordingTicker()
-                voiceMessageViews.hideRecordingViews(recordingState, isCancelled = true) { callback.deleteVoiceMessage() }
+                voiceMessageViews.hideRecordingViews(recordingState) { callback.deleteVoiceMessage() }
                 vibrate(context)
             }
             RecordingUiState.Locked    -> {
                 voiceMessageViews.renderLocked()
                 postDelayed({
-                    voiceMessageViews.showRecordingLockedViews(recordingState) {
-                        // do nothing
-                    }
+                    voiceMessageViews.showRecordingLockedViews(recordingState)
                 }, 500)
             }
             RecordingUiState.Playback  -> {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt
index 0b2696931c..12a32405b2 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt
@@ -34,7 +34,6 @@ import im.vector.app.core.utils.DimensionConverter
 import im.vector.app.databinding.ViewVoiceMessageRecorderBinding
 import im.vector.app.features.home.room.detail.composer.voice.VoiceMessageRecorderView.RecordingUiState
 import im.vector.app.features.home.room.detail.timeline.helper.VoiceMessagePlaybackTracker
-import org.matrix.android.sdk.api.extensions.orFalse
 
 class VoiceMessageViews(
         private val resources: Resources,
@@ -152,9 +151,9 @@ class VoiceMessageViews(
         views.voiceMessageSendButton.isVisible = false
     }
 
-    fun hideRecordingViews(recordingState: RecordingUiState, isCancelled: Boolean?, onVoiceRecordingEnded: (Boolean) -> Unit) {
+    fun hideRecordingViews(recordingState: RecordingUiState, onVoiceRecordingEnded: () -> Unit = {}) {
         // We need to animate the lock image first
-        if (recordingState != RecordingUiState.Locked || isCancelled.orFalse()) {
+        if (recordingState != RecordingUiState.Locked) {
             views.voiceMessageLockImage.isVisible = false
             views.voiceMessageLockImage.animate().translationY(0f).start()
             views.voiceMessageLockBackground.isVisible = false
@@ -181,9 +180,7 @@ class VoiceMessageViews(
                     .setDuration(150)
                     .withEndAction {
                         resetMicButtonUi()
-                        isCancelled?.let {
-                            onVoiceRecordingEnded(it)
-                        }
+                        onVoiceRecordingEnded()
                     }
                     .start()
         } else {
@@ -195,9 +192,7 @@ class VoiceMessageViews(
                 translationX = 0f
                 translationY = 0f
             }
-            isCancelled?.let {
-                onVoiceRecordingEnded(it)
-            }
+            onVoiceRecordingEnded()
         }
 
         // Hide toasts if user cancelled recording before the timeout of the toast.
@@ -264,8 +259,8 @@ class VoiceMessageViews(
         views.voiceMessageToast.isVisible = false
     }
 
-    fun showRecordingLockedViews(recordingState: RecordingUiState, onVoiceRecordingEnded: (Boolean) -> Unit) {
-        hideRecordingViews(recordingState, null, onVoiceRecordingEnded)
+    fun showRecordingLockedViews(recordingState: RecordingUiState) {
+        hideRecordingViews(recordingState)
         views.voiceMessagePlaybackLayout.isVisible = true
         views.voiceMessagePlaybackTimerIndicator.isVisible = true
         views.voicePlaybackControlButton.isVisible = false
@@ -281,7 +276,7 @@ class VoiceMessageViews(
     }
 
     fun initViews() {
-        hideRecordingViews(RecordingUiState.None, null, onVoiceRecordingEnded = {})
+        hideRecordingViews(RecordingUiState.None)
         views.voiceMessageMicButton.isVisible = true
         views.voiceMessageSendButton.isVisible = false
         views.voicePlaybackWaveform.post { views.voicePlaybackWaveform.recreate() }

From 734e7df910503c05636bd7b5f8ce9be2ae926d4f Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Thu, 18 Nov 2021 17:00:43 +0000
Subject: [PATCH 16/52] renaming display function as its updating state, rather
 than directly displaying

---
 .../home/room/detail/RoomDetailFragment.kt       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index befca5cd7d..70b95aefab 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -700,7 +700,7 @@ class RoomDetailFragment @Inject constructor(
                 if (checkPermissions(PERMISSIONS_FOR_VOICE_MESSAGE, requireActivity(), permissionVoiceMessageLauncher)) {
                     roomDetailViewModel.handle(RoomDetailAction.StartRecordingVoiceMessage)
                     vibrate(requireContext())
-                    display(RecordingUiState.Started)
+                    updateRecordingUiState(RecordingUiState.Started)
                 }
             }
 
@@ -716,32 +716,32 @@ class RoomDetailFragment @Inject constructor(
                 if (lastKnownState != RecordingUiState.Locked) {
                     val isCancelled = lastKnownState == RecordingUiState.Cancelled
                     roomDetailViewModel.handle(RoomDetailAction.EndRecordingVoiceMessage(isCancelled = isCancelled))
-                    display(RecordingUiState.None)
+                    updateRecordingUiState(RecordingUiState.None)
                 }
             }
 
             override fun onUiStateChanged(state: RecordingUiState) {
-                display(state)
+                updateRecordingUiState(state)
             }
 
             override fun sendVoiceMessage() {
-                display(RecordingUiState.None)
+                updateRecordingUiState(RecordingUiState.None)
             }
 
             override fun deleteVoiceMessage() {
                 roomDetailViewModel.handle(RoomDetailAction.EndRecordingVoiceMessage(isCancelled = true))
-                display(RecordingUiState.None)
+                updateRecordingUiState(RecordingUiState.None)
             }
 
             override fun onRecordingLimitReached() {
-                display(RecordingUiState.Playback)
+                updateRecordingUiState(RecordingUiState.Playback)
             }
 
             override fun recordingWaveformClicked() {
-                display(RecordingUiState.Playback)
+                updateRecordingUiState(RecordingUiState.Playback)
             }
 
-            private fun display(state: RecordingUiState) {
+            private fun updateRecordingUiState(state: RecordingUiState) {
                 textComposerViewModel.handle(TextComposerAction.OnVoiceRecordingUiStateChanged(state))
             }
         }

From c5746a59aecddf995a2d244bdd69e247eb8e7c5f Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Thu, 18 Nov 2021 17:11:10 +0000
Subject: [PATCH 17/52] updating voice view interface method names for
 consistency

---
 .../home/room/detail/RoomDetailFragment.kt    | 12 ++--
 .../voice/VoiceMessageRecorderView.kt         | 60 +++++++------------
 .../composer/voice/VoiceMessageViews.kt       | 16 ++---
 3 files changed, 33 insertions(+), 55 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index 70b95aefab..60015b0fa3 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -704,10 +704,6 @@ class RoomDetailFragment @Inject constructor(
                 }
             }
 
-            override fun onVoiceRecordingPlaybackModeOn() {
-                roomDetailViewModel.handle(RoomDetailAction.PauseRecordingVoiceMessage)
-            }
-
             override fun onVoicePlaybackButtonClicked() {
                 roomDetailViewModel.handle(RoomDetailAction.PlayOrPauseRecordingPlayback)
             }
@@ -724,21 +720,23 @@ class RoomDetailFragment @Inject constructor(
                 updateRecordingUiState(state)
             }
 
-            override fun sendVoiceMessage() {
+            override fun onSendVoiceMessage() {
                 updateRecordingUiState(RecordingUiState.None)
             }
 
-            override fun deleteVoiceMessage() {
+            override fun onDeleteVoiceMessage() {
                 roomDetailViewModel.handle(RoomDetailAction.EndRecordingVoiceMessage(isCancelled = true))
                 updateRecordingUiState(RecordingUiState.None)
             }
 
             override fun onRecordingLimitReached() {
                 updateRecordingUiState(RecordingUiState.Playback)
+                roomDetailViewModel.handle(RoomDetailAction.PauseRecordingVoiceMessage)
             }
 
-            override fun recordingWaveformClicked() {
+            override fun onRecordingWaveformClicked() {
                 updateRecordingUiState(RecordingUiState.Playback)
+                roomDetailViewModel.handle(RoomDetailAction.PauseRecordingVoiceMessage)
             }
 
             private fun updateRecordingUiState(state: RecordingUiState) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
index 7f6f9505f0..818a22107f 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
@@ -41,14 +41,13 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
 
     interface Callback {
         fun onVoiceRecordingStarted()
-        fun onVoiceRecordingPlaybackModeOn()
+        fun onVoiceRecordingEnded(lastKnownState: RecordingUiState?)
         fun onVoicePlaybackButtonClicked()
         fun onUiStateChanged(state: RecordingUiState)
-        fun sendVoiceMessage()
-        fun deleteVoiceMessage()
+        fun onSendVoiceMessage()
+        fun onDeleteVoiceMessage()
         fun onRecordingLimitReached()
-        fun recordingWaveformClicked()
-        fun onVoiceRecordingEnded(lastKnownState: RecordingUiState?)
+        fun onRecordingWaveformClicked()
     }
 
     // We need to define views as lateinit var to be able to check if initialized for the bug fix on api 21 and 22.
@@ -70,25 +69,15 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
         initListeners()
     }
 
-    override fun onVisibilityChanged(changedView: View, visibility: Int) {
-        super.onVisibilityChanged(changedView, visibility)
-        // onVisibilityChanged is called by constructor on api 21 and 22.
-        if (!this::voiceMessageViews.isInitialized) return
-        val parentChanged = changedView == this
-        voiceMessageViews.renderVisibilityChanged(parentChanged, visibility)
-    }
-
     private fun initListeners() {
         voiceMessageViews.start(object : VoiceMessageViews.Actions {
-            override fun onRequestRecording() {
-                callback.onVoiceRecordingStarted()
-            }
-
-            override fun onMicButtonReleased() {
-                callback.onVoiceRecordingEnded(lastKnownState)
-            }
-
-            override fun updateState(updater: (RecordingUiState) -> RecordingUiState) {
+            override fun onRequestRecording() = callback.onVoiceRecordingStarted()
+            override fun onMicButtonReleased() = callback.onVoiceRecordingEnded(lastKnownState)
+            override fun onSendVoiceMessage() = callback.onSendVoiceMessage()
+            override fun onDeleteVoiceMessage() = callback.onDeleteVoiceMessage()
+            override fun onWaveformClicked() = callback.onRecordingWaveformClicked()
+            override fun onVoicePlaybackButtonClicked() = callback.onVoicePlaybackButtonClicked()
+            override fun onMicButtonDrag(updater: (RecordingUiState) -> RecordingUiState) {
                 when (val currentState = lastKnownState) {
                     null, RecordingUiState.None -> {
                         // ignore drag events when the view is idle
@@ -104,25 +93,17 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
                     }
                 }
             }
-
-            override fun sendMessage() {
-                callback.sendVoiceMessage()
-            }
-
-            override fun delete() {
-                callback.deleteVoiceMessage()
-            }
-
-            override fun waveformClicked() {
-                callback.recordingWaveformClicked()
-            }
-
-            override fun onVoicePlaybackButtonClicked() {
-                callback.onVoicePlaybackButtonClicked()
-            }
         })
     }
 
+    override fun onVisibilityChanged(changedView: View, visibility: Int) {
+        super.onVisibilityChanged(changedView, visibility)
+        // onVisibilityChanged is called by constructor on api 21 and 22.
+        if (!this::voiceMessageViews.isInitialized) return
+        val parentChanged = changedView == this
+        voiceMessageViews.renderVisibilityChanged(parentChanged, visibility)
+    }
+
     fun display(recordingState: RecordingUiState) {
         if (lastKnownState == recordingState) return
         val previousState = lastKnownState
@@ -139,7 +120,7 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
             }
             RecordingUiState.Cancelled -> {
                 stopRecordingTicker()
-                voiceMessageViews.hideRecordingViews(recordingState) { callback.deleteVoiceMessage() }
+                voiceMessageViews.hideRecordingViews(recordingState) { callback.onDeleteVoiceMessage() }
                 vibrate(context)
             }
             RecordingUiState.Locked    -> {
@@ -151,7 +132,6 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
             RecordingUiState.Playback  -> {
                 stopRecordingTicker()
                 voiceMessageViews.showPlaybackViews()
-                callback.onVoiceRecordingPlaybackModeOn()
             }
             is DraggingState           -> when (recordingState) {
                 is DraggingState.Cancelling -> voiceMessageViews.renderCancelling(recordingState.distanceX)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt
index 12a32405b2..16a12aae35 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt
@@ -48,16 +48,16 @@ class VoiceMessageViews(
     fun start(actions: Actions) {
         views.voiceMessageSendButton.setOnClickListener {
             views.voiceMessageSendButton.isVisible = false
-            actions.sendMessage()
+            actions.onSendVoiceMessage()
         }
 
         views.voiceMessageDeletePlayback.setOnClickListener {
             views.voiceMessageSendButton.isVisible = false
-            actions.delete()
+            actions.onDeleteVoiceMessage()
         }
 
         views.voicePlaybackWaveform.setOnClickListener {
-            actions.waveformClicked()
+            actions.onWaveformClicked()
         }
 
         views.voicePlaybackControlButton.setOnClickListener {
@@ -81,7 +81,7 @@ class VoiceMessageViews(
                     true
                 }
                 MotionEvent.ACTION_MOVE -> {
-                    actions.updateState { currentState -> positions.process(event, currentState) }
+                    actions.onMicButtonDrag { currentState -> positions.process(event, currentState) }
                     true
                 }
                 else                    -> false
@@ -341,10 +341,10 @@ class VoiceMessageViews(
     interface Actions {
         fun onRequestRecording()
         fun onMicButtonReleased()
-        fun updateState(updater: (RecordingUiState) -> RecordingUiState)
-        fun sendMessage()
-        fun delete()
-        fun waveformClicked()
+        fun onMicButtonDrag(updater: (RecordingUiState) -> RecordingUiState)
+        fun onSendVoiceMessage()
+        fun onDeleteVoiceMessage()
+        fun onWaveformClicked()
         fun onVoicePlaybackButtonClicked()
     }
 }

From 16ca7d50402dd59a58e3b74e209685ecccf34e21 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Thu, 18 Nov 2021 17:18:13 +0000
Subject: [PATCH 18/52] adding sending of voice message on send pressed

---
 .../app/features/home/room/detail/RoomDetailFragment.kt      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index 60015b0fa3..dc538bd72b 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -721,6 +721,7 @@ class RoomDetailFragment @Inject constructor(
             }
 
             override fun onSendVoiceMessage() {
+                roomDetailViewModel.handle(RoomDetailAction.EndRecordingVoiceMessage(isCancelled = false))
                 updateRecordingUiState(RecordingUiState.None)
             }
 
@@ -730,13 +731,13 @@ class RoomDetailFragment @Inject constructor(
             }
 
             override fun onRecordingLimitReached() {
-                updateRecordingUiState(RecordingUiState.Playback)
                 roomDetailViewModel.handle(RoomDetailAction.PauseRecordingVoiceMessage)
+                updateRecordingUiState(RecordingUiState.Playback)
             }
 
             override fun onRecordingWaveformClicked() {
-                updateRecordingUiState(RecordingUiState.Playback)
                 roomDetailViewModel.handle(RoomDetailAction.PauseRecordingVoiceMessage)
+                updateRecordingUiState(RecordingUiState.Playback)
             }
 
             private fun updateRecordingUiState(state: RecordingUiState) {

From 4dbb150ac2dd69022975128b855cace949204cc8 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Thu, 18 Nov 2021 17:21:03 +0000
Subject: [PATCH 19/52] clarifying why we do nothing when the state is locked
 on voice recording ended

---
 .../home/room/detail/RoomDetailFragment.kt         | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index dc538bd72b..8f532413e9 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -709,10 +709,16 @@ class RoomDetailFragment @Inject constructor(
             }
 
             override fun onVoiceRecordingEnded(lastKnownState: RecordingUiState?) {
-                if (lastKnownState != RecordingUiState.Locked) {
-                    val isCancelled = lastKnownState == RecordingUiState.Cancelled
-                    roomDetailViewModel.handle(RoomDetailAction.EndRecordingVoiceMessage(isCancelled = isCancelled))
-                    updateRecordingUiState(RecordingUiState.None)
+                when (lastKnownState) {
+                    RecordingUiState.Locked -> {
+                        // do nothing,
+                        // onSendVoiceMessage, onDeleteVoiceMessage or onRecordingLimitReached will be triggered instead
+                    }
+                    else                    -> {
+                        val isCancelled = lastKnownState == RecordingUiState.Cancelled
+                        roomDetailViewModel.handle(RoomDetailAction.EndRecordingVoiceMessage(isCancelled = isCancelled))
+                        updateRecordingUiState(RecordingUiState.None)
+                    }
                 }
             }
 

From 1afc1b51e5709817732f48b5a17368f011b26003 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Thu, 18 Nov 2021 17:25:30 +0000
Subject: [PATCH 20/52] separating the cancelled and ended events to make the
 consumption simpler

---
 .../home/room/detail/RoomDetailFragment.kt     | 18 ++++++------------
 .../composer/voice/VoiceMessageRecorderView.kt | 15 +++++++++++++--
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index 8f532413e9..cea9641443 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -708,18 +708,12 @@ class RoomDetailFragment @Inject constructor(
                 roomDetailViewModel.handle(RoomDetailAction.PlayOrPauseRecordingPlayback)
             }
 
-            override fun onVoiceRecordingEnded(lastKnownState: RecordingUiState?) {
-                when (lastKnownState) {
-                    RecordingUiState.Locked -> {
-                        // do nothing,
-                        // onSendVoiceMessage, onDeleteVoiceMessage or onRecordingLimitReached will be triggered instead
-                    }
-                    else                    -> {
-                        val isCancelled = lastKnownState == RecordingUiState.Cancelled
-                        roomDetailViewModel.handle(RoomDetailAction.EndRecordingVoiceMessage(isCancelled = isCancelled))
-                        updateRecordingUiState(RecordingUiState.None)
-                    }
-                }
+            override fun onVoiceRecordingCancelled() {
+                onDeleteVoiceMessage()
+            }
+
+            override fun onVoiceRecordingEnded() {
+                onSendVoiceMessage()
             }
 
             override fun onUiStateChanged(state: RecordingUiState) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
index 818a22107f..178e814550 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
@@ -41,8 +41,9 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
 
     interface Callback {
         fun onVoiceRecordingStarted()
-        fun onVoiceRecordingEnded(lastKnownState: RecordingUiState?)
+        fun onVoiceRecordingEnded()
         fun onVoicePlaybackButtonClicked()
+        fun onVoiceRecordingCancelled()
         fun onUiStateChanged(state: RecordingUiState)
         fun onSendVoiceMessage()
         fun onDeleteVoiceMessage()
@@ -72,7 +73,17 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
     private fun initListeners() {
         voiceMessageViews.start(object : VoiceMessageViews.Actions {
             override fun onRequestRecording() = callback.onVoiceRecordingStarted()
-            override fun onMicButtonReleased() = callback.onVoiceRecordingEnded(lastKnownState)
+            override fun onMicButtonReleased() {
+                when (lastKnownState) {
+                    RecordingUiState.Locked    -> {
+                        // do nothing,
+                        // onSendVoiceMessage, onDeleteVoiceMessage or onRecordingLimitReached will be triggered instead
+                    }
+                    RecordingUiState.Cancelled -> callback.onVoiceRecordingCancelled()
+                    else                       -> callback.onVoiceRecordingEnded()
+                }
+            }
+
             override fun onSendVoiceMessage() = callback.onSendVoiceMessage()
             override fun onDeleteVoiceMessage() = callback.onDeleteVoiceMessage()
             override fun onWaveformClicked() = callback.onRecordingWaveformClicked()

From 7d262ebc329665613cd761bd599f2e0b9e8bac4c Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Thu, 18 Nov 2021 17:28:08 +0000
Subject: [PATCH 21/52] removing no longer needed message delete on animation
 end, we delete the file straight away

---
 .../room/detail/composer/voice/VoiceMessageRecorderView.kt    | 2 +-
 .../home/room/detail/composer/voice/VoiceMessageViews.kt      | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
index 178e814550..c673ecfc16 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
@@ -131,7 +131,7 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
             }
             RecordingUiState.Cancelled -> {
                 stopRecordingTicker()
-                voiceMessageViews.hideRecordingViews(recordingState) { callback.onDeleteVoiceMessage() }
+                voiceMessageViews.hideRecordingViews(recordingState)
                 vibrate(context)
             }
             RecordingUiState.Locked    -> {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt
index 16a12aae35..7aeb665486 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt
@@ -151,7 +151,7 @@ class VoiceMessageViews(
         views.voiceMessageSendButton.isVisible = false
     }
 
-    fun hideRecordingViews(recordingState: RecordingUiState, onVoiceRecordingEnded: () -> Unit = {}) {
+    fun hideRecordingViews(recordingState: RecordingUiState) {
         // We need to animate the lock image first
         if (recordingState != RecordingUiState.Locked) {
             views.voiceMessageLockImage.isVisible = false
@@ -180,7 +180,6 @@ class VoiceMessageViews(
                     .setDuration(150)
                     .withEndAction {
                         resetMicButtonUi()
-                        onVoiceRecordingEnded()
                     }
                     .start()
         } else {
@@ -192,7 +191,6 @@ class VoiceMessageViews(
                 translationX = 0f
                 translationY = 0f
             }
-            onVoiceRecordingEnded()
         }
 
         // Hide toasts if user cancelled recording before the timeout of the toast.

From 55fd362b3d7fbc8d3806c5e4bafaab99bb14c703 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Fri, 19 Nov 2021 09:14:18 +0000
Subject: [PATCH 22/52] removing unused default constructor param and making
 queue a data class since it's only manipulating its own internal data

---
 .../app/features/notifications/NotificationEventQueue.kt      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationEventQueue.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationEventQueue.kt
index 2dc86f0aa0..04506b218b 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationEventQueue.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationEventQueue.kt
@@ -18,8 +18,8 @@ package im.vector.app.features.notifications
 
 import timber.log.Timber
 
-class NotificationEventQueue(
-        private val queue: MutableList<NotifiableEvent> = mutableListOf(),
+data class NotificationEventQueue(
+        private val queue: MutableList<NotifiableEvent>,
 
         /**
          * An in memory FIFO cache of the seen events.

From 7693f3bc6c7607ade8015838e0cbfaf3bdc1160f Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Fri, 19 Nov 2021 09:33:28 +0000
Subject: [PATCH 23/52] lifting the persistence out of the notification state

---
 .../NotificationDrawerManager.kt              | 33 ++++++++++++++-----
 .../NotificationEventPersistence.kt           | 31 +++++++++--------
 .../notifications/NotificationState.kt        | 18 ++--------
 3 files changed, 43 insertions(+), 39 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
index 81db029d8b..fa56e3b8ed 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
@@ -38,12 +38,15 @@ import javax.inject.Singleton
  * Events can be grouped into the same notification, old (already read) events can be removed to do some cleaning.
  */
 @Singleton
-class NotificationDrawerManager @Inject constructor(private val context: Context,
-                                                    private val notificationDisplayer: NotificationDisplayer,
-                                                    private val vectorPreferences: VectorPreferences,
-                                                    private val activeSessionDataSource: ActiveSessionDataSource,
-                                                    private val notifiableEventProcessor: NotifiableEventProcessor,
-                                                    private val notificationRenderer: NotificationRenderer) {
+class NotificationDrawerManager @Inject constructor(
+        private val context: Context,
+        private val notificationDisplayer: NotificationDisplayer,
+        private val vectorPreferences: VectorPreferences,
+        private val activeSessionDataSource: ActiveSessionDataSource,
+        private val notifiableEventProcessor: NotifiableEventProcessor,
+        private val notificationRenderer: NotificationRenderer,
+        private val notificationEventPersistence: NotificationEventPersistence
+) {
 
     private val handlerThread: HandlerThread = HandlerThread("NotificationDrawerManager", Thread.MIN_PRIORITY)
     private var backgroundHandler: Handler
@@ -55,7 +58,7 @@ class NotificationDrawerManager @Inject constructor(private val context: Context
     /**
      * Lazily initializes the NotificationState as we rely on having a current session in order to fetch the persisted queue of events
      */
-    private val notificationState by lazy { NotificationState.createInitialNotificationState(context, currentSession) }
+    private val notificationState by lazy { createInitialNotificationState() }
     private val avatarSize = context.resources.getDimensionPixelSize(R.dimen.profile_avatar_size)
     private var currentRoomId: String? = null
     private val firstThrottler = FirstThrottler(200)
@@ -67,6 +70,14 @@ class NotificationDrawerManager @Inject constructor(private val context: Context
         backgroundHandler = Handler(handlerThread.looper)
     }
 
+    private fun createInitialNotificationState(): NotificationState {
+        val queuedEvents = notificationEventPersistence.loadEvents(currentSession, factory = { rawEvents ->
+            NotificationEventQueue(rawEvents.toMutableList(), seenEventIds = CircularCache.create(cacheSize = 25))
+        })
+        val renderedEvents = queuedEvents.rawEvents().map { ProcessedEvent(ProcessedEvent.Type.KEEP, it) }.toMutableList()
+        return NotificationState(queuedEvents, renderedEvents)
+    }
+
     /**
     Should be called as soon as a new event is ready to be displayed.
     The notification corresponding to this event will not be displayed until
@@ -161,7 +172,13 @@ class NotificationDrawerManager @Inject constructor(private val context: Context
             notificationState.clearAndAddRenderedEvents(eventsToRender)
             val session = currentSession ?: return
             renderEvents(session, eventsToRender)
-            notificationState.persist(context, session)
+            persistEvents(session)
+        }
+    }
+
+    private fun persistEvents(session: Session) {
+        notificationState.queuedEvents { queuedEvents ->
+            notificationEventPersistence.persistEvents(queuedEvents, session)
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationEventPersistence.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationEventPersistence.kt
index 11cc247b48..a4a7570fec 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationEventPersistence.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationEventPersistence.kt
@@ -21,14 +21,15 @@ import org.matrix.android.sdk.api.session.Session
 import timber.log.Timber
 import java.io.File
 import java.io.FileOutputStream
+import javax.inject.Inject
 
 // TODO Multi-account
 private const val ROOMS_NOTIFICATIONS_FILE_NAME = "im.vector.notifications.cache"
 private const val KEY_ALIAS_SECRET_STORAGE = "notificationMgr"
 
-object NotificationEventPersistence {
+class NotificationEventPersistence @Inject constructor(private val context: Context) {
 
-    fun loadEvents(context: Context, currentSession: Session?, factory: (List<NotifiableEvent>) -> NotificationEventQueue): NotificationEventQueue {
+    fun loadEvents(currentSession: Session?, factory: (List<NotifiableEvent>) -> NotificationEventQueue): NotificationEventQueue {
         try {
             val file = File(context.applicationContext.cacheDir, ROOMS_NOTIFICATIONS_FILE_NAME)
             if (file.exists()) {
@@ -45,21 +46,19 @@ object NotificationEventPersistence {
         return factory(emptyList())
     }
 
-    fun persistEvents(queuedEvents: NotificationEventQueue, context: Context, currentSession: Session) {
-        synchronized(queuedEvents) {
-            if (queuedEvents.isEmpty()) {
-                deleteCachedRoomNotifications(context)
-                return
-            }
-            try {
-                val file = File(context.applicationContext.cacheDir, ROOMS_NOTIFICATIONS_FILE_NAME)
-                if (!file.exists()) file.createNewFile()
-                FileOutputStream(file).use {
-                    currentSession.securelyStoreObject(queuedEvents.rawEvents(), KEY_ALIAS_SECRET_STORAGE, it)
-                }
-            } catch (e: Throwable) {
-                Timber.e(e, "## Failed to save cached notification info")
+    fun persistEvents(queuedEvents: NotificationEventQueue, currentSession: Session) {
+        if (queuedEvents.isEmpty()) {
+            deleteCachedRoomNotifications(context)
+            return
+        }
+        try {
+            val file = File(context.applicationContext.cacheDir, ROOMS_NOTIFICATIONS_FILE_NAME)
+            if (!file.exists()) file.createNewFile()
+            FileOutputStream(file).use {
+                currentSession.securelyStoreObject(queuedEvents.rawEvents(), KEY_ALIAS_SECRET_STORAGE, it)
             }
+        } catch (e: Throwable) {
+            Timber.e(e, "## Failed to save cached notification info")
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationState.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationState.kt
index c880b99db5..193116a6bc 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationState.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationState.kt
@@ -16,9 +16,6 @@
 
 package im.vector.app.features.notifications
 
-import android.content.Context
-import org.matrix.android.sdk.api.session.Session
-
 class NotificationState(
         /**
          * The notifiable events queued for rendering or currently rendered
@@ -53,18 +50,9 @@ class NotificationState(
 
     fun hasAlreadyRendered(eventsToRender: List<ProcessedEvent<NotifiableEvent>>) = renderedEvents == eventsToRender
 
-    fun persist(context: Context, session: Session) {
-        NotificationEventPersistence.persistEvents(queuedEvents, context, session)
-    }
-
-    companion object {
-
-        fun createInitialNotificationState(context: Context, currentSession: Session?): NotificationState {
-            val queuedEvents = NotificationEventPersistence.loadEvents(context, currentSession, factory = { rawEvents ->
-                NotificationEventQueue(rawEvents.toMutableList(), seenEventIds = CircularCache.create(cacheSize = 25))
-            })
-            val renderedEvents = queuedEvents.rawEvents().map { ProcessedEvent(ProcessedEvent.Type.KEEP, it) }.toMutableList()
-            return NotificationState(queuedEvents, renderedEvents)
+    fun queuedEvents(block: (NotificationEventQueue) -> Unit) {
+        synchronized(queuedEvents) {
+            block(queuedEvents)
         }
     }
 }

From 331bcbfc8adebcb62de8ab5b42fc48222704924f Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Fri, 19 Nov 2021 11:31:10 +0000
Subject: [PATCH 24/52] separating the drag state from the main UI state in
 order to clarify which actions should be handled in each layer

---
 .../home/room/detail/RoomDetailFragment.kt    | 11 +--
 .../detail/composer/TextComposerViewState.kt  |  2 -
 .../composer/voice/DraggableStateProcessor.kt | 15 ++--
 .../voice/VoiceMessageRecorderView.kt         | 76 ++++++++++---------
 .../composer/voice/VoiceMessageViews.kt       |  9 ++-
 5 files changed, 59 insertions(+), 54 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index cea9641443..84e8260a97 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -709,17 +709,18 @@ class RoomDetailFragment @Inject constructor(
             }
 
             override fun onVoiceRecordingCancelled() {
-                onDeleteVoiceMessage()
+                roomDetailViewModel.handle(RoomDetailAction.EndRecordingVoiceMessage(isCancelled = true))
+                updateRecordingUiState(RecordingUiState.Cancelled)
+            }
+
+            override fun onVoiceRecordingLocked() {
+                updateRecordingUiState(RecordingUiState.Locked)
             }
 
             override fun onVoiceRecordingEnded() {
                 onSendVoiceMessage()
             }
 
-            override fun onUiStateChanged(state: RecordingUiState) {
-                updateRecordingUiState(state)
-            }
-
             override fun onSendVoiceMessage() {
                 roomDetailViewModel.handle(RoomDetailAction.EndRecordingVoiceMessage(isCancelled = false))
                 updateRecordingUiState(RecordingUiState.None)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerViewState.kt
index 4eb70138bb..fa19d129e9 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerViewState.kt
@@ -54,8 +54,6 @@ data class TextComposerViewState(
         VoiceMessageRecorderView.RecordingUiState.None,
         VoiceMessageRecorderView.RecordingUiState.Cancelled,
         VoiceMessageRecorderView.RecordingUiState.Playback -> false
-        is VoiceMessageRecorderView.DraggingState.Cancelling,
-        is VoiceMessageRecorderView.DraggingState.Locking,
         VoiceMessageRecorderView.RecordingUiState.Locked,
         VoiceMessageRecorderView.RecordingUiState.Started  -> true
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/DraggableStateProcessor.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/DraggableStateProcessor.kt
index a8b19d6f6a..088070ceb9 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/DraggableStateProcessor.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/DraggableStateProcessor.kt
@@ -21,7 +21,6 @@ import android.view.MotionEvent
 import im.vector.app.R
 import im.vector.app.core.utils.DimensionConverter
 import im.vector.app.features.home.room.detail.composer.voice.VoiceMessageRecorderView.DraggingState
-import im.vector.app.features.home.room.detail.composer.voice.VoiceMessageRecorderView.RecordingUiState
 
 class DraggableStateProcessor(
         resources: Resources,
@@ -44,37 +43,37 @@ class DraggableStateProcessor(
         lastDistanceY = 0F
     }
 
-    fun process(event: MotionEvent, recordingState: RecordingUiState): RecordingUiState {
+    fun process(event: MotionEvent, draggingState: DraggingState): DraggingState {
         val currentX = event.rawX
         val currentY = event.rawY
         val distanceX = firstX - currentX
         val distanceY = firstY - currentY
-        return recordingState.nextRecordingState(currentX, currentY, distanceX, distanceY).also {
+        return draggingState.nextDragState(currentX, currentY, distanceX, distanceY).also {
             lastDistanceX = distanceX
             lastDistanceY = distanceY
         }
     }
 
-    private fun RecordingUiState.nextRecordingState(currentX: Float, currentY: Float, distanceX: Float, distanceY: Float): RecordingUiState {
+    private fun DraggingState.nextDragState(currentX: Float, currentY: Float, distanceX: Float, distanceY: Float): DraggingState {
         return when (this) {
-            RecordingUiState.Started    -> {
+            DraggingState.Ready         -> {
                 when {
                     isDraggingToCancel(currentX, distanceX, distanceY) -> DraggingState.Cancelling(distanceX)
                     isDraggingToLock(currentY, distanceX, distanceY)   -> DraggingState.Locking(distanceY)
-                    else                                               -> this
+                    else                                               -> DraggingState.Ready
                 }
             }
             is DraggingState.Cancelling -> {
                 when {
                     isDraggingToLock(currentY, distanceX, distanceY) -> DraggingState.Locking(distanceY)
-                    shouldCancelRecording(distanceX)                 -> RecordingUiState.Cancelled
+                    shouldCancelRecording(distanceX)                 -> DraggingState.Cancel
                     else                                             -> DraggingState.Cancelling(distanceX)
                 }
             }
             is DraggingState.Locking    -> {
                 when {
                     isDraggingToCancel(currentX, distanceX, distanceY) -> DraggingState.Cancelling(distanceX)
-                    shouldLockRecording(distanceY)                     -> RecordingUiState.Locked
+                    shouldLockRecording(distanceY)                     -> DraggingState.Lock
                     else                                               -> DraggingState.Locking(distanceY)
                 }
             }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
index c673ecfc16..d212e800a8 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
@@ -44,7 +44,7 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
         fun onVoiceRecordingEnded()
         fun onVoicePlaybackButtonClicked()
         fun onVoiceRecordingCancelled()
-        fun onUiStateChanged(state: RecordingUiState)
+        fun onVoiceRecordingLocked()
         fun onSendVoiceMessage()
         fun onDeleteVoiceMessage()
         fun onRecordingLimitReached()
@@ -58,6 +58,7 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
 
     private var recordingTicker: CountUpTimer? = null
     private var lastKnownState: RecordingUiState? = null
+    private var dragState: DraggingState = DraggingState.Ignored
 
     init {
         inflate(this.context, R.layout.view_voice_message_recorder, this)
@@ -74,13 +75,13 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
         voiceMessageViews.start(object : VoiceMessageViews.Actions {
             override fun onRequestRecording() = callback.onVoiceRecordingStarted()
             override fun onMicButtonReleased() {
-                when (lastKnownState) {
-                    RecordingUiState.Locked    -> {
+                when (dragState) {
+                    DraggingState.Lock   -> {
                         // do nothing,
                         // onSendVoiceMessage, onDeleteVoiceMessage or onRecordingLimitReached will be triggered instead
                     }
-                    RecordingUiState.Cancelled -> callback.onVoiceRecordingCancelled()
-                    else                       -> callback.onVoiceRecordingEnded()
+                    DraggingState.Cancel -> callback.onVoiceRecordingCancelled()
+                    else                 -> callback.onVoiceRecordingEnded()
                 }
             }
 
@@ -88,21 +89,8 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
             override fun onDeleteVoiceMessage() = callback.onDeleteVoiceMessage()
             override fun onWaveformClicked() = callback.onRecordingWaveformClicked()
             override fun onVoicePlaybackButtonClicked() = callback.onVoicePlaybackButtonClicked()
-            override fun onMicButtonDrag(updater: (RecordingUiState) -> RecordingUiState) {
-                when (val currentState = lastKnownState) {
-                    null, RecordingUiState.None -> {
-                        // ignore drag events when the view is idle
-                    }
-                    else                        -> {
-                        updater(currentState).also { newState ->
-                            when (newState) {
-                                // display drag events directly without leaving the view for faster UI feedback
-                                is DraggingState -> display(newState)
-                                else             -> callback.onUiStateChanged(newState)
-                            }
-                        }
-                    }
-                }
+            override fun onMicButtonDrag(nextDragStateCreator: (DraggingState) -> DraggingState) {
+                onDrag(dragState, newDragState = nextDragStateCreator(dragState))
             }
         })
     }
@@ -117,21 +105,19 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
 
     fun display(recordingState: RecordingUiState) {
         if (lastKnownState == recordingState) return
-        val previousState = lastKnownState
         lastKnownState = recordingState
         when (recordingState) {
             RecordingUiState.None      -> {
-                stopRecordingTicker()
-                voiceMessageViews.initViews()
+                reset()
             }
             RecordingUiState.Started   -> {
                 startRecordingTicker()
                 voiceMessageViews.renderToast(context.getString(R.string.voice_message_release_to_send_toast))
                 voiceMessageViews.showRecordingViews()
+                dragState = DraggingState.Ready
             }
             RecordingUiState.Cancelled -> {
-                stopRecordingTicker()
-                voiceMessageViews.hideRecordingViews(recordingState)
+                reset()
                 vibrate(context)
             }
             RecordingUiState.Locked    -> {
@@ -144,18 +130,34 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
                 stopRecordingTicker()
                 voiceMessageViews.showPlaybackViews()
             }
-            is DraggingState           -> when (recordingState) {
-                is DraggingState.Cancelling -> voiceMessageViews.renderCancelling(recordingState.distanceX)
-                is DraggingState.Locking    -> {
-                    if (previousState is DraggingState.Cancelling) {
-                        voiceMessageViews.showRecordingViews()
-                    }
-                    voiceMessageViews.renderLocking(recordingState.distanceY)
-                }
-            }.exhaustive
         }
     }
 
+    private fun reset() {
+        stopRecordingTicker()
+        voiceMessageViews.initViews()
+        dragState = DraggingState.Ignored
+    }
+
+    private fun onDrag(currentDragState: DraggingState, newDragState: DraggingState) {
+        when (newDragState) {
+            is DraggingState.Cancelling -> voiceMessageViews.renderCancelling(newDragState.distanceX)
+            is DraggingState.Locking    -> {
+                if (currentDragState is DraggingState.Cancelling) {
+                    voiceMessageViews.showRecordingViews()
+                }
+                voiceMessageViews.renderLocking(newDragState.distanceY)
+            }
+            DraggingState.Cancel        -> callback.onVoiceRecordingCancelled()
+            DraggingState.Lock          -> callback.onVoiceRecordingLocked()
+            DraggingState.Ignored,
+            DraggingState.Ready         -> {
+                // do nothing
+            }
+        }.exhaustive
+        dragState = newDragState
+    }
+
     private fun startRecordingTicker() {
         recordingTicker?.stop()
         recordingTicker = CountUpTimer().apply {
@@ -214,8 +216,12 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
         object Playback : RecordingUiState
     }
 
-    sealed interface DraggingState : RecordingUiState {
+    sealed interface DraggingState {
+        object Ready : DraggingState
+        object Ignored : DraggingState
         data class Cancelling(val distanceX: Float) : DraggingState
         data class Locking(val distanceY: Float) : DraggingState
+        object Cancel : DraggingState
+        object Lock : DraggingState
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt
index 7aeb665486..32f21a3177 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt
@@ -32,6 +32,7 @@ import im.vector.app.core.extensions.setAttributeTintedBackground
 import im.vector.app.core.extensions.setAttributeTintedImageResource
 import im.vector.app.core.utils.DimensionConverter
 import im.vector.app.databinding.ViewVoiceMessageRecorderBinding
+import im.vector.app.features.home.room.detail.composer.voice.VoiceMessageRecorderView.DraggingState
 import im.vector.app.features.home.room.detail.composer.voice.VoiceMessageRecorderView.RecordingUiState
 import im.vector.app.features.home.room.detail.timeline.helper.VoiceMessagePlaybackTracker
 
@@ -68,11 +69,11 @@ class VoiceMessageViews(
 
     @SuppressLint("ClickableViewAccessibility")
     private fun observeMicButton(actions: Actions) {
-        val positions = DraggableStateProcessor(resources, dimensionConverter)
+        val draggableStateProcessor = DraggableStateProcessor(resources, dimensionConverter)
         views.voiceMessageMicButton.setOnTouchListener { _, event ->
             when (event.action) {
                 MotionEvent.ACTION_DOWN -> {
-                    positions.initialize(event)
+                    draggableStateProcessor.initialize(event)
                     actions.onRequestRecording()
                     true
                 }
@@ -81,7 +82,7 @@ class VoiceMessageViews(
                     true
                 }
                 MotionEvent.ACTION_MOVE -> {
-                    actions.onMicButtonDrag { currentState -> positions.process(event, currentState) }
+                    actions.onMicButtonDrag { currentState -> draggableStateProcessor.process(event, currentState) }
                     true
                 }
                 else                    -> false
@@ -339,7 +340,7 @@ class VoiceMessageViews(
     interface Actions {
         fun onRequestRecording()
         fun onMicButtonReleased()
-        fun onMicButtonDrag(updater: (RecordingUiState) -> RecordingUiState)
+        fun onMicButtonDrag(nextDragStateCreator: (DraggingState) -> DraggingState)
         fun onSendVoiceMessage()
         fun onDeleteVoiceMessage()
         fun onWaveformClicked()

From d80a25feac3c8faba66730ed4ca1074d43680625 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 19 Nov 2021 15:29:11 +0100
Subject: [PATCH 25/52] Fix "@JvmStatic used for @Provides function in an
 object class" Lint warning. See
 https://github.com/google/dagger/releases/tag/dagger-2.25.2 point 2.ii. :
 @Module object classes no longer need @JvmStatic on the provides methods.
 Ensure this warning does not appear again.

---
 vector/lint.xml                                    |  3 +++
 .../fdroid/java/im/vector/app/di/FlavorModule.kt   | 14 +++++---------
 .../gplay/java/im/vector/app/di/FlavorModule.kt    | 12 ++++--------
 .../main/java/im/vector/app/core/di/HomeModule.kt  |  1 -
 .../java/im/vector/app/core/di/ScreenModule.kt     |  2 --
 .../java/im/vector/app/core/di/SingletonModule.kt  | 11 -----------
 .../java/im/vector/app/features/home/HomeModule.kt |  1 -
 7 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/vector/lint.xml b/vector/lint.xml
index e534bdc355..9d9b208df7 100644
--- a/vector/lint.xml
+++ b/vector/lint.xml
@@ -84,4 +84,7 @@
     <!-- Bug in lint agp 4.1 incorrectly thinks kotlin forEach is using java 8 API's. -->
     <!-- FIXME this workaround should be removed in a near future -->
     <issue id="NewApi" severity="warning" />
+
+    <!-- DI -->
+    <issue id="JvmStaticProvidesInObjectDetector" severity="error" />
 </lint>
diff --git a/vector/src/fdroid/java/im/vector/app/di/FlavorModule.kt b/vector/src/fdroid/java/im/vector/app/di/FlavorModule.kt
index 39b5c4a976..1a3348f4c6 100644
--- a/vector/src/fdroid/java/im/vector/app/di/FlavorModule.kt
+++ b/vector/src/fdroid/java/im/vector/app/di/FlavorModule.kt
@@ -25,16 +25,12 @@ import im.vector.app.core.services.GuardServiceStarter
 import im.vector.app.fdroid.service.FDroidGuardServiceStarter
 import im.vector.app.features.settings.VectorPreferences
 
-@Module
 @InstallIn(SingletonComponent::class)
-abstract class FlavorModule {
+@Module
+object FlavorModule {
 
-    companion object {
-
-        @Provides
-        @JvmStatic
-        fun provideGuardServiceStarter(preferences: VectorPreferences, appContext: Context): GuardServiceStarter {
-            return FDroidGuardServiceStarter(preferences, appContext)
-        }
+    @Provides
+    fun provideGuardServiceStarter(preferences: VectorPreferences, appContext: Context): GuardServiceStarter {
+        return FDroidGuardServiceStarter(preferences, appContext)
     }
 }
diff --git a/vector/src/gplay/java/im/vector/app/di/FlavorModule.kt b/vector/src/gplay/java/im/vector/app/di/FlavorModule.kt
index 61fd476c87..901320be4c 100644
--- a/vector/src/gplay/java/im/vector/app/di/FlavorModule.kt
+++ b/vector/src/gplay/java/im/vector/app/di/FlavorModule.kt
@@ -24,14 +24,10 @@ import im.vector.app.core.services.GuardServiceStarter
 
 @InstallIn(SingletonComponent::class)
 @Module
-abstract class FlavorModule {
+object FlavorModule {
 
-    companion object {
-
-        @Provides
-        @JvmStatic
-        fun provideGuardServiceStarter(): GuardServiceStarter {
-            return object : GuardServiceStarter {}
-        }
+    @Provides
+    fun provideGuardServiceStarter(): GuardServiceStarter {
+        return object : GuardServiceStarter {}
     }
 }
diff --git a/vector/src/main/java/im/vector/app/core/di/HomeModule.kt b/vector/src/main/java/im/vector/app/core/di/HomeModule.kt
index 1af67cdc83..b667a12ce8 100644
--- a/vector/src/main/java/im/vector/app/core/di/HomeModule.kt
+++ b/vector/src/main/java/im/vector/app/core/di/HomeModule.kt
@@ -28,7 +28,6 @@ import im.vector.app.features.home.room.detail.timeline.helper.TimelineAsyncHelp
 @InstallIn(ActivityComponent::class)
 object HomeModule {
     @Provides
-    @JvmStatic
     @TimelineEventControllerHandler
     fun providesTimelineBackgroundHandler(): Handler {
         return TimelineAsyncHelper.getBackgroundHandler()
diff --git a/vector/src/main/java/im/vector/app/core/di/ScreenModule.kt b/vector/src/main/java/im/vector/app/core/di/ScreenModule.kt
index 2dab05378c..4ed71039e4 100644
--- a/vector/src/main/java/im/vector/app/core/di/ScreenModule.kt
+++ b/vector/src/main/java/im/vector/app/core/di/ScreenModule.kt
@@ -30,11 +30,9 @@ import im.vector.app.core.glide.GlideApp
 object ScreenModule {
 
     @Provides
-    @JvmStatic
     fun providesGlideRequests(context: AppCompatActivity) = GlideApp.with(context)
 
     @Provides
-    @JvmStatic
     @ActivityScoped
     fun providesSharedViewPool() = RecyclerView.RecycledViewPool()
 }
diff --git a/vector/src/main/java/im/vector/app/core/di/SingletonModule.kt b/vector/src/main/java/im/vector/app/core/di/SingletonModule.kt
index a3d8f39b30..429b88be69 100644
--- a/vector/src/main/java/im/vector/app/core/di/SingletonModule.kt
+++ b/vector/src/main/java/im/vector/app/core/di/SingletonModule.kt
@@ -73,69 +73,58 @@ abstract class VectorBindModule {
 object VectorStaticModule {
 
     @Provides
-    @JvmStatic
     fun providesContext(application: Application): Context {
         return application.applicationContext
     }
 
     @Provides
-    @JvmStatic
     fun providesResources(context: Context): Resources {
         return context.resources
     }
 
     @Provides
-    @JvmStatic
     fun providesSharedPreferences(context: Context): SharedPreferences {
         return context.getSharedPreferences("im.vector.riot", MODE_PRIVATE)
     }
 
     @Provides
-    @JvmStatic
     fun providesMatrix(context: Context): Matrix {
         return Matrix.getInstance(context)
     }
 
     @Provides
-    @JvmStatic
     fun providesCurrentSession(activeSessionHolder: ActiveSessionHolder): Session {
         // TODO: handle session injection better
         return activeSessionHolder.getActiveSession()
     }
 
     @Provides
-    @JvmStatic
     fun providesLegacySessionImporter(matrix: Matrix): LegacySessionImporter {
         return matrix.legacySessionImporter()
     }
 
     @Provides
-    @JvmStatic
     fun providesAuthenticationService(matrix: Matrix): AuthenticationService {
         return matrix.authenticationService()
     }
 
     @Provides
-    @JvmStatic
     fun providesRawService(matrix: Matrix): RawService {
         return matrix.rawService()
     }
 
     @Provides
-    @JvmStatic
     fun providesHomeServerHistoryService(matrix: Matrix): HomeServerHistoryService {
         return matrix.homeServerHistoryService()
     }
 
     @Provides
-    @JvmStatic
     @Singleton
     fun providesApplicationCoroutineScope(): CoroutineScope {
         return CoroutineScope(SupervisorJob() + Dispatchers.Main)
     }
 
     @Provides
-    @JvmStatic
     fun providesCoroutineDispatchers(): CoroutineDispatchers {
         return CoroutineDispatchers(io = Dispatchers.IO, computation = Dispatchers.Default)
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeModule.kt b/vector/src/main/java/im/vector/app/features/home/HomeModule.kt
index 0782bbb573..d34d3489c5 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeModule.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeModule.kt
@@ -28,7 +28,6 @@ import im.vector.app.features.home.room.detail.timeline.helper.TimelineAsyncHelp
 object HomeModule {
 
     @Provides
-    @JvmStatic
     @TimelineEventControllerHandler
     fun providesTimelineBackgroundHandler(): Handler {
         return TimelineAsyncHelper.getBackgroundHandler()

From 7d0d105e823b97af6dcdaa823cc07a2ee5dbd490 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Fri, 19 Nov 2021 14:53:20 +0000
Subject: [PATCH 26/52] adding changelog entry

---
 changelog.d/4515.misc | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/4515.misc

diff --git a/changelog.d/4515.misc b/changelog.d/4515.misc
new file mode 100644
index 0000000000..f47ace25d4
--- /dev/null
+++ b/changelog.d/4515.misc
@@ -0,0 +1 @@
+Voice recording mic button refactor with small animation tweaks in preparation for voice drafts
\ No newline at end of file

From b5055453d19afda45a7341c855802beeced67365 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Fri, 19 Nov 2021 14:24:04 +0000
Subject: [PATCH 27/52] moving voice recording logic to the
 TextComposerViewModel (name to be updated) from the RoomDetailViewModel

---
 .../app/core/di/MavericksViewModelModule.kt   |  6 +-
 .../home/room/detail/RoomDetailAction.kt      |  9 --
 .../home/room/detail/RoomDetailFragment.kt    | 45 +++++-----
 .../home/room/detail/RoomDetailViewModel.kt   | 81 ++----------------
 .../detail/composer/TextComposerAction.kt     |  9 ++
 .../detail/composer/TextComposerViewEvents.kt |  2 +
 .../detail/composer/TextComposerViewModel.kt  | 83 +++++++++++++++++--
 7 files changed, 119 insertions(+), 116 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt b/vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt
index c827bd0b35..69257f1f05 100644
--- a/vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt
+++ b/vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt
@@ -41,7 +41,7 @@ import im.vector.app.features.home.PromoteRestrictedViewModel
 import im.vector.app.features.home.UnknownDeviceDetectorSharedViewModel
 import im.vector.app.features.home.UnreadMessagesSharedViewModel
 import im.vector.app.features.home.room.breadcrumbs.BreadcrumbsViewModel
-import im.vector.app.features.home.room.detail.composer.TextComposerViewModel
+import im.vector.app.features.home.room.detail.RoomDetailViewModel
 import im.vector.app.features.home.room.detail.search.SearchViewModel
 import im.vector.app.features.home.room.detail.timeline.action.MessageActionsViewModel
 import im.vector.app.features.home.room.detail.timeline.edithistory.ViewEditHistoryViewModel
@@ -505,8 +505,8 @@ interface MavericksViewModelModule {
 
     @Binds
     @IntoMap
-    @MavericksViewModelKey(TextComposerViewModel::class)
-    fun textComposerViewModelFactory(factory: TextComposerViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+    @MavericksViewModelKey(RoomDetailViewModel::class)
+    fun roomDetailViewModelFactory(factory: RoomDetailViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
 
     @Binds
     @IntoMap
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
index a9b9f8000b..5b05ece56f 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
@@ -21,7 +21,6 @@ import android.view.View
 import im.vector.app.core.platform.VectorViewModelAction
 import im.vector.app.features.call.conference.ConferenceEvent
 import org.matrix.android.sdk.api.session.content.ContentAttachmentData
-import org.matrix.android.sdk.api.session.room.model.message.MessageAudioContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageStickerContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageWithAttachmentContent
 import org.matrix.android.sdk.api.session.room.timeline.Timeline
@@ -108,12 +107,4 @@ sealed class RoomDetailAction : VectorViewModelAction {
     object RemoveAllFailedMessages : RoomDetailAction()
 
     data class RoomUpgradeSuccess(val replacementRoomId: String) : RoomDetailAction()
-
-    // Voice Message
-    object StartRecordingVoiceMessage : RoomDetailAction()
-    data class EndRecordingVoiceMessage(val isCancelled: Boolean) : RoomDetailAction()
-    object PauseRecordingVoiceMessage : RoomDetailAction()
-    data class PlayOrPauseVoicePlayback(val eventId: String, val messageAudioContent: MessageAudioContent) : RoomDetailAction()
-    object PlayOrPauseRecordingPlayback : RoomDetailAction()
-    data class EndAllVoiceActions(val deleteRecord: Boolean = true) : RoomDetailAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index 3fcdefaf56..53a49c5180 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -241,7 +241,7 @@ class RoomDetailFragment @Inject constructor(
         autoCompleterFactory: AutoCompleter.Factory,
         private val permalinkHandler: PermalinkHandler,
         private val notificationDrawerManager: NotificationDrawerManager,
-        val roomDetailViewModelFactory: RoomDetailViewModel.Factory,
+        val textComposerViewModelFactory: TextComposerViewModel.Factory,
         private val eventHtmlRenderer: EventHtmlRenderer,
         private val vectorPreferences: VectorPreferences,
         private val colorProvider: ColorProvider,
@@ -414,23 +414,24 @@ class RoomDetailFragment @Inject constructor(
 
         textComposerViewModel.observeViewEvents {
             when (it) {
-                is TextComposerViewEvents.JoinRoomCommandSuccess      -> handleJoinedToAnotherRoom(it)
-                is TextComposerViewEvents.SendMessageResult           -> renderSendMessageResult(it)
-                is TextComposerViewEvents.ShowMessage                 -> showSnackWithMessage(it.message)
-                is TextComposerViewEvents.ShowRoomUpgradeDialog       -> handleShowRoomUpgradeDialog(it)
-                is TextComposerViewEvents.AnimateSendButtonVisibility -> handleSendButtonVisibilityChanged(it)
-                is TextComposerViewEvents.OpenRoomMemberProfile       -> openRoomMemberProfile(it.userId)
-            }.exhaustive
-        }
-
-        roomDetailViewModel.observeViewEvents {
-            when (it) {
-                is RoomDetailViewEvents.Failure                          -> {
+                is TextComposerViewEvents.JoinRoomCommandSuccess          -> handleJoinedToAnotherRoom(it)
+                is TextComposerViewEvents.SendMessageResult               -> renderSendMessageResult(it)
+                is TextComposerViewEvents.ShowMessage                     -> showSnackWithMessage(it.message)
+                is TextComposerViewEvents.ShowRoomUpgradeDialog           -> handleShowRoomUpgradeDialog(it)
+                is TextComposerViewEvents.AnimateSendButtonVisibility     -> handleSendButtonVisibilityChanged(it)
+                is TextComposerViewEvents.OpenRoomMemberProfile           -> openRoomMemberProfile(it.userId)
+                is TextComposerViewEvents.VoicePlaybackOrRecordingFailure -> {
                     if (it.throwable is VoiceFailure.UnableToRecord) {
                         onCannotRecord()
                     }
                     showErrorInSnackbar(it.throwable)
                 }
+            }.exhaustive
+        }
+
+        roomDetailViewModel.observeViewEvents {
+            when (it) {
+                is RoomDetailViewEvents.Failure                          -> showErrorInSnackbar(it.throwable)
                 is RoomDetailViewEvents.OnNewTimelineEvents              -> scrollOnNewMessageCallback.addNewTimelineEventIds(it.eventIds)
                 is RoomDetailViewEvents.ActionSuccess                    -> displayRoomDetailActionSuccess(it)
                 is RoomDetailViewEvents.ActionFailure                    -> displayRoomDetailActionFailure(it)
@@ -698,18 +699,18 @@ class RoomDetailFragment @Inject constructor(
 
             override fun onVoiceRecordingStarted() {
                 if (checkPermissions(PERMISSIONS_FOR_VOICE_MESSAGE, requireActivity(), permissionVoiceMessageLauncher)) {
-                    roomDetailViewModel.handle(RoomDetailAction.StartRecordingVoiceMessage)
+                    textComposerViewModel.handle(TextComposerAction.StartRecordingVoiceMessage)
                     vibrate(requireContext())
                     updateRecordingUiState(RecordingUiState.Started)
                 }
             }
 
             override fun onVoicePlaybackButtonClicked() {
-                roomDetailViewModel.handle(RoomDetailAction.PlayOrPauseRecordingPlayback)
+                textComposerViewModel.handle(TextComposerAction.PlayOrPauseRecordingPlayback)
             }
 
             override fun onVoiceRecordingCancelled() {
-                roomDetailViewModel.handle(RoomDetailAction.EndRecordingVoiceMessage(isCancelled = true))
+                textComposerViewModel.handle(TextComposerAction.EndRecordingVoiceMessage(isCancelled = true))
                 updateRecordingUiState(RecordingUiState.Cancelled)
             }
 
@@ -722,22 +723,22 @@ class RoomDetailFragment @Inject constructor(
             }
 
             override fun onSendVoiceMessage() {
-                roomDetailViewModel.handle(RoomDetailAction.EndRecordingVoiceMessage(isCancelled = false))
+                textComposerViewModel.handle(TextComposerAction.EndRecordingVoiceMessage(isCancelled = false))
                 updateRecordingUiState(RecordingUiState.None)
             }
 
             override fun onDeleteVoiceMessage() {
-                roomDetailViewModel.handle(RoomDetailAction.EndRecordingVoiceMessage(isCancelled = true))
+                textComposerViewModel.handle(TextComposerAction.EndRecordingVoiceMessage(isCancelled = true))
                 updateRecordingUiState(RecordingUiState.None)
             }
 
             override fun onRecordingLimitReached() {
-                roomDetailViewModel.handle(RoomDetailAction.PauseRecordingVoiceMessage)
+                textComposerViewModel.handle(TextComposerAction.PauseRecordingVoiceMessage)
                 updateRecordingUiState(RecordingUiState.Playback)
             }
 
             override fun onRecordingWaveformClicked() {
-                roomDetailViewModel.handle(RoomDetailAction.PauseRecordingVoiceMessage)
+                textComposerViewModel.handle(TextComposerAction.PauseRecordingVoiceMessage)
                 updateRecordingUiState(RecordingUiState.Playback)
             }
 
@@ -1136,7 +1137,7 @@ class RoomDetailFragment @Inject constructor(
         textComposerViewModel.handle(TextComposerAction.SaveDraft(views.composerLayout.text.toString()))
 
         // We should improve the UX to support going into playback mode when paused and delete the media when the view is destroyed.
-        roomDetailViewModel.handle(RoomDetailAction.EndAllVoiceActions(deleteRecord = false))
+        textComposerViewModel.handle(TextComposerAction.EndAllVoiceActions(deleteRecord = false))
         views.voiceMessageRecorderView.display(RecordingUiState.None)
     }
 
@@ -1883,7 +1884,7 @@ class RoomDetailFragment @Inject constructor(
     }
 
     override fun onVoiceControlButtonClicked(eventId: String, messageAudioContent: MessageAudioContent) {
-        roomDetailViewModel.handle(RoomDetailAction.PlayOrPauseVoicePlayback(eventId, messageAudioContent))
+        textComposerViewModel.handle(TextComposerAction.PlayOrPauseVoicePlayback(eventId, messageAudioContent))
     }
 
     private fun onShareActionClicked(action: EventSharedAction.Share) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index d846a1d1f8..6de710d849 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -21,24 +21,23 @@ import androidx.annotation.IdRes
 import androidx.lifecycle.asFlow
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.Fail
-import com.airbnb.mvrx.FragmentViewModelContext
 import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.MavericksViewModelFactory
 import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.Uninitialized
-import com.airbnb.mvrx.ViewModelContext
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import im.vector.app.BuildConfig
 import im.vector.app.R
+import im.vector.app.core.di.MavericksAssistedViewModelFactory
+import im.vector.app.core.di.hiltMavericksViewModelFactory
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.flow.chunk
 import im.vector.app.core.mvrx.runCatchingToAsync
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.core.utils.BehaviorDataSource
-import im.vector.app.features.attachments.toContentAttachmentData
 import im.vector.app.features.call.conference.ConferenceEvent
 import im.vector.app.features.call.conference.JitsiActiveConferenceHolder
 import im.vector.app.features.call.conference.JitsiService
@@ -47,7 +46,6 @@ import im.vector.app.features.call.webrtc.WebRtcCallManager
 import im.vector.app.features.createdirect.DirectRoomHelper
 import im.vector.app.features.crypto.keysrequest.OutboundSessionKeySharingStrategy
 import im.vector.app.features.crypto.verification.SupportedVerificationMethodsProvider
-import im.vector.app.features.home.room.detail.composer.VoiceMessageHelper
 import im.vector.app.features.home.room.detail.sticker.StickerPickerActionHandler
 import im.vector.app.features.home.room.detail.timeline.factory.TimelineFactory
 import im.vector.app.features.home.room.detail.timeline.url.PreviewUrlRetriever
@@ -56,7 +54,6 @@ import im.vector.app.features.powerlevel.PowerLevelsFlowFactory
 import im.vector.app.features.session.coroutineScope
 import im.vector.app.features.settings.VectorDataStore
 import im.vector.app.features.settings.VectorPreferences
-import im.vector.app.features.voice.VoicePlayerHelper
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.collect
@@ -116,8 +113,6 @@ class RoomDetailViewModel @AssistedInject constructor(
         private val directRoomHelper: DirectRoomHelper,
         private val jitsiService: JitsiService,
         private val activeConferenceHolder: JitsiActiveConferenceHolder,
-        private val voiceMessageHelper: VoiceMessageHelper,
-        private val voicePlayerHelper: VoicePlayerHelper,
         timelineFactory: TimelineFactory
 ) : VectorViewModel<RoomDetailViewState, RoomDetailAction, RoomDetailViewEvents>(initialState),
         Timeline.Listener, ChatEffectManager.Delegate, CallProtocolsChecker.Listener {
@@ -144,22 +139,12 @@ class RoomDetailViewModel @AssistedInject constructor(
     private var prepareToEncrypt: Async<Unit> = Uninitialized
 
     @AssistedFactory
-    interface Factory {
-        fun create(initialState: RoomDetailViewState): RoomDetailViewModel
+    interface Factory : MavericksAssistedViewModelFactory<RoomDetailViewModel, RoomDetailViewState> {
+        override fun create(initialState: RoomDetailViewState): RoomDetailViewModel
     }
 
-    /**
-     * Can't use the hiltMaverick here because some dependencies are injected here and in fragment but they don't share the graph.
-     */
-    companion object : MavericksViewModelFactory<RoomDetailViewModel, RoomDetailViewState> {
-
+    companion object : MavericksViewModelFactory<RoomDetailViewModel, RoomDetailViewState> by hiltMavericksViewModelFactory() {
         const val PAGINATION_COUNT = 50
-
-        @JvmStatic
-        override fun create(viewModelContext: ViewModelContext, state: RoomDetailViewState): RoomDetailViewModel {
-            val fragment: RoomDetailFragment = (viewModelContext as FragmentViewModelContext).fragment()
-            return fragment.roomDetailViewModelFactory.create(state)
-        }
     }
 
     init {
@@ -343,12 +328,6 @@ class RoomDetailViewModel @AssistedInject constructor(
             is RoomDetailAction.DoNotShowPreviewUrlFor           -> handleDoNotShowPreviewUrlFor(action)
             RoomDetailAction.RemoveAllFailedMessages             -> handleRemoveAllFailedMessages()
             RoomDetailAction.ResendAll                           -> handleResendAll()
-            RoomDetailAction.StartRecordingVoiceMessage          -> handleStartRecordingVoiceMessage()
-            is RoomDetailAction.EndRecordingVoiceMessage         -> handleEndRecordingVoiceMessage(action.isCancelled)
-            is RoomDetailAction.PlayOrPauseVoicePlayback         -> handlePlayOrPauseVoicePlayback(action)
-            RoomDetailAction.PauseRecordingVoiceMessage          -> handlePauseRecordingVoiceMessage()
-            RoomDetailAction.PlayOrPauseRecordingPlayback        -> handlePlayOrPauseRecordingPlayback()
-            is RoomDetailAction.EndAllVoiceActions               -> handleEndAllVoiceActions(action.deleteRecord)
             is RoomDetailAction.RoomUpgradeSuccess               -> {
                 setState {
                     copy(joinUpgradedRoomAsync = Success(action.replacementRoomId))
@@ -612,56 +591,6 @@ class RoomDetailViewModel @AssistedInject constructor(
         }
     }
 
-    private fun handleStartRecordingVoiceMessage() {
-        try {
-            voiceMessageHelper.startRecording()
-        } catch (failure: Throwable) {
-            _viewEvents.post(RoomDetailViewEvents.Failure(failure))
-        }
-    }
-
-    private fun handleEndRecordingVoiceMessage(isCancelled: Boolean) {
-        voiceMessageHelper.stopPlayback()
-        if (isCancelled) {
-            voiceMessageHelper.deleteRecording()
-        } else {
-            voiceMessageHelper.stopRecording()?.let { audioType ->
-                if (audioType.duration > 1000) {
-                    room.sendMedia(audioType.toContentAttachmentData(), false, emptySet())
-                } else {
-                    voiceMessageHelper.deleteRecording()
-                }
-            }
-        }
-    }
-
-    private fun handlePlayOrPauseVoicePlayback(action: RoomDetailAction.PlayOrPauseVoicePlayback) {
-        viewModelScope.launch(Dispatchers.IO) {
-            try {
-                // Download can fail
-                val audioFile = session.fileService().downloadFile(action.messageAudioContent)
-                // Conversion can fail, fallback to the original file in this case and let the player fail for us
-                val convertedFile = voicePlayerHelper.convertFile(audioFile) ?: audioFile
-                // Play can fail
-                voiceMessageHelper.startOrPausePlayback(action.eventId, convertedFile)
-            } catch (failure: Throwable) {
-                _viewEvents.post(RoomDetailViewEvents.Failure(failure))
-            }
-        }
-    }
-
-    private fun handlePlayOrPauseRecordingPlayback() {
-        voiceMessageHelper.startOrPauseRecordingPlayback()
-    }
-
-    private fun handleEndAllVoiceActions(deleteRecord: Boolean) {
-        voiceMessageHelper.stopAllVoiceActions(deleteRecord)
-    }
-
-    private fun handlePauseRecordingVoiceMessage() {
-        voiceMessageHelper.pauseRecording()
-    }
-
     private fun isIntegrationEnabled() = session.integrationManagerService().isIntegrationEnabled()
 
     fun isMenuItemVisible(@IdRes itemId: Int): Boolean = com.airbnb.mvrx.withState(this) { state ->
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerAction.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerAction.kt
index 4f85b78226..1f61351755 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerAction.kt
@@ -18,6 +18,7 @@ package im.vector.app.features.home.room.detail.composer
 
 import im.vector.app.core.platform.VectorViewModelAction
 import im.vector.app.features.home.room.detail.composer.voice.VoiceMessageRecorderView
+import org.matrix.android.sdk.api.session.room.model.message.MessageAudioContent
 
 sealed class TextComposerAction : VectorViewModelAction {
     data class SaveDraft(val draft: String) : TextComposerAction()
@@ -28,5 +29,13 @@ sealed class TextComposerAction : VectorViewModelAction {
     data class EnterRegularMode(val text: String, val fromSharing: Boolean) : TextComposerAction()
     data class UserIsTyping(val isTyping: Boolean) : TextComposerAction()
     data class OnTextChanged(val text: CharSequence) : TextComposerAction()
+
+    // Voice Message
     data class OnVoiceRecordingUiStateChanged(val uiState: VoiceMessageRecorderView.RecordingUiState) : TextComposerAction()
+    object StartRecordingVoiceMessage : TextComposerAction()
+    data class EndRecordingVoiceMessage(val isCancelled: Boolean) : TextComposerAction()
+    object PauseRecordingVoiceMessage : TextComposerAction()
+    data class PlayOrPauseVoicePlayback(val eventId: String, val messageAudioContent: MessageAudioContent) : TextComposerAction()
+    object PlayOrPauseRecordingPlayback : TextComposerAction()
+    data class EndAllVoiceActions(val deleteRecord: Boolean = true) : TextComposerAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerViewEvents.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerViewEvents.kt
index ff4a09ad71..2b1d4dcf84 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerViewEvents.kt
@@ -42,4 +42,6 @@ sealed class TextComposerViewEvents : VectorViewEvents {
     object SlashCommandNotImplemented : SendMessageResult()
 
     data class ShowRoomUpgradeDialog(val newVersion: String, val isPublic: Boolean) : TextComposerViewEvents()
+
+    data class VoicePlaybackOrRecordingFailure(val throwable: Throwable) : TextComposerViewEvents()
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerViewModel.kt
index 2ff8ef6618..1541090958 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerViewModel.kt
@@ -16,24 +16,27 @@
 
 package im.vector.app.features.home.room.detail.composer
 
+import com.airbnb.mvrx.FragmentViewModelContext
 import com.airbnb.mvrx.MavericksViewModelFactory
+import com.airbnb.mvrx.ViewModelContext
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import im.vector.app.R
-import im.vector.app.core.di.MavericksAssistedViewModelFactory
-import im.vector.app.core.di.hiltMavericksViewModelFactory
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.attachments.toContentAttachmentData
 import im.vector.app.features.command.CommandParser
 import im.vector.app.features.command.ParsedCommand
 import im.vector.app.features.home.room.detail.ChatEffect
+import im.vector.app.features.home.room.detail.RoomDetailFragment
 import im.vector.app.features.home.room.detail.composer.rainbow.RainbowGenerator
 import im.vector.app.features.home.room.detail.toMessageType
 import im.vector.app.features.powerlevel.PowerLevelsFlowFactory
 import im.vector.app.features.session.coroutineScope
 import im.vector.app.features.settings.VectorPreferences
+import im.vector.app.features.voice.VoicePlayerHelper
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.commonmark.parser.Parser
@@ -60,7 +63,9 @@ class TextComposerViewModel @AssistedInject constructor(
         private val session: Session,
         private val stringProvider: StringProvider,
         private val vectorPreferences: VectorPreferences,
-        private val rainbowGenerator: RainbowGenerator
+        private val rainbowGenerator: RainbowGenerator,
+        private val voiceMessageHelper: VoiceMessageHelper,
+        private val voicePlayerHelper: VoicePlayerHelper
 ) : VectorViewModel<TextComposerViewState, TextComposerAction, TextComposerViewEvents>(initialState) {
 
     private val room = session.getRoom(initialState.roomId)!!
@@ -86,6 +91,12 @@ class TextComposerViewModel @AssistedInject constructor(
             is TextComposerAction.UserIsTyping                   -> handleUserIsTyping(action)
             is TextComposerAction.OnTextChanged                  -> handleOnTextChanged(action)
             is TextComposerAction.OnVoiceRecordingUiStateChanged -> handleOnVoiceRecordingUiStateChanged(action)
+            TextComposerAction.StartRecordingVoiceMessage        -> handleStartRecordingVoiceMessage()
+            is TextComposerAction.EndRecordingVoiceMessage       -> handleEndRecordingVoiceMessage(action.isCancelled)
+            is TextComposerAction.PlayOrPauseVoicePlayback       -> handlePlayOrPauseVoicePlayback(action)
+            TextComposerAction.PauseRecordingVoiceMessage        -> handlePauseRecordingVoiceMessage()
+            TextComposerAction.PlayOrPauseRecordingPlayback      -> handlePlayOrPauseRecordingPlayback()
+            is TextComposerAction.EndAllVoiceActions             -> handleEndAllVoiceActions(action.deleteRecord)
         }
     }
 
@@ -688,6 +699,56 @@ class TextComposerViewModel @AssistedInject constructor(
         }
     }
 
+    private fun handleStartRecordingVoiceMessage() {
+        try {
+            voiceMessageHelper.startRecording()
+        } catch (failure: Throwable) {
+            _viewEvents.post(TextComposerViewEvents.VoicePlaybackOrRecordingFailure(failure))
+        }
+    }
+
+    private fun handleEndRecordingVoiceMessage(isCancelled: Boolean) {
+        voiceMessageHelper.stopPlayback()
+        if (isCancelled) {
+            voiceMessageHelper.deleteRecording()
+        } else {
+            voiceMessageHelper.stopRecording()?.let { audioType ->
+                if (audioType.duration > 1000) {
+                    room.sendMedia(audioType.toContentAttachmentData(), false, emptySet())
+                } else {
+                    voiceMessageHelper.deleteRecording()
+                }
+            }
+        }
+    }
+
+    private fun handlePlayOrPauseVoicePlayback(action: TextComposerAction.PlayOrPauseVoicePlayback) {
+        viewModelScope.launch(Dispatchers.IO) {
+            try {
+                // Download can fail
+                val audioFile = session.fileService().downloadFile(action.messageAudioContent)
+                // Conversion can fail, fallback to the original file in this case and let the player fail for us
+                val convertedFile = voicePlayerHelper.convertFile(audioFile) ?: audioFile
+                // Play can fail
+                voiceMessageHelper.startOrPausePlayback(action.eventId, convertedFile)
+            } catch (failure: Throwable) {
+                _viewEvents.post(TextComposerViewEvents.VoicePlaybackOrRecordingFailure(failure))
+            }
+        }
+    }
+
+    private fun handlePlayOrPauseRecordingPlayback() {
+        voiceMessageHelper.startOrPauseRecordingPlayback()
+    }
+
+    private fun handleEndAllVoiceActions(deleteRecord: Boolean) {
+        voiceMessageHelper.stopAllVoiceActions(deleteRecord)
+    }
+
+    private fun handlePauseRecordingVoiceMessage() {
+        voiceMessageHelper.pauseRecording()
+    }
+
     private fun launchSlashCommandFlowSuspendable(block: suspend () -> Unit) {
         _viewEvents.post(TextComposerViewEvents.SlashCommandLoading)
         viewModelScope.launch {
@@ -703,9 +764,19 @@ class TextComposerViewModel @AssistedInject constructor(
     }
 
     @AssistedFactory
-    interface Factory : MavericksAssistedViewModelFactory<TextComposerViewModel, TextComposerViewState> {
-        override fun create(initialState: TextComposerViewState): TextComposerViewModel
+    interface Factory {
+        fun create(initialState: TextComposerViewState): TextComposerViewModel
     }
 
-    companion object : MavericksViewModelFactory<TextComposerViewModel, TextComposerViewState> by hiltMavericksViewModelFactory()
+    /**
+     * Can't use the hiltMaverick here because some dependencies are injected here and in fragment but they don't share the graph.
+     */
+    companion object : MavericksViewModelFactory<TextComposerViewModel, TextComposerViewState> {
+
+        @JvmStatic
+        override fun create(viewModelContext: ViewModelContext, state: TextComposerViewState): TextComposerViewModel {
+            val fragment: RoomDetailFragment = (viewModelContext as FragmentViewModelContext).fragment()
+            return fragment.textComposerViewModelFactory.create(state)
+        }
+    }
 }

From 8837640b5a8748ec5a584873e5f457d79935e7aa Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Fri, 19 Nov 2021 14:34:13 +0000
Subject: [PATCH 28/52] renaming text composer files to message composer

---
 .../composer/{TextComposerAction.kt => MessageComposerAction.kt}  | 0
 .../composer/{TextComposerView.kt => MessageComposerView.kt}      | 0
 .../{TextComposerViewEvents.kt => MessageComposerViewEvents.kt}   | 0
 .../{TextComposerViewModel.kt => MessageComposerViewModel.kt}     | 0
 .../{TextComposerViewState.kt => MessageComposerViewState.kt}     | 0
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename vector/src/main/java/im/vector/app/features/home/room/detail/composer/{TextComposerAction.kt => MessageComposerAction.kt} (100%)
 rename vector/src/main/java/im/vector/app/features/home/room/detail/composer/{TextComposerView.kt => MessageComposerView.kt} (100%)
 rename vector/src/main/java/im/vector/app/features/home/room/detail/composer/{TextComposerViewEvents.kt => MessageComposerViewEvents.kt} (100%)
 rename vector/src/main/java/im/vector/app/features/home/room/detail/composer/{TextComposerViewModel.kt => MessageComposerViewModel.kt} (100%)
 rename vector/src/main/java/im/vector/app/features/home/room/detail/composer/{TextComposerViewState.kt => MessageComposerViewState.kt} (100%)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerAction.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerAction.kt
similarity index 100%
rename from vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerAction.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerAction.kt
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerView.kt
similarity index 100%
rename from vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerView.kt
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerViewEvents.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewEvents.kt
similarity index 100%
rename from vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerViewEvents.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewEvents.kt
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
similarity index 100%
rename from vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerViewModel.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt
similarity index 100%
rename from vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerViewState.kt
rename to vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt

From f140dbc0a0434ba7cc3c6fb8e7332ab4e6208b1f Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Fri, 19 Nov 2021 14:34:42 +0000
Subject: [PATCH 29/52] update text composer classes to message composer (as
 they include voice not just text)

---
 .../home/room/detail/RoomDetailFragment.kt    | 116 ++++++-------
 .../detail/composer/MessageComposerAction.kt  |  32 ++--
 .../detail/composer/MessageComposerView.kt    |   2 +-
 .../composer/MessageComposerViewEvents.kt     |  14 +-
 .../composer/MessageComposerViewModel.kt      | 154 +++++++++---------
 .../composer/MessageComposerViewState.kt      |   2 +-
 .../main/res/layout/fragment_room_detail.xml  |   2 +-
 7 files changed, 161 insertions(+), 161 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index 53a49c5180..270f467ff1 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -133,11 +133,11 @@ import im.vector.app.features.crypto.keysbackup.restore.KeysBackupRestoreActivit
 import im.vector.app.features.crypto.verification.VerificationBottomSheet
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.room.detail.composer.SendMode
-import im.vector.app.features.home.room.detail.composer.TextComposerAction
-import im.vector.app.features.home.room.detail.composer.TextComposerView
-import im.vector.app.features.home.room.detail.composer.TextComposerViewEvents
-import im.vector.app.features.home.room.detail.composer.TextComposerViewModel
-import im.vector.app.features.home.room.detail.composer.TextComposerViewState
+import im.vector.app.features.home.room.detail.composer.MessageComposerAction
+import im.vector.app.features.home.room.detail.composer.MessageComposerView
+import im.vector.app.features.home.room.detail.composer.MessageComposerViewEvents
+import im.vector.app.features.home.room.detail.composer.MessageComposerViewModel
+import im.vector.app.features.home.room.detail.composer.MessageComposerViewState
 import im.vector.app.features.home.room.detail.composer.voice.VoiceMessageRecorderView
 import im.vector.app.features.home.room.detail.composer.voice.VoiceMessageRecorderView.RecordingUiState
 import im.vector.app.features.home.room.detail.readreceipts.DisplayReadReceiptsBottomSheet
@@ -241,7 +241,7 @@ class RoomDetailFragment @Inject constructor(
         autoCompleterFactory: AutoCompleter.Factory,
         private val permalinkHandler: PermalinkHandler,
         private val notificationDrawerManager: NotificationDrawerManager,
-        val textComposerViewModelFactory: TextComposerViewModel.Factory,
+        val messageComposerViewModelFactory: MessageComposerViewModel.Factory,
         private val eventHtmlRenderer: EventHtmlRenderer,
         private val vectorPreferences: VectorPreferences,
         private val colorProvider: ColorProvider,
@@ -294,7 +294,7 @@ class RoomDetailFragment @Inject constructor(
         autoCompleterFactory.create(roomDetailArgs.roomId)
     }
     private val roomDetailViewModel: RoomDetailViewModel by fragmentViewModel()
-    private val textComposerViewModel: TextComposerViewModel by fragmentViewModel()
+    private val messageComposerViewModel: MessageComposerViewModel by fragmentViewModel()
     private val debouncer = Debouncer(createUIHandler())
 
     private lateinit var scrollOnNewMessageCallback: ScrollOnNewMessageCallback
@@ -387,7 +387,7 @@ class RoomDetailFragment @Inject constructor(
             updateJumpToReadMarkerViewVisibility()
         }
 
-        textComposerViewModel.onEach(TextComposerViewState::sendMode, TextComposerViewState::canSendMessage) { mode, canSend ->
+        messageComposerViewModel.onEach(MessageComposerViewState::sendMode, MessageComposerViewState::canSendMessage) { mode, canSend ->
             if (!canSend) {
                 return@onEach
             }
@@ -412,15 +412,15 @@ class RoomDetailFragment @Inject constructor(
             )
         }
 
-        textComposerViewModel.observeViewEvents {
+        messageComposerViewModel.observeViewEvents {
             when (it) {
-                is TextComposerViewEvents.JoinRoomCommandSuccess          -> handleJoinedToAnotherRoom(it)
-                is TextComposerViewEvents.SendMessageResult               -> renderSendMessageResult(it)
-                is TextComposerViewEvents.ShowMessage                     -> showSnackWithMessage(it.message)
-                is TextComposerViewEvents.ShowRoomUpgradeDialog           -> handleShowRoomUpgradeDialog(it)
-                is TextComposerViewEvents.AnimateSendButtonVisibility     -> handleSendButtonVisibilityChanged(it)
-                is TextComposerViewEvents.OpenRoomMemberProfile           -> openRoomMemberProfile(it.userId)
-                is TextComposerViewEvents.VoicePlaybackOrRecordingFailure -> {
+                is MessageComposerViewEvents.JoinRoomCommandSuccess          -> handleJoinedToAnotherRoom(it)
+                is MessageComposerViewEvents.SendMessageResult               -> renderSendMessageResult(it)
+                is MessageComposerViewEvents.ShowMessage                     -> showSnackWithMessage(it.message)
+                is MessageComposerViewEvents.ShowRoomUpgradeDialog           -> handleShowRoomUpgradeDialog(it)
+                is MessageComposerViewEvents.AnimateSendButtonVisibility     -> handleSendButtonVisibilityChanged(it)
+                is MessageComposerViewEvents.OpenRoomMemberProfile           -> openRoomMemberProfile(it.userId)
+                is MessageComposerViewEvents.VoicePlaybackOrRecordingFailure -> {
                     if (it.throwable is VoiceFailure.UnableToRecord) {
                         onCannotRecord()
                     }
@@ -471,7 +471,7 @@ class RoomDetailFragment @Inject constructor(
         }
     }
 
-    private fun handleSendButtonVisibilityChanged(event: TextComposerViewEvents.AnimateSendButtonVisibility) {
+    private fun handleSendButtonVisibilityChanged(event: MessageComposerViewEvents.AnimateSendButtonVisibility) {
         if (event.isVisible) {
             views.voiceMessageRecorderView.isVisible = false
             views.composerLayout.views.sendButton.alpha = 0f
@@ -507,7 +507,7 @@ class RoomDetailFragment @Inject constructor(
 
     private fun onCannotRecord() {
         // Update the UI, cancel the animation
-        textComposerViewModel.handle(TextComposerAction.OnVoiceRecordingUiStateChanged(RecordingUiState.None))
+        messageComposerViewModel.handle(MessageComposerAction.OnVoiceRecordingUiStateChanged(RecordingUiState.None))
     }
 
     private fun acceptIncomingCall(event: RoomDetailViewEvents.DisplayAndAcceptCall) {
@@ -526,7 +526,7 @@ class RoomDetailFragment @Inject constructor(
         JoinReplacementRoomBottomSheet().show(childFragmentManager, tag)
     }
 
-    private fun handleShowRoomUpgradeDialog(roomDetailViewEvents: TextComposerViewEvents.ShowRoomUpgradeDialog) {
+    private fun handleShowRoomUpgradeDialog(roomDetailViewEvents: MessageComposerViewEvents.ShowRoomUpgradeDialog) {
         val tag = MigrateRoomBottomSheet::javaClass.name
         MigrateRoomBottomSheet.newInstance(roomDetailArgs.roomId, roomDetailViewEvents.newVersion)
                 .show(parentFragmentManager, tag)
@@ -699,18 +699,18 @@ class RoomDetailFragment @Inject constructor(
 
             override fun onVoiceRecordingStarted() {
                 if (checkPermissions(PERMISSIONS_FOR_VOICE_MESSAGE, requireActivity(), permissionVoiceMessageLauncher)) {
-                    textComposerViewModel.handle(TextComposerAction.StartRecordingVoiceMessage)
+                    messageComposerViewModel.handle(MessageComposerAction.StartRecordingVoiceMessage)
                     vibrate(requireContext())
                     updateRecordingUiState(RecordingUiState.Started)
                 }
             }
 
             override fun onVoicePlaybackButtonClicked() {
-                textComposerViewModel.handle(TextComposerAction.PlayOrPauseRecordingPlayback)
+                messageComposerViewModel.handle(MessageComposerAction.PlayOrPauseRecordingPlayback)
             }
 
             override fun onVoiceRecordingCancelled() {
-                textComposerViewModel.handle(TextComposerAction.EndRecordingVoiceMessage(isCancelled = true))
+                messageComposerViewModel.handle(MessageComposerAction.EndRecordingVoiceMessage(isCancelled = true))
                 updateRecordingUiState(RecordingUiState.Cancelled)
             }
 
@@ -723,27 +723,27 @@ class RoomDetailFragment @Inject constructor(
             }
 
             override fun onSendVoiceMessage() {
-                textComposerViewModel.handle(TextComposerAction.EndRecordingVoiceMessage(isCancelled = false))
+                messageComposerViewModel.handle(MessageComposerAction.EndRecordingVoiceMessage(isCancelled = false))
                 updateRecordingUiState(RecordingUiState.None)
             }
 
             override fun onDeleteVoiceMessage() {
-                textComposerViewModel.handle(TextComposerAction.EndRecordingVoiceMessage(isCancelled = true))
+                messageComposerViewModel.handle(MessageComposerAction.EndRecordingVoiceMessage(isCancelled = true))
                 updateRecordingUiState(RecordingUiState.None)
             }
 
             override fun onRecordingLimitReached() {
-                textComposerViewModel.handle(TextComposerAction.PauseRecordingVoiceMessage)
+                messageComposerViewModel.handle(MessageComposerAction.PauseRecordingVoiceMessage)
                 updateRecordingUiState(RecordingUiState.Playback)
             }
 
             override fun onRecordingWaveformClicked() {
-                textComposerViewModel.handle(TextComposerAction.PauseRecordingVoiceMessage)
+                messageComposerViewModel.handle(MessageComposerAction.PauseRecordingVoiceMessage)
                 updateRecordingUiState(RecordingUiState.Playback)
             }
 
             private fun updateRecordingUiState(state: RecordingUiState) {
-                textComposerViewModel.handle(TextComposerAction.OnVoiceRecordingUiStateChanged(state))
+                messageComposerViewModel.handle(MessageComposerAction.OnVoiceRecordingUiStateChanged(state))
             }
         }
     }
@@ -820,7 +820,7 @@ class RoomDetailFragment @Inject constructor(
                 .show()
     }
 
-    private fun handleJoinedToAnotherRoom(action: TextComposerViewEvents.JoinRoomCommandSuccess) {
+    private fun handleJoinedToAnotherRoom(action: MessageComposerViewEvents.JoinRoomCommandSuccess) {
         views.composerLayout.setTextIfDifferent("")
         lockSendButton = false
         navigator.openRoom(vectorBaseActivity, action.roomId)
@@ -829,7 +829,7 @@ class RoomDetailFragment @Inject constructor(
     private fun handleShareData() {
         when (val sharedData = roomDetailArgs.sharedData) {
             is SharedData.Text        -> {
-                textComposerViewModel.handle(TextComposerAction.EnterRegularMode(sharedData.text, fromSharing = true))
+                messageComposerViewModel.handle(MessageComposerAction.EnterRegularMode(sharedData.text, fromSharing = true))
             }
             is SharedData.Attachments -> {
                 // open share edition
@@ -1134,10 +1134,10 @@ class RoomDetailFragment @Inject constructor(
 
         notificationDrawerManager.setCurrentRoom(null)
 
-        textComposerViewModel.handle(TextComposerAction.SaveDraft(views.composerLayout.text.toString()))
+        messageComposerViewModel.handle(MessageComposerAction.SaveDraft(views.composerLayout.text.toString()))
 
         // We should improve the UX to support going into playback mode when paused and delete the media when the view is destroyed.
-        textComposerViewModel.handle(TextComposerAction.EndAllVoiceActions(deleteRecord = false))
+        messageComposerViewModel.handle(MessageComposerAction.EndAllVoiceActions(deleteRecord = false))
         views.voiceMessageRecorderView.display(RecordingUiState.None)
     }
 
@@ -1253,12 +1253,12 @@ class RoomDetailFragment @Inject constructor(
                 override fun performQuickReplyOnHolder(model: EpoxyModel<*>) {
                     (model as? AbsMessageItem)?.attributes?.informationData?.let {
                         val eventId = it.eventId
-                        textComposerViewModel.handle(TextComposerAction.EnterReplyMode(eventId, views.composerLayout.text.toString()))
+                        messageComposerViewModel.handle(MessageComposerAction.EnterReplyMode(eventId, views.composerLayout.text.toString()))
                     }
                 }
 
                 override fun canSwipeModel(model: EpoxyModel<*>): Boolean {
-                    val canSendMessage = withState(textComposerViewModel) {
+                    val canSendMessage = withState(messageComposerViewModel) {
                         it.canSendMessage
                     }
                     if (!canSendMessage) {
@@ -1347,7 +1347,7 @@ class RoomDetailFragment @Inject constructor(
 
         views.composerLayout.views.composerEmojiButton.isVisible = vectorPreferences.showEmojiKeyboard()
 
-        views.composerLayout.callback = object : TextComposerView.Callback {
+        views.composerLayout.callback = object : MessageComposerView.Callback {
             override fun onAddAttachment() {
                 if (!::attachmentTypeSelector.isInitialized) {
                     attachmentTypeSelector = AttachmentTypeSelectorView(vectorBaseActivity, vectorBaseActivity.layoutInflater, this@RoomDetailFragment)
@@ -1360,7 +1360,7 @@ class RoomDetailFragment @Inject constructor(
             }
 
             override fun onCloseRelatedMessage() {
-                textComposerViewModel.handle(TextComposerAction.EnterRegularMode(views.composerLayout.text.toString(), false))
+                messageComposerViewModel.handle(MessageComposerAction.EnterRegularMode(views.composerLayout.text.toString(), false))
             }
 
             override fun onRichContentSelected(contentUri: Uri): Boolean {
@@ -1368,7 +1368,7 @@ class RoomDetailFragment @Inject constructor(
             }
 
             override fun onTextChanged(text: CharSequence) {
-                textComposerViewModel.handle(TextComposerAction.OnTextChanged(text))
+                messageComposerViewModel.handle(MessageComposerAction.OnTextChanged(text))
             }
         }
     }
@@ -1382,7 +1382,7 @@ class RoomDetailFragment @Inject constructor(
             // We collapse ASAP, if not there will be a slight annoying delay
             views.composerLayout.collapse(true)
             lockSendButton = true
-            textComposerViewModel.handle(TextComposerAction.SendMessage(text, vectorPreferences.isMarkdownEnabled()))
+            messageComposerViewModel.handle(MessageComposerAction.SendMessage(text, vectorPreferences.isMarkdownEnabled()))
             emojiPopup.dismiss()
         }
     }
@@ -1394,7 +1394,7 @@ class RoomDetailFragment @Inject constructor(
                 .map { it.isNotEmpty() }
                 .onEach {
                     Timber.d("Typing: User is typing: $it")
-                    textComposerViewModel.handle(TextComposerAction.UserIsTyping(it))
+                    messageComposerViewModel.handle(MessageComposerAction.UserIsTyping(it))
                 }
                 .launchIn(viewLifecycleOwner.lifecycleScope)
 
@@ -1414,7 +1414,7 @@ class RoomDetailFragment @Inject constructor(
         return isHandled
     }
 
-    override fun invalidate() = withState(roomDetailViewModel, textComposerViewModel) { mainState, textComposerState ->
+    override fun invalidate() = withState(roomDetailViewModel, messageComposerViewModel) { mainState, messageComposerState ->
         invalidateOptionsMenu()
         val summary = mainState.asyncRoomSummary()
         renderToolbar(summary, mainState.formattedTypingUsers)
@@ -1431,13 +1431,13 @@ class RoomDetailFragment @Inject constructor(
             timelineEventController.update(mainState)
             lazyLoadedViews.inviteView(false)?.isVisible = false
             if (mainState.tombstoneEvent == null) {
-                views.composerLayout.isInvisible = !textComposerState.isComposerVisible
-                views.voiceMessageRecorderView.isVisible = textComposerState.isVoiceMessageRecorderVisible
-                views.composerLayout.views.sendButton.isInvisible = !textComposerState.isSendButtonVisible
-                views.voiceMessageRecorderView.display(textComposerState.voiceRecordingUiState)
+                views.composerLayout.isInvisible = !messageComposerState.isComposerVisible
+                views.voiceMessageRecorderView.isVisible = messageComposerState.isVoiceMessageRecorderVisible
+                views.composerLayout.views.sendButton.isInvisible = !messageComposerState.isSendButtonVisible
+                views.voiceMessageRecorderView.display(messageComposerState.voiceRecordingUiState)
                 views.composerLayout.setRoomEncrypted(summary.isEncrypted)
                 // views.composerLayout.alwaysShowSendButton = false
-                if (textComposerState.canSendMessage) {
+                if (messageComposerState.canSendMessage) {
                     views.notificationAreaView.render(NotificationAreaView.State.Hidden)
                 } else {
                     views.notificationAreaView.render(NotificationAreaView.State.NoPermissionToPost)
@@ -1494,27 +1494,27 @@ class RoomDetailFragment @Inject constructor(
         }
     }
 
-    private fun renderSendMessageResult(sendMessageResult: TextComposerViewEvents.SendMessageResult) {
+    private fun renderSendMessageResult(sendMessageResult: MessageComposerViewEvents.SendMessageResult) {
         when (sendMessageResult) {
-            is TextComposerViewEvents.SlashCommandLoading        -> {
+            is MessageComposerViewEvents.SlashCommandLoading        -> {
                 showLoading(null)
             }
-            is TextComposerViewEvents.SlashCommandError          -> {
+            is MessageComposerViewEvents.SlashCommandError          -> {
                 displayCommandError(getString(R.string.command_problem_with_parameters, sendMessageResult.command.command))
             }
-            is TextComposerViewEvents.SlashCommandUnknown        -> {
+            is MessageComposerViewEvents.SlashCommandUnknown        -> {
                 displayCommandError(getString(R.string.unrecognized_command, sendMessageResult.command))
             }
-            is TextComposerViewEvents.SlashCommandResultOk       -> {
+            is MessageComposerViewEvents.SlashCommandResultOk       -> {
                 dismissLoadingDialog()
                 views.composerLayout.setTextIfDifferent("")
                 sendMessageResult.messageRes?.let { showSnackWithMessage(getString(it)) }
             }
-            is TextComposerViewEvents.SlashCommandResultError    -> {
+            is MessageComposerViewEvents.SlashCommandResultError    -> {
                 dismissLoadingDialog()
                 displayCommandError(errorFormatter.toHumanReadable(sendMessageResult.throwable))
             }
-            is TextComposerViewEvents.SlashCommandNotImplemented -> {
+            is MessageComposerViewEvents.SlashCommandNotImplemented -> {
                 displayCommandError(getString(R.string.not_implemented))
             }
         } // .exhaustive
@@ -1884,7 +1884,7 @@ class RoomDetailFragment @Inject constructor(
     }
 
     override fun onVoiceControlButtonClicked(eventId: String, messageAudioContent: MessageAudioContent) {
-        textComposerViewModel.handle(TextComposerAction.PlayOrPauseVoicePlayback(eventId, messageAudioContent))
+        messageComposerViewModel.handle(MessageComposerAction.PlayOrPauseVoicePlayback(eventId, messageAudioContent))
     }
 
     private fun onShareActionClicked(action: EventSharedAction.Share) {
@@ -1989,18 +1989,18 @@ class RoomDetailFragment @Inject constructor(
                 roomDetailViewModel.handle(RoomDetailAction.UpdateQuickReactAction(action.eventId, action.clickedOn, action.add))
             }
             is EventSharedAction.Edit                       -> {
-                if (withState(textComposerViewModel) { it.isVoiceMessageIdle }) {
-                    textComposerViewModel.handle(TextComposerAction.EnterEditMode(action.eventId, views.composerLayout.text.toString()))
+                if (withState(messageComposerViewModel) { it.isVoiceMessageIdle }) {
+                    messageComposerViewModel.handle(MessageComposerAction.EnterEditMode(action.eventId, views.composerLayout.text.toString()))
                 } else {
                     requireActivity().toast(R.string.error_voice_message_cannot_reply_or_edit)
                 }
             }
             is EventSharedAction.Quote                      -> {
-                textComposerViewModel.handle(TextComposerAction.EnterQuoteMode(action.eventId, views.composerLayout.text.toString()))
+                messageComposerViewModel.handle(MessageComposerAction.EnterQuoteMode(action.eventId, views.composerLayout.text.toString()))
             }
             is EventSharedAction.Reply                      -> {
-                if (withState(textComposerViewModel) { it.isVoiceMessageIdle }) {
-                    textComposerViewModel.handle(TextComposerAction.EnterReplyMode(action.eventId, views.composerLayout.text.toString()))
+                if (withState(messageComposerViewModel) { it.isVoiceMessageIdle }) {
+                    messageComposerViewModel.handle(MessageComposerAction.EnterReplyMode(action.eventId, views.composerLayout.text.toString()))
                 } else {
                     requireActivity().toast(R.string.error_voice_message_cannot_reply_or_edit)
                 }
@@ -2213,7 +2213,7 @@ class RoomDetailFragment @Inject constructor(
     override fun onContactAttachmentReady(contactAttachment: ContactAttachment) {
         super.onContactAttachmentReady(contactAttachment)
         val formattedContact = contactAttachment.toHumanReadable()
-        textComposerViewModel.handle(TextComposerAction.SendMessage(formattedContact, false))
+        messageComposerViewModel.handle(MessageComposerAction.SendMessage(formattedContact, false))
     }
 
     private fun onViewWidgetsClicked() {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerAction.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerAction.kt
index 1f61351755..392a52e7fa 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerAction.kt
@@ -20,22 +20,22 @@ import im.vector.app.core.platform.VectorViewModelAction
 import im.vector.app.features.home.room.detail.composer.voice.VoiceMessageRecorderView
 import org.matrix.android.sdk.api.session.room.model.message.MessageAudioContent
 
-sealed class TextComposerAction : VectorViewModelAction {
-    data class SaveDraft(val draft: String) : TextComposerAction()
-    data class SendMessage(val text: CharSequence, val autoMarkdown: Boolean) : TextComposerAction()
-    data class EnterEditMode(val eventId: String, val text: String) : TextComposerAction()
-    data class EnterQuoteMode(val eventId: String, val text: String) : TextComposerAction()
-    data class EnterReplyMode(val eventId: String, val text: String) : TextComposerAction()
-    data class EnterRegularMode(val text: String, val fromSharing: Boolean) : TextComposerAction()
-    data class UserIsTyping(val isTyping: Boolean) : TextComposerAction()
-    data class OnTextChanged(val text: CharSequence) : TextComposerAction()
+sealed class MessageComposerAction : VectorViewModelAction {
+    data class SaveDraft(val draft: String) : MessageComposerAction()
+    data class SendMessage(val text: CharSequence, val autoMarkdown: Boolean) : MessageComposerAction()
+    data class EnterEditMode(val eventId: String, val text: String) : MessageComposerAction()
+    data class EnterQuoteMode(val eventId: String, val text: String) : MessageComposerAction()
+    data class EnterReplyMode(val eventId: String, val text: String) : MessageComposerAction()
+    data class EnterRegularMode(val text: String, val fromSharing: Boolean) : MessageComposerAction()
+    data class UserIsTyping(val isTyping: Boolean) : MessageComposerAction()
+    data class OnTextChanged(val text: CharSequence) : MessageComposerAction()
 
     // Voice Message
-    data class OnVoiceRecordingUiStateChanged(val uiState: VoiceMessageRecorderView.RecordingUiState) : TextComposerAction()
-    object StartRecordingVoiceMessage : TextComposerAction()
-    data class EndRecordingVoiceMessage(val isCancelled: Boolean) : TextComposerAction()
-    object PauseRecordingVoiceMessage : TextComposerAction()
-    data class PlayOrPauseVoicePlayback(val eventId: String, val messageAudioContent: MessageAudioContent) : TextComposerAction()
-    object PlayOrPauseRecordingPlayback : TextComposerAction()
-    data class EndAllVoiceActions(val deleteRecord: Boolean = true) : TextComposerAction()
+    data class OnVoiceRecordingUiStateChanged(val uiState: VoiceMessageRecorderView.RecordingUiState) : MessageComposerAction()
+    object StartRecordingVoiceMessage : MessageComposerAction()
+    data class EndRecordingVoiceMessage(val isCancelled: Boolean) : MessageComposerAction()
+    object PauseRecordingVoiceMessage : MessageComposerAction()
+    data class PlayOrPauseVoicePlayback(val eventId: String, val messageAudioContent: MessageAudioContent) : MessageComposerAction()
+    object PlayOrPauseRecordingPlayback : MessageComposerAction()
+    data class EndAllVoiceActions(val deleteRecord: Boolean = true) : MessageComposerAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerView.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerView.kt
index 34b3c1777c..e77ad66a9f 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerView.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerView.kt
@@ -36,7 +36,7 @@ import im.vector.app.databinding.ComposerLayoutBinding
 /**
  * Encapsulate the timeline composer UX.
  */
-class TextComposerView @JvmOverloads constructor(
+class MessageComposerView @JvmOverloads constructor(
         context: Context,
         attrs: AttributeSet? = null,
         defStyleAttr: Int = 0) : ConstraintLayout(context, attrs, defStyleAttr) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewEvents.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewEvents.kt
index 2b1d4dcf84..07c58c9196 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewEvents.kt
@@ -20,13 +20,13 @@ import androidx.annotation.StringRes
 import im.vector.app.core.platform.VectorViewEvents
 import im.vector.app.features.command.Command
 
-sealed class TextComposerViewEvents : VectorViewEvents {
+sealed class MessageComposerViewEvents : VectorViewEvents {
 
-    data class AnimateSendButtonVisibility(val isVisible: Boolean) : TextComposerViewEvents()
+    data class AnimateSendButtonVisibility(val isVisible: Boolean) : MessageComposerViewEvents()
 
-    data class ShowMessage(val message: String) : TextComposerViewEvents()
+    data class ShowMessage(val message: String) : MessageComposerViewEvents()
 
-    abstract class SendMessageResult : TextComposerViewEvents()
+    abstract class SendMessageResult : MessageComposerViewEvents()
 
     object MessageSent : SendMessageResult()
     data class JoinRoomCommandSuccess(val roomId: String) : SendMessageResult()
@@ -36,12 +36,12 @@ sealed class TextComposerViewEvents : VectorViewEvents {
     data class SlashCommandResultOk(@StringRes val messageRes: Int? = null) : SendMessageResult()
     class SlashCommandResultError(val throwable: Throwable) : SendMessageResult()
 
-    data class OpenRoomMemberProfile(val userId: String) : TextComposerViewEvents()
+    data class OpenRoomMemberProfile(val userId: String) : MessageComposerViewEvents()
 
     // TODO Remove
     object SlashCommandNotImplemented : SendMessageResult()
 
-    data class ShowRoomUpgradeDialog(val newVersion: String, val isPublic: Boolean) : TextComposerViewEvents()
+    data class ShowRoomUpgradeDialog(val newVersion: String, val isPublic: Boolean) : MessageComposerViewEvents()
 
-    data class VoicePlaybackOrRecordingFailure(val throwable: Throwable) : TextComposerViewEvents()
+    data class VoicePlaybackOrRecordingFailure(val throwable: Throwable) : MessageComposerViewEvents()
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
index 1541090958..d0c5f6de1d 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
@@ -58,15 +58,15 @@ import org.matrix.android.sdk.api.session.room.timeline.getTextEditableContent
 import org.matrix.android.sdk.api.session.space.CreateSpaceParams
 import timber.log.Timber
 
-class TextComposerViewModel @AssistedInject constructor(
-        @Assisted initialState: TextComposerViewState,
+class MessageComposerViewModel @AssistedInject constructor(
+        @Assisted initialState: MessageComposerViewState,
         private val session: Session,
         private val stringProvider: StringProvider,
         private val vectorPreferences: VectorPreferences,
         private val rainbowGenerator: RainbowGenerator,
         private val voiceMessageHelper: VoiceMessageHelper,
         private val voicePlayerHelper: VoicePlayerHelper
-) : VectorViewModel<TextComposerViewState, TextComposerAction, TextComposerViewEvents>(initialState) {
+) : VectorViewModel<MessageComposerViewState, MessageComposerAction, MessageComposerViewEvents>(initialState) {
 
     private val room = session.getRoom(initialState.roomId)!!
 
@@ -79,32 +79,32 @@ class TextComposerViewModel @AssistedInject constructor(
         subscribeToStateInternal()
     }
 
-    override fun handle(action: TextComposerAction) {
+    override fun handle(action: MessageComposerAction) {
         Timber.v("Handle action: $action")
         when (action) {
-            is TextComposerAction.EnterEditMode                  -> handleEnterEditMode(action)
-            is TextComposerAction.EnterQuoteMode                 -> handleEnterQuoteMode(action)
-            is TextComposerAction.EnterRegularMode               -> handleEnterRegularMode(action)
-            is TextComposerAction.EnterReplyMode                 -> handleEnterReplyMode(action)
-            is TextComposerAction.SaveDraft                      -> handleSaveDraft(action)
-            is TextComposerAction.SendMessage                    -> handleSendMessage(action)
-            is TextComposerAction.UserIsTyping                   -> handleUserIsTyping(action)
-            is TextComposerAction.OnTextChanged                  -> handleOnTextChanged(action)
-            is TextComposerAction.OnVoiceRecordingUiStateChanged -> handleOnVoiceRecordingUiStateChanged(action)
-            TextComposerAction.StartRecordingVoiceMessage        -> handleStartRecordingVoiceMessage()
-            is TextComposerAction.EndRecordingVoiceMessage       -> handleEndRecordingVoiceMessage(action.isCancelled)
-            is TextComposerAction.PlayOrPauseVoicePlayback       -> handlePlayOrPauseVoicePlayback(action)
-            TextComposerAction.PauseRecordingVoiceMessage        -> handlePauseRecordingVoiceMessage()
-            TextComposerAction.PlayOrPauseRecordingPlayback      -> handlePlayOrPauseRecordingPlayback()
-            is TextComposerAction.EndAllVoiceActions             -> handleEndAllVoiceActions(action.deleteRecord)
+            is MessageComposerAction.EnterEditMode                  -> handleEnterEditMode(action)
+            is MessageComposerAction.EnterQuoteMode                 -> handleEnterQuoteMode(action)
+            is MessageComposerAction.EnterRegularMode               -> handleEnterRegularMode(action)
+            is MessageComposerAction.EnterReplyMode                 -> handleEnterReplyMode(action)
+            is MessageComposerAction.SaveDraft                      -> handleSaveDraft(action)
+            is MessageComposerAction.SendMessage                    -> handleSendMessage(action)
+            is MessageComposerAction.UserIsTyping                   -> handleUserIsTyping(action)
+            is MessageComposerAction.OnTextChanged                  -> handleOnTextChanged(action)
+            is MessageComposerAction.OnVoiceRecordingUiStateChanged -> handleOnVoiceRecordingUiStateChanged(action)
+            MessageComposerAction.StartRecordingVoiceMessage        -> handleStartRecordingVoiceMessage()
+            is MessageComposerAction.EndRecordingVoiceMessage       -> handleEndRecordingVoiceMessage(action.isCancelled)
+            is MessageComposerAction.PlayOrPauseVoicePlayback       -> handlePlayOrPauseVoicePlayback(action)
+            MessageComposerAction.PauseRecordingVoiceMessage        -> handlePauseRecordingVoiceMessage()
+            MessageComposerAction.PlayOrPauseRecordingPlayback      -> handlePlayOrPauseRecordingPlayback()
+            is MessageComposerAction.EndAllVoiceActions             -> handleEndAllVoiceActions(action.deleteRecord)
         }
     }
 
-    private fun handleOnVoiceRecordingUiStateChanged(action: TextComposerAction.OnVoiceRecordingUiStateChanged) = setState {
+    private fun handleOnVoiceRecordingUiStateChanged(action: MessageComposerAction.OnVoiceRecordingUiStateChanged) = setState {
         copy(voiceRecordingUiState = action.uiState)
     }
 
-    private fun handleOnTextChanged(action: TextComposerAction.OnTextChanged) {
+    private fun handleOnTextChanged(action: MessageComposerAction.OnTextChanged) {
         setState {
             // Makes sure currentComposerText is upToDate when accessing further setState
             currentComposerText = action.text
@@ -114,7 +114,7 @@ class TextComposerViewModel @AssistedInject constructor(
     }
 
     private fun subscribeToStateInternal() {
-        onEach(TextComposerViewState::sendMode, TextComposerViewState::canSendMessage, TextComposerViewState::isVoiceRecording) { _, _, _ ->
+        onEach(MessageComposerViewState::sendMode, MessageComposerViewState::canSendMessage, MessageComposerViewState::isVoiceRecording) { _, _, _ ->
             updateIsSendButtonVisibility(false)
         }
     }
@@ -122,16 +122,16 @@ class TextComposerViewModel @AssistedInject constructor(
     private fun updateIsSendButtonVisibility(triggerAnimation: Boolean) = setState {
         val isSendButtonVisible = isComposerVisible && (sendMode !is SendMode.REGULAR || currentComposerText.isNotBlank())
         if (this.isSendButtonVisible != isSendButtonVisible && triggerAnimation) {
-            _viewEvents.post(TextComposerViewEvents.AnimateSendButtonVisibility(isSendButtonVisible))
+            _viewEvents.post(MessageComposerViewEvents.AnimateSendButtonVisibility(isSendButtonVisible))
         }
         copy(isSendButtonVisible = isSendButtonVisible)
     }
 
-    private fun handleEnterRegularMode(action: TextComposerAction.EnterRegularMode) = setState {
+    private fun handleEnterRegularMode(action: MessageComposerAction.EnterRegularMode) = setState {
         copy(sendMode = SendMode.REGULAR(action.text, action.fromSharing))
     }
 
-    private fun handleEnterEditMode(action: TextComposerAction.EnterEditMode) {
+    private fun handleEnterEditMode(action: MessageComposerAction.EnterEditMode) {
         room.getTimeLineEvent(action.eventId)?.let { timelineEvent ->
             setState { copy(sendMode = SendMode.EDIT(timelineEvent, timelineEvent.getTextEditableContent())) }
         }
@@ -145,19 +145,19 @@ class TextComposerViewModel @AssistedInject constructor(
                 }
     }
 
-    private fun handleEnterQuoteMode(action: TextComposerAction.EnterQuoteMode) {
+    private fun handleEnterQuoteMode(action: MessageComposerAction.EnterQuoteMode) {
         room.getTimeLineEvent(action.eventId)?.let { timelineEvent ->
             setState { copy(sendMode = SendMode.QUOTE(timelineEvent, action.text)) }
         }
     }
 
-    private fun handleEnterReplyMode(action: TextComposerAction.EnterReplyMode) {
+    private fun handleEnterReplyMode(action: MessageComposerAction.EnterReplyMode) {
         room.getTimeLineEvent(action.eventId)?.let { timelineEvent ->
             setState { copy(sendMode = SendMode.REPLY(timelineEvent, action.text)) }
         }
     }
 
-    private fun handleSendMessage(action: TextComposerAction.SendMessage) {
+    private fun handleSendMessage(action: MessageComposerAction.SendMessage) {
         withState { state ->
             when (state.sendMode) {
                 is SendMode.REGULAR -> {
@@ -165,22 +165,22 @@ class TextComposerViewModel @AssistedInject constructor(
                         is ParsedCommand.ErrorNotACommand         -> {
                             // Send the text message to the room
                             room.sendTextMessage(action.text, autoMarkdown = action.autoMarkdown)
-                            _viewEvents.post(TextComposerViewEvents.MessageSent)
+                            _viewEvents.post(MessageComposerViewEvents.MessageSent)
                             popDraft()
                         }
                         is ParsedCommand.ErrorSyntax              -> {
-                            _viewEvents.post(TextComposerViewEvents.SlashCommandError(slashCommandResult.command))
+                            _viewEvents.post(MessageComposerViewEvents.SlashCommandError(slashCommandResult.command))
                         }
                         is ParsedCommand.ErrorEmptySlashCommand   -> {
-                            _viewEvents.post(TextComposerViewEvents.SlashCommandUnknown("/"))
+                            _viewEvents.post(MessageComposerViewEvents.SlashCommandUnknown("/"))
                         }
                         is ParsedCommand.ErrorUnknownSlashCommand -> {
-                            _viewEvents.post(TextComposerViewEvents.SlashCommandUnknown(slashCommandResult.slashCommand))
+                            _viewEvents.post(MessageComposerViewEvents.SlashCommandUnknown(slashCommandResult.slashCommand))
                         }
                         is ParsedCommand.SendPlainText            -> {
                             // Send the text message to the room, without markdown
                             room.sendTextMessage(slashCommandResult.message, autoMarkdown = false)
-                            _viewEvents.post(TextComposerViewEvents.MessageSent)
+                            _viewEvents.post(MessageComposerViewEvents.MessageSent)
                             popDraft()
                         }
                         is ParsedCommand.ChangeRoomName           -> {
@@ -197,11 +197,11 @@ class TextComposerViewModel @AssistedInject constructor(
                         }
                         is ParsedCommand.ClearScalarToken         -> {
                             // TODO
-                            _viewEvents.post(TextComposerViewEvents.SlashCommandNotImplemented)
+                            _viewEvents.post(MessageComposerViewEvents.SlashCommandNotImplemented)
                         }
                         is ParsedCommand.SetMarkdown              -> {
                             vectorPreferences.setMarkdownEnabled(slashCommandResult.enable)
-                            _viewEvents.post(TextComposerViewEvents.SlashCommandResultOk(
+                            _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk(
                                     if (slashCommandResult.enable) R.string.markdown_has_been_enabled else R.string.markdown_has_been_disabled))
                             popDraft()
                         }
@@ -229,21 +229,21 @@ class TextComposerViewModel @AssistedInject constructor(
                         }
                         is ParsedCommand.SendEmote                -> {
                             room.sendTextMessage(slashCommandResult.message, msgType = MessageType.MSGTYPE_EMOTE, autoMarkdown = action.autoMarkdown)
-                            _viewEvents.post(TextComposerViewEvents.SlashCommandResultOk())
+                            _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk())
                             popDraft()
                         }
                         is ParsedCommand.SendRainbow              -> {
                             slashCommandResult.message.toString().let {
                                 room.sendFormattedTextMessage(it, rainbowGenerator.generate(it))
                             }
-                            _viewEvents.post(TextComposerViewEvents.SlashCommandResultOk())
+                            _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk())
                             popDraft()
                         }
                         is ParsedCommand.SendRainbowEmote         -> {
                             slashCommandResult.message.toString().let {
                                 room.sendFormattedTextMessage(it, rainbowGenerator.generate(it), MessageType.MSGTYPE_EMOTE)
                             }
-                            _viewEvents.post(TextComposerViewEvents.SlashCommandResultOk())
+                            _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk())
                             popDraft()
                         }
                         is ParsedCommand.SendSpoiler              -> {
@@ -251,22 +251,22 @@ class TextComposerViewModel @AssistedInject constructor(
                                     "[${stringProvider.getString(R.string.spoiler)}](${slashCommandResult.message})",
                                     "<span data-mx-spoiler>${slashCommandResult.message}</span>"
                             )
-                            _viewEvents.post(TextComposerViewEvents.SlashCommandResultOk())
+                            _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk())
                             popDraft()
                         }
                         is ParsedCommand.SendShrug                -> {
                             sendPrefixedMessage("¯\\_(ツ)_/¯", slashCommandResult.message)
-                            _viewEvents.post(TextComposerViewEvents.SlashCommandResultOk())
+                            _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk())
                             popDraft()
                         }
                         is ParsedCommand.SendLenny                -> {
                             sendPrefixedMessage("( ͡° ͜ʖ ͡°)", slashCommandResult.message)
-                            _viewEvents.post(TextComposerViewEvents.SlashCommandResultOk())
+                            _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk())
                             popDraft()
                         }
                         is ParsedCommand.SendChatEffect           -> {
                             sendChatEffect(slashCommandResult)
-                            _viewEvents.post(TextComposerViewEvents.SlashCommandResultOk())
+                            _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk())
                             popDraft()
                         }
                         is ParsedCommand.ChangeTopic              -> {
@@ -285,25 +285,25 @@ class TextComposerViewModel @AssistedInject constructor(
                             handleChangeAvatarForRoomSlashCommand(slashCommandResult)
                         }
                         is ParsedCommand.ShowUser                 -> {
-                            _viewEvents.post(TextComposerViewEvents.SlashCommandResultOk())
+                            _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk())
                             handleWhoisSlashCommand(slashCommandResult)
                             popDraft()
                         }
                         is ParsedCommand.DiscardSession           -> {
                             if (room.isEncrypted()) {
                                 session.cryptoService().discardOutboundSession(room.roomId)
-                                _viewEvents.post(TextComposerViewEvents.SlashCommandResultOk())
+                                _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk())
                                 popDraft()
                             } else {
-                                _viewEvents.post(TextComposerViewEvents.SlashCommandResultOk())
+                                _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk())
                                 _viewEvents.post(
-                                        TextComposerViewEvents
+                                        MessageComposerViewEvents
                                                 .ShowMessage(stringProvider.getString(R.string.command_description_discard_session_not_handled))
                                 )
                             }
                         }
                         is ParsedCommand.CreateSpace              -> {
-                            _viewEvents.post(TextComposerViewEvents.SlashCommandLoading)
+                            _viewEvents.post(MessageComposerViewEvents.SlashCommandLoading)
                             viewModelScope.launch(Dispatchers.IO) {
                                 try {
                                     val params = CreateSpaceParams().apply {
@@ -319,15 +319,15 @@ class TextComposerViewModel @AssistedInject constructor(
                                                     true
                                             )
                                     popDraft()
-                                    _viewEvents.post(TextComposerViewEvents.SlashCommandResultOk())
+                                    _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk())
                                 } catch (failure: Throwable) {
-                                    _viewEvents.post(TextComposerViewEvents.SlashCommandResultError(failure))
+                                    _viewEvents.post(MessageComposerViewEvents.SlashCommandResultError(failure))
                                 }
                             }
                             Unit
                         }
                         is ParsedCommand.AddToSpace               -> {
-                            _viewEvents.post(TextComposerViewEvents.SlashCommandLoading)
+                            _viewEvents.post(MessageComposerViewEvents.SlashCommandLoading)
                             viewModelScope.launch(Dispatchers.IO) {
                                 try {
                                     session.spaceService().getSpace(slashCommandResult.spaceId)
@@ -338,22 +338,22 @@ class TextComposerViewModel @AssistedInject constructor(
                                                     false
                                             )
                                     popDraft()
-                                    _viewEvents.post(TextComposerViewEvents.SlashCommandResultOk())
+                                    _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk())
                                 } catch (failure: Throwable) {
-                                    _viewEvents.post(TextComposerViewEvents.SlashCommandResultError(failure))
+                                    _viewEvents.post(MessageComposerViewEvents.SlashCommandResultError(failure))
                                 }
                             }
                             Unit
                         }
                         is ParsedCommand.JoinSpace                -> {
-                            _viewEvents.post(TextComposerViewEvents.SlashCommandLoading)
+                            _viewEvents.post(MessageComposerViewEvents.SlashCommandLoading)
                             viewModelScope.launch(Dispatchers.IO) {
                                 try {
                                     session.spaceService().joinSpace(slashCommandResult.spaceIdOrAlias)
                                     popDraft()
-                                    _viewEvents.post(TextComposerViewEvents.SlashCommandResultOk())
+                                    _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk())
                                 } catch (failure: Throwable) {
-                                    _viewEvents.post(TextComposerViewEvents.SlashCommandResultError(failure))
+                                    _viewEvents.post(MessageComposerViewEvents.SlashCommandResultError(failure))
                                 }
                             }
                             Unit
@@ -363,21 +363,21 @@ class TextComposerViewModel @AssistedInject constructor(
                                 try {
                                     session.getRoom(slashCommandResult.roomId)?.leave(null)
                                     popDraft()
-                                    _viewEvents.post(TextComposerViewEvents.SlashCommandResultOk())
+                                    _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk())
                                 } catch (failure: Throwable) {
-                                    _viewEvents.post(TextComposerViewEvents.SlashCommandResultError(failure))
+                                    _viewEvents.post(MessageComposerViewEvents.SlashCommandResultError(failure))
                                 }
                             }
                             Unit
                         }
                         is ParsedCommand.UpgradeRoom              -> {
                             _viewEvents.post(
-                                    TextComposerViewEvents.ShowRoomUpgradeDialog(
+                                    MessageComposerViewEvents.ShowRoomUpgradeDialog(
                                             slashCommandResult.newVersion,
                                             room.roomSummary()?.isPublic ?: false
                                     )
                             )
-                            _viewEvents.post(TextComposerViewEvents.SlashCommandResultOk())
+                            _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk())
                             popDraft()
                         }
                     }.exhaustive
@@ -402,7 +402,7 @@ class TextComposerViewModel @AssistedInject constructor(
                             Timber.w("Same message content, do not send edition")
                         }
                     }
-                    _viewEvents.post(TextComposerViewEvents.MessageSent)
+                    _viewEvents.post(MessageComposerViewEvents.MessageSent)
                     popDraft()
                 }
                 is SendMode.QUOTE   -> {
@@ -423,13 +423,13 @@ class TextComposerViewModel @AssistedInject constructor(
                     } else {
                         room.sendFormattedTextMessage(finalText, htmlText)
                     }
-                    _viewEvents.post(TextComposerViewEvents.MessageSent)
+                    _viewEvents.post(MessageComposerViewEvents.MessageSent)
                     popDraft()
                 }
                 is SendMode.REPLY   -> {
                     state.sendMode.timelineEvent.let {
                         room.replyToMessage(it, action.text.toString(), action.autoMarkdown)
-                        _viewEvents.post(TextComposerViewEvents.MessageSent)
+                        _viewEvents.post(MessageComposerViewEvents.MessageSent)
                         popDraft()
                     }
                 }
@@ -478,7 +478,7 @@ class TextComposerViewModel @AssistedInject constructor(
         }
     }
 
-    private fun handleUserIsTyping(action: TextComposerAction.UserIsTyping) {
+    private fun handleUserIsTyping(action: MessageComposerAction.UserIsTyping) {
         if (vectorPreferences.sendTypingNotifs()) {
             if (action.isTyping) {
                 room.userIsTyping()
@@ -506,13 +506,13 @@ class TextComposerViewModel @AssistedInject constructor(
             try {
                 session.joinRoom(command.roomAlias, command.reason, emptyList())
             } catch (failure: Throwable) {
-                _viewEvents.post(TextComposerViewEvents.SlashCommandResultError(failure))
+                _viewEvents.post(MessageComposerViewEvents.SlashCommandResultError(failure))
                 return@launch
             }
             session.getRoomSummary(command.roomAlias)
                     ?.roomId
                     ?.let {
-                        _viewEvents.post(TextComposerViewEvents.JoinRoomCommandSuccess(it))
+                        _viewEvents.post(MessageComposerViewEvents.JoinRoomCommandSuccess(it))
                     }
         }
     }
@@ -659,7 +659,7 @@ class TextComposerViewModel @AssistedInject constructor(
     }
 
     private fun handleWhoisSlashCommand(whois: ParsedCommand.ShowUser) {
-        _viewEvents.post(TextComposerViewEvents.OpenRoomMemberProfile(whois.userId))
+        _viewEvents.post(MessageComposerViewEvents.OpenRoomMemberProfile(whois.userId))
     }
 
     private fun sendPrefixedMessage(prefix: String, message: CharSequence) {
@@ -676,7 +676,7 @@ class TextComposerViewModel @AssistedInject constructor(
     /**
      * Convert a send mode to a draft and save the draft
      */
-    private fun handleSaveDraft(action: TextComposerAction.SaveDraft) = withState {
+    private fun handleSaveDraft(action: MessageComposerAction.SaveDraft) = withState {
         session.coroutineScope.launch {
             when {
                 it.sendMode is SendMode.REGULAR && !it.sendMode.fromSharing -> {
@@ -703,7 +703,7 @@ class TextComposerViewModel @AssistedInject constructor(
         try {
             voiceMessageHelper.startRecording()
         } catch (failure: Throwable) {
-            _viewEvents.post(TextComposerViewEvents.VoicePlaybackOrRecordingFailure(failure))
+            _viewEvents.post(MessageComposerViewEvents.VoicePlaybackOrRecordingFailure(failure))
         }
     }
 
@@ -722,7 +722,7 @@ class TextComposerViewModel @AssistedInject constructor(
         }
     }
 
-    private fun handlePlayOrPauseVoicePlayback(action: TextComposerAction.PlayOrPauseVoicePlayback) {
+    private fun handlePlayOrPauseVoicePlayback(action: MessageComposerAction.PlayOrPauseVoicePlayback) {
         viewModelScope.launch(Dispatchers.IO) {
             try {
                 // Download can fail
@@ -732,7 +732,7 @@ class TextComposerViewModel @AssistedInject constructor(
                 // Play can fail
                 voiceMessageHelper.startOrPausePlayback(action.eventId, convertedFile)
             } catch (failure: Throwable) {
-                _viewEvents.post(TextComposerViewEvents.VoicePlaybackOrRecordingFailure(failure))
+                _viewEvents.post(MessageComposerViewEvents.VoicePlaybackOrRecordingFailure(failure))
             }
         }
     }
@@ -750,14 +750,14 @@ class TextComposerViewModel @AssistedInject constructor(
     }
 
     private fun launchSlashCommandFlowSuspendable(block: suspend () -> Unit) {
-        _viewEvents.post(TextComposerViewEvents.SlashCommandLoading)
+        _viewEvents.post(MessageComposerViewEvents.SlashCommandLoading)
         viewModelScope.launch {
             val event = try {
                 block()
                 popDraft()
-                TextComposerViewEvents.SlashCommandResultOk()
+                MessageComposerViewEvents.SlashCommandResultOk()
             } catch (failure: Throwable) {
-                TextComposerViewEvents.SlashCommandResultError(failure)
+                MessageComposerViewEvents.SlashCommandResultError(failure)
             }
             _viewEvents.post(event)
         }
@@ -765,18 +765,18 @@ class TextComposerViewModel @AssistedInject constructor(
 
     @AssistedFactory
     interface Factory {
-        fun create(initialState: TextComposerViewState): TextComposerViewModel
+        fun create(initialState: MessageComposerViewState): MessageComposerViewModel
     }
 
     /**
      * Can't use the hiltMaverick here because some dependencies are injected here and in fragment but they don't share the graph.
      */
-    companion object : MavericksViewModelFactory<TextComposerViewModel, TextComposerViewState> {
+    companion object : MavericksViewModelFactory<MessageComposerViewModel, MessageComposerViewState> {
 
         @JvmStatic
-        override fun create(viewModelContext: ViewModelContext, state: TextComposerViewState): TextComposerViewModel {
+        override fun create(viewModelContext: ViewModelContext, state: MessageComposerViewState): MessageComposerViewModel {
             val fragment: RoomDetailFragment = (viewModelContext as FragmentViewModelContext).fragment()
-            return fragment.textComposerViewModelFactory.create(state)
+            return fragment.messageComposerViewModelFactory.create(state)
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt
index fa19d129e9..def1c8d2fb 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt
@@ -42,7 +42,7 @@ sealed class SendMode(open val text: String) {
     data class REPLY(val timelineEvent: TimelineEvent, override val text: String) : SendMode(text)
 }
 
-data class TextComposerViewState(
+data class MessageComposerViewState(
         val roomId: String,
         val canSendMessage: Boolean = true,
         val isSendButtonVisible: Boolean = false,
diff --git a/vector/src/main/res/layout/fragment_room_detail.xml b/vector/src/main/res/layout/fragment_room_detail.xml
index 1b73e0e91d..356907cd4e 100644
--- a/vector/src/main/res/layout/fragment_room_detail.xml
+++ b/vector/src/main/res/layout/fragment_room_detail.xml
@@ -199,7 +199,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
-    <im.vector.app.features.home.room.detail.composer.TextComposerView
+    <im.vector.app.features.home.room.detail.composer.MessageComposerView
         android:id="@+id/composerLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

From 9ce228c5bcb3ca55ef40c1cba885216f229b4c37 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Fri, 19 Nov 2021 14:47:52 +0000
Subject: [PATCH 30/52] fixing import ordering

---
 .../vector/app/features/home/room/detail/RoomDetailFragment.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index 270f467ff1..b1a6dae9dd 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -132,12 +132,12 @@ import im.vector.app.features.command.Command
 import im.vector.app.features.crypto.keysbackup.restore.KeysBackupRestoreActivity
 import im.vector.app.features.crypto.verification.VerificationBottomSheet
 import im.vector.app.features.home.AvatarRenderer
-import im.vector.app.features.home.room.detail.composer.SendMode
 import im.vector.app.features.home.room.detail.composer.MessageComposerAction
 import im.vector.app.features.home.room.detail.composer.MessageComposerView
 import im.vector.app.features.home.room.detail.composer.MessageComposerViewEvents
 import im.vector.app.features.home.room.detail.composer.MessageComposerViewModel
 import im.vector.app.features.home.room.detail.composer.MessageComposerViewState
+import im.vector.app.features.home.room.detail.composer.SendMode
 import im.vector.app.features.home.room.detail.composer.voice.VoiceMessageRecorderView
 import im.vector.app.features.home.room.detail.composer.voice.VoiceMessageRecorderView.RecordingUiState
 import im.vector.app.features.home.room.detail.readreceipts.DisplayReadReceiptsBottomSheet

From cca50ed6698f45cc5cb2797231e36384ba9f27e9 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Fri, 19 Nov 2021 15:03:37 +0000
Subject: [PATCH 31/52] using project terminoloy for rendering ui states on
 views

---
 .../app/features/home/room/detail/RoomDetailFragment.kt       | 4 ++--
 .../room/detail/composer/voice/VoiceMessageRecorderView.kt    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index b1a6dae9dd..25c2c0b795 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -1138,7 +1138,7 @@ class RoomDetailFragment @Inject constructor(
 
         // We should improve the UX to support going into playback mode when paused and delete the media when the view is destroyed.
         messageComposerViewModel.handle(MessageComposerAction.EndAllVoiceActions(deleteRecord = false))
-        views.voiceMessageRecorderView.display(RecordingUiState.None)
+        views.voiceMessageRecorderView.render(RecordingUiState.None)
     }
 
     private val attachmentFileActivityResultLauncher = registerStartForActivityResult {
@@ -1434,7 +1434,7 @@ class RoomDetailFragment @Inject constructor(
                 views.composerLayout.isInvisible = !messageComposerState.isComposerVisible
                 views.voiceMessageRecorderView.isVisible = messageComposerState.isVoiceMessageRecorderVisible
                 views.composerLayout.views.sendButton.isInvisible = !messageComposerState.isSendButtonVisible
-                views.voiceMessageRecorderView.display(messageComposerState.voiceRecordingUiState)
+                views.voiceMessageRecorderView.render(messageComposerState.voiceRecordingUiState)
                 views.composerLayout.setRoomEncrypted(summary.isEncrypted)
                 // views.composerLayout.alwaysShowSendButton = false
                 if (messageComposerState.canSendMessage) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
index d212e800a8..14d5a58279 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
@@ -103,7 +103,7 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
         voiceMessageViews.renderVisibilityChanged(parentChanged, visibility)
     }
 
-    fun display(recordingState: RecordingUiState) {
+    fun render(recordingState: RecordingUiState) {
         if (lastKnownState == recordingState) return
         lastKnownState = recordingState
         when (recordingState) {

From 430e171f85659279fb8651d025d3d4ea8c1f8f8c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 19 Nov 2021 16:05:57 +0100
Subject: [PATCH 32/52] Remove useless module, it's a miss of the migration to
 hilt

---
 .../im/vector/app/features/home/HomeModule.kt | 35 -------------------
 1 file changed, 35 deletions(-)
 delete mode 100644 vector/src/main/java/im/vector/app/features/home/HomeModule.kt

diff --git a/vector/src/main/java/im/vector/app/features/home/HomeModule.kt b/vector/src/main/java/im/vector/app/features/home/HomeModule.kt
deleted file mode 100644
index d34d3489c5..0000000000
--- a/vector/src/main/java/im/vector/app/features/home/HomeModule.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2019 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package im.vector.app.features.home
-
-import android.os.Handler
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.migration.DisableInstallInCheck
-import im.vector.app.features.home.room.detail.timeline.TimelineEventControllerHandler
-import im.vector.app.features.home.room.detail.timeline.helper.TimelineAsyncHelper
-
-@DisableInstallInCheck
-@Module
-object HomeModule {
-
-    @Provides
-    @TimelineEventControllerHandler
-    fun providesTimelineBackgroundHandler(): Handler {
-        return TimelineAsyncHelper.getBackgroundHandler()
-    }
-}

From 909e93b6d630ad0efd567ae6e399ab60df734e7e Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 19 Nov 2021 16:42:56 +0100
Subject: [PATCH 33/52] Fix crash (#4520)

---
 .../app/features/crypto/recover/BootstrapBottomSheet.kt     | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapBottomSheet.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapBottomSheet.kt
index 50f9526da5..063c0f4df5 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapBottomSheet.kt
@@ -214,14 +214,10 @@ class BootstrapBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetBoot
 
     companion object {
 
-        const val EXTRA_ARGS = "EXTRA_ARGS"
-
         fun show(fragmentManager: FragmentManager, mode: SetupMode): BootstrapBottomSheet {
             return BootstrapBottomSheet().apply {
                 isCancelable = false
-                arguments = Bundle().apply {
-                    this.putParcelable(EXTRA_ARGS, Args(setUpMode = mode))
-                }
+                setArguments(Args(setUpMode = mode))
             }.also {
                 it.show(fragmentManager, "BootstrapBottomSheet")
             }

From d0f5a10c76675110270617a8bcaa05edcd67ed9e Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 19 Nov 2021 16:45:32 +0100
Subject: [PATCH 34/52] Use extension

---
 .../app/core/platform/VectorBaseBottomSheetDialogFragment.kt  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt
index 20697c6d11..95feb45ad6 100644
--- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt
@@ -28,13 +28,13 @@ import androidx.annotation.CallSuper
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import androidx.viewbinding.ViewBinding
-import com.airbnb.mvrx.Mavericks
 import com.airbnb.mvrx.MavericksView
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import dagger.hilt.android.EntryPointAccessors
 import im.vector.app.core.di.ActivityEntryPoint
+import im.vector.app.core.extensions.toMvRxBundle
 import im.vector.app.core.flow.throttleFirst
 import im.vector.app.core.utils.DimensionConverter
 import kotlinx.coroutines.flow.launchIn
@@ -159,7 +159,7 @@ abstract class VectorBaseBottomSheetDialogFragment<VB : ViewBinding> : BottomShe
     }
 
     protected fun setArguments(args: Parcelable? = null) {
-        arguments = args?.let { Bundle().apply { putParcelable(Mavericks.KEY_ARG, it) } }
+        arguments = args.toMvRxBundle()
     }
 
     /* ==========================================================================================

From 292c09b1764e4054204b224d172f41e6b2579e17 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 19 Nov 2021 17:03:18 +0100
Subject: [PATCH 35/52] Cleanup: Use extension, use setArguments() and avoid
 direct usage of Mavericks.KEY_ARG

---
 .../verification/VerificationBottomSheet.kt   | 178 ++++++++++--------
 1 file changed, 95 insertions(+), 83 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt
index 4ef0109227..e90ec99680 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt
@@ -24,7 +24,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
-import com.airbnb.mvrx.Mavericks
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
@@ -33,6 +32,7 @@ import im.vector.app.R
 import im.vector.app.core.extensions.commitTransaction
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.extensions.registerStartForActivityResult
+import im.vector.app.core.extensions.toMvRxBundle
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
 import im.vector.app.databinding.BottomSheetVerificationBinding
@@ -178,36 +178,37 @@ class VerificationBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetV
         }
 
         if (state.quadSHasBeenReset) {
-            showFragment(VerificationConclusionFragment::class, Bundle().apply {
-                putParcelable(Mavericks.KEY_ARG, VerificationConclusionFragment.Args(
-                        isSuccessFull = true,
-                        isMe = true,
-                        cancelReason = null
-                ))
-            })
+            showFragment(
+                    VerificationConclusionFragment::class,
+                    VerificationConclusionFragment.Args(
+                            isSuccessFull = true,
+                            isMe = true,
+                            cancelReason = null
+                    ))
             return@withState
         }
 
         if (state.userThinkItsNotHim) {
             views.otherUserNameText.text = getString(R.string.dialog_title_warning)
-            showFragment(VerificationNotMeFragment::class, Bundle())
+            showFragment(VerificationNotMeFragment::class)
             return@withState
         }
 
         if (state.userWantsToCancel) {
             views.otherUserNameText.text = getString(R.string.are_you_sure)
-            showFragment(VerificationCancelFragment::class, Bundle())
+            showFragment(VerificationCancelFragment::class)
             return@withState
         }
 
         if (state.selfVerificationMode && state.verifyingFrom4S) {
-            showFragment(QuadSLoadingFragment::class, Bundle())
+            showFragment(QuadSLoadingFragment::class)
             return@withState
         }
         if (state.selfVerificationMode && state.verifiedFromPrivateKeys) {
-            showFragment(VerificationConclusionFragment::class, Bundle().apply {
-                putParcelable(Mavericks.KEY_ARG, VerificationConclusionFragment.Args(true, null, state.isMe))
-            })
+            showFragment(
+                    VerificationConclusionFragment::class,
+                    VerificationConclusionFragment.Args(true, null, state.isMe)
+            )
             return@withState
         }
 
@@ -229,23 +230,27 @@ class VerificationBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetV
                 is VerificationTxState.SendingMac,
                 is VerificationTxState.MacSent,
                 is VerificationTxState.Verifying -> {
-                    showFragment(VerificationEmojiCodeFragment::class, Bundle().apply {
-                        putParcelable(Mavericks.KEY_ARG, VerificationArgs(
-                                state.otherUserMxItem?.id ?: "",
-                                // If it was outgoing it.transaction id would be null, but the pending request
-                                // would be updated (from localId to txId)
-                                state.pendingRequest.invoke()?.transactionId ?: state.transactionId))
-                    })
+                    showFragment(
+                            VerificationEmojiCodeFragment::class,
+                            VerificationArgs(
+                                    state.otherUserMxItem?.id ?: "",
+                                    // If it was outgoing it.transaction id would be null, but the pending request
+                                    // would be updated (from localId to txId)
+                                    state.pendingRequest.invoke()?.transactionId ?: state.transactionId
+                            )
+                    )
                 }
                 is VerificationTxState.Verified  -> {
-                    showFragment(VerificationConclusionFragment::class, Bundle().apply {
-                        putParcelable(Mavericks.KEY_ARG, VerificationConclusionFragment.Args(true, null, state.isMe))
-                    })
+                    showFragment(
+                            VerificationConclusionFragment::class,
+                            VerificationConclusionFragment.Args(true, null, state.isMe)
+                    )
                 }
                 is VerificationTxState.Cancelled -> {
-                    showFragment(VerificationConclusionFragment::class, Bundle().apply {
-                        putParcelable(Mavericks.KEY_ARG, VerificationConclusionFragment.Args(false, state.sasTransactionState.cancelCode.value, state.isMe))
-                    })
+                    showFragment(
+                            VerificationConclusionFragment::class,
+                            VerificationConclusionFragment.Args(false, state.sasTransactionState.cancelCode.value, state.isMe)
+                    )
                 }
             }
 
@@ -254,29 +259,32 @@ class VerificationBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetV
 
         when (state.qrTransactionState) {
             is VerificationTxState.QrScannedByOther               -> {
-                showFragment(VerificationQrScannedByOtherFragment::class, Bundle())
+                showFragment(VerificationQrScannedByOtherFragment::class)
                 return@withState
             }
             is VerificationTxState.Started,
             is VerificationTxState.WaitingOtherReciprocateConfirm -> {
-                showFragment(VerificationQRWaitingFragment::class, Bundle().apply {
-                    putParcelable(Mavericks.KEY_ARG, VerificationQRWaitingFragment.Args(
-                            isMe = state.isMe,
-                            otherUserName = state.otherUserMxItem?.getBestName() ?: ""
-                    ))
-                })
+                showFragment(
+                        VerificationQRWaitingFragment::class,
+                        VerificationQRWaitingFragment.Args(
+                                isMe = state.isMe,
+                                otherUserName = state.otherUserMxItem?.getBestName() ?: ""
+                        )
+                )
                 return@withState
             }
             is VerificationTxState.Verified                       -> {
-                showFragment(VerificationConclusionFragment::class, Bundle().apply {
-                    putParcelable(Mavericks.KEY_ARG, VerificationConclusionFragment.Args(true, null, state.isMe))
-                })
+                showFragment(
+                        VerificationConclusionFragment::class,
+                        VerificationConclusionFragment.Args(true, null, state.isMe)
+                )
                 return@withState
             }
             is VerificationTxState.Cancelled                      -> {
-                showFragment(VerificationConclusionFragment::class, Bundle().apply {
-                    putParcelable(Mavericks.KEY_ARG, VerificationConclusionFragment.Args(false, state.qrTransactionState.cancelCode.value, state.isMe))
-                })
+                showFragment(
+                        VerificationConclusionFragment::class,
+                        VerificationConclusionFragment.Args(false, state.qrTransactionState.cancelCode.value, state.isMe)
+                )
                 return@withState
             }
             else                                                  -> Unit
@@ -288,12 +296,14 @@ class VerificationBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetV
         if (state.pendingRequest.invoke()?.cancelConclusion != null) {
             // The request has been declined, we should dismiss
             views.otherUserNameText.text = getString(R.string.verification_cancelled)
-            showFragment(VerificationConclusionFragment::class, Bundle().apply {
-                putParcelable(Mavericks.KEY_ARG, VerificationConclusionFragment.Args(
-                        false,
-                        state.pendingRequest.invoke()?.cancelConclusion?.value ?: CancelCode.User.value,
-                        state.isMe))
-            })
+            showFragment(
+                    VerificationConclusionFragment::class,
+                    VerificationConclusionFragment.Args(
+                            isSuccessFull = false,
+                            cancelReason = state.pendingRequest.invoke()?.cancelConclusion?.value ?: CancelCode.User.value,
+                            isMe = state.isMe
+                    )
+            )
             return@withState
         }
 
@@ -303,36 +313,44 @@ class VerificationBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetV
             if (state.pendingRequest.invoke()?.isReady == true) {
                 Timber.v("## SAS show bottom sheet for outgoing and ready request")
                 // Show choose method fragment with waiting
-                showFragment(VerificationChooseMethodFragment::class, Bundle().apply {
-                    putParcelable(Mavericks.KEY_ARG, VerificationArgs(state.otherUserMxItem?.id
-                            ?: "", state.pendingRequest.invoke()?.transactionId))
-                })
+                showFragment(
+                        VerificationChooseMethodFragment::class,
+                        VerificationArgs(
+                                otherUserId = state.otherUserMxItem?.id ?: "",
+                                verificationId = state.pendingRequest.invoke()?.transactionId
+                        )
+                )
             } else {
                 // Stay on the start fragment
-                showFragment(VerificationRequestFragment::class, Bundle().apply {
-                    putParcelable(Mavericks.KEY_ARG, VerificationArgs(
-                            state.otherUserMxItem?.id ?: "",
-                            state.pendingRequest.invoke()?.transactionId,
-                            state.roomId))
-                })
+                showFragment(
+                        VerificationRequestFragment::class,
+                        VerificationArgs(
+                                otherUserId = state.otherUserMxItem?.id ?: "",
+                                verificationId = state.pendingRequest.invoke()?.transactionId,
+                                verificationLocalId = state.roomId
+                        )
+                )
             }
         } else if (state.pendingRequest.invoke()?.isIncoming == true) {
             Timber.v("## SAS show bottom sheet for Incoming request")
             // For incoming we can switch to choose method because ready is being sent or already sent
-            showFragment(VerificationChooseMethodFragment::class, Bundle().apply {
-                putParcelable(Mavericks.KEY_ARG, VerificationArgs(state.otherUserMxItem?.id
-                        ?: "", state.pendingRequest.invoke()?.transactionId))
-            })
+            showFragment(
+                    VerificationChooseMethodFragment::class,
+                    VerificationArgs(
+                            otherUserId = state.otherUserMxItem?.id ?: "",
+                            verificationId = state.pendingRequest.invoke()?.transactionId
+                    )
+            )
         }
         super.invalidate()
     }
 
-    private fun showFragment(fragmentClass: KClass<out Fragment>, bundle: Bundle) {
+    private fun showFragment(fragmentClass: KClass<out Fragment>, parcelable: Parcelable? = null) {
         if (childFragmentManager.findFragmentByTag(fragmentClass.simpleName) == null) {
             childFragmentManager.commitTransaction {
                 replace(R.id.bottomSheetFragmentContainer,
                         fragmentClass.java,
-                        bundle,
+                        parcelable?.toMvRxBundle(),
                         fragmentClass.simpleName
                 )
             }
@@ -342,37 +360,31 @@ class VerificationBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetV
     companion object {
         fun withArgs(roomId: String?, otherUserId: String, transactionId: String? = null): VerificationBottomSheet {
             return VerificationBottomSheet().apply {
-                arguments = Bundle().apply {
-                    putParcelable(Mavericks.KEY_ARG, VerificationArgs(
-                            otherUserId = otherUserId,
-                            roomId = roomId,
-                            verificationId = transactionId,
-                            selfVerificationMode = false
-                    ))
-                }
+                setArguments(VerificationArgs(
+                        otherUserId = otherUserId,
+                        roomId = roomId,
+                        verificationId = transactionId,
+                        selfVerificationMode = false
+                ))
             }
         }
 
         fun forSelfVerification(session: Session): VerificationBottomSheet {
             return VerificationBottomSheet().apply {
-                arguments = Bundle().apply {
-                    putParcelable(Mavericks.KEY_ARG, VerificationArgs(
-                            otherUserId = session.myUserId,
-                            selfVerificationMode = true
-                    ))
-                }
+                setArguments(VerificationArgs(
+                        otherUserId = session.myUserId,
+                        selfVerificationMode = true
+                ))
             }
         }
 
         fun forSelfVerification(session: Session, outgoingRequest: String): VerificationBottomSheet {
             return VerificationBottomSheet().apply {
-                arguments = Bundle().apply {
-                    putParcelable(Mavericks.KEY_ARG, VerificationArgs(
-                            otherUserId = session.myUserId,
-                            selfVerificationMode = true,
-                            verificationId = outgoingRequest
-                    ))
-                }
+                setArguments(VerificationArgs(
+                        otherUserId = session.myUserId,
+                        selfVerificationMode = true,
+                        verificationId = outgoingRequest
+                ))
             }
         }
 

From 0f42f379c6f6125f40d2b5c6cef7bf328a66410c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 19 Nov 2021 17:12:38 +0100
Subject: [PATCH 36/52] Cleanup: use setArguments() and avoid direct usage of
 Mavericks.KEY_ARG `fun <T : Fragment> T.withArgs` should not be used anymore

---
 .../app/core/extensions/BasicExtensions.kt    |  7 -------
 .../home/room/detail/RoomDetailFragment.kt    | 10 +++++-----
 .../DisplayReadReceiptsBottomSheet.kt         | 10 +++-------
 .../edithistory/ViewEditHistoryBottomSheet.kt | 16 +++++++---------
 .../reactions/ViewReactionsBottomSheet.kt     | 16 +++++++---------
 .../features/matrixto/MatrixToBottomSheet.kt  | 19 +++++++------------
 .../devices/DeviceListBottomSheet.kt          |  7 +++----
 .../DeviceVerificationInfoBottomSheet.kt      |  8 +++-----
 .../RoomWidgetPermissionBottomSheet.kt        |  8 ++++----
 9 files changed, 39 insertions(+), 62 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/core/extensions/BasicExtensions.kt b/vector/src/main/java/im/vector/app/core/extensions/BasicExtensions.kt
index dbe90dfdc1..f8b8b83178 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/BasicExtensions.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/BasicExtensions.kt
@@ -16,9 +16,7 @@
 
 package im.vector.app.core.extensions
 
-import android.os.Bundle
 import android.util.Patterns
-import androidx.fragment.app.Fragment
 import com.google.i18n.phonenumbers.NumberParseException
 import com.google.i18n.phonenumbers.PhoneNumberUtil
 import org.matrix.android.sdk.api.extensions.ensurePrefix
@@ -27,11 +25,6 @@ fun Boolean.toOnOff() = if (this) "ON" else "OFF"
 
 inline fun <T> T.ooi(block: (T) -> Unit): T = also(block)
 
-/**
- * Apply argument to a Fragment
- */
-fun <T : Fragment> T.withArgs(block: Bundle.() -> Unit) = apply { arguments = Bundle().apply(block) }
-
 /**
  * Check if a CharSequence is an email
  */
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index 3fcdefaf56..bb69bd5339 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -62,7 +62,6 @@ import com.airbnb.epoxy.EpoxyModel
 import com.airbnb.epoxy.OnModelBuildFinishedListener
 import com.airbnb.epoxy.addGlidePreloader
 import com.airbnb.epoxy.glidePreloader
-import com.airbnb.mvrx.Mavericks
 import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
@@ -1635,10 +1634,11 @@ class RoomDetailFragment @Inject constructor(
             is RoomDetailAction.ResumeVerification        -> {
                 val otherUserId = data.otherUserId ?: return
                 VerificationBottomSheet().apply {
-                    arguments = Bundle().apply {
-                        putParcelable(Mavericks.KEY_ARG, VerificationBottomSheet.VerificationArgs(
-                                otherUserId, data.transactionId, roomId = roomDetailArgs.roomId))
-                    }
+                    setArguments(VerificationBottomSheet.VerificationArgs(
+                            otherUserId = otherUserId,
+                            verificationId = data.transactionId,
+                            roomId = roomDetailArgs.roomId
+                    ))
                 }.show(parentFragmentManager, "REQ")
             }
         }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/readreceipts/DisplayReadReceiptsBottomSheet.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/readreceipts/DisplayReadReceiptsBottomSheet.kt
index 6c315a4e76..db80b02a6b 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/readreceipts/DisplayReadReceiptsBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/readreceipts/DisplayReadReceiptsBottomSheet.kt
@@ -21,7 +21,6 @@ import android.os.Parcelable
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import com.airbnb.mvrx.Mavericks
 import com.airbnb.mvrx.args
 import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
@@ -81,12 +80,9 @@ class DisplayReadReceiptsBottomSheet :
 
     companion object {
         fun newInstance(readReceipts: List<ReadReceiptData>): DisplayReadReceiptsBottomSheet {
-            val args = Bundle()
-            val parcelableArgs = DisplayReadReceiptArgs(
-                    readReceipts
-            )
-            args.putParcelable(Mavericks.KEY_ARG, parcelableArgs)
-            return DisplayReadReceiptsBottomSheet().apply { arguments = args }
+            return DisplayReadReceiptsBottomSheet().apply {
+                setArguments(DisplayReadReceiptArgs(readReceipts = readReceipts))
+            }
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryBottomSheet.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryBottomSheet.kt
index 63140edd8b..321745355e 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryBottomSheet.kt
@@ -19,7 +19,6 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import com.airbnb.mvrx.Mavericks
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import dagger.hilt.android.AndroidEntryPoint
@@ -68,14 +67,13 @@ class ViewEditHistoryBottomSheet :
 
     companion object {
         fun newInstance(roomId: String, informationData: MessageInformationData): ViewEditHistoryBottomSheet {
-            val args = Bundle()
-            val parcelableArgs = TimelineEventFragmentArgs(
-                    informationData.eventId,
-                    roomId,
-                    informationData
-            )
-            args.putParcelable(Mavericks.KEY_ARG, parcelableArgs)
-            return ViewEditHistoryBottomSheet().apply { arguments = args }
+            return ViewEditHistoryBottomSheet().apply {
+                setArguments(TimelineEventFragmentArgs(
+                        eventId = informationData.eventId,
+                        roomId = roomId,
+                        informationData = informationData
+                ))
+            }
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsBottomSheet.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsBottomSheet.kt
index 8071ed8809..6ae3cd227f 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsBottomSheet.kt
@@ -20,7 +20,6 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import com.airbnb.mvrx.Mavericks
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import dagger.hilt.android.AndroidEntryPoint
@@ -82,14 +81,13 @@ class ViewReactionsBottomSheet :
 
     companion object {
         fun newInstance(roomId: String, informationData: MessageInformationData): ViewReactionsBottomSheet {
-            val args = Bundle()
-            val parcelableArgs = TimelineEventFragmentArgs(
-                    informationData.eventId,
-                    roomId,
-                    informationData
-            )
-            args.putParcelable(Mavericks.KEY_ARG, parcelableArgs)
-            return ViewReactionsBottomSheet().apply { arguments = args }
+            return ViewReactionsBottomSheet().apply {
+                setArguments(TimelineEventFragmentArgs(
+                        eventId = informationData.eventId,
+                        roomId = roomId,
+                        informationData = informationData
+                ))
+            }
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheet.kt b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheet.kt
index 029234a66d..63e0398fc1 100644
--- a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheet.kt
@@ -24,7 +24,6 @@ import android.view.ViewGroup
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import com.airbnb.mvrx.Incomplete
-import com.airbnb.mvrx.Mavericks
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
@@ -66,15 +65,15 @@ class MatrixToBottomSheet :
     override fun invalidate() = withState(viewModel) { state ->
         super.invalidate()
         when (state.linkType) {
-            is PermalinkData.RoomLink -> {
+            is PermalinkData.RoomLink     -> {
                 views.matrixToCardContentLoading.isVisible = state.roomPeekResult is Incomplete
                 showFragment(MatrixToRoomSpaceFragment::class, Bundle())
             }
-            is PermalinkData.UserLink -> {
+            is PermalinkData.UserLink     -> {
                 views.matrixToCardContentLoading.isVisible = state.matrixItem is Incomplete
                 showFragment(MatrixToUserFragment::class, Bundle())
             }
-            is PermalinkData.GroupLink -> {
+            is PermalinkData.GroupLink    -> {
             }
             is PermalinkData.FallbackLink -> {
             }
@@ -98,16 +97,16 @@ class MatrixToBottomSheet :
 
         viewModel.observeViewEvents {
             when (it) {
-                is MatrixToViewEvents.NavigateToRoom -> {
+                is MatrixToViewEvents.NavigateToRoom  -> {
                     interactionListener?.mxToBottomSheetNavigateToRoom(it.roomId)
                     dismiss()
                 }
-                MatrixToViewEvents.Dismiss -> dismiss()
+                MatrixToViewEvents.Dismiss            -> dismiss()
                 is MatrixToViewEvents.NavigateToSpace -> {
                     interactionListener?.mxToBottomSheetSwitchToSpace(it.spaceId)
                     dismiss()
                 }
-                is MatrixToViewEvents.ShowModalError -> {
+                is MatrixToViewEvents.ShowModalError  -> {
                     MaterialAlertDialogBuilder(requireContext())
                             .setMessage(it.error)
                             .setPositiveButton(getString(R.string.ok), null)
@@ -120,11 +119,7 @@ class MatrixToBottomSheet :
     companion object {
         fun withLink(matrixToLink: String): MatrixToBottomSheet {
             return MatrixToBottomSheet().apply {
-                arguments = Bundle().apply {
-                    putParcelable(Mavericks.KEY_ARG, MatrixToArgs(
-                            matrixToLink = matrixToLink
-                    ))
-                }
+                setArguments(MatrixToArgs(matrixToLink = matrixToLink))
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheet.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheet.kt
index f83ac8f19d..bb2317b59c 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheet.kt
@@ -24,7 +24,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
-import com.airbnb.mvrx.Mavericks
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import dagger.hilt.android.AndroidEntryPoint
@@ -115,9 +114,9 @@ class DeviceListBottomSheet :
 
     companion object {
         fun newInstance(userId: String, allowDeviceAction: Boolean = true): DeviceListBottomSheet {
-            val args = Bundle()
-            args.putParcelable(Mavericks.KEY_ARG, Args(userId, allowDeviceAction))
-            return DeviceListBottomSheet().apply { arguments = args }
+            return DeviceListBottomSheet().apply {
+                setArguments(Args(userId, allowDeviceAction))
+            }
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheet.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheet.kt
index 441a344660..e5a67675e6 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheet.kt
@@ -21,7 +21,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isVisible
-import com.airbnb.mvrx.Mavericks
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
@@ -76,10 +75,9 @@ class DeviceVerificationInfoBottomSheet :
 
     companion object {
         fun newInstance(userId: String, deviceId: String): DeviceVerificationInfoBottomSheet {
-            val args = Bundle()
-            val parcelableArgs = DeviceVerificationInfoArgs(userId, deviceId)
-            args.putParcelable(Mavericks.KEY_ARG, parcelableArgs)
-            return DeviceVerificationInfoBottomSheet().apply { arguments = args }
+            return DeviceVerificationInfoBottomSheet().apply {
+                setArguments(DeviceVerificationInfoArgs(userId, deviceId))
+            }
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionBottomSheet.kt b/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionBottomSheet.kt
index ae3028925a..58cfebba94 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionBottomSheet.kt
@@ -23,12 +23,10 @@ import android.text.style.BulletSpan
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import com.airbnb.mvrx.Mavericks
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.withState
 import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
-import im.vector.app.core.extensions.withArgs
 import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
 import im.vector.app.databinding.BottomSheetRoomWidgetPermissionBinding
 import im.vector.app.features.home.AvatarRenderer
@@ -111,8 +109,10 @@ class RoomWidgetPermissionBottomSheet :
 
     companion object {
 
-        fun newInstance(widgetArgs: WidgetArgs) = RoomWidgetPermissionBottomSheet().withArgs {
-            putParcelable(Mavericks.KEY_ARG, widgetArgs)
+        fun newInstance(widgetArgs: WidgetArgs): RoomWidgetPermissionBottomSheet {
+            return RoomWidgetPermissionBottomSheet().apply {
+                setArguments(widgetArgs)
+            }
         }
     }
 }

From 23f726a2f0fd80d55f0fc485e2cddbaa756f3e7c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 19 Nov 2021 17:17:23 +0100
Subject: [PATCH 37/52] Cleanup API

---
 .../java/im/vector/app/core/platform/VectorBaseActivity.kt  | 6 ++++--
 .../features/crypto/verification/VerificationBottomSheet.kt | 4 ++--
 .../im/vector/app/features/devtools/RoomDevToolActivity.kt  | 6 +++---
 .../im/vector/app/features/spaces/SpaceCreationActivity.kt  | 2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
index 0fd660effb..a56c2f0432 100644
--- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
@@ -22,6 +22,7 @@ import android.content.Context
 import android.content.res.Configuration
 import android.os.Build
 import android.os.Bundle
+import android.os.Parcelable
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
@@ -60,6 +61,7 @@ import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.extensions.restart
 import im.vector.app.core.extensions.setTextOrHide
 import im.vector.app.core.extensions.singletonEntryPoint
+import im.vector.app.core.extensions.toMvRxBundle
 import im.vector.app.core.flow.throttleFirst
 import im.vector.app.core.utils.toast
 import im.vector.app.features.MainActivity
@@ -385,9 +387,9 @@ abstract class VectorBaseActivity<VB : ViewBinding> : AppCompatActivity(), Maver
         bugReporter.inMultiWindowMode = isInMultiWindowMode
     }
 
-    protected fun createFragment(fragmentClass: Class<out Fragment>, args: Bundle?): Fragment {
+    protected fun createFragment(fragmentClass: Class<out Fragment>, argsParcelable: Parcelable? = null): Fragment {
         return fragmentFactory.instantiate(classLoader, fragmentClass.name).apply {
-            arguments = args
+            arguments = argsParcelable?.toMvRxBundle()
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt
index e90ec99680..65e3fbabba 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt
@@ -345,12 +345,12 @@ class VerificationBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetV
         super.invalidate()
     }
 
-    private fun showFragment(fragmentClass: KClass<out Fragment>, parcelable: Parcelable? = null) {
+    private fun showFragment(fragmentClass: KClass<out Fragment>, argsParcelable: Parcelable? = null) {
         if (childFragmentManager.findFragmentByTag(fragmentClass.simpleName) == null) {
             childFragmentManager.commitTransaction {
                 replace(R.id.bottomSheetFragmentContainer,
                         fragmentClass.java,
-                        parcelable?.toMvRxBundle(),
+                        argsParcelable?.toMvRxBundle(),
                         fragmentClass.simpleName
                 )
             }
diff --git a/vector/src/main/java/im/vector/app/features/devtools/RoomDevToolActivity.kt b/vector/src/main/java/im/vector/app/features/devtools/RoomDevToolActivity.kt
index 2c7a15e6ad..9e0ccf1e79 100644
--- a/vector/src/main/java/im/vector/app/features/devtools/RoomDevToolActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/devtools/RoomDevToolActivity.kt
@@ -109,15 +109,15 @@ class RoomDevToolActivity : SimpleFragmentActivity(), FragmentManager.OnBackStac
                 }
                 RoomDevToolViewState.Mode.StateEventList,
                 RoomDevToolViewState.Mode.StateEventListByType -> {
-                    val frag = createFragment(RoomDevToolStateEventListFragment::class.java, Bundle().toMvRxBundle())
+                    val frag = createFragment(RoomDevToolStateEventListFragment::class.java)
                     navigateTo(frag)
                 }
                 RoomDevToolViewState.Mode.EditEventContent     -> {
-                    val frag = createFragment(RoomDevToolEditFragment::class.java, Bundle().toMvRxBundle())
+                    val frag = createFragment(RoomDevToolEditFragment::class.java)
                     navigateTo(frag)
                 }
                 is RoomDevToolViewState.Mode.SendEventForm     -> {
-                    val frag = createFragment(RoomDevToolSendFormFragment::class.java, Bundle().toMvRxBundle())
+                    val frag = createFragment(RoomDevToolSendFormFragment::class.java)
                     navigateTo(frag)
                 }
             }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
index 44acfa8ee3..59363e28c8 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
@@ -121,7 +121,7 @@ class SpaceCreationActivity : SimpleFragmentActivity() {
     }
 
     private fun navigateToFragment(fragmentClass: Class<out Fragment>) {
-        val frag = supportFragmentManager.findFragmentByTag(fragmentClass.name) ?: createFragment(fragmentClass, Bundle().toMvRxBundle())
+        val frag = supportFragmentManager.findFragmentByTag(fragmentClass.name) ?: createFragment(fragmentClass)
         supportFragmentManager.beginTransaction()
                 .setCustomAnimations(R.anim.fade_in, R.anim.fade_out, R.anim.fade_in, R.anim.fade_out)
                 .replace(R.id.container,

From 4af2780ad9189aad4cc0a6cfa3fec866eba4d369 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 19 Nov 2021 17:31:04 +0100
Subject: [PATCH 38/52] Password hidden by default

---
 .../res/layout/fragment_bootstrap_enter_account_password.xml  | 1 +
 .../main/res/layout/fragment_bootstrap_enter_passphrase.xml   | 1 +
 .../src/main/res/layout/fragment_bootstrap_migrate_backup.xml | 1 +
 .../layout/fragment_keys_backup_restore_from_passphrase.xml   | 1 +
 .../src/main/res/layout/fragment_keys_backup_setup_step2.xml  | 2 ++
 .../main/res/layout/fragment_ssss_access_from_passphrase.xml  | 4 ++--
 6 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml b/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml
index aed72d3183..9b8d6918f4 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml
@@ -35,6 +35,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:imeOptions="actionDone"
+            android:inputType="textPassword"
             android:maxLines="3"
             android:singleLine="false"
             tools:hint="@string/passphrase_enter_passphrase" />
diff --git a/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml b/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml
index 942a1a7e00..78782b0b45 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml
@@ -33,6 +33,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:imeOptions="actionDone"
+            android:inputType="textPassword"
             android:maxLines="3"
             android:singleLine="false"
             tools:hint="@string/passphrase_enter_passphrase" />
diff --git a/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml b/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml
index 1e6b1b6ddb..04f547d500 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml
@@ -35,6 +35,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:imeOptions="actionDone"
+            android:inputType="textPassword"
             android:maxLines="3"
             android:singleLine="false"
             tools:hint="@string/keys_backup_restore_key_enter_hint" />
diff --git a/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml b/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml
index f3061186ef..8360cb3a4f 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml
@@ -56,6 +56,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/passphrase_enter_passphrase"
+                android:inputType="textPassword"
                 android:maxLines="3"
                 android:singleLine="false" />
 
diff --git a/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml b/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
index f0fa64426a..673c2fee29 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
@@ -58,6 +58,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/passphrase_create_passphrase"
+                android:inputType="textPassword"
                 android:maxLines="3" />
 
         </com.google.android.material.textfield.TextInputLayout>
@@ -86,6 +87,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/passphrase_confirm_passphrase"
+                android:inputType="textPassword"
                 android:maxLines="3" />
 
         </com.google.android.material.textfield.TextInputLayout>
diff --git a/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml b/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
index 37aa44af2e..cf7a5f695f 100644
--- a/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
+++ b/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
@@ -70,9 +70,9 @@
                 android:layout_height="wrap_content"
                 android:hint="@string/passphrase_enter_passphrase"
                 android:imeOptions="actionDone"
+                android:inputType="textPassword"
                 android:maxLines="3"
-                android:singleLine="false"
-                tools:inputType="textPassword" />
+                android:singleLine="false" />
 
         </com.google.android.material.textfield.TextInputLayout>
 

From 35ee555252d4930a016ae4c1c3e1adcd6c8bc41f Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 19 Nov 2021 17:35:02 +0100
Subject: [PATCH 39/52] Moar cleanup

---
 .../crypto/recover/BootstrapBottomSheet.kt    | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapBottomSheet.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapBottomSheet.kt
index 063c0f4df5..727180385d 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapBottomSheet.kt
@@ -38,6 +38,7 @@ import im.vector.app.R
 import im.vector.app.core.extensions.commitTransaction
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.extensions.registerStartForActivityResult
+import im.vector.app.core.extensions.toMvRxBundle
 import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
 import im.vector.app.databinding.BottomSheetBootstrapBinding
 import im.vector.app.features.auth.ReAuthActivity
@@ -154,48 +155,48 @@ class BootstrapBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetBoot
             is BootstrapStep.CheckingMigration           -> {
                 views.bootstrapIcon.isVisible = false
                 views.bootstrapTitleText.text = getString(R.string.bottom_sheet_setup_secure_backup_title)
-                showFragment(BootstrapWaitingFragment::class, Bundle())
+                showFragment(BootstrapWaitingFragment::class)
             }
             is BootstrapStep.FirstForm                   -> {
                 views.bootstrapIcon.isVisible = false
                 views.bootstrapTitleText.text = getString(R.string.bottom_sheet_setup_secure_backup_title)
-                showFragment(BootstrapSetupRecoveryKeyFragment::class, Bundle())
+                showFragment(BootstrapSetupRecoveryKeyFragment::class)
             }
             is BootstrapStep.SetupPassphrase             -> {
                 views.bootstrapIcon.isVisible = true
                 views.bootstrapIcon.setImageDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.ic_security_phrase_24dp))
                 views.bootstrapTitleText.text = getString(R.string.set_a_security_phrase_title)
-                showFragment(BootstrapEnterPassphraseFragment::class, Bundle())
+                showFragment(BootstrapEnterPassphraseFragment::class)
             }
             is BootstrapStep.ConfirmPassphrase           -> {
                 views.bootstrapIcon.isVisible = true
                 views.bootstrapIcon.setImageDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.ic_security_phrase_24dp))
                 views.bootstrapTitleText.text = getString(R.string.set_a_security_phrase_title)
-                showFragment(BootstrapConfirmPassphraseFragment::class, Bundle())
+                showFragment(BootstrapConfirmPassphraseFragment::class)
             }
             is BootstrapStep.AccountReAuth               -> {
                 views.bootstrapIcon.isVisible = true
                 views.bootstrapIcon.setImageDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.ic_user))
                 views.bootstrapTitleText.text = getString(R.string.re_authentication_activity_title)
-                showFragment(BootstrapReAuthFragment::class, Bundle())
+                showFragment(BootstrapReAuthFragment::class)
             }
             is BootstrapStep.Initializing                -> {
                 views.bootstrapIcon.isVisible = true
                 views.bootstrapIcon.setImageDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.ic_security_key_24dp))
                 views.bootstrapTitleText.text = getString(R.string.bootstrap_loading_title)
-                showFragment(BootstrapWaitingFragment::class, Bundle())
+                showFragment(BootstrapWaitingFragment::class)
             }
             is BootstrapStep.SaveRecoveryKey             -> {
                 views.bootstrapIcon.isVisible = true
                 views.bootstrapIcon.setImageDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.ic_security_key_24dp))
                 views.bootstrapTitleText.text = getString(R.string.bottom_sheet_save_your_recovery_key_title)
-                showFragment(BootstrapSaveRecoveryKeyFragment::class, Bundle())
+                showFragment(BootstrapSaveRecoveryKeyFragment::class)
             }
             is BootstrapStep.DoneSuccess                 -> {
                 views.bootstrapIcon.isVisible = true
                 views.bootstrapIcon.setImageDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.ic_security_key_24dp))
                 views.bootstrapTitleText.text = getString(R.string.bootstrap_finish_title)
-                showFragment(BootstrapConclusionFragment::class, Bundle())
+                showFragment(BootstrapConclusionFragment::class)
             }
             is BootstrapStep.GetBackupSecretForMigration -> {
                 val isKey = state.step.useKey()
@@ -206,7 +207,7 @@ class BootstrapBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetBoot
                         drawableRes)
                 )
                 views.bootstrapTitleText.text = getString(R.string.upgrade_security)
-                showFragment(BootstrapMigrateBackupFragment::class, Bundle())
+                showFragment(BootstrapMigrateBackupFragment::class)
             }
         }.exhaustive
         super.invalidate()
@@ -224,12 +225,12 @@ class BootstrapBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetBoot
         }
     }
 
-    private fun showFragment(fragmentClass: KClass<out Fragment>, bundle: Bundle) {
+    private fun showFragment(fragmentClass: KClass<out Fragment>, argsParcelable: Parcelable? = null) {
         if (childFragmentManager.findFragmentByTag(fragmentClass.simpleName) == null) {
             childFragmentManager.commitTransaction {
                 replace(R.id.bottomSheetFragmentContainer,
                         fragmentClass.java,
-                        bundle,
+                        argsParcelable?.toMvRxBundle(),
                         fragmentClass.simpleName
                 )
             }

From c0f8984d165a6c5b1e26a60536837bab079d9f81 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Fri, 19 Nov 2021 15:43:37 +0000
Subject: [PATCH 40/52] updating workaround factory doc

---
 .../home/room/detail/composer/MessageComposerViewModel.kt   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
index d0c5f6de1d..b9932e32ee 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
@@ -769,7 +769,11 @@ class MessageComposerViewModel @AssistedInject constructor(
     }
 
     /**
-     * Can't use the hiltMaverick here because some dependencies are injected here and in fragment but they don't share the graph.
+     * We're unable to create this ViewModel with `by hiltMavericksViewModelFactory()` due to the
+     * VoiceMessagePlaybackTracker being ActivityScoped
+     *
+     * This factory allows us to provide the ViewModel instance from the Fragment directly
+     * bypassing the Singleton scope requirement
      */
     companion object : MavericksViewModelFactory<MessageComposerViewModel, MessageComposerViewState> {
 

From e709896fb0f14b83a0725f5b6328a181a83f1746 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 19 Nov 2021 18:27:30 +0100
Subject: [PATCH 41/52] ktlint

---
 .../java/im/vector/app/features/devtools/RoomDevToolActivity.kt | 2 --
 .../java/im/vector/app/features/spaces/SpaceCreationActivity.kt | 1 -
 2 files changed, 3 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/devtools/RoomDevToolActivity.kt b/vector/src/main/java/im/vector/app/features/devtools/RoomDevToolActivity.kt
index 9e0ccf1e79..099fa2bdb9 100644
--- a/vector/src/main/java/im/vector/app/features/devtools/RoomDevToolActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/devtools/RoomDevToolActivity.kt
@@ -18,7 +18,6 @@ package im.vector.app.features.devtools
 
 import android.content.Context
 import android.content.Intent
-import android.os.Bundle
 import android.os.Parcelable
 import android.view.Menu
 import android.view.MenuItem
@@ -37,7 +36,6 @@ import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.extensions.replaceFragment
-import im.vector.app.core.extensions.toMvRxBundle
 import im.vector.app.core.platform.SimpleFragmentActivity
 import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.utils.createJSonViewerStyleProvider
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
index 59363e28c8..82a3205681 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
@@ -26,7 +26,6 @@ import com.airbnb.mvrx.withState
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
-import im.vector.app.core.extensions.toMvRxBundle
 import im.vector.app.core.platform.SimpleFragmentActivity
 import im.vector.app.features.spaces.create.ChoosePrivateSpaceTypeFragment
 import im.vector.app.features.spaces.create.ChooseSpaceTypeFragment

From e15c84129c533fd86b0b942382d234b6770c00a6 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 22 Nov 2021 10:20:01 +0100
Subject: [PATCH 42/52] Use same values than for light theme, for a better
 rendering See
 https://github.com/vector-im/element-android/issues/4285#issuecomment-974270998

---
 library/ui-styles/src/main/res/values/theme_dark.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/library/ui-styles/src/main/res/values/theme_dark.xml b/library/ui-styles/src/main/res/values/theme_dark.xml
index 4d525f7eee..b828855721 100644
--- a/library/ui-styles/src/main/res/values/theme_dark.xml
+++ b/library/ui-styles/src/main/res/values/theme_dark.xml
@@ -129,7 +129,9 @@
         <item name="android:windowSharedElementEnterTransition">@transition/image_preview_transition</item>
         <item name="android:windowSharedElementExitTransition">@transition/image_preview_transition</item>
 
-        <item name="vctr_social_login_button_google_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Google.Dark</item>
+        <!-- For Google button style, use same values than for light theme, for a better rendering (white background)
+        see https://github.com/vector-im/element-android/issues/4285#issuecomment-974270998 -->
+        <item name="vctr_social_login_button_google_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Google.Light</item>
         <item name="vctr_social_login_button_github_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Github.Dark</item>
         <item name="vctr_social_login_button_facebook_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Facebook.Dark</item>
         <item name="vctr_social_login_button_twitter_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Twitter.Dark</item>

From 2c6993af44b08df76b0d461ec083a9bb397f2431 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 22 Nov 2021 10:37:04 +0100
Subject: [PATCH 43/52] Add missing changelog for #4526

---
 changelog.d/4520.bugfix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/4520.bugfix

diff --git a/changelog.d/4520.bugfix b/changelog.d/4520.bugfix
new file mode 100644
index 0000000000..58314025f1
--- /dev/null
+++ b/changelog.d/4520.bugfix
@@ -0,0 +1 @@
+Fix a crash when displaying the bootstrap bottom sheet
\ No newline at end of file

From e520a374e4c39b3624190ad815a19e82db5cf57b Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 22 Nov 2021 10:45:45 +0100
Subject: [PATCH 44/52] Format code

---
 .../app/features/home/HomeDetailViewModel.kt  | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
index 1c1d012cc8..af7eea205f 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
@@ -60,15 +60,16 @@ import timber.log.Timber
  * View model used to update the home bottom bar notification counts, observe the sync state and
  * change the selected room list view
  */
-class HomeDetailViewModel @AssistedInject constructor(@Assisted initialState: HomeDetailViewState,
-                                                      private val session: Session,
-                                                      private val uiStateRepository: UiStateRepository,
-                                                      private val vectorDataStore: VectorDataStore,
-                                                      private val callManager: WebRtcCallManager,
-                                                      private val directRoomHelper: DirectRoomHelper,
-                                                      private val appStateHandler: AppStateHandler,
-                                                      private val autoAcceptInvites: AutoAcceptInvites) :
-        VectorViewModel<HomeDetailViewState, HomeDetailAction, HomeDetailViewEvents>(initialState),
+class HomeDetailViewModel @AssistedInject constructor(
+        @Assisted initialState: HomeDetailViewState,
+        private val session: Session,
+        private val uiStateRepository: UiStateRepository,
+        private val vectorDataStore: VectorDataStore,
+        private val callManager: WebRtcCallManager,
+        private val directRoomHelper: DirectRoomHelper,
+        private val appStateHandler: AppStateHandler,
+        private val autoAcceptInvites: AutoAcceptInvites
+) : VectorViewModel<HomeDetailViewState, HomeDetailAction, HomeDetailViewEvents>(initialState),
         CallProtocolsChecker.Listener {
 
     @AssistedFactory

From 2586b376f5b0a4248ef12774f49eb091c88f00f0 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 22 Nov 2021 11:36:18 +0100
Subject: [PATCH 45/52] Add a debug screen to display private settings, and use
 it to force display of Dialpad Tab

---
 vector/src/debug/AndroidManifest.xml          |  1 +
 .../app/features/debug/DebugMenuActivity.kt   |  6 ++
 .../settings/DebugPrivateSettingsActivity.kt  | 41 +++++++++++
 .../DebugPrivateSettingsViewActions.kt        | 23 +++++++
 .../settings/DebugPrivateSettingsViewModel.kt | 68 +++++++++++++++++++
 .../settings/DebugPrivateSettingsViewState.kt | 23 +++++++
 .../debug/res/layout/activity_debug_menu.xml  |  6 ++
 .../activity_debug_private_settings.xml       | 32 +++++++++
 .../app/features/home/HomeDetailViewModel.kt  |  8 ++-
 .../app/features/settings/VectorDataStore.kt  | 15 ++++
 10 files changed, 222 insertions(+), 1 deletion(-)
 create mode 100644 vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsActivity.kt
 create mode 100644 vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewActions.kt
 create mode 100644 vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewModel.kt
 create mode 100644 vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewState.kt
 create mode 100644 vector/src/debug/res/layout/activity_debug_private_settings.xml

diff --git a/vector/src/debug/AndroidManifest.xml b/vector/src/debug/AndroidManifest.xml
index 8ffcec6bc1..dba8440602 100644
--- a/vector/src/debug/AndroidManifest.xml
+++ b/vector/src/debug/AndroidManifest.xml
@@ -5,6 +5,7 @@
     <application>
         <activity android:name=".features.debug.TestLinkifyActivity" />
         <activity android:name=".features.debug.DebugPermissionActivity" />
+        <activity android:name=".features.debug.settings.DebugPrivateSettingsActivity" />
         <activity android:name=".features.debug.sas.DebugSasEmojiActivity" />
     </application>
 
diff --git a/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt b/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
index 960994b169..64de648a23 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
+++ b/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
@@ -35,6 +35,7 @@ import im.vector.app.core.utils.registerForPermissionsResult
 import im.vector.app.core.utils.toast
 import im.vector.app.databinding.ActivityDebugMenuBinding
 import im.vector.app.features.debug.sas.DebugSasEmojiActivity
+import im.vector.app.features.debug.settings.DebugPrivateSettingsActivity
 import im.vector.app.features.qrcode.QrCodeScannerActivity
 import im.vector.lib.ui.styles.debug.DebugMaterialThemeDarkDefaultActivity
 import im.vector.lib.ui.styles.debug.DebugMaterialThemeDarkTestActivity
@@ -75,6 +76,7 @@ class DebugMenuActivity : VectorBaseActivity<ActivityDebugMenuBinding>() {
     }
 
     private fun setupViews() {
+        views.debugPrivateSetting.setOnClickListener { openPrivateSettings() }
         views.debugTestTextViewLink.setOnClickListener { testTextViewLink() }
         views.debugOpenButtonStylesLight.setOnClickListener {
             startActivity(Intent(this, DebugVectorButtonStylesLightActivity::class.java))
@@ -115,6 +117,10 @@ class DebugMenuActivity : VectorBaseActivity<ActivityDebugMenuBinding>() {
         }
     }
 
+    private fun openPrivateSettings() {
+        startActivity(Intent(this, DebugPrivateSettingsActivity::class.java))
+    }
+
     private fun renderQrCode(text: String) {
         views.debugQrCode.setData(text)
     }
diff --git a/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsActivity.kt b/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsActivity.kt
new file mode 100644
index 0000000000..ad2ac70646
--- /dev/null
+++ b/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsActivity.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.debug.settings
+
+import com.airbnb.mvrx.viewModel
+import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.databinding.ActivityDebugPrivateSettingsBinding
+
+@AndroidEntryPoint
+class DebugPrivateSettingsActivity : VectorBaseActivity<ActivityDebugPrivateSettingsBinding>() {
+
+    private val viewModel: DebugPrivateSettingsViewModel by viewModel()
+
+    override fun getBinding() = ActivityDebugPrivateSettingsBinding.inflate(layoutInflater)
+
+    override fun initUiAndData() {
+        views.forceDialPadTabDisplay.setOnCheckedChangeListener { _, isChecked ->
+            viewModel.handle(DebugPrivateSettingsViewActions.SetDialPadVisibility(isChecked))
+        }
+    }
+
+    override fun invalidate() = withState(viewModel) {
+        views.forceDialPadTabDisplay.isChecked = it.dialPadVisible
+    }
+}
diff --git a/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewActions.kt b/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewActions.kt
new file mode 100644
index 0000000000..ecbb241387
--- /dev/null
+++ b/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewActions.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.debug.settings
+
+import im.vector.app.core.platform.VectorViewModelAction
+
+sealed class DebugPrivateSettingsViewActions : VectorViewModelAction {
+    data class SetDialPadVisibility(val force: Boolean) : DebugPrivateSettingsViewActions()
+}
diff --git a/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewModel.kt b/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewModel.kt
new file mode 100644
index 0000000000..f4ff4da163
--- /dev/null
+++ b/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewModel.kt
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.debug.settings
+
+import com.airbnb.mvrx.MavericksViewModelFactory
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import im.vector.app.core.di.MavericksAssistedViewModelFactory
+import im.vector.app.core.di.hiltMavericksViewModelFactory
+import im.vector.app.core.platform.EmptyViewEvents
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.features.settings.VectorDataStore
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
+
+class DebugPrivateSettingsViewModel @AssistedInject constructor(
+        @Assisted initialState: DebugPrivateSettingsViewState,
+        private val vectorDataStore: VectorDataStore
+) : VectorViewModel<DebugPrivateSettingsViewState, DebugPrivateSettingsViewActions, EmptyViewEvents>(initialState) {
+
+    @AssistedFactory
+    interface Factory : MavericksAssistedViewModelFactory<DebugPrivateSettingsViewModel, DebugPrivateSettingsViewState> {
+        override fun create(initialState: DebugPrivateSettingsViewState): DebugPrivateSettingsViewModel
+    }
+
+    companion object : MavericksViewModelFactory<DebugPrivateSettingsViewModel, DebugPrivateSettingsViewState> by hiltMavericksViewModelFactory()
+
+    init {
+        observeVectorDataStore()
+    }
+
+    private fun observeVectorDataStore() {
+        vectorDataStore.forceDialPadDisplayFlow.onEach {
+            setState {
+                copy(
+                        dialPadVisible = it
+                )
+            }
+        }
+    }
+
+    override fun handle(action: DebugPrivateSettingsViewActions) {
+        when (action) {
+            is DebugPrivateSettingsViewActions.SetDialPadVisibility -> handleSetDialPadVisibility(action)
+        }
+    }
+
+    private fun handleSetDialPadVisibility(action: DebugPrivateSettingsViewActions.SetDialPadVisibility) {
+        viewModelScope.launch {
+            vectorDataStore.setForceDialPadDisplay(action.force)
+        }
+    }
+}
diff --git a/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewState.kt b/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewState.kt
new file mode 100644
index 0000000000..0ad4b185ec
--- /dev/null
+++ b/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewState.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.debug.settings
+
+import com.airbnb.mvrx.MavericksState
+
+data class DebugPrivateSettingsViewState(
+        val dialPadVisible: Boolean = false
+) : MavericksState
diff --git a/vector/src/debug/res/layout/activity_debug_menu.xml b/vector/src/debug/res/layout/activity_debug_menu.xml
index fadffecf83..ac70e4ef0e 100644
--- a/vector/src/debug/res/layout/activity_debug_menu.xml
+++ b/vector/src/debug/res/layout/activity_debug_menu.xml
@@ -20,6 +20,12 @@
             android:padding="@dimen/layout_horizontal_margin"
             android:showDividers="middle">
 
+            <Button
+                android:id="@+id/debug_private_setting"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Private settings" />
+
             <Button
                 android:id="@+id/debug_test_text_view_link"
                 android:layout_width="wrap_content"
diff --git a/vector/src/debug/res/layout/activity_debug_private_settings.xml b/vector/src/debug/res/layout/activity_debug_private_settings.xml
new file mode 100644
index 0000000000..b4186e7bba
--- /dev/null
+++ b/vector/src/debug/res/layout/activity_debug_private_settings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/coordinatorLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".features.debug.settings.DebugPrivateSettingsActivity"
+    tools:ignore="HardcodedText">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:divider="@drawable/linear_divider"
+            android:orientation="vertical"
+            android:padding="@dimen/layout_horizontal_margin"
+            android:showDividers="middle">
+
+            <CheckBox
+                android:id="@+id/forceDialPadTabDisplay"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Force DialPad tab display" />
+
+        </LinearLayout>
+
+    </ScrollView>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
index af7eea205f..84fd8e06ee 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
@@ -101,6 +101,8 @@ class HomeDetailViewModel @AssistedInject constructor(
         }
     }
 
+    private var forceDialPad = false
+
     private fun observeDataStore() {
         viewModelScope.launch {
             vectorDataStore.pushCounterFlow.collect { nbOfPush ->
@@ -110,6 +112,10 @@ class HomeDetailViewModel @AssistedInject constructor(
                     )
                 }
             }
+            vectorDataStore.forceDialPadDisplayFlow.collect { force ->
+                forceDialPad = force
+                updateShowDialPadTab()
+            }
         }
     }
 
@@ -156,7 +162,7 @@ class HomeDetailViewModel @AssistedInject constructor(
 
     private fun updateShowDialPadTab() {
         setState {
-            copy(showDialPadTab = callManager.supportsPSTNProtocol)
+            copy(showDialPadTab = forceDialPad || callManager.supportsPSTNProtocol)
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorDataStore.kt b/vector/src/main/java/im/vector/app/features/settings/VectorDataStore.kt
index 74b3794b2c..6a5ef0ac99 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorDataStore.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorDataStore.kt
@@ -19,11 +19,13 @@ package im.vector.app.features.settings
 import android.content.Context
 import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.booleanPreferencesKey
 import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.intPreferencesKey
 import androidx.datastore.preferences.preferencesDataStore
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
+import org.matrix.android.sdk.api.extensions.orFalse
 import javax.inject.Inject
 
 private val Context.dataStore: DataStore<Preferences> by preferencesDataStore(name = "vector_settings")
@@ -44,4 +46,17 @@ class VectorDataStore @Inject constructor(
             settings[pushCounter] = currentCounterValue + 1
         }
     }
+
+    // For debug only
+    private val forceDialPadDisplay = booleanPreferencesKey("force_dial_pad_display")
+
+    val forceDialPadDisplayFlow: Flow<Boolean> = context.dataStore.data.map { preferences ->
+        preferences[forceDialPadDisplay].orFalse()
+    }
+
+    suspend fun setForceDialPadDisplay(force: Boolean) {
+        context.dataStore.edit { settings ->
+            settings[forceDialPadDisplay] = force
+        }
+    }
 }

From 86d76e76a471a3a436989ccb5913d41a789bb3cc Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 22 Nov 2021 15:41:54 +0100
Subject: [PATCH 46/52] Fix DI

---
 .../debug/di/MavericksViewModelDebugModule.kt | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 vector/src/debug/java/im/vector/app/features/debug/di/MavericksViewModelDebugModule.kt

diff --git a/vector/src/debug/java/im/vector/app/features/debug/di/MavericksViewModelDebugModule.kt b/vector/src/debug/java/im/vector/app/features/debug/di/MavericksViewModelDebugModule.kt
new file mode 100644
index 0000000000..8be4470b3f
--- /dev/null
+++ b/vector/src/debug/java/im/vector/app/features/debug/di/MavericksViewModelDebugModule.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.debug.di
+
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.multibindings.IntoMap
+import im.vector.app.core.di.MavericksAssistedViewModelFactory
+import im.vector.app.core.di.MavericksViewModelComponent
+import im.vector.app.core.di.MavericksViewModelKey
+import im.vector.app.features.debug.settings.DebugPrivateSettingsViewModel
+
+@InstallIn(MavericksViewModelComponent::class)
+@Module
+interface MavericksViewModelDebugModule {
+
+    @Binds
+    @IntoMap
+    @MavericksViewModelKey(DebugPrivateSettingsViewModel::class)
+    fun debugPrivateSettingsViewModelFactory(factory: DebugPrivateSettingsViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+}

From aa0f0319105f06d3c8f44d2d40d2c35e350787c1 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 22 Nov 2021 16:18:57 +0100
Subject: [PATCH 47/52] invalidate does not work on Activity :/

---
 .../settings/DebugPrivateSettingsActivity.kt  | 23 ++++-----
 .../settings/DebugPrivateSettingsFragment.kt  | 47 +++++++++++++++++++
 ...ml => fragment_debug_private_settings.xml} |  0
 3 files changed, 57 insertions(+), 13 deletions(-)
 create mode 100644 vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsFragment.kt
 rename vector/src/debug/res/layout/{activity_debug_private_settings.xml => fragment_debug_private_settings.xml} (100%)

diff --git a/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsActivity.kt b/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsActivity.kt
index ad2ac70646..25a068e794 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsActivity.kt
+++ b/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsActivity.kt
@@ -16,26 +16,23 @@
 
 package im.vector.app.features.debug.settings
 
-import com.airbnb.mvrx.viewModel
-import com.airbnb.mvrx.withState
 import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.R
+import im.vector.app.core.extensions.addFragment
 import im.vector.app.core.platform.VectorBaseActivity
-import im.vector.app.databinding.ActivityDebugPrivateSettingsBinding
+import im.vector.app.databinding.ActivitySimpleBinding
 
 @AndroidEntryPoint
-class DebugPrivateSettingsActivity : VectorBaseActivity<ActivityDebugPrivateSettingsBinding>() {
+class DebugPrivateSettingsActivity : VectorBaseActivity<ActivitySimpleBinding>() {
 
-    private val viewModel: DebugPrivateSettingsViewModel by viewModel()
-
-    override fun getBinding() = ActivityDebugPrivateSettingsBinding.inflate(layoutInflater)
+    override fun getBinding() = ActivitySimpleBinding.inflate(layoutInflater)
 
     override fun initUiAndData() {
-        views.forceDialPadTabDisplay.setOnCheckedChangeListener { _, isChecked ->
-            viewModel.handle(DebugPrivateSettingsViewActions.SetDialPadVisibility(isChecked))
+        if (isFirstCreation()) {
+            addFragment(
+                    R.id.simpleFragmentContainer,
+                    DebugPrivateSettingsFragment::class.java
+            )
         }
     }
-
-    override fun invalidate() = withState(viewModel) {
-        views.forceDialPadTabDisplay.isChecked = it.dialPadVisible
-    }
 }
diff --git a/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsFragment.kt b/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsFragment.kt
new file mode 100644
index 0000000000..c30de8ed15
--- /dev/null
+++ b/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsFragment.kt
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.debug.settings
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import com.airbnb.mvrx.fragmentViewModel
+import com.airbnb.mvrx.withState
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.databinding.FragmentDebugPrivateSettingsBinding
+
+class DebugPrivateSettingsFragment : VectorBaseFragment<FragmentDebugPrivateSettingsBinding>() {
+
+    private val viewModel: DebugPrivateSettingsViewModel by fragmentViewModel()
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentDebugPrivateSettingsBinding {
+        return FragmentDebugPrivateSettingsBinding.inflate(inflater, container, false)
+    }
+
+    init {
+        setViewListeners()
+    }
+
+    private fun setViewListeners() {
+        views.forceDialPadTabDisplay.setOnCheckedChangeListener { _, isChecked ->
+            viewModel.handle(DebugPrivateSettingsViewActions.SetDialPadVisibility(isChecked))
+        }
+    }
+
+    override fun invalidate() = withState(viewModel) {
+        views.forceDialPadTabDisplay.isChecked = it.dialPadVisible
+    }
+}
diff --git a/vector/src/debug/res/layout/activity_debug_private_settings.xml b/vector/src/debug/res/layout/fragment_debug_private_settings.xml
similarity index 100%
rename from vector/src/debug/res/layout/activity_debug_private_settings.xml
rename to vector/src/debug/res/layout/fragment_debug_private_settings.xml

From e10af6476f5b96938db28fa5847802714b0baea7 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 22 Nov 2021 16:19:59 +0100
Subject: [PATCH 48/52] invalidate does not work on Activity :/

---
 .../features/debug/settings/DebugPrivateSettingsFragment.kt | 6 +++++-
 .../java/im/vector/app/core/platform/VectorBaseActivity.kt  | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsFragment.kt b/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsFragment.kt
index c30de8ed15..808c379354 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsFragment.kt
+++ b/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsFragment.kt
@@ -16,7 +16,9 @@
 
 package im.vector.app.features.debug.settings
 
+import android.os.Bundle
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
@@ -31,7 +33,9 @@ class DebugPrivateSettingsFragment : VectorBaseFragment<FragmentDebugPrivateSett
         return FragmentDebugPrivateSettingsBinding.inflate(inflater, container, false)
     }
 
-    init {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
         setViewListeners()
     }
 
diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
index a56c2f0432..66c5a53cc2 100644
--- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
@@ -556,7 +556,8 @@ abstract class VectorBaseActivity<VB : ViewBinding> : AppCompatActivity(), Maver
 
     open fun initUiAndData() = Unit
 
-    override fun invalidate() = Unit
+    // Note: does not seem to be called
+    final override fun invalidate() = Unit
 
     @StringRes
     open fun getTitleRes() = -1

From aee34ad5527ff61354e222c0923bc4a9c36f7b18 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 22 Nov 2021 16:45:18 +0100
Subject: [PATCH 49/52] Cleanup the ViewModels

---
 .../settings/DebugPrivateSettingsViewModel.kt | 11 ++++------
 .../app/features/home/HomeDetailViewModel.kt  | 22 ++++++++-----------
 .../home/room/detail/RoomDetailViewModel.kt   | 12 ++++------
 3 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewModel.kt b/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewModel.kt
index f4ff4da163..624c46556a 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewModel.kt
+++ b/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewModel.kt
@@ -25,7 +25,6 @@ import im.vector.app.core.di.hiltMavericksViewModelFactory
 import im.vector.app.core.platform.EmptyViewEvents
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.features.settings.VectorDataStore
-import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 
 class DebugPrivateSettingsViewModel @AssistedInject constructor(
@@ -45,12 +44,10 @@ class DebugPrivateSettingsViewModel @AssistedInject constructor(
     }
 
     private fun observeVectorDataStore() {
-        vectorDataStore.forceDialPadDisplayFlow.onEach {
-            setState {
-                copy(
-                        dialPadVisible = it
-                )
-            }
+        vectorDataStore.forceDialPadDisplayFlow.setOnEach {
+            copy(
+                    dialPadVisible = it
+            )
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
index 84fd8e06ee..e6eaa7e0ec 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
@@ -38,7 +38,6 @@ import im.vector.app.features.invite.showInvites
 import im.vector.app.features.settings.VectorDataStore
 import im.vector.app.features.ui.UiStateRepository
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.flatMapLatest
@@ -104,19 +103,16 @@ class HomeDetailViewModel @AssistedInject constructor(
     private var forceDialPad = false
 
     private fun observeDataStore() {
-        viewModelScope.launch {
-            vectorDataStore.pushCounterFlow.collect { nbOfPush ->
-                setState {
-                    copy(
-                            pushCounter = nbOfPush
-                    )
-                }
-            }
-            vectorDataStore.forceDialPadDisplayFlow.collect { force ->
-                forceDialPad = force
-                updateShowDialPadTab()
-            }
+        vectorDataStore.pushCounterFlow.setOnEach { nbOfPush ->
+            copy(
+                    pushCounter = nbOfPush
+            )
         }
+
+        vectorDataStore.forceDialPadDisplayFlow.onEach { force ->
+            forceDialPad = force
+            updateShowDialPadTab()
+        }.launchIn(viewModelScope)
     }
 
     override fun handle(action: HomeDetailAction) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index d846a1d1f8..3e1d9487f3 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -195,14 +195,10 @@ class RoomDetailViewModel @AssistedInject constructor(
     }
 
     private fun observeDataStore() {
-        viewModelScope.launch {
-            vectorDataStore.pushCounterFlow.collect { nbOfPush ->
-                setState {
-                    copy(
-                            pushCounter = nbOfPush
-                    )
-                }
-            }
+        vectorDataStore.pushCounterFlow.setOnEach { nbOfPush ->
+            copy(
+                    pushCounter = nbOfPush
+            )
         }
     }
 

From e546587efbe836442aca982f06d965c9ef841922 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 22 Nov 2021 17:18:11 +0100
Subject: [PATCH 50/52] Better ViewState

---
 .../vector/app/features/home/HomeDetailFragment.kt  |  1 -
 .../vector/app/features/home/HomeDetailViewModel.kt | 13 ++++++-------
 .../vector/app/features/home/HomeDetailViewState.kt |  7 +++++--
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
index 55d8e2e09a..712055435f 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
@@ -23,7 +23,6 @@ import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isVisible
-import androidx.core.view.iterator
 import androidx.fragment.app.Fragment
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.fragmentViewModel
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
index e6eaa7e0ec..77bdc664b9 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
@@ -100,8 +100,6 @@ class HomeDetailViewModel @AssistedInject constructor(
         }
     }
 
-    private var forceDialPad = false
-
     private fun observeDataStore() {
         vectorDataStore.pushCounterFlow.setOnEach { nbOfPush ->
             copy(
@@ -109,10 +107,11 @@ class HomeDetailViewModel @AssistedInject constructor(
             )
         }
 
-        vectorDataStore.forceDialPadDisplayFlow.onEach { force ->
-            forceDialPad = force
-            updateShowDialPadTab()
-        }.launchIn(viewModelScope)
+        vectorDataStore.forceDialPadDisplayFlow.setOnEach { force ->
+            copy(
+                    forceDialPadTab = force
+            )
+        }
     }
 
     override fun handle(action: HomeDetailAction) {
@@ -158,7 +157,7 @@ class HomeDetailViewModel @AssistedInject constructor(
 
     private fun updateShowDialPadTab() {
         setState {
-            copy(showDialPadTab = forceDialPad || callManager.supportsPSTNProtocol)
+            copy(pstnSupportFlag = callManager.supportsPSTNProtocol)
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt
index 7665dd41e5..fbf67cdcff 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt
@@ -42,8 +42,11 @@ data class HomeDetailViewState(
         val syncState: SyncState = SyncState.Idle,
         val incrementalSyncStatus: SyncStatusService.Status.IncrementalSyncStatus = SyncStatusService.Status.IncrementalSyncIdle,
         val pushCounter: Int = 0,
-        val showDialPadTab: Boolean = false
-) : MavericksState
+        val pstnSupportFlag: Boolean = false,
+        val forceDialPadTab: Boolean = false
+) : MavericksState {
+    val showDialPadTab = forceDialPadTab || pstnSupportFlag
+}
 
 sealed class HomeTab(@StringRes val titleRes: Int) {
     data class RoomList(val displayMode: RoomListDisplayMode) : HomeTab(displayMode.titleRes)

From e95d603dc50a6288323de58cfa764f2fc79028ec Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 22 Nov 2021 17:19:25 +0100
Subject: [PATCH 51/52] Rename fun

---
 .../java/im/vector/app/features/home/HomeDetailViewModel.kt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
index 77bdc664b9..5260330475 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
@@ -90,7 +90,7 @@ class HomeDetailViewModel @AssistedInject constructor(
         observeSyncState()
         observeRoomGroupingMethod()
         observeRoomSummaries()
-        updateShowDialPadTab()
+        updatePstnSupportFlag()
         observeDataStore()
         callManager.addProtocolsCheckerListener(this)
         session.flow().liveUser(session.myUserId).execute {
@@ -152,10 +152,10 @@ class HomeDetailViewModel @AssistedInject constructor(
     }
 
     override fun onPSTNSupportUpdated() {
-        updateShowDialPadTab()
+        updatePstnSupportFlag()
     }
 
-    private fun updateShowDialPadTab() {
+    private fun updatePstnSupportFlag() {
         setState {
             copy(pstnSupportFlag = callManager.supportsPSTNProtocol)
         }

From 62293e3a4e027a0032ce746a2e289fb7c3dccc7f Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 22 Nov 2021 17:59:38 +0100
Subject: [PATCH 52/52] ktlint

---
 .../vector/app/features/home/room/detail/RoomDetailViewModel.kt  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index 3e1d9487f3..91c7d25b49 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -59,7 +59,6 @@ import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.voice.VoicePlayerHelper
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.filter