From f84f42d8bd0ebc876efbb0e9f9a9c0aa22a5b6e8 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 13 Nov 2023 11:36:01 +0100
Subject: [PATCH] Moved voice recording layout to it's own file

---
 ...conversation_record_voice_message_area.xml | 138 ++++++++++++++++++
 ...at_conversation_send_area_bottom_sheet.xml | 120 ++-------------
 2 files changed, 149 insertions(+), 109 deletions(-)
 create mode 100644 app/src/main/res/layout/chat_conversation_record_voice_message_area.xml

diff --git a/app/src/main/res/layout/chat_conversation_record_voice_message_area.xml b/app/src/main/res/layout/chat_conversation_record_voice_message_area.xml
new file mode 100644
index 000000000..f056fcd79
--- /dev/null
+++ b/app/src/main/res/layout/chat_conversation_record_voice_message_area.xml
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+        <import type="android.view.View" />
+        <variable
+            name="openFilePickerClickListener"
+            type="View.OnClickListener" />
+        <variable
+            name="viewModel"
+            type="org.linphone.ui.main.chat.viewmodel.SendMessageInConversationViewModel" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <ImageView
+            android:id="@+id/cancel_voice_message"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_marginStart="8dp"
+            android:onClick="@{() -> viewModel.cancelVoiceMessageRecording()}"
+            android:padding="8dp"
+            android:src="@drawable/x"
+            android:background="@drawable/circle_white_button_background"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:tint="@color/orange_main_500" />
+
+        <ProgressBar
+            style="?android:attr/progressBarStyleHorizontal"
+            android:id="@+id/voice_record_progress"
+            android:layout_width="0dp"
+            android:layout_height="48dp"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp"
+            android:progressDrawable="@drawable/voice_recording_gradient_progress"
+            android:progress="@{viewModel.voiceRecordPlayerPosition}"
+            android:max="@{viewModel.voiceRecordingDuration}"
+            tools:progress="60"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/send_message"
+            app:layout_constraintStart_toEndOf="@id/cancel_voice_message"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <ImageView
+            android:id="@+id/stop_recording"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginStart="10dp"
+            android:onClick="@{() -> viewModel.stopVoiceMessageRecording()}"
+            android:padding="8dp"
+            android:src="@drawable/stop_fill"
+            android:background="@drawable/circle_white_button_background"
+            android:visibility="@{viewModel.voiceRecordingInProgress ? View.VISIBLE : View.GONE}"
+            app:layout_constraintDimensionRatio="1:1"
+            app:layout_constraintBottom_toBottomOf="@id/voice_recording_duration"
+            app:layout_constraintStart_toStartOf="@id/voice_record_progress"
+            app:layout_constraintTop_toTopOf="@id/voice_recording_duration"
+            app:tint="@color/orange_main_500" />
+
+        <ImageView
+            android:id="@+id/play_pause_voice_record"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginStart="10dp"
+            android:onClick="@{() -> viewModel.togglePlayPauseVoiceRecord()}"
+            android:padding="8dp"
+            android:src="@{viewModel.isPlayingVoiceRecord ? @drawable/pause_fill : @drawable/play_fill, default=@drawable/play_fill}"
+            android:background="@drawable/circle_white_button_background"
+            android:visibility="@{!viewModel.voiceRecordingInProgress ? View.VISIBLE : View.GONE}"
+            app:layout_constraintDimensionRatio="1:1"
+            app:layout_constraintBottom_toBottomOf="@id/voice_record_duration"
+            app:layout_constraintStart_toStartOf="@id/voice_record_progress"
+            app:layout_constraintTop_toTopOf="@id/voice_record_duration"
+            app:tint="@color/orange_main_500" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/default_text_style"
+            android:id="@+id/voice_recording_duration"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="10dp"
+            android:paddingStart="12dp"
+            android:paddingEnd="12dp"
+            android:paddingTop="5dp"
+            android:paddingBottom="5dp"
+            android:text="@{viewModel.formattedVoiceRecordingDuration, default=`00:00`}"
+            android:textSize="14sp"
+            android:textColor="@color/gray_main2_600"
+            android:background="@drawable/shape_squircle_white_r50_background"
+            android:visibility="@{viewModel.voiceRecordingInProgress ? View.VISIBLE : View.GONE}"
+            android:drawableStart="@drawable/record_fill"
+            android:drawablePadding="8dp"
+            app:drawableTint="@color/red_danger_500"
+            app:layout_constraintBottom_toBottomOf="@id/voice_record_progress"
+            app:layout_constraintEnd_toEndOf="@id/voice_record_progress"
+            app:layout_constraintTop_toTopOf="@id/voice_record_progress"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/default_text_style"
+            android:id="@+id/voice_record_duration"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="10dp"
+            android:paddingStart="12dp"
+            android:paddingEnd="12dp"
+            android:paddingTop="5dp"
+            android:paddingBottom="5dp"
+            android:text="@{viewModel.formattedVoiceRecordingDuration, default=`00:00`}"
+            android:textSize="14sp"
+            android:textColor="@color/gray_main2_600"
+            android:background="@drawable/shape_squircle_white_r50_background"
+            android:visibility="@{!viewModel.voiceRecordingInProgress ? View.VISIBLE : View.GONE}"
+            app:layout_constraintBottom_toBottomOf="@id/voice_record_progress"
+            app:layout_constraintEnd_toEndOf="@id/voice_record_progress"
+            app:layout_constraintTop_toTopOf="@id/voice_record_progress"/>
+
+        <ImageView
+            android:id="@+id/send_message"
+            android:layout_width="40dp"
+            android:layout_height="0dp"
+            android:layout_marginEnd="4dp"
+            android:onClick="@{() -> viewModel.sendMessage()}"
+            android:padding="8dp"
+            android:src="@drawable/paper_plane_tilt"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:tint="@color/icon_primary_color_selector" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_conversation_send_area_bottom_sheet.xml b/app/src/main/res/layout/chat_conversation_send_area_bottom_sheet.xml
index e43bda0ac..97724818a 100644
--- a/app/src/main/res/layout/chat_conversation_send_area_bottom_sheet.xml
+++ b/app/src/main/res/layout/chat_conversation_send_area_bottom_sheet.xml
@@ -20,13 +20,6 @@
         app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
         <!-- Keep behavior to have it at the bottom -->
 
