TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-01-11 23:13:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix voice recording UI when replying to a message.

Browse Source 
Just had to relayer some of the views so the recording UI positions
correctly lined up at the bottom.
This commit is contained in:
Greyson Parrelli 2018-04-26 17:43:35 -07:00
parent 102941c18c
commit f580edaf91
1 changed files with 71 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
res/layout/conversation_input_panel.xml
View File

@ -37,12 +37,18 @@
app:message_type="preview" app:message_type="preview"
tools:visibility="visible"/> tools:visibility="visible"/>
<LinearLayout android:layout_width="match_parent" <FrameLayout
android:layout_height="wrap_content" android:layout_width="match_parent"
android:clipChildren="false" android:layout_height="wrap_content"
android:clipToPadding="false"> android:clipChildren="false"
android:clipToPadding="false">
<org.thoughtcrime.securesms.components.emoji.EmojiToggle <LinearLayout android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipChildren="false"
android:clipToPadding="false">
<org.thoughtcrime.securesms.components.emoji.EmojiToggle
android:id="@+id/emoji_toggle" android:id="@+id/emoji_toggle"
android:layout_width="37dp" android:layout_width="37dp"
android:layout_height="37dp" android:layout_height="37dp"
@ -50,7 +56,7 @@
android:background="@drawable/touch_highlight_background" android:background="@drawable/touch_highlight_background"
android:contentDescription="@string/conversation_activity__emoji_toggle_description" /> android:contentDescription="@string/conversation_activity__emoji_toggle_description" />
<org.thoughtcrime.securesms.components.ComposeText <org.thoughtcrime.securesms.components.ComposeText
style="@style/ComposeEditText" style="@style/ComposeEditText"
android:id="@+id/embedded_text_editor" android:id="@+id/embedded_text_editor"
android:layout_width="0dp" android:layout_width="0dp"
@ -62,17 +68,17 @@
android:nextFocusRight="@+id/send_button" android:nextFocusRight="@+id/send_button"
tools:visibility="invisible" tools:visibility="invisible"
tools:hint="Send TextSecure message" > tools:hint="Send TextSecure message" >
<requestFocus /> <requestFocus />
</org.thoughtcrime.securesms.components.ComposeText> </org.thoughtcrime.securesms.components.ComposeText>
<org.thoughtcrime.securesms.components.HidingLinearLayout <org.thoughtcrime.securesms.components.HidingLinearLayout
android:id="@+id/quick_attachment_toggle" android:id="@+id/quick_attachment_toggle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:clipChildren="false" android:clipChildren="false"
android:clipToPadding="false"> android:clipToPadding="false">
<ImageButton <ImageButton
android:id="@+id/quick_camera_toggle" android:id="@+id/quick_camera_toggle"
android:layout_width="37dp" android:layout_width="37dp"
android:layout_height="37dp" android:layout_height="37dp"
@ -82,14 +88,14 @@
android:contentDescription="@string/conversation_activity__quick_attachment_drawer_toggle_camera_description" android:contentDescription="@string/conversation_activity__quick_attachment_drawer_toggle_camera_description"
android:padding="10dp"/> android:padding="10dp"/>
<org.thoughtcrime.securesms.components.MicrophoneRecorderView <org.thoughtcrime.securesms.components.MicrophoneRecorderView
android:id="@+id/recorder_view" android:id="@+id/recorder_view"
android:layout_width="37dp" android:layout_width="37dp"
android:layout_height="37dp" android:layout_height="37dp"
android:clipChildren="false" android:clipChildren="false"
android:clipToPadding="false"> android:clipToPadding="false">
<ImageButton <ImageButton
android:id="@+id/quick_audio_toggle" android:id="@+id/quick_audio_toggle"
android:layout_width="37dp" android:layout_width="37dp"
android:layout_height="37dp" android:layout_height="37dp"
@ -99,68 +105,72 @@
android:contentDescription="@string/conversation_activity__quick_attachment_drawer_record_and_send_audio_description" android:contentDescription="@string/conversation_activity__quick_attachment_drawer_record_and_send_audio_description"
android:padding="10dp"/> android:padding="10dp"/>
<ImageView android:id="@+id/quick_audio_fab" <ImageView android:id="@+id/quick_audio_fab"
android:layout_width="74dp" android:layout_width="74dp"
android:layout_height="74dp" android:layout_height="74dp"
android:src="@drawable/ic_mic_white_48dp" android:src="@drawable/ic_mic_white_48dp"
android:background="@drawable/circle_tintable" android:background="@drawable/circle_tintable"
android:backgroundTint="@color/red_400" android:backgroundTint="@color/red_400"
android:visibility="gone" android:visibility="gone"
android:scaleType="center"/> android:scaleType="center"/>
</org.thoughtcrime.securesms.components.MicrophoneRecorderView> </org.thoughtcrime.securesms.components.MicrophoneRecorderView>
</org.thoughtcrime.securesms.components.HidingLinearLayout> </org.thoughtcrime.securesms.components.HidingLinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout>
<LinearLayout android:id="@+id/recording_container" <LinearLayout android:id="@+id/recording_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal"
tools:visibility="gone"> tools:visibility="gone">
<TextView android:id="@+id/record_time" <TextView android:id="@+id/record_time"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ellipsize="none" android:ellipsize="none"
android:layout_marginLeft="20dp" android:layout_marginLeft="20dp"
android:layout_marginStart="20dp" android:layout_marginStart="20dp"
android:text="00:00" android:text="00:00"
android:textColor="#61737b" android:textColor="#61737b"
android:textSize="20dp" android:textSize="20dp"
android:singleLine="true" android:singleLine="true"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible"/> tools:visibility="visible"/>
<FrameLayout android:layout_width="match_parent" <FrameLayout android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:clipChildren="true"> android:clipChildren="true">
<TextView android:id="@+id/slide_to_cancel" <TextView android:id="@+id/slide_to_cancel"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center" android:gravity="center"
android:drawableLeft="@drawable/ic_keyboard_arrow_left_grey600_24dp" android:drawableLeft="@drawable/ic_keyboard_arrow_left_grey600_24dp"
android:drawableStart="@drawable/ic_keyboard_arrow_left_grey600_24dp" android:drawableStart="@drawable/ic_keyboard_arrow_left_grey600_24dp"
android:text="@string/conversation_input_panel__slide_to_cancel" android:text="@string/conversation_input_panel__slide_to_cancel"
android:textAllCaps="true" android:textAllCaps="true"
android:textColor="#61737b" android:textColor="#61737b"
android:textSize="10sp" android:textSize="10sp"
android:ellipsize="none" android:ellipsize="none"
android:singleLine="true" android:singleLine="true"
android:paddingLeft="20dp" android:paddingLeft="20dp"
android:paddingStart="20dp" android:paddingStart="20dp"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible"/> tools:visibility="visible"/>
</FrameLayout>
</LinearLayout>
</FrameLayout> </FrameLayout>
</LinearLayout> </LinearLayout>
</FrameLayout> </FrameLayout>
<org.thoughtcrime.securesms.components.AnimatingToggle <org.thoughtcrime.securesms.components.AnimatingToggle
android:id="@+id/button_toggle" android:id="@+id/button_toggle"
android:layout_width="50dp" android:layout_width="50dp"