TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-07 11:22:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement input bar redesign

Browse Source
This commit is contained in:
Niels Andriesse
2020-01-10 16:35:32 +11:00
parent 4f9b5f06f0
commit c05c1eecd8
30 changed files with 201 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/layout/attachment_type_selector.xml
View File

@@ -233,6 +233,7 @@
android:id="@+id/close_button"
android:layout_width="53dp"
android:layout_height="53dp"
android:paddingTop="4dp"
android:src="@drawable/ic_keyboard_arrow_down_white_24dp"
android:scaleType="center"
android:contentDescription="@string/attachment_type_selector__drawer_description"

4
res/layout/conversation_activity.xml
View File

@@ -112,7 +112,9 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
android:orientation="vertical"
android:clipChildren="false"
android:clipToPadding="false">
<include layout="@layout/view_mention_candidate_selection" />

13
res/layout/conversation_input_panel.xml
View File

@@ -9,6 +9,7 @@
android:gravity="center_vertical"
android:orientation="horizontal"
android:clickable="true"
android:background="@color/compose_view_background"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:paddingTop="6dp"
@@ -96,8 +97,11 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:textColorHint="#99FFFFFF"
android:textSize="@dimen/small_font_size"
android:nextFocusForward="@+id/send_button"
android:nextFocusRight="@+id/send_button"
android:textCursorDrawable="@drawable/session_edit_text_cursor"
tools:visibility="invisible"
tools:hint="Send TextSecure message" >
<requestFocus />
@@ -178,7 +182,6 @@
android:layout_width="@dimen/conversation_compose_height"
android:layout_height="@dimen/conversation_compose_height"
android:layout_marginStart="12dp"
android:background="@drawable/circle_tintable"
android:layout_gravity="bottom">
<ImageButton
@@ -187,7 +190,7 @@
android:layout_height="match_parent"
android:layout_gravity="center"
android:background="@drawable/circle_touch_highlight_background"
android:src="@drawable/ic_add_white_24dp"
android:src="@drawable/ic_circle_plus"
android:contentDescription="@string/ConversationActivity_add_attachment"
android:nextFocusLeft="@+id/embedded_text_editor" />
@@ -195,11 +198,7 @@
android:id="@+id/send_button"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="6dp"
android:paddingEnd="6dp"
android:paddingBottom="6dp"
android:paddingStart="11dp"
android:scaleType="fitCenter"
android:scaleType="centerInside"
android:contentDescription="@string/conversation_activity__send"
android:nextFocusLeft="@+id/embedded_text_editor"
android:src="?conversation_transport_sms_indicator"

10
res/layout/microphone_recorder_view.xml
View File

@@ -7,14 +7,14 @@
<ImageButton
android:id="@+id/quick_audio_toggle"
android:layout_width="24dp"
android:layout_height="match_parent"
android:layout_height="24dp"
android:layout_gravity="center_vertical"
android:layout_marginEnd="2dp"
android:background="@null"
android:contentDescription="@string/conversation_activity__quick_attachment_drawer_record_and_send_audio_description"
android:scaleType="fitCenter"
android:tint="?compose_icon_tint"
app:srcCompat="@drawable/ic_mic_filled_24" />
android:scaleType="centerInside"
android:tint="@color/text"
app:srcCompat="@drawable/ic_microphone" />
<LinearLayout
android:id="@+id/lock_drop_target"
@@ -59,7 +59,7 @@
android:clickable="false"
android:visibility="gone"
android:tint="@color/core_white"
app:srcCompat="@drawable/ic_mic_filled_24"
app:srcCompat="@drawable/ic_microphone"
tools:ignore="ContentDescription"
tools:visibility="visible" />
</merge>

44
res/layout/permissions_rationale_dialog.xml
View File

@@ -1,29 +1,29 @@
<?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:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<LinearLayout android:id="@+id/header_container"
android:background="@color/signal_primary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center"
android:padding="40dp">
<LinearLayout
android:id="@+id/header_container"
android:background="@color/accent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center"
android:padding="40dp">
</LinearLayout>
<TextView android:id="@+id/message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="40dp"
android:paddingBottom="40dp"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:textSize="15sp"
android:lineSpacingMultiplier="1.3"
tools:text="Signal needs access to your contacts and media in order to connect with friends, exchange messages, and make secure calls."/>
<TextView
android:id="@+id/message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/large_spacing"
android:textSize="@dimen/medium_font_size"
android:lineSpacingMultiplier="1.3"
tools:text="Signal needs access to your contacts and media in order to connect with friends, exchange messages, and make secure calls."/>
</LinearLayout>

51
res/layout/recording_layout.xml
View File

@@ -13,13 +13,14 @@
<ImageView
android:id="@+id/microphone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginStart="14dp"
android:importantForAccessibility="no"
android:tint="@color/red_500"
android:tint="@color/destructive"
android:visibility="invisible"
app:srcCompat="@drawable/ic_mic_filled_24"
android:scaleType="centerInside"
app:srcCompat="@drawable/ic_microphone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
@@ -30,11 +31,12 @@
style="@style/Signal.Text.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="2dp"
android:layout_marginStart="4dp"
android:ellipsize="none"
android:singleLine="true"
android:textColor="@color/core_grey_60"
android:textColor="#99FFFFFF"
android:visibility="gone"
android:textSize="@dimen/small_font_size"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/microphone"
app:layout_constraintTop_toTopOf="parent"
@@ -47,17 +49,16 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:layout_marginEnd="@dimen/medium_spacing"
android:ellipsize="none"
android:gravity="center_vertical"
android:padding="4dp"
android:text="@string/conversation_input_panel__cancel"
android:textAllCaps="true"
android:textColor="@color/red_500"
android:textSize="@dimen/small_font_size"
android:textColor="@color/destructive"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/frameLayout"
app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible" />
@@ -70,19 +71,33 @@
app:layout_constraintStart_toEndOf="@+id/record_time"
app:layout_constraintTop_toTopOf="parent">
<TextView
<LinearLayout
android:id="@+id/slide_to_cancel"
style="@style/Signal.Text.Caption"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableStart="@drawable/ic_keyboard_arrow_left_grey600_24dp"
android:ellipsize="none"
android:orientation="horizontal"
android:gravity="center_vertical"
android:text="@string/conversation_input_panel__slide_to_cancel"
android:textAllCaps="true"
android:textColor="@color/core_grey_60"
android:visibility="gone"
tools:visibility="visible" />
tools:visibility="visible">
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginTop="1dp"
android:src="@drawable/ic_keyboard_arrow_left_grey600_24dp"
android:tint="#99FFFFFF"
android:scaleType="centerInside" />
<TextView
style="@style/Signal.Text.Caption"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/small_font_size"
android:ellipsize="none"
android:text="@string/conversation_input_panel__slide_to_cancel"
android:textColor="#99FFFFFF" />
</LinearLayout>
</FrameLayout>