-        <androidx.constraintlayout.widget.Group
-            android:id="@+id/voice_recording"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="@{viewModel.voiceRecording ? View.VISIBLE : View.GONE, default=gone}"
-            app:constraint_referenced_ids="cancel_voice_message, voice_record_progress" />
-
         <androidx.constraintlayout.widget.Group
             android:id="@+id/standard_messages"
             android:layout_width="wrap_content"
@@ -88,20 +81,6 @@
             app:layout_constraintTop_toTopOf="@id/message_area_background"
             app:tint="@color/icon_color_selector" />
 
-        <ImageView
-            android:id="@+id/cancel_voice_message"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_marginStart="8dp"
-            android:onClick="@{() -> viewModel.cancelVoiceMessageRecording()}"
-            android:padding="8dp"
-            android:src="@drawable/x"
-            android:background="@drawable/circle_white_button_background"
-            app:layout_constraintBottom_toBottomOf="@id/message_area_background"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/message_area_background"
-            app:tint="@color/orange_main_500" />
-
         <ImageView
             android:id="@+id/attach_file"
             android:layout_width="40dp"
@@ -157,100 +136,13 @@
             android:layout_height="wrap_content"
             app:barrierDirection="start"
             app:constraint_referenced_ids="record_voice_message, send_message" />
