mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Allow multi-line text in media send flow.

fork-5.53.8
Greyson Parrelli 2021-09-10 10:47:32 -04:00
rodzic 655f3c1219
commit 2eaadd4337
3 zmienionych plików z 20 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
app/src/main/res/drawable/rounded_rectangle_secondary_dark.xml
Wyświetl plik

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" > <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
<solid android:color="@color/core_grey_75"/> <solid android:color="@color/core_grey_75"/>
<corners android:radius="30dp"/> <corners android:radius="20dp"/>
</shape> </shape>

18
app/src/main/res/layout/v2_media_add_message_dialog_fragment.xml
Wyświetl plik

@ -39,13 +39,13 @@
android:layout_height="@dimen/conversation_compose_height" android:layout_height="@dimen/conversation_compose_height"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_marginBottom="6dp"
android:background="?selectableItemBackgroundBorderless" android:background="?selectableItemBackgroundBorderless"
android:contentDescription="@string/conversation_activity__emoji_toggle_description" android:contentDescription="@string/conversation_activity__emoji_toggle_description"
android:paddingStart="4dp" android:paddingStart="8dp"
android:paddingEnd="6dp" android:paddingEnd="6dp"
app:layout_constraintBottom_toBottomOf="@id/add_a_message_input" app:layout_constraintBottom_toTopOf="@id/emoji_drawer_stub"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintTop_toTopOf="@id/add_a_message_input" />
<org.thoughtcrime.securesms.components.ComposeText <org.thoughtcrime.securesms.components.ComposeText
android:id="@+id/add_a_message_input" android:id="@+id/add_a_message_input"
@ -56,10 +56,13 @@
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:background="@null" android:background="@null"
android:hint="@string/MediaReviewFragment__add_a_message" android:hint="@string/MediaReviewFragment__add_a_message"
android:inputType="textCapSentences" android:inputType="textAutoCorrect|textCapSentences|textMultiLine"
android:minHeight="36dp" android:minHeight="36dp"
android:paddingEnd="10dp" android:paddingEnd="10dp"
android:textAppearance="@style/TextAppearance.Signal.Body2" android:maxLines="3"
android:maxLength="65536"
android:imeOptions="flagNoEnterAction"
android:textAppearance="@style/Signal.Text.Body"
app:layout_constraintBottom_toTopOf="@id/emoji_drawer_stub" app:layout_constraintBottom_toTopOf="@id/emoji_drawer_stub"
app:layout_constraintEnd_toStartOf="@id/confirm_button" app:layout_constraintEnd_toStartOf="@id/confirm_button"
app:layout_constraintStart_toEndOf="@id/emoji_toggle" app:layout_constraintStart_toEndOf="@id/emoji_toggle"
@ -71,9 +74,10 @@
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginBottom="2dp"
android:padding="6dp" android:padding="6dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/input_barrier" app:layout_constraintBottom_toTopOf="@id/emoji_drawer_stub"
app:srcCompat="@drawable/v2_media_add_a_message_check" /> app:srcCompat="@drawable/v2_media_add_a_message_check" />
<ViewStub <ViewStub

9
app/src/main/res/layout/v2_media_review_fragment.xml
Wyświetl plik

@ -151,7 +151,7 @@
app:layout_constraintBottom_toTopOf="@id/button_barrier" app:layout_constraintBottom_toTopOf="@id/button_barrier"
tools:alpha="1" /> tools:alpha="1" />
<org.thoughtcrime.securesms.components.emoji.EmojiTextView <org.thoughtcrime.securesms.components.emoji.EmojiEditText
android:id="@+id/add_a_message_entry" android:id="@+id/add_a_message_entry"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -164,9 +164,16 @@
android:minHeight="36dp" android:minHeight="36dp"
android:paddingStart="12dp" android:paddingStart="12dp"
android:paddingEnd="12dp" android:paddingEnd="12dp"
android:paddingTop="6dp"
android:paddingBottom="6dp"
android:textAppearance="@style/Signal.Text.Body" android:textAppearance="@style/Signal.Text.Body"
android:textColor="@color/core_white" android:textColor="@color/core_white"
android:visibility="gone" android:visibility="gone"
android:inputType="none"
android:enabled="false"
android:focusable="false"
android:cursorVisible="false"
android:maxLines="3"
app:layout_constraintBottom_toTopOf="@id/button_barrier" app:layout_constraintBottom_toTopOf="@id/button_barrier"
app:layout_constraintTop_toTopOf="@id/add_a_message_barrier" app:layout_constraintTop_toTopOf="@id/add_a_message_barrier"
tools:visibility="visible" /> tools:visibility="visible" />