-        
-        <ProgressBar
-            style="?android:attr/progressBarStyleHorizontal"
-            android:id="@+id/voice_record_progress"
-            android:layout_width="0dp"
-            android:layout_height="60dp"
-            android:layout_marginStart="20dp"
-            android:layout_marginEnd="20dp"
-            android:progressDrawable="@drawable/voice_recording_gradient_progress"
-            android:progress="@{viewModel.voiceRecordPlayerPosition}"
-            android:max="@{viewModel.voiceRecordingDuration}"
-            tools:progress="60"
-            app:layout_constraintBottom_toBottomOf="@id/message_to_send"
-            app:layout_constraintEnd_toStartOf="@id/send_message"
-            app:layout_constraintStart_toEndOf="@id/cancel_voice_message"
-            app:layout_constraintTop_toTopOf="@id/message_to_send" />
-
-        <ImageView
-            android:id="@+id/stop_recording"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_marginStart="10dp"
-            android:onClick="@{() -> viewModel.stopVoiceMessageRecording()}"
-            android:padding="8dp"
-            android:src="@drawable/stop_fill"
-            android:background="@drawable/circle_white_button_background"
-            android:visibility="@{viewModel.voiceRecording &amp;&amp; viewModel.voiceRecordingInProgress ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintBottom_toBottomOf="@id/voice_record_progress"
-            app:layout_constraintStart_toStartOf="@id/voice_record_progress"
-            app:layout_constraintTop_toTopOf="@id/voice_record_progress"
-            app:tint="@color/orange_main_500" />
-
-        <ImageView
-            android:id="@+id/play_pause_voice_record"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_marginStart="10dp"
-            android:onClick="@{() -> viewModel.togglePlayPauseVoiceRecord()}"
-            android:padding="8dp"
-            android:src="@{viewModel.isPlayingVoiceRecord ? @drawable/pause_fill : @drawable/play_fill, default=@drawable/play_fill}"
-            android:background="@drawable/circle_white_button_background"
-            android:visibility="@{viewModel.voiceRecording &amp;&amp; !viewModel.voiceRecordingInProgress ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintBottom_toBottomOf="@id/voice_record_progress"
-            app:layout_constraintStart_toStartOf="@id/voice_record_progress"
-            app:layout_constraintTop_toTopOf="@id/voice_record_progress"
-            app:tint="@color/orange_main_500" />
-
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style"
-            android:id="@+id/voice_recording_duration"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="10dp"
-            android:paddingStart="12dp"
-            android:paddingEnd="12dp"
-            android:paddingTop="5dp"
-            android:paddingBottom="5dp"
-            android:text="@{viewModel.formattedVoiceRecordingDuration, default=`00:00`}"
-            android:textSize="14sp"
-            android:textColor="@color/gray_main2_600"
-            android:background="@drawable/shape_squircle_white_r50_background"
-            android:visibility="@{viewModel.voiceRecording &amp;&amp; viewModel.voiceRecordingInProgress ? View.VISIBLE : View.GONE, default=gone}"
-            android:drawableStart="@drawable/record_fill"
-            android:drawablePadding="8dp"
-            app:drawableTint="@color/red_danger_500"
-            app:layout_constraintBottom_toBottomOf="@id/voice_record_progress"
-            app:layout_constraintEnd_toEndOf="@id/voice_record_progress"
-            app:layout_constraintTop_toTopOf="@id/voice_record_progress"/>
-
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style"
-            android:id="@+id/voice_record_duration"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="10dp"
-            android:paddingStart="12dp"
-            android:paddingEnd="12dp"
-            android:paddingTop="5dp"
-            android:paddingBottom="5dp"
-            android:text="@{viewModel.formattedVoiceRecordingDuration, default=`00:00`}"
-            android:textSize="14sp"
-            android:textColor="@color/gray_main2_600"
-            android:background="@drawable/shape_squircle_white_r50_background"
-            android:visibility="@{viewModel.voiceRecording &amp;&amp; !viewModel.voiceRecordingInProgress ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintBottom_toBottomOf="@id/voice_record_progress"
-            app:layout_constraintEnd_toEndOf="@id/voice_record_progress"
-            app:layout_constraintTop_toTopOf="@id/voice_record_progress"/>
 
         <ImageView
             android:id="@+id/send_message"
             android:layout_width="40dp"
             android:layout_height="0dp"
             android:layout_marginEnd="4dp"
-            android:visibility="@{viewModel.textToSend.length() > 0 || viewModel.attachments.size() > 0 || viewModel.voiceRecording ? View.VISIBLE : View.GONE, default=gone}"
+            android:visibility="@{viewModel.textToSend.length() > 0 || viewModel.attachments.size() > 0 ? View.VISIBLE : View.GONE, default=gone}"
             android:onClick="@{() -> viewModel.sendMessage()}"
             android:padding="8dp"
             android:src="@drawable/paper_plane_tilt"
@@ -273,6 +165,16 @@
             app:layout_constraintTop_toTopOf="@id/message_area_background"
             app:tint="@color/gray_main2_500" />
 
+        <include
+            android:id="@+id/voice_recording_area"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            layout="@layout/chat_conversation_record_voice_message_area"
+            viewModel="@{viewModel}"
+            android:visibility="@{viewModel.voiceRecording ? View.VISIBLE : View.GONE, default=gone}"
+            app:layout_constraintTop_toTopOf="@id/message_area_background"
+            app:layout_constraintBottom_toBottomOf="@id/message_area_background"/>
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </layout>
\ No newline at end